Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ALSA: emu10k1: more documentation updates

- Clarify the data flows. For SB Live! I fixed only the most obvious
point ("from" vs. "for").
- Mention 7.1 side channels on Audigy.
- Be unspecific about the output DACs on Audigy, as lots of variants
actually exist (see emu_chip_details table).

Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Link: https://lore.kernel.org/r/20230825222157.170978-2-oswald.buddenhagen@gmx.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

authored by

Oswald Buddenhagen and committed by
Takashi Iwai
13890a6a d945ef36

+77 -77
+65 -65
Documentation/sound/cards/audigy-mixer.rst
··· 46 46 47 47 name='PCM Front Playback Volume',index=0 48 48 ---------------------------------------- 49 - This control is used to attenuate samples for left and right front PCM FX-bus 49 + This control is used to attenuate samples from left and right front PCM FX-bus 50 50 accumulators. ALSA uses accumulators 8 and 9 for left and right front PCM 51 - samples for 5.1 playback. The result samples are forwarded to the front DAC PCM 52 - slots of the Philips DAC. 51 + samples for 5.1 playback. The result samples are forwarded to the front speakers. 53 52 54 53 name='PCM Surround Playback Volume',index=0 55 54 ------------------------------------------- 56 - This control is used to attenuate samples for left and right surround PCM FX-bus 55 + This control is used to attenuate samples from left and right surround PCM FX-bus 57 56 accumulators. ALSA uses accumulators 2 and 3 for left and right surround PCM 58 - samples for 5.1 playback. The result samples are forwarded to the surround DAC PCM 59 - slots of the Philips DAC. 57 + samples for 5.1 playback. The result samples are forwarded to the surround (rear) 58 + speakers. 59 + 60 + name='PCM Side Playback Volume',index=0 61 + --------------------------------------- 62 + This control is used to attenuate samples from left and right side PCM FX-bus 63 + accumulators. ALSA uses accumulators 14 and 15 for left and right side PCM 64 + samples for 7.1 playback. The result samples are forwarded to the side speakers. 60 65 61 66 name='PCM Center Playback Volume',index=0 62 67 ----------------------------------------- 63 - This control is used to attenuate samples for center PCM FX-bus accumulator. 64 - ALSA uses accumulator 6 for center PCM sample for 5.1 playback. The result sample 65 - is forwarded to the center DAC PCM slot of the Philips DAC. 68 + This control is used to attenuate samples from center PCM FX-bus accumulator. 69 + ALSA uses accumulator 6 for center PCM samples for 5.1 playback. The result 70 + samples are forwarded to the center speaker. 66 71 67 72 name='PCM LFE Playback Volume',index=0 68 73 -------------------------------------- 69 74 This control is used to attenuate sample for LFE PCM FX-bus accumulator. 70 - ALSA uses accumulator 7 for LFE PCM sample for 5.1 playback. The result sample 71 - is forwarded to the LFE DAC PCM slot of the Philips DAC. 75 + ALSA uses accumulator 7 for LFE PCM samples for 5.1 playback. The result 76 + samples are forwarded to the subwoofer. 72 77 73 78 name='PCM Playback Volume',index=0 74 79 ---------------------------------- 75 - This control is used to attenuate samples for left and right PCM FX-bus 80 + This control is used to attenuate samples from left and right PCM FX-bus 76 81 accumulators. ALSA uses accumulators 0 and 1 for left and right PCM samples for 77 - stereo playback. The result samples are forwarded to the front DAC PCM slots 78 - of the Philips DAC. 82 + stereo playback. The result samples are forwarded to the front speakers. 79 83 80 84 name='PCM Capture Volume',index=0 81 85 --------------------------------- 82 - This control is used to attenuate samples for left and right PCM FX-bus 83 - accumulator. ALSA uses accumulators 0 and 1 for left and right PCM. 84 - The result is forwarded to the ADC capture FIFO (thus to the standard capture 85 - PCM device). 86 + This control is used to attenuate samples from left and right PCM FX-bus 87 + accumulators. ALSA uses accumulators 0 and 1 for left and right PCM samples for 88 + stereo playback. The result is forwarded to the standard capture PCM device. 86 89 87 90 name='Music Playback Volume',index=0 88 91 ------------------------------------ 89 - This control is used to attenuate samples for left and right MIDI FX-bus 92 + This control is used to attenuate samples from left and right MIDI FX-bus 90 93 accumulators. ALSA uses accumulators 4 and 5 for left and right MIDI samples. 91 - The result samples are forwarded to the front DAC PCM slots of the AC97 codec. 94 + The result samples are forwarded to the virtual stereo mixer. 92 95 93 96 name='Music Capture Volume',index=0 94 97 ----------------------------------- 95 - These controls are used to attenuate samples for left and right MIDI FX-bus 96 - accumulator. ALSA uses accumulators 4 and 5 for left and right PCM. 97 - The result is forwarded to the ADC capture FIFO (thus to the standard capture 98 - PCM device). 98 + These controls are used to attenuate samples from left and right MIDI FX-bus 99 + accumulator. ALSA uses accumulators 4 and 5 for left and right MIDI samples. 100 + The result is forwarded to the standard capture PCM device. 99 101 100 102 name='Mic Playback Volume',index=0 101 103 ---------------------------------- 102 - This control is used to attenuate samples for left and right Mic input. 103 - For Mic input is used AC97 codec. The result samples are forwarded to 104 - the front DAC PCM slots of the Philips DAC. Samples are forwarded to Mic 105 - capture FIFO (device 1 - 16bit/8KHz mono) too without volume control. 104 + This control is used to attenuate samples from left and right Mic input of 105 + the AC97 codec. The result samples are forwarded to the virtual stereo mixer. 106 106 107 107 name='Mic Capture Volume',index=0 108 108 --------------------------------- 109 - This control is used to attenuate samples for left and right Mic input. 110 - The result is forwarded to the ADC capture FIFO (thus to the standard capture 111 - PCM device). 109 + This control is used to attenuate samples from left and right Mic input of 110 + the AC97 codec. The result is forwarded to the standard capture PCM device. 111 + 112 + The original samples are also forwarded to the Mic capture PCM device (device 1; 113 + 16bit/8KHz mono) without volume control. 112 114 113 115 name='Audigy CD Playback Volume',index=0 114 116 ---------------------------------------- 115 117 This control is used to attenuate samples from left and right IEC958 TTL 116 118 digital inputs (usually used by a CDROM drive). The result samples are 117 - forwarded to the front DAC PCM slots of the Philips DAC. 119 + forwarded to the virtual stereo mixer. 118 120 119 121 name='Audigy CD Capture Volume',index=0 120 122 --------------------------------------- 121 123 This control is used to attenuate samples from left and right IEC958 TTL 122 - digital inputs (usually used by a CDROM drive). The result samples are 123 - forwarded to the ADC capture FIFO (thus to the standard capture PCM device). 124 + digital inputs (usually used by a CDROM drive). The result is forwarded 125 + to the standard capture PCM device. 124 126 125 127 name='IEC958 Optical Playback Volume',index=0 126 128 --------------------------------------------- 127 129 This control is used to attenuate samples from left and right IEC958 optical 128 - digital input. The result samples are forwarded to the front DAC PCM slots 129 - of the Philips DAC. 130 + digital input. The result samples are forwarded to the virtual stereo mixer. 130 131 131 132 name='IEC958 Optical Capture Volume',index=0 132 133 -------------------------------------------- 133 134 This control is used to attenuate samples from left and right IEC958 optical 134 - digital inputs. The result samples are forwarded to the ADC capture FIFO 135 - (thus to the standard capture PCM device). 135 + digital inputs. The result is forwarded to the standard capture PCM device. 136 136 137 137 name='Line2 Playback Volume',index=0 138 138 ------------------------------------ 139 139 This control is used to attenuate samples from left and right I2S ADC 140 - inputs (on the AudigyDrive). The result samples are forwarded to the front 141 - DAC PCM slots of the Philips DAC. 140 + inputs (on the AudigyDrive). The result samples are forwarded to the virtual 141 + stereo mixer. 142 142 143 143 name='Line2 Capture Volume',index=1 144 144 ----------------------------------- 145 145 This control is used to attenuate samples from left and right I2S ADC 146 - inputs (on the AudigyDrive). The result samples are forwarded to the ADC 147 - capture FIFO (thus to the standard capture PCM device). 146 + inputs (on the AudigyDrive). The result is forwarded to the standard capture 147 + PCM device. 148 148 149 149 name='Analog Mix Playback Volume',index=0 150 150 ----------------------------------------- 151 151 This control is used to attenuate samples from left and right I2S ADC 152 - inputs from Philips ADC. The result samples are forwarded to the front 153 - DAC PCM slots of the Philips DAC. This contains mix from analog sources 154 - like CD, Line In, Aux, .... 152 + inputs from Philips ADC. The result samples are forwarded to the virtual 153 + stereo mixer. This contains mix from analog sources like CD, Line In, Aux, .... 155 154 156 155 name='Analog Mix Capture Volume',index=1 157 156 ---------------------------------------- 158 157 This control is used to attenuate samples from left and right I2S ADC 159 - inputs Philips ADC. The result samples are forwarded to the ADC 160 - capture FIFO (thus to the standard capture PCM device). 158 + inputs Philips ADC. The result is forwarded to the standard capture PCM device. 161 159 162 160 name='Aux2 Playback Volume',index=0 163 161 ----------------------------------- 164 162 This control is used to attenuate samples from left and right I2S ADC 165 - inputs (on the AudigyDrive). The result samples are forwarded to the front 166 - DAC PCM slots of the Philips DAC. 163 + inputs (on the AudigyDrive). The result samples are forwarded to the virtual 164 + stereo mixer. 167 165 168 166 name='Aux2 Capture Volume',index=1 169 167 ---------------------------------- 170 168 This control is used to attenuate samples from left and right I2S ADC 171 - inputs (on the AudigyDrive). The result samples are forwarded to the ADC 172 - capture FIFO (thus to the standard capture PCM device). 169 + inputs (on the AudigyDrive). The result is forwarded to the standard capture 170 + PCM device. 173 171 174 172 name='Front Playback Volume',index=0 175 173 ------------------------------------ 176 - All stereo signals are mixed together and mirrored to surround, center and LFE. 177 - This control is used to attenuate samples for left and right front speakers of 178 - this mix. 174 + This control is used to attenuate samples from the virtual stereo mixer. 175 + The result samples are forwarded to the front speakers. 179 176 180 177 name='Surround Playback Volume',index=0 181 178 --------------------------------------- 182 - All stereo signals are mixed together and mirrored to surround, center and LFE. 183 - This control is used to attenuate samples for left and right surround speakers of 184 - this mix. 179 + This control is used to attenuate samples from the virtual stereo mixer. 180 + The result samples are forwarded to the surround (rear) speakers. 181 + 182 + name='Side Playback Volume',index=0 183 + ----------------------------------- 184 + This control is used to attenuate samples from the virtual stereo mixer. 185 + The result samples are forwarded to the side speakers. 185 186 186 187 name='Center Playback Volume',index=0 187 188 ------------------------------------- 188 - All stereo signals are mixed together and mirrored to surround, center and LFE. 189 - This control is used to attenuate sample for center speaker of this mix. 189 + This control is used to attenuate samples from the virtual stereo mixer. 190 + The result samples are forwarded to the center speaker. 190 191 191 192 name='LFE Playback Volume',index=0 192 193 ---------------------------------- 193 - All stereo signals are mixed together and mirrored to surround, center and LFE. 194 - This control is used to attenuate sample for LFE speaker of this mix. 194 + This control is used to attenuate samples from the virtual stereo mixer. 195 + The result samples are forwarded to the subwoofer. 195 196 196 197 name='Tone Control - Switch',index=0 197 198 ------------------------------------ 198 - This control turns the tone control on or off. The samples for front, rear 199 - and center / LFE outputs are affected. 199 + This control turns the tone control on or off. The samples forwarded to 200 + the speaker outputs are affected. 200 201 201 202 name='Tone Control - Bass',index=0 202 203 ---------------------------------- ··· 213 212 214 213 name='Master Playback Volume',index=0 215 214 ------------------------------------- 216 - This control is used to attenuate samples for front, surround, center and 217 - LFE outputs. 215 + This control is used to attenuate samples forwarded to the speaker outputs. 218 216 219 217 name='IEC958 Optical Raw Playback Switch',index=0 220 218 -------------------------------------------------
+12 -12
Documentation/sound/cards/sb-live-mixer.rst
··· 61 61 62 62 ``name='Wave Playback Volume',index=0`` 63 63 --------------------------------------- 64 - This control is used to attenuate samples for left and right PCM FX-bus 64 + This control is used to attenuate samples from left and right PCM FX-bus 65 65 accumulators. ALSA uses accumulators 0 and 1 for left and right PCM samples. 66 66 The result samples are forwarded to the front DAC PCM slots of the AC97 codec. 67 67 68 68 ``name='Wave Surround Playback Volume',index=0`` 69 69 ------------------------------------------------ 70 - This control is used to attenuate samples for left and right PCM FX-bus 70 + This control is used to attenuate samples from left and right PCM FX-bus 71 71 accumulators. ALSA uses accumulators 0 and 1 for left and right PCM samples. 72 72 The result samples are forwarded to the rear I2S DACs. These DACs operates 73 73 separately (they are not inside the AC97 codec). 74 74 75 75 ``name='Wave Center Playback Volume',index=0`` 76 76 ---------------------------------------------- 77 - This control is used to attenuate samples for left and right PCM FX-bus 77 + This control is used to attenuate samples from left and right PCM FX-bus 78 78 accumulators. ALSA uses accumulators 0 and 1 for left and right PCM samples. 79 79 The result is mixed to mono signal (single channel) and forwarded to 80 80 the ??rear?? right DAC PCM slot of the AC97 codec. 81 81 82 82 ``name='Wave LFE Playback Volume',index=0`` 83 83 ------------------------------------------- 84 - This control is used to attenuate samples for left and right PCM FX-bus 84 + This control is used to attenuate samples from left and right PCM FX-bus 85 85 accumulators. ALSA uses accumulators 0 and 1 for left and right PCM. 86 86 The result is mixed to mono signal (single channel) and forwarded to 87 87 the ??rear?? left DAC PCM slot of the AC97 codec. 88 88 89 89 ``name='Wave Capture Volume',index=0``, ``name='Wave Capture Switch',index=0`` 90 90 ------------------------------------------------------------------------------ 91 - These controls are used to attenuate samples for left and right PCM FX-bus 91 + These controls are used to attenuate samples from left and right PCM FX-bus 92 92 accumulator. ALSA uses accumulators 0 and 1 for left and right PCM. 93 93 The result is forwarded to the ADC capture FIFO (thus to the standard capture 94 94 PCM device). 95 95 96 96 ``name='Synth Playback Volume',index=0`` 97 97 ---------------------------------------- 98 - This control is used to attenuate samples for left and right MIDI FX-bus 98 + This control is used to attenuate samples from left and right MIDI FX-bus 99 99 accumulators. ALSA uses accumulators 4 and 5 for left and right MIDI samples. 100 100 The result samples are forwarded to the front DAC PCM slots of the AC97 codec. 101 101 102 102 ``name='Synth Capture Volume',index=0``, ``name='Synth Capture Switch',index=0`` 103 103 -------------------------------------------------------------------------------- 104 - These controls are used to attenuate samples for left and right MIDI FX-bus 105 - accumulator. ALSA uses accumulators 4 and 5 for left and right PCM. 104 + These controls are used to attenuate samples from left and right MIDI FX-bus 105 + accumulator. ALSA uses accumulators 4 and 5 for left and right MIDI samples. 106 106 The result is forwarded to the ADC capture FIFO (thus to the standard capture 107 107 PCM device). 108 108 109 109 ``name='Surround Playback Volume',index=0`` 110 110 ------------------------------------------- 111 - This control is used to attenuate samples for left and right rear PCM FX-bus 111 + This control is used to attenuate samples from left and right rear PCM FX-bus 112 112 accumulators. ALSA uses accumulators 2 and 3 for left and right rear PCM samples. 113 113 The result samples are forwarded to the rear I2S DACs. These DACs operate 114 114 separately (they are not inside the AC97 codec). 115 115 116 116 ``name='Surround Capture Volume',index=0``, ``name='Surround Capture Switch',index=0`` 117 117 -------------------------------------------------------------------------------------- 118 - These controls are used to attenuate samples for left and right rear PCM FX-bus 118 + These controls are used to attenuate samples from left and right rear PCM FX-bus 119 119 accumulators. ALSA uses accumulators 2 and 3 for left and right rear PCM samples. 120 120 The result is forwarded to the ADC capture FIFO (thus to the standard capture 121 121 PCM device). ··· 134 134 135 135 ``name='AC97 Playback Volume',index=0`` 136 136 --------------------------------------- 137 - This control is used to attenuate samples for left and right front ADC PCM slots 137 + This control is used to attenuate samples from left and right front ADC PCM slots 138 138 of the AC97 codec. The result samples are forwarded to the front DAC PCM 139 139 slots of the AC97 codec. 140 140 ··· 145 145 146 146 ``name='AC97 Capture Volume',index=0`` 147 147 -------------------------------------- 148 - This control is used to attenuate samples for left and right front ADC PCM slots 148 + This control is used to attenuate samples from left and right front ADC PCM slots 149 149 of the AC97 codec. The result is forwarded to the ADC capture FIFO (thus to 150 150 the standard capture PCM device). 151 151