summaryrefslogtreecommitdiff
path: root/sys/dev/audio.c
diff options
context:
space:
mode:
authorKlemens Nanni <kn@cvs.openbsd.org>2022-10-26 20:19:10 +0000
committerKlemens Nanni <kn@cvs.openbsd.org>2022-10-26 20:19:10 +0000
commitb3fe5d25736242646ad4720ae465600b98535108 (patch)
treee627aad857a9e5ce1b387b607988565bafb24eae /sys/dev/audio.c
parent9543cc6d3abbc2670d3dd05054df7453ed421348 (diff)
Make audio(9) get_props() optional, remove it from duplex drivers
The property bits of audio(9) are obsolete and ought to be removed completely. sys/dev/audio.c:audio_open() currently uses get_props() to bail out if read *and* write was requested on a non-duplex driver. Drivers that currently support playing but not recording need adjustment before the API can be cleaned up. Drivers that advertise themselves as full duplex, i.e. those that always return AUDIO_PROP_FULLDUPLEX unconditionally in their get_props() currently always succeed this check. As this is the only property, losen audio_open()'s DIAGNOSTIC check and only do the duplex check if the driver provides get_props(). This allows for simple removal of get_props() from full-duplex drivers without adding any other code or without changing functionality. This includes all audio drivers under sys/dev/pci/ (maestro(4) being the only unfinished exception here). Other drivers as well as the API change can then follow in smaller diffs. This builds on amd64, arm64, i386, macppc and sparc64. amd64 with azalia(4) still plays, records as well as plays and records at the same time on my X230 as tested with $ aucat -i play.wav [-o rec.wav] alpha and hppa tests by miod OK ratchov miod
Diffstat (limited to 'sys/dev/audio.c')
-rw-r--r--sys/dev/audio.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/audio.c b/sys/dev/audio.c
index e06f51361b5..700a148c042 100644
--- a/sys/dev/audio.c
+++ b/sys/dev/audio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: audio.c,v 1.201 2022/10/19 19:59:06 kn Exp $ */
+/* $OpenBSD: audio.c,v 1.202 2022/10/26 20:19:07 kn Exp $ */
/*
* Copyright (c) 2015 Alexandre Ratchov <alex@caoua.org>
*
@@ -1209,8 +1209,7 @@ audio_attach(struct device *parent, struct device *self, void *aux)
ops->halt_input == 0 ||
ops->set_port == 0 ||
ops->get_port == 0 ||
- ops->query_devinfo == 0 ||
- ops->get_props == 0) {
+ ops->query_devinfo == 0) {
printf("%s: missing method\n", DEVNAME(sc));
sc->ops = 0;
return;
@@ -1477,7 +1476,6 @@ int
audio_open(struct audio_softc *sc, int flags)
{
int error;
- int props;
if (sc->mode)
return EBUSY;
@@ -1493,11 +1491,13 @@ audio_open(struct audio_softc *sc, int flags)
sc->mode |= AUMODE_PLAY;
if (flags & FREAD)
sc->mode |= AUMODE_RECORD;
- props = sc->ops->get_props(sc->arg);
- if (sc->mode == (AUMODE_PLAY | AUMODE_RECORD)) {
- if (!(props & AUDIO_PROP_FULLDUPLEX)) {
- error = ENOTTY;
- goto bad;
+ if (sc->ops->get_props) {
+ int props = sc->ops->get_props(sc->arg);
+ if (sc->mode == (AUMODE_PLAY | AUMODE_RECORD)) {
+ if (!(props & AUDIO_PROP_FULLDUPLEX)) {
+ error = ENOTTY;
+ goto bad;
+ }
}
}