146,148c146,147
< #define GUSMAX_MIXER
< #ifdef GUSMAX_MIXER
< #define MODE1_REC_DEVICES \
---
>
> #define MSS_REC_DEVICES \
151,153d149
< #define MODE1_MIXER_DEVICES \
< (SOUND_MASK_SYNTH | SOUND_MASK_MIC | SOUND_MASK_CD | \
< SOUND_MASK_IGAIN | SOUND_MASK_PCM|SOUND_MASK_IMIX)
155,178d150
< #define MODE2_MIXER_DEVICES \
< (SOUND_MASK_SYNTH | SOUND_MASK_LINE | SOUND_MASK_MIC | \
< SOUND_MASK_CD | SOUND_MASK_SPEAKER | SOUND_MASK_IGAIN | \
< SOUND_MASK_PCM | SOUND_MASK_IMIX)
<
< #else /* Generic mapping */
<
< #define MODE1_REC_DEVICES \
< (SOUND_MASK_LINE3 | SOUND_MASK_MIC | SOUND_MASK_LINE1|SOUND_MASK_IMIX)
<
< #define MODE1_MIXER_DEVICES \
< (SOUND_MASK_LINE1 | SOUND_MASK_MIC | SOUND_MASK_LINE2 | \
< SOUND_MASK_IGAIN | SOUND_MASK_PCM | SOUND_MASK_IMIX)
<
< #define MODE2_MIXER_DEVICES \
< (SOUND_MASK_LINE1 | SOUND_MASK_MIC | SOUND_MASK_LINE2 | \
< SOUND_MASK_LINE3 | SOUND_MASK_SPEAKER | \
< SOUND_MASK_IGAIN | SOUND_MASK_PCM | SOUND_MASK_IMIX)
< #endif
<
< #define OPTI931_MIXER_DEVICES \
< (SOUND_MASK_VOLUME | SOUND_MASK_SYNTH | SOUND_MASK_PCM | \
< SOUND_MASK_LINE | SOUND_MASK_MIC | SOUND_MASK_CD | SOUND_MASK_IGAIN )
<
180,181c152,154
< * Most of the mixer entries work in backwards. Setting the polarity field
< * makes them to work correctly.
---
> * Table of mixer registers. There is a default table for the
> * AD1848/CS423x clones, and one for the OPTI931. As more WSS
> * clones come out, there ought to be more tables.
182a156,157
> * Fields in the table are : polarity, register, offset, bits
> *
186d160
< * The current version doesn't try to compensate this.
187a162,166
> * Following there is a macro ...MIXER_DEVICES which is a bitmap
> * of all non-zero fields in the table.
> * MODE1_MIXER_DEVICES is the basic mixer of the 1848 in mode 1
> * registers I0..I15)
> *
190,194c169,173
< mixer_ent mix_devices[32][2] = { /* As used in GUS MAX */
< MIX_ENT(SOUND_MIXER_VOLUME, 0, 0, 0, 0, 0, 0, 0, 0),
< MIX_ENT(SOUND_MIXER_BASS, 0, 0, 0, 0, 0, 0, 0, 0),
< MIX_ENT(SOUND_MIXER_TREBLE, 0, 0, 0, 0, 0, 0, 0, 0),
< MIX_ENT(SOUND_MIXER_SYNTH, 4, 1, 0, 5, 5, 1, 0, 5),
---
> mixer_ent mix_devices[32][2] = {
> MIX_NONE(SOUND_MIXER_VOLUME),
> MIX_NONE(SOUND_MIXER_BASS),
> MIX_NONE(SOUND_MIXER_TREBLE),
> MIX_ENT(SOUND_MIXER_SYNTH, 2, 1, 0, 5, 3, 1, 0, 5),
199c178
< MIX_ENT(SOUND_MIXER_CD, 2, 1, 0, 5, 3, 1, 0, 5),
---
> MIX_ENT(SOUND_MIXER_CD, 4, 1, 0, 5, 5, 1, 0, 5),
201,202c180,181
< MIX_ENT(SOUND_MIXER_ALTPCM, 0, 0, 0, 0, 0, 0, 0, 0),
< MIX_ENT(SOUND_MIXER_RECLEV, 0, 0, 0, 0, 0, 0, 0, 0),
---
> MIX_NONE(SOUND_MIXER_ALTPCM),
> MIX_NONE(SOUND_MIXER_RECLEV),
204,207c183,186
< MIX_ENT(SOUND_MIXER_OGAIN, 0, 0, 0, 0, 0, 0, 0, 0),
< MIX_ENT(SOUND_MIXER_LINE1, 2, 1, 0, 5, 3, 1, 0, 5),
< MIX_ENT(SOUND_MIXER_LINE2, 4, 1, 0, 5, 5, 1, 0, 5),
< MIX_ENT(SOUND_MIXER_LINE3, 18, 1, 0, 5, 19, 1, 0, 5)
---
> MIX_NONE(SOUND_MIXER_OGAIN),
> MIX_NONE(SOUND_MIXER_LINE1),
> MIX_NONE(SOUND_MIXER_LINE2),
> MIX_NONE(SOUND_MIXER_LINE3),
209a189,202
> #define MODE2_MIXER_DEVICES \
> (SOUND_MASK_SYNTH | SOUND_MASK_PCM | SOUND_MASK_SPEAKER | \
> SOUND_MASK_LINE | SOUND_MASK_MIC | SOUND_MASK_CD | \
> SOUND_MASK_IMIX | SOUND_MASK_IGAIN )
>
> #define MODE1_MIXER_DEVICES \
> (SOUND_MASK_SYNTH | SOUND_MASK_PCM | SOUND_MASK_MIC | \
> SOUND_MASK_CD | SOUND_MASK_IMIX | SOUND_MASK_IGAIN )
>
>
> /*
> * entries for the opti931...
> */
>
212,213c205,206
< MIX_ENT(SOUND_MIXER_BASS, 0, 0, 0, 0, 0, 0, 0, 0),
< MIX_ENT(SOUND_MIXER_TREBLE, 0, 0, 0, 0, 0, 0, 0, 0),
---
> MIX_NONE(SOUND_MIXER_BASS),
> MIX_NONE(SOUND_MIXER_TREBLE),
216c209
< MIX_ENT(SOUND_MIXER_SPEAKER, 0, 0, 0, 0, 0, 0, 0, 0),
---
> MIX_NONE(SOUND_MIXER_SPEAKER),
220,222c213,215
< MIX_ENT(SOUND_MIXER_IMIX, 0, 0, 0, 0, 0, 0, 0, 0),
< MIX_ENT(SOUND_MIXER_ALTPCM, 0, 0, 0, 0, 0, 0, 0, 0),
< MIX_ENT(SOUND_MIXER_RECLEV, 0, 0, 0, 0, 0, 0, 0, 0),
---
> MIX_NONE(SOUND_MIXER_IMIX),
> MIX_NONE(SOUND_MIXER_ALTPCM),
> MIX_NONE(SOUND_MIXER_RECLEV),
224,227c217,220
< MIX_ENT(SOUND_MIXER_OGAIN, 0, 0, 0, 0, 0, 0, 0, 0),
< MIX_ENT(SOUND_MIXER_LINE1, 2, 1, 0, 5, 3, 1, 0, 5),
< MIX_ENT(SOUND_MIXER_LINE2, 4, 1, 0, 5, 5, 1, 0, 5),
< MIX_ENT(SOUND_MIXER_LINE3, 18, 1, 0, 5, 19, 1, 0, 5)
---
> MIX_NONE(SOUND_MIXER_OGAIN),
> MIX_ENT(SOUND_MIXER_LINE1, 16, 1, 1, 4, 17, 1, 1, 4),
> MIX_NONE(SOUND_MIXER_LINE2),
> MIX_NONE(SOUND_MIXER_LINE3),
229a223,228
> #define OPTI931_MIXER_DEVICES \
> (SOUND_MASK_VOLUME | SOUND_MASK_SYNTH | SOUND_MASK_PCM | \
> SOUND_MASK_LINE | SOUND_MASK_MIC | SOUND_MASK_CD | \
> SOUND_MASK_IGAIN | SOUND_MASK_LINE1 )
>
>