diff options
43 files changed, 147 insertions, 71 deletions
diff --git a/share/man/man4/audio.4 b/share/man/man4/audio.4 index e14a6893489..0c54211e815 100644 --- a/share/man/man4/audio.4 +++ b/share/man/man4/audio.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: audio.4,v 1.51 2008/03/22 11:05:31 ratchov Exp $ +.\" $OpenBSD: audio.4,v 1.52 2008/04/21 00:32:42 jakemsr Exp $ .\" $NetBSD: audio.4,v 1.20 1998/05/28 17:27:15 augustss Exp $ .\" .\" Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: March 22 2008 $ +.Dd $Mdocdate: April 21 2008 $ .Dt AUDIO 4 .Os .Sh NAME @@ -87,14 +87,15 @@ device while it is in use. .Sh SAMPLING DEVICES When .Pa /dev/audio -is opened, it automatically directs the underlying driver to manipulate -monaural 8-bit mu-law samples. +is opened, it automatically configures the underlying driver for the +hardware's default sample format, or monaural 8-bit mu-law if a default +sample format has not been specified by the underlying driver. In addition, if it is opened read-only (write-only) the device is set to half-duplex record (play) mode with recording (playing) unpaused and playing (recording) paused. When .Pa /dev/sound -is opened, it maintains the previous audio sample mode and +is opened, it maintains the previous audio sample format and record/playback mode. In all other respects .Pa /dev/audio diff --git a/share/man/man9/audio.9 b/share/man/man9/audio.9 index d54a2e79558..0be2a30e59c 100644 --- a/share/man/man9/audio.9 +++ b/share/man/man9/audio.9 @@ -1,4 +1,4 @@ -.\" $OpenBSD: audio.9,v 1.17 2007/05/31 19:20:00 jmc Exp $ +.\" $OpenBSD: audio.9,v 1.18 2008/04/21 00:32:42 jakemsr Exp $ .\" $NetBSD: audio.9,v 1.14 2000/02/11 22:56:15 kleink Exp $ .\" .\" Copyright (c) 1999, 2000 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: April 21 2008 $ .Dt AUDIO 9 .Os .Sh NAME @@ -93,6 +93,7 @@ struct audio_hw_if { void (*)(void *), void *, struct audio_params *); int (*trigger_input)(void *, void *, void *, int, void (*)(void *), void *, struct audio_params *); + void (*get_default_params)(void *, int, struct audio_params *); }; struct audio_params { @@ -469,6 +470,21 @@ will be called with the argument Once started, the transfer may be stopped using .Fn halt_input . This function returns 0 on success, otherwise an error code. +.It Fn "void (*get_default_params)" "void *hdl" "int direction" \ +"struct audio_params *param" +This function is optional. +If supplied, it is called to retrieve the default configuration +for the given +.Fa direction , +parameterized in +.Fa param . +.Fa direction +is +.Dv AUMODE_PLAY +or +.Dv AUMODE_RECORD . +The default configuration should not include emulated formats, and should +reflect the optimal operating configuration for the underlying hardware. .El .Pp The diff --git a/sys/arch/hppa/gsc/harmony.c b/sys/arch/hppa/gsc/harmony.c index 2fb05dbc834..8dc70d91c79 100644 --- a/sys/arch/hppa/gsc/harmony.c +++ b/sys/arch/hppa/gsc/harmony.c @@ -1,4 +1,4 @@ -/* $OpenBSD: harmony.c,v 1.25 2006/05/20 01:58:27 mickey Exp $ */ +/* $OpenBSD: harmony.c,v 1.26 2008/04/21 00:32:42 jakemsr Exp $ */ /* * Copyright (c) 2003 Jason L. Wright (jason@thought.net) @@ -104,6 +104,7 @@ struct audio_hw_if harmony_sa_hw_if = { harmony_get_props, harmony_trigger_output, harmony_trigger_input, + NULL }; int harmony_match(struct device *, void *, void *); diff --git a/sys/arch/macppc/dev/aoa.c b/sys/arch/macppc/dev/aoa.c index df6488f7af7..88b3d13da33 100644 --- a/sys/arch/macppc/dev/aoa.c +++ b/sys/arch/macppc/dev/aoa.c @@ -1,5 +1,5 @@ -/* $OpenBSD: aoa.c,v 1.3 2005/11/19 00:44:38 kettenis Exp $ */ -/* $Id: aoa.c,v 1.3 2005/11/19 00:44:38 kettenis Exp $ */ +/* $OpenBSD: aoa.c,v 1.4 2008/04/21 00:32:42 jakemsr Exp $ */ +/* $Id: aoa.c,v 1.4 2008/04/21 00:32:42 jakemsr Exp $ */ /*- * Copyright (c) 2005 Tsubai Masanari. All rights reserved. @@ -93,6 +93,7 @@ struct audio_hw_if aoa_hw_if = { i2s_get_props, i2s_trigger_output, i2s_trigger_input, + NULL }; struct audio_device aoa_device = { diff --git a/sys/arch/macppc/dev/awacs.c b/sys/arch/macppc/dev/awacs.c index b7dcfd723fd..86b49f5b395 100644 --- a/sys/arch/macppc/dev/awacs.c +++ b/sys/arch/macppc/dev/awacs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: awacs.c,v 1.21 2007/11/05 00:17:28 jakemsr Exp $ */ +/* $OpenBSD: awacs.c,v 1.22 2008/04/21 00:32:42 jakemsr Exp $ */ /* $NetBSD: awacs.c,v 1.4 2001/02/26 21:07:51 wiz Exp $ */ /*- @@ -157,7 +157,8 @@ struct audio_hw_if awacs_hw_if = { awacs_mappage, awacs_get_props, awacs_trigger_output, - awacs_trigger_input + awacs_trigger_input, + NULL }; struct audio_device awacs_device = { diff --git a/sys/arch/macppc/dev/daca.c b/sys/arch/macppc/dev/daca.c index 8fcf8053e6d..f7be5eb6c42 100644 --- a/sys/arch/macppc/dev/daca.c +++ b/sys/arch/macppc/dev/daca.c @@ -1,5 +1,5 @@ -/* $OpenBSD: daca.c,v 1.4 2007/04/23 16:27:20 deraadt Exp $ */ -/* $Id: daca.c,v 1.4 2007/04/23 16:27:20 deraadt Exp $ */ +/* $OpenBSD: daca.c,v 1.5 2008/04/21 00:32:42 jakemsr Exp $ */ +/* $Id: daca.c,v 1.5 2008/04/21 00:32:42 jakemsr Exp $ */ /*- * Copyright (c) 2002,2003 Tsubai Masanari. All rights reserved. @@ -100,6 +100,7 @@ struct audio_hw_if daca_hw_if = { i2s_get_props, i2s_trigger_output, i2s_trigger_input, + NULL }; struct audio_device daca_device = { diff --git a/sys/arch/macppc/dev/onyx.c b/sys/arch/macppc/dev/onyx.c index 6417721070a..afb883f77a3 100644 --- a/sys/arch/macppc/dev/onyx.c +++ b/sys/arch/macppc/dev/onyx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: onyx.c,v 1.7 2007/04/23 16:27:20 deraadt Exp $ */ +/* $OpenBSD: onyx.c,v 1.8 2008/04/21 00:32:42 jakemsr Exp $ */ /*- * Copyright (c) 2005 Tsubai Masanari. All rights reserved. @@ -108,6 +108,7 @@ struct audio_hw_if onyx_hw_if = { i2s_get_props, i2s_trigger_output, i2s_trigger_input, + NULL }; struct audio_device onyx_device = { diff --git a/sys/arch/macppc/dev/snapper.c b/sys/arch/macppc/dev/snapper.c index 06322333627..1b334af8c78 100644 --- a/sys/arch/macppc/dev/snapper.c +++ b/sys/arch/macppc/dev/snapper.c @@ -1,4 +1,4 @@ -/* $OpenBSD: snapper.c,v 1.28 2007/04/23 16:27:20 deraadt Exp $ */ +/* $OpenBSD: snapper.c,v 1.29 2008/04/21 00:32:42 jakemsr Exp $ */ /* $NetBSD: snapper.c,v 1.1 2003/12/27 02:19:34 grant Exp $ */ /*- @@ -104,6 +104,7 @@ struct audio_hw_if snapper_hw_if = { i2s_get_props, i2s_trigger_output, i2s_trigger_input, + NULL }; struct audio_device snapper_device = { diff --git a/sys/arch/macppc/dev/tumbler.c b/sys/arch/macppc/dev/tumbler.c index ac5896bf834..e801e7d1a86 100644 --- a/sys/arch/macppc/dev/tumbler.c +++ b/sys/arch/macppc/dev/tumbler.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tumbler.c,v 1.4 2007/04/23 16:27:20 deraadt Exp $ */ +/* $OpenBSD: tumbler.c,v 1.5 2008/04/21 00:32:42 jakemsr Exp $ */ /*- * Copyright (c) 2001,2003 Tsubai Masanari. All rights reserved. @@ -103,6 +103,7 @@ struct audio_hw_if tumbler_hw_if = { i2s_get_props, i2s_trigger_output, i2s_trigger_input, + NULL }; struct audio_device tumbler_device = { diff --git a/sys/arch/sgi/dev/mavb.c b/sys/arch/sgi/dev/mavb.c index e3a1bafd8ec..7e67b2ed0f6 100644 --- a/sys/arch/sgi/dev/mavb.c +++ b/sys/arch/sgi/dev/mavb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mavb.c,v 1.8 2008/02/20 18:46:20 miod Exp $ */ +/* $OpenBSD: mavb.c,v 1.9 2008/04/21 00:32:42 jakemsr Exp $ */ /* * Copyright (c) 2005 Mark Kettenis @@ -194,7 +194,8 @@ struct audio_hw_if mavb_sa_hw_if = { 0, mavb_get_props, mavb_trigger_output, - mavb_trigger_input + mavb_trigger_input, + 0 }; struct audio_device mavb_device = { diff --git a/sys/arch/sparc/dev/amd7930.c b/sys/arch/sparc/dev/amd7930.c index fabc158aedc..5930c16a292 100644 --- a/sys/arch/sparc/dev/amd7930.c +++ b/sys/arch/sparc/dev/amd7930.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amd7930.c,v 1.30 2005/08/14 10:58:33 miod Exp $ */ +/* $OpenBSD: amd7930.c,v 1.31 2008/04/21 00:32:42 jakemsr Exp $ */ /* $NetBSD: amd7930.c,v 1.37 1998/03/30 14:23:40 pk Exp $ */ /* @@ -248,6 +248,7 @@ struct audio_hw_if sa_hw_if = { NULL, amd7930_get_props, NULL, + NULL, NULL }; diff --git a/sys/arch/sparc/dev/cs4231.c b/sys/arch/sparc/dev/cs4231.c index b0625b9d6bd..b055edb650b 100644 --- a/sys/arch/sparc/dev/cs4231.c +++ b/sys/arch/sparc/dev/cs4231.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4231.c,v 1.26 2006/06/02 20:00:54 miod Exp $ */ +/* $OpenBSD: cs4231.c,v 1.27 2008/04/21 00:32:42 jakemsr Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -168,7 +168,8 @@ struct audio_hw_if cs4231_sa_hw_if = { 0, cs4231_get_props, cs4231_trigger_output, - cs4231_trigger_input + cs4231_trigger_input, + 0 }; struct cfattach audiocs_ca = { diff --git a/sys/arch/sparc64/dev/ce4231.c b/sys/arch/sparc64/dev/ce4231.c index 83b7b053803..3849e4c3f1d 100644 --- a/sys/arch/sparc64/dev/ce4231.c +++ b/sys/arch/sparc64/dev/ce4231.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ce4231.c,v 1.21 2005/09/08 15:25:54 martin Exp $ */ +/* $OpenBSD: ce4231.c,v 1.22 2008/04/21 00:32:42 jakemsr Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -184,7 +184,8 @@ struct audio_hw_if ce4231_sa_hw_if = { 0, ce4231_get_props, ce4231_trigger_output, - ce4231_trigger_input + ce4231_trigger_input, + 0 }; struct cfattach audioce_ca = { diff --git a/sys/arch/zaurus/dev/zaurus_audio.c b/sys/arch/zaurus/dev/zaurus_audio.c index d8ce681a6a5..f50d886e759 100644 --- a/sys/arch/zaurus/dev/zaurus_audio.c +++ b/sys/arch/zaurus/dev/zaurus_audio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zaurus_audio.c,v 1.9 2007/11/05 00:17:28 jakemsr Exp $ */ +/* $OpenBSD: zaurus_audio.c,v 1.10 2008/04/21 00:32:42 jakemsr Exp $ */ /* * Copyright (c) 2005 Christopher Pascoe <pascoe@openbsd.org> @@ -158,7 +158,8 @@ struct audio_hw_if wm8750_hw_if = { pxa2x0_i2s_mappage, zaudio_get_props, NULL /* zaudio_trigger_output */, - NULL /* zaudio_trigger_input */ + NULL /* zaudio_trigger_input */, + NULL }; static const unsigned short playback_registers[][2] = { diff --git a/sys/dev/audio.c b/sys/dev/audio.c index bfcefa24863..7fba234145e 100644 --- a/sys/dev/audio.c +++ b/sys/dev/audio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: audio.c,v 1.94 2008/04/04 04:57:16 jakemsr Exp $ */ +/* $OpenBSD: audio.c,v 1.95 2008/04/21 00:32:42 jakemsr Exp $ */ /* $NetBSD: audio.c,v 1.119 1999/11/09 16:50:47 augustss Exp $ */ /* @@ -310,8 +310,14 @@ audioattach(struct device *parent, struct device *self, void *aux) /* * Set default softc params */ - sc->sc_pparams = audio_default; - sc->sc_rparams = audio_default; + + if (hwp->get_default_params) { + hwp->get_default_params(sc, AUMODE_PLAY, &sc->sc_pparams); + hwp->get_default_params(sc, AUMODE_RECORD, &sc->sc_rparams); + } else { + sc->sc_pparams = audio_default; + sc->sc_rparams = audio_default; + } /* Set up some default values */ sc->sc_rr.blkset = sc->sc_pr.blkset = 0; @@ -1001,14 +1007,21 @@ audio_open(dev_t dev, struct audio_softc *sc, int flags, int ifmt, } /* - * Multiplex device: /dev/audio (MU-Law) and /dev/sound (linear) - * The /dev/audio is always (re)set to 8-bit MU-Law mono + * Multiplex device: /dev/audio (default) and /dev/sound (last) + * The /dev/audio is always (re)set to the default parameters. * For the other devices, you get what they were last set to. */ if (ISDEVAUDIO(dev)) { /* /dev/audio */ - sc->sc_rparams = audio_default; - sc->sc_pparams = audio_default; + if (sc->hw_if->get_default_params) { + sc->hw_if->get_default_params(sc, AUMODE_PLAY, + &sc->sc_pparams); + sc->hw_if->get_default_params(sc, AUMODE_RECORD, + &sc->sc_rparams); + } else { + sc->sc_rparams = audio_default; + sc->sc_pparams = audio_default; + } } #ifdef DIAGNOSTIC /* diff --git a/sys/dev/audio_if.h b/sys/dev/audio_if.h index 1f306240de8..1e3164f6861 100644 --- a/sys/dev/audio_if.h +++ b/sys/dev/audio_if.h @@ -1,4 +1,4 @@ -/* $OpenBSD: audio_if.h,v 1.25 2004/04/16 04:53:17 pvalchev Exp $ */ +/* $OpenBSD: audio_if.h,v 1.26 2008/04/21 00:32:42 jakemsr Exp $ */ /* $NetBSD: audio_if.h,v 1.24 1998/01/10 14:07:25 tv Exp $ */ /* @@ -127,6 +127,7 @@ struct audio_hw_if { void (*)(void *), void *, struct audio_params *); int (*trigger_input)(void *, void *, void *, int, void (*)(void *), void *, struct audio_params *); + void (*get_default_params)(void *, int, struct audio_params *); }; struct audio_attach_args { diff --git a/sys/dev/isa/ess.c b/sys/dev/isa/ess.c index b661ad8abb8..a2941cf06bd 100644 --- a/sys/dev/isa/ess.c +++ b/sys/dev/isa/ess.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ess.c,v 1.12 2007/11/05 00:17:28 jakemsr Exp $ */ +/* $OpenBSD: ess.c,v 1.13 2008/04/21 00:32:42 jakemsr Exp $ */ /* $NetBSD: ess.c,v 1.44.4.1 1999/06/21 01:18:00 thorpej Exp $ */ /* @@ -237,6 +237,7 @@ struct audio_hw_if ess_1788_hw_if = { ess_1788_get_props, ess_audio1_trigger_output, ess_audio1_trigger_input, + NULL }; struct audio_hw_if ess_1888_hw_if = { @@ -266,6 +267,7 @@ struct audio_hw_if ess_1888_hw_if = { ess_1888_get_props, ess_audio2_trigger_output, ess_audio1_trigger_input, + NULL }; #ifdef AUDIO_DEBUG diff --git a/sys/dev/isa/gus.c b/sys/dev/isa/gus.c index 657e07c1286..3138299a830 100644 --- a/sys/dev/isa/gus.c +++ b/sys/dev/isa/gus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gus.c,v 1.29 2006/03/04 12:42:23 miod Exp $ */ +/* $OpenBSD: gus.c,v 1.30 2008/04/21 00:32:42 jakemsr Exp $ */ /* $NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $ */ /*- @@ -304,6 +304,7 @@ struct audio_hw_if gus_hw_if = { gus_get_props, NULL, + NULL, NULL }; @@ -340,6 +341,10 @@ static struct audio_hw_if gusmax_hw_if = { ad1848_round, ad1848_mappage, gusmax_get_props, + + NULL, + NULL, + NULL }; /* diff --git a/sys/dev/isa/pas.c b/sys/dev/isa/pas.c index c6879b40eab..7ba974ddaec 100644 --- a/sys/dev/isa/pas.c +++ b/sys/dev/isa/pas.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pas.c,v 1.24 2003/04/27 11:22:53 ho Exp $ */ +/* $OpenBSD: pas.c,v 1.25 2008/04/21 00:32:42 jakemsr Exp $ */ /* $NetBSD: pas.c,v 1.37 1998/01/12 09:43:43 thorpej Exp $ */ /* @@ -136,7 +136,8 @@ struct audio_hw_if pas_hw_if = { sb_mappage, sbdsp_get_props, sbdsp_trigger_output, - sbdsp_trigger_input + sbdsp_trigger_input, + NULL }; /* The Address Translation code is used to convert I/O register addresses to diff --git a/sys/dev/isa/pss.c b/sys/dev/isa/pss.c index bc90bb8c802..a8d7cf3b071 100644 --- a/sys/dev/isa/pss.c +++ b/sys/dev/isa/pss.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pss.c,v 1.22 2003/04/27 11:22:53 ho Exp $ */ +/* $OpenBSD: pss.c,v 1.23 2008/04/21 00:32:42 jakemsr Exp $ */ /* $NetBSD: pss.c,v 1.38 1998/01/12 09:43:44 thorpej Exp $ */ /* @@ -237,6 +237,7 @@ struct audio_hw_if pss_audio_if = { ad1848_mappage, ad1848_get_props, NULL, + NULL, NULL }; diff --git a/sys/dev/isa/sb.c b/sys/dev/isa/sb.c index 78af4793722..0ac148e8b51 100644 --- a/sys/dev/isa/sb.c +++ b/sys/dev/isa/sb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sb.c,v 1.24 2006/04/07 22:41:33 jsg Exp $ */ +/* $OpenBSD: sb.c,v 1.25 2008/04/21 00:32:42 jakemsr Exp $ */ /* $NetBSD: sb.c,v 1.57 1998/01/12 09:43:46 thorpej Exp $ */ /* @@ -128,7 +128,8 @@ struct audio_hw_if sb_hw_if = { sb_mappage, sbdsp_get_props, sbdsp_trigger_output, - sbdsp_trigger_input + sbdsp_trigger_input, + NULL }; #ifdef AUDIO_DEBUG diff --git a/sys/dev/isa/wss.c b/sys/dev/isa/wss.c index 879a09b06b1..6f244ba514b 100644 --- a/sys/dev/isa/wss.c +++ b/sys/dev/isa/wss.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wss.c,v 1.22 2003/04/27 11:22:53 ho Exp $ */ +/* $OpenBSD: wss.c,v 1.23 2008/04/21 00:32:42 jakemsr Exp $ */ /* $NetBSD: wss.c,v 1.42 1998/01/19 22:18:23 augustss Exp $ */ /* @@ -110,6 +110,7 @@ struct audio_hw_if wss_hw_if = { ad1848_mappage, ad1848_get_props, NULL, + NULL, NULL }; diff --git a/sys/dev/isa/ym.c b/sys/dev/isa/ym.c index 7d418659ce7..a0313ef5833 100644 --- a/sys/dev/isa/ym.c +++ b/sys/dev/isa/ym.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ym.c,v 1.13 2006/04/07 22:41:33 jsg Exp $ */ +/* $OpenBSD: ym.c,v 1.14 2008/04/21 00:32:42 jakemsr Exp $ */ /* @@ -93,6 +93,7 @@ struct audio_hw_if ym_hw_if = { ad1848_mappage, ad1848_get_props, NULL, + NULL, NULL }; diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c index 0510ab62e53..57e2c4a7014 100644 --- a/sys/dev/pci/auich.c +++ b/sys/dev/pci/auich.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auich.c,v 1.71 2008/03/24 07:03:16 jakemsr Exp $ */ +/* $OpenBSD: auich.c,v 1.72 2008/04/21 00:32:43 jakemsr Exp $ */ /* * Copyright (c) 2000,2001 Michael Shalayeff @@ -333,7 +333,8 @@ struct audio_hw_if auich_hw_if = { auich_mappage, auich_get_props, auich_trigger_output, - auich_trigger_input + auich_trigger_input, + NULL }; int auich_attach_codec(void *, struct ac97_codec_if *); diff --git a/sys/dev/pci/auixp.c b/sys/dev/pci/auixp.c index da1d0b3e5a0..2e37dbe7e04 100644 --- a/sys/dev/pci/auixp.c +++ b/sys/dev/pci/auixp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auixp.c,v 1.17 2008/02/13 23:35:08 jakemsr Exp $ */ +/* $OpenBSD: auixp.c,v 1.18 2008/04/21 00:32:42 jakemsr Exp $ */ /* $NetBSD: auixp.c,v 1.9 2005/06/27 21:13:09 thorpej Exp $ */ /* @@ -200,7 +200,8 @@ struct audio_hw_if auixp_hw_if = { auixp_mappage, auixp_get_props, auixp_trigger_output, - auixp_trigger_input + auixp_trigger_input, + NULL }; int diff --git a/sys/dev/pci/autri.c b/sys/dev/pci/autri.c index 0735d78ec4f..e5b8fceff18 100644 --- a/sys/dev/pci/autri.c +++ b/sys/dev/pci/autri.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autri.c,v 1.20 2007/05/26 00:36:03 krw Exp $ */ +/* $OpenBSD: autri.c,v 1.21 2008/04/21 00:32:42 jakemsr Exp $ */ /* * Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro. @@ -171,6 +171,7 @@ struct audio_hw_if autri_hw_if = { autri_get_props, autri_trigger_output, autri_trigger_input, + NULL }; #if NMIDI > 0 diff --git a/sys/dev/pci/auvia.c b/sys/dev/pci/auvia.c index 57f192602dc..610d7a85add 100644 --- a/sys/dev/pci/auvia.c +++ b/sys/dev/pci/auvia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auvia.c,v 1.36 2008/03/30 08:48:53 jakemsr Exp $ */ +/* $OpenBSD: auvia.c,v 1.37 2008/04/21 00:32:42 jakemsr Exp $ */ /* $NetBSD: auvia.c,v 1.28 2002/11/04 16:38:49 kent Exp $ */ /*- @@ -210,7 +210,8 @@ struct audio_hw_if auvia_hw_if = { auvia_mappage, auvia_get_props, auvia_trigger_output, - auvia_trigger_input + auvia_trigger_input, + NULL }; int auvia_attach_codec(void *, struct ac97_codec_if *); diff --git a/sys/dev/pci/azalia.c b/sys/dev/pci/azalia.c index 11539fc9ce9..d940c774384 100644 --- a/sys/dev/pci/azalia.c +++ b/sys/dev/pci/azalia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: azalia.c,v 1.47 2008/03/02 17:24:12 deanna Exp $ */ +/* $OpenBSD: azalia.c,v 1.48 2008/04/21 00:32:42 jakemsr Exp $ */ /* $NetBSD: azalia.c,v 1.20 2006/05/07 08:31:44 kent Exp $ */ /*- @@ -325,6 +325,7 @@ struct audio_hw_if azalia_hw_if = { azalia_get_props, azalia_trigger_output, azalia_trigger_input, + NULL }; static const char *pin_devices[16] = { diff --git a/sys/dev/pci/cmpci.c b/sys/dev/pci/cmpci.c index 708ddb594d0..a2395296afa 100644 --- a/sys/dev/pci/cmpci.c +++ b/sys/dev/pci/cmpci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmpci.c,v 1.17 2008/01/09 02:17:52 jakemsr Exp $ */ +/* $OpenBSD: cmpci.c,v 1.18 2008/04/21 00:32:43 jakemsr Exp $ */ /* $NetBSD: cmpci.c,v 1.25 2004/10/26 06:32:20 xtraeme Exp $ */ /* @@ -184,6 +184,7 @@ struct audio_hw_if cmpci_hw_if = { cmpci_get_props, /* get_props */ cmpci_trigger_output, /* trigger_output */ cmpci_trigger_input, /* trigger_input */ + NULL }; /* diff --git a/sys/dev/pci/cs4280.c b/sys/dev/pci/cs4280.c index 28ec6c39829..0659eeb5aef 100644 --- a/sys/dev/pci/cs4280.c +++ b/sys/dev/pci/cs4280.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4280.c,v 1.29 2007/11/05 00:17:28 jakemsr Exp $ */ +/* $OpenBSD: cs4280.c,v 1.30 2008/04/21 00:32:43 jakemsr Exp $ */ /* $NetBSD: cs4280.c,v 1.5 2000/06/26 04:56:23 simonb Exp $ */ /* @@ -270,6 +270,7 @@ struct audio_hw_if cs4280_hw_if = { cs4280_get_props, cs4280_trigger_output, cs4280_trigger_input, + NULL }; #if NMIDI > 0 diff --git a/sys/dev/pci/cs4281.c b/sys/dev/pci/cs4281.c index 8e6cc2cd47c..690c4e096ff 100644 --- a/sys/dev/pci/cs4281.c +++ b/sys/dev/pci/cs4281.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4281.c,v 1.20 2007/10/22 03:16:35 fgsch Exp $ */ +/* $OpenBSD: cs4281.c,v 1.21 2008/04/21 00:32:43 jakemsr Exp $ */ /* $Tera: cs4281.c,v 1.18 2000/12/27 14:24:45 tacha Exp $ */ /* @@ -235,6 +235,7 @@ struct audio_hw_if cs4281_hw_if = { cs4281_get_props, cs4281_trigger_output, cs4281_trigger_input, + NULL }; #if NMIDI > 0 diff --git a/sys/dev/pci/eap.c b/sys/dev/pci/eap.c index 1999f035ddf..afcd912929a 100644 --- a/sys/dev/pci/eap.c +++ b/sys/dev/pci/eap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eap.c,v 1.31 2008/03/21 20:11:36 ratchov Exp $ */ +/* $OpenBSD: eap.c,v 1.32 2008/04/21 00:32:43 jakemsr Exp $ */ /* $NetBSD: eap.c,v 1.46 2001/09/03 15:07:37 reinoud Exp $ */ /* @@ -234,6 +234,7 @@ struct audio_hw_if eap1370_hw_if = { eap_get_props, eap_trigger_output, eap_trigger_input, + NULL }; struct audio_hw_if eap1371_hw_if = { @@ -263,6 +264,7 @@ struct audio_hw_if eap1371_hw_if = { eap_get_props, eap_trigger_output, eap_trigger_input, + NULL }; #if NMIDI > 0 diff --git a/sys/dev/pci/emuxki.c b/sys/dev/pci/emuxki.c index c5da568e230..9013f6b72c6 100644 --- a/sys/dev/pci/emuxki.c +++ b/sys/dev/pci/emuxki.c @@ -1,4 +1,4 @@ -/* $OpenBSD: emuxki.c,v 1.26 2008/03/10 21:25:53 jakemsr Exp $ */ +/* $OpenBSD: emuxki.c,v 1.27 2008/04/21 00:32:43 jakemsr Exp $ */ /* $NetBSD: emuxki.c,v 1.1 2001/10/17 18:39:41 jdolecek Exp $ */ /*- @@ -253,6 +253,7 @@ struct audio_hw_if emuxki_hw_if = { emuxki_get_props, emuxki_trigger_output, emuxki_trigger_input, + NULL }; #if 0 diff --git a/sys/dev/pci/envy.c b/sys/dev/pci/envy.c index 5e4348cff1d..f7903462ef9 100644 --- a/sys/dev/pci/envy.c +++ b/sys/dev/pci/envy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: envy.c,v 1.7 2008/02/21 01:41:04 ratchov Exp $ */ +/* $OpenBSD: envy.c,v 1.8 2008/04/21 00:32:43 jakemsr Exp $ */ /* * Copyright (c) 2007 Alexandre Ratchov <alex@caoua.org> * @@ -120,6 +120,7 @@ struct audio_hw_if envy_hw_if = { envy_get_props, /* get_props */ envy_trigger_output, /* trigger_output */ envy_trigger_input, /* trigger_input */ + NULL }; /* diff --git a/sys/dev/pci/esa.c b/sys/dev/pci/esa.c index ece7ca74fd5..91f03545bc9 100644 --- a/sys/dev/pci/esa.c +++ b/sys/dev/pci/esa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: esa.c,v 1.13 2007/10/22 03:16:35 fgsch Exp $ */ +/* $OpenBSD: esa.c,v 1.14 2008/04/21 00:32:43 jakemsr Exp $ */ /* $NetBSD: esa.c,v 1.12 2002/03/24 14:17:35 jmcneill Exp $ */ /* @@ -207,7 +207,8 @@ struct audio_hw_if esa_hw_if = { esa_mappage, esa_get_props, esa_trigger_output, - esa_trigger_input + esa_trigger_input, + NULL }; struct cfdriver esa_cd = { diff --git a/sys/dev/pci/eso.c b/sys/dev/pci/eso.c index f64980ac1f1..b7af1fb89af 100644 --- a/sys/dev/pci/eso.c +++ b/sys/dev/pci/eso.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eso.c,v 1.24 2008/02/17 05:18:42 brad Exp $ */ +/* $OpenBSD: eso.c,v 1.25 2008/04/21 00:32:43 jakemsr Exp $ */ /* $NetBSD: eso.c,v 1.48 2006/12/18 23:13:39 kleink Exp $ */ /* @@ -158,6 +158,7 @@ struct audio_hw_if eso_hw_if = { eso_get_props, eso_trigger_output, eso_trigger_input, + NULL }; const char * const eso_rev2model[] = { diff --git a/sys/dev/pci/fms.c b/sys/dev/pci/fms.c index a317928a563..32e71fc9a98 100644 --- a/sys/dev/pci/fms.c +++ b/sys/dev/pci/fms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fms.c,v 1.17 2005/04/16 21:57:23 mickey Exp $ */ +/* $OpenBSD: fms.c,v 1.18 2008/04/21 00:32:43 jakemsr Exp $ */ /* $NetBSD: fms.c,v 1.5.4.1 2000/06/30 16:27:50 simonb Exp $ */ /*- @@ -145,7 +145,8 @@ struct audio_hw_if fms_hw_if = { fms_mappage, fms_get_props, fms_trigger_output, - fms_trigger_input + fms_trigger_input, + NULL }; int fms_attach_codec(void *, struct ac97_codec_if *); diff --git a/sys/dev/pci/maestro.c b/sys/dev/pci/maestro.c index 176047252ba..597558e564b 100644 --- a/sys/dev/pci/maestro.c +++ b/sys/dev/pci/maestro.c @@ -1,4 +1,4 @@ -/* $OpenBSD: maestro.c,v 1.23 2007/10/22 21:42:14 ratchov Exp $ */ +/* $OpenBSD: maestro.c,v 1.24 2008/04/21 00:32:43 jakemsr Exp $ */ /* $FreeBSD: /c/ncvs/src/sys/dev/sound/pci/maestro.c,v 1.3 2000/11/21 12:22:11 julian Exp $ */ /* * FreeBSD's ESS Agogo/Maestro driver @@ -571,7 +571,8 @@ struct audio_hw_if maestro_hw_if = { maestro_mappage, maestro_get_props, maestro_trigger_output, - maestro_trigger_input + maestro_trigger_input, + NULL }; struct audio_device maestro_audev = { diff --git a/sys/dev/pci/neo.c b/sys/dev/pci/neo.c index 13181e502f2..1dd62e4e5ac 100644 --- a/sys/dev/pci/neo.c +++ b/sys/dev/pci/neo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: neo.c,v 1.20 2007/11/05 00:17:28 jakemsr Exp $ */ +/* $OpenBSD: neo.c,v 1.21 2008/04/21 00:32:43 jakemsr Exp $ */ /* * Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk> @@ -280,6 +280,7 @@ struct audio_hw_if neo_hw_if = { neo_get_props, neo_trigger_output, neo_trigger_input, + NULL }; diff --git a/sys/dev/pci/sv.c b/sys/dev/pci/sv.c index 76be6bf66d6..678388a3c2f 100644 --- a/sys/dev/pci/sv.c +++ b/sys/dev/pci/sv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sv.c,v 1.23 2008/01/14 01:23:53 jakemsr Exp $ */ +/* $OpenBSD: sv.c,v 1.24 2008/04/21 00:32:43 jakemsr Exp $ */ /* * Copyright (c) 1998 Constantine Paul Sapuntzakis @@ -185,6 +185,7 @@ struct audio_hw_if sv_hw_if = { sv_mappage, sv_get_props, NULL, + NULL, NULL }; diff --git a/sys/dev/pci/yds.c b/sys/dev/pci/yds.c index ce7c862c4dd..d43184596df 100644 --- a/sys/dev/pci/yds.c +++ b/sys/dev/pci/yds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: yds.c,v 1.28 2007/01/06 02:48:40 deraadt Exp $ */ +/* $OpenBSD: yds.c,v 1.29 2008/04/21 00:32:43 jakemsr Exp $ */ /* $NetBSD: yds.c,v 1.5 2001/05/21 23:55:04 minoura Exp $ */ /* @@ -232,7 +232,8 @@ static struct audio_hw_if yds_hw_if = { yds_mappage, yds_get_props, yds_trigger_output, - yds_trigger_input + yds_trigger_input, + NULL }; struct audio_device yds_device = { diff --git a/sys/dev/sbus/cs4231.c b/sys/dev/sbus/cs4231.c index 3f43629560b..4a74570aa19 100644 --- a/sys/dev/sbus/cs4231.c +++ b/sys/dev/sbus/cs4231.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4231.c,v 1.28 2006/06/02 20:00:56 miod Exp $ */ +/* $OpenBSD: cs4231.c,v 1.29 2008/04/21 00:32:43 jakemsr Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -180,7 +180,8 @@ struct audio_hw_if cs4231_sa_hw_if = { 0, cs4231_get_props, cs4231_trigger_output, - cs4231_trigger_input + cs4231_trigger_input, + 0 }; struct cfattach audiocs_ca = { diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c index b48810c78c5..6cfa9e0f822 100644 --- a/sys/dev/usb/uaudio.c +++ b/sys/dev/usb/uaudio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uaudio.c,v 1.56 2007/12/02 14:59:31 robert Exp $ */ +/* $OpenBSD: uaudio.c,v 1.57 2008/04/21 00:32:43 jakemsr Exp $ */ /* $NetBSD: uaudio.c,v 1.90 2004/10/29 17:12:53 kent Exp $ */ /* @@ -351,6 +351,7 @@ struct audio_hw_if uaudio_hw_if = { uaudio_get_props, uaudio_trigger_output, uaudio_trigger_input, + NULL }; struct audio_device uaudio_device = { |