diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-10-24 16:30:06 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2001-10-24 16:30:06 +0000 |
| commit | 1653b6de40f9ce2e956adccfed2ec3317f8192c3 (patch) | |
| tree | 245ac50ff6fe91158b9e2ef12037eead4e0ca2b4 /sys/dev/ic/ac97.c | |
| parent | 89126a3cbbcf065479cee0993dfd15dd1999b1c6 (diff) | |
replace strings w/ defined names, missing initializer for pcbeep and split tone into bass/treble
Diffstat (limited to 'sys/dev/ic/ac97.c')
| -rw-r--r-- | sys/dev/ic/ac97.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/sys/dev/ic/ac97.c b/sys/dev/ic/ac97.c index 7d12a5c0a06..a2ed297db2c 100644 --- a/sys/dev/ic/ac97.c +++ b/sys/dev/ic/ac97.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ac97.c,v 1.23 2001/10/24 03:52:40 mickey Exp $ */ +/* $OpenBSD: ac97.c,v 1.24 2001/10/24 16:30:05 mickey Exp $ */ /* * Copyright (c) 1999, 2000 Constantine Sapuntzakis @@ -163,15 +163,18 @@ const struct ac97_source_info { WRAP(ac97_volume_stereo), AC97_REG_HEADPHONE_VOLUME, 6, 0, 1, 0, 0x8000 }, { - /* Tone */ - AudioCoutputs, "tone", NULL, AUDIO_MIXER_VALUE, - WRAP(ac97_volume_stereo), + AudioCoutputs, AudioNbass, NULL, AUDIO_MIXER_VALUE, + WRAP(ac97_volume_mono), + AC97_REG_MASTER_TONE, 4, 8, 0, 0, 0x0f0f + }, { + AudioCoutputs, AudioNtreble, NULL, AUDIO_MIXER_VALUE, + WRAP(ac97_volume_mono), AC97_REG_MASTER_TONE, 4, 0, 0, 0, 0x0f0f }, { /* PC Beep Volume */ AudioCinputs, AudioNspeaker, NULL, AUDIO_MIXER_VALUE, WRAP(ac97_volume_mono), - AC97_REG_PCBEEP_VOLUME, 4, 1, 1, 0x0000 + AC97_REG_PCBEEP_VOLUME, 4, 1, 1, 0, 0x0000 }, { /* Phone */ AudioCinputs, "phone", NULL, AUDIO_MIXER_VALUE, @@ -240,26 +243,26 @@ const struct ac97_source_info { WRAP(ac97_on_off), AC97_REG_GP, 1, 13, 0, 0, 0x0000 }, { - AudioCoutputs, AudioNspatial, "center", AUDIO_MIXER_VALUE, + AudioCoutputs, AudioNspatial, AudioNcenter,AUDIO_MIXER_VALUE, WRAP(ac97_volume_mono), AC97_REG_3D_CONTROL, 4, 8, 0, 1, 0x0000 }, { - AudioCoutputs, AudioNspatial, "depth", AUDIO_MIXER_VALUE, + AudioCoutputs, AudioNspatial, AudioNdepth, AUDIO_MIXER_VALUE, WRAP(ac97_volume_mono), AC97_REG_3D_CONTROL, 4, 0, 0, 1, 0x0000 }, { /* Surround volume */ - AudioCoutputs, "surround", NULL, AUDIO_MIXER_VALUE, + AudioCoutputs, AudioNsurround, NULL, AUDIO_MIXER_VALUE, WRAP(ac97_volume_stereo), AC97_REG_SURROUND_VOLUME, 6, 0, 1, 0, 0x8080 }, { /* Center volume */ - AudioCoutputs, "center", NULL, AUDIO_MIXER_VALUE, + AudioCoutputs, AudioNcenter, NULL, AUDIO_MIXER_VALUE, WRAP(ac97_volume_mono), AC97_REG_CENTER_LFE_VOLUME, 6, 0, 1, 0, 0x8080 }, { /* LFE volume */ - AudioCoutputs, "lfe", NULL, AUDIO_MIXER_VALUE, + AudioCoutputs, AudioNlfe, NULL, AUDIO_MIXER_VALUE, WRAP(ac97_volume_mono), AC97_REG_CENTER_LFE_VOLUME, 6, 8, 1, 0, 0x8080 } |