summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Meuser <jakemsr@cvs.openbsd.org>2009-10-27 12:13:34 +0000
committerJacob Meuser <jakemsr@cvs.openbsd.org>2009-10-27 12:13:34 +0000
commitd946c10994ee5e21bcce188d0a8836ab6417cdfa (patch)
treef4bb9f608c79028908d9335c5f3726bff038ae9f
parent407c12a2f94870fb298ea8e6066cc6ee9ba483bf (diff)
in the get_default_parameters method, give the low level drivers a
pointer to the low level driver's softc, not audio's softc. nothing is actually using this yet. ok ratchov
-rw-r--r--sys/dev/audio.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/audio.c b/sys/dev/audio.c
index 9299857f2d1..6dd0f35a685 100644
--- a/sys/dev/audio.c
+++ b/sys/dev/audio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: audio.c,v 1.105 2009/10/13 19:33:16 pirofti Exp $ */
+/* $OpenBSD: audio.c,v 1.106 2009/10/27 12:13:33 jakemsr Exp $ */
/* $NetBSD: audio.c,v 1.119 1999/11/09 16:50:47 augustss Exp $ */
/*
@@ -314,8 +314,8 @@ audioattach(struct device *parent, struct device *self, void *aux)
*/
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);
+ hwp->get_default_params(hdlp, AUMODE_PLAY, &sc->sc_pparams);
+ hwp->get_default_params(hdlp, AUMODE_RECORD, &sc->sc_rparams);
} else {
sc->sc_pparams = audio_default;
sc->sc_rparams = audio_default;
@@ -1014,9 +1014,9 @@ audio_open(dev_t dev, struct audio_softc *sc, int flags, int ifmt,
if (ISDEVAUDIO(dev)) {
/* /dev/audio */
if (sc->hw_if->get_default_params) {
- sc->hw_if->get_default_params(sc, AUMODE_PLAY,
+ sc->hw_if->get_default_params(sc->hw_hdl, AUMODE_PLAY,
&sc->sc_pparams);
- sc->hw_if->get_default_params(sc, AUMODE_RECORD,
+ sc->hw_if->get_default_params(sc->hw_hdl, AUMODE_RECORD,
&sc->sc_rparams);
} else {
sc->sc_rparams = audio_default;