diff options
| author | Klemens Nanni <kn@cvs.openbsd.org> | 2022-10-26 20:19:10 +0000 |
|---|---|---|
| committer | Klemens Nanni <kn@cvs.openbsd.org> | 2022-10-26 20:19:10 +0000 |
| commit | b3fe5d25736242646ad4720ae465600b98535108 (patch) | |
| tree | e627aad857a9e5ce1b387b607988565bafb24eae /sys/dev/sbus | |
| parent | 9543cc6d3abbc2670d3dd05054df7453ed421348 (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/sbus')
| -rw-r--r-- | sys/dev/sbus/cs4231.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/dev/sbus/cs4231.c b/sys/dev/sbus/cs4231.c index 9ef430ff6a2..a9b0c3d682d 100644 --- a/sys/dev/sbus/cs4231.c +++ b/sys/dev/sbus/cs4231.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4231.c,v 1.43 2022/10/19 19:14:17 kn Exp $ */ +/* $OpenBSD: cs4231.c,v 1.44 2022/10/26 20:19:09 kn Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -145,7 +145,6 @@ int cs4231_get_port(void *, mixer_ctrl_t *); int cs4231_query_devinfo(void *, mixer_devinfo_t *); void * cs4231_alloc(void *, int, size_t, int, int); void cs4231_free(void *, void *, int); -int cs4231_get_props(void *); int cs4231_trigger_output(void *, void *, void *, int, void (*)(void *), void *, struct audio_params *); int cs4231_trigger_input(void *, void *, void *, int, @@ -164,7 +163,6 @@ const struct audio_hw_if cs4231_sa_hw_if = { .query_devinfo = cs4231_query_devinfo, .allocm = cs4231_alloc, .freem = cs4231_free, - .get_props = cs4231_get_props, .trigger_output = cs4231_trigger_output, .trigger_input = cs4231_trigger_input, }; @@ -1179,12 +1177,6 @@ cs4231_query_devinfo(void *vsc, mixer_devinfo_t *dip) return (err); } -int -cs4231_get_props(void *vsc) -{ - return (AUDIO_PROP_FULLDUPLEX); -} - /* * Hardware interrupt handler */ |