diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2005-11-17 02:58:04 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2005-11-17 02:58:04 +0000 |
| commit | 0fbe00f5d955be33cafcb6a5abf51808bd496394 (patch) | |
| tree | 47d3cdb7ef6ef24b871f83f668bc88212b2f749b | |
| parent | ba0393accb0e9d6f8d913fa30ee01ca671befa13 (diff) | |
fix mixer control names.
i2s.c diff from Tsubai Masanari's CVS repo.
ok joris@
| -rw-r--r-- | sys/arch/macppc/dev/awacs.c | 6 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/i2s.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/macppc/dev/awacs.c b/sys/arch/macppc/dev/awacs.c index 22349a304e4..40fb3116a2d 100644 --- a/sys/arch/macppc/dev/awacs.c +++ b/sys/arch/macppc/dev/awacs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: awacs.c,v 1.17 2004/01/18 13:51:35 miod Exp $ */ +/* $OpenBSD: awacs.c,v 1.18 2005/11/17 02:58:03 brad Exp $ */ /* $NetBSD: awacs.c,v 1.4 2001/02/26 21:07:51 wiz Exp $ */ /*- @@ -884,8 +884,8 @@ awacs_query_devinfo(void *h, mixer_devinfo_t *dip) switch (dip->index) { case AWACS_OUTPUT_SELECT: - dip->mixer_class = AWACS_MONITOR_CLASS; - strlcpy(dip->label.name, AudioNoutput, sizeof dip->label.name); + dip->mixer_class = AWACS_OUTPUT_CLASS; + strlcpy(dip->label.name, AudioNselect, sizeof dip->label.name); dip->type = AUDIO_MIXER_SET; dip->prev = dip->next = AUDIO_MIXER_LAST; dip->un.s.num_mem = 2; diff --git a/sys/arch/macppc/dev/i2s.c b/sys/arch/macppc/dev/i2s.c index 125596c5d51..46a01554785 100644 --- a/sys/arch/macppc/dev/i2s.c +++ b/sys/arch/macppc/dev/i2s.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i2s.c,v 1.2 2005/10/31 00:26:07 joris Exp $ */ +/* $OpenBSD: i2s.c,v 1.3 2005/11/17 02:58:03 brad Exp $ */ /* $NetBSD: i2s.c,v 1.1 2003/12/27 02:19:34 grant Exp $ */ /*- @@ -626,8 +626,8 @@ i2s_query_devinfo(h, dip) switch (dip->index) { case I2S_OUTPUT_SELECT: - dip->mixer_class = I2S_MONITOR_CLASS; - strlcpy(dip->label.name, AudioNoutput, sizeof(dip->label.name)); + dip->mixer_class = I2S_OUTPUT_CLASS; + strlcpy(dip->label.name, AudioNselect, sizeof(dip->label.name)); dip->type = AUDIO_MIXER_SET; dip->prev = dip->next = AUDIO_MIXER_LAST; dip->un.s.num_mem = 2; @@ -640,7 +640,7 @@ i2s_query_devinfo(h, dip) return 0; case I2S_VOL_OUTPUT: - dip->mixer_class = I2S_MONITOR_CLASS; + dip->mixer_class = I2S_OUTPUT_CLASS; strlcpy(dip->label.name, AudioNmaster, sizeof(dip->label.name)); dip->type = AUDIO_MIXER_VALUE; dip->prev = dip->next = AUDIO_MIXER_LAST; |