dde_bsd: update audio driver to OpenBSD 7.3

Fixes #4857.
This commit is contained in:
Josef Söntgen
2023-05-04 14:25:34 +02:00
committed by Christian Helmuth
parent 05e5ecca86
commit 03ed5fc3f4
7 changed files with 17 additions and 10 deletions

View File

@ -3,7 +3,7 @@ This repository contains device drivers ported from OpenBSD.
Audio Audio
##### #####
The audio driver is ported from OpenBSD 6.6 and includes support for The audio driver is ported from OpenBSD 7.3 and includes support for
Intel HD Audio devices. The HDA driver works on real hardware and Intel HD Audio devices. The HDA driver works on real hardware and
supposedly in VirtualBox. supposedly in VirtualBox.

View File

@ -1 +1 @@
771f320f0d4e11510d8f565fda456400b4793230 c84599f4ae0aebf2bb6e82151fa629867a3b07c0

View File

@ -3,13 +3,13 @@ VERSION := 1
DOWNLOADS := audio.archive DOWNLOADS := audio.archive
# #
# Audio drivers from OpenBSD 7.1 # Audio drivers from OpenBSD 7.3
# #
SRC_DIR_AUDIO := src/lib/audio SRC_DIR_AUDIO := src/lib/audio
VERSION_AUDIO := 7.1 VERSION_AUDIO := 7.3
BASE_URL := https://cdn.openbsd.org/pub/OpenBSD BASE_URL := https://cdn.openbsd.org/pub/OpenBSD
URL(audio) := $(BASE_URL)/$(VERSION_AUDIO)/sys.tar.gz URL(audio) := $(BASE_URL)/$(VERSION_AUDIO)/sys.tar.gz
SHA(audio) := 890cb97c01052f26cefe5430d635e0fdf6047ca701a99992968e16801e2a6565 SHA(audio) := bb0dfa11584d68464b3f788e43655f6454bb3ecba8ad5500377630bcf23570ec
DIR(audio) := $(SRC_DIR_AUDIO) DIR(audio) := $(SRC_DIR_AUDIO)
TAR_OPT(audio) := --strip-components=1 --files-from $(REP_DIR)/audio.list TAR_OPT(audio) := --strip-components=1 --files-from $(REP_DIR)/audio.list
HASH_INPUT += $(REP_DIR)/audio.list HASH_INPUT += $(REP_DIR)/audio.list

View File

@ -42,7 +42,7 @@ struct cdevsw cdevsw[] = {
audioioctl, audioioctl,
(int (*)(struct tty*, int)) enodev, (int (*)(struct tty*, int)) enodev,
0, 0,
audiopoll, 0,
0, 0,
0, 0,
0, 0,
@ -59,8 +59,8 @@ struct device *config_found_sm(struct device *parent, void *aux, cfprint_t print
cfmatch_t submatch) cfmatch_t submatch)
{ {
struct cfdata *cf = &cfdata[0]; struct cfdata *cf = &cfdata[0];
struct cfattach *ca = cf->cf_attach; struct cfattach const *ca = cf->cf_attach;
struct cfdriver *cd = cf->cf_driver; struct cfdriver const *cd = cf->cf_driver;
int rv = ca->ca_match(parent, NULL, aux); int rv = ca->ca_match(parent, NULL, aux);
if (rv) { if (rv) {

View File

@ -61,12 +61,12 @@ int probe_cfdata(struct pci_attach_args *pa)
size_t i; size_t i;
for (i = 0; i < ncd; i++) { for (i = 0; i < ncd; i++) {
struct cfdata *cf = &cfdata[i]; struct cfdata *cf = &cfdata[i];
struct cfdriver *cd = cf->cf_driver; struct cfdriver const *cd = cf->cf_driver;
if (*cf->cf_parents != PCI_BUS_PARENT) if (*cf->cf_parents != PCI_BUS_PARENT)
continue; continue;
struct cfattach *ca = cf->cf_attach; struct cfattach const *ca = cf->cf_attach;
if (!ca->ca_match) if (!ca->ca_match)
continue; continue;

View File

@ -64,6 +64,7 @@ DUMMY(0, klist_remove)
DUMMY(0, klist_remove_locked) DUMMY(0, klist_remove_locked)
DUMMY(0, knote_modify) DUMMY(0, knote_modify)
DUMMY(0, knote_process) DUMMY(0, knote_process)
DUMMY(0, knote_locked)
DUMMY(0, pci_findvendor) DUMMY(0, pci_findvendor)
DUMMY(0, pci_intr_disestablish) DUMMY(0, pci_intr_disestablish)
DUMMY(0, pci_set_powerstate) DUMMY(0, pci_set_powerstate)

View File

@ -247,6 +247,12 @@ struct kevent
short filter; short filter;
}; };
struct klist;
void knote_locked(struct klist *list, long hint);
#include <sys/queue.h> #include <sys/queue.h>
struct knote; struct knote;