Skip to content

Commit 13890a6

Browse files
ossilatortiwai
authored andcommitted
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>
1 parent d945ef3 commit 13890a6

File tree

2 files changed

+77
-77
lines changed

2 files changed

+77
-77
lines changed

Documentation/sound/cards/audigy-mixer.rst

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -46,157 +46,158 @@ FX-bus
4646

4747
name='PCM Front Playback Volume',index=0
4848
----------------------------------------
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
5050
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.
5352

5453
name='PCM Surround Playback Volume',index=0
5554
-------------------------------------------
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
5756
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.
6065

6166
name='PCM Center Playback Volume',index=0
6267
-----------------------------------------
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.
6671

6772
name='PCM LFE Playback Volume',index=0
6873
--------------------------------------
6974
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.
7277

7378
name='PCM Playback Volume',index=0
7479
----------------------------------
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
7681
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.
7983

8084
name='PCM Capture Volume',index=0
8185
---------------------------------
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.
8689

8790
name='Music Playback Volume',index=0
8891
------------------------------------
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
9093
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.
9295

9396
name='Music Capture Volume',index=0
9497
-----------------------------------
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.
99101

100102
name='Mic Playback Volume',index=0
101103
----------------------------------
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.
106106

107107
name='Mic Capture Volume',index=0
108108
---------------------------------
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.
112114

113115
name='Audigy CD Playback Volume',index=0
114116
----------------------------------------
115117
This control is used to attenuate samples from left and right IEC958 TTL
116118
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.
118120

119121
name='Audigy CD Capture Volume',index=0
120122
---------------------------------------
121123
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.
124126

125127
name='IEC958 Optical Playback Volume',index=0
126128
---------------------------------------------
127129
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.
130131

131132
name='IEC958 Optical Capture Volume',index=0
132133
--------------------------------------------
133134
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.
136136

137137
name='Line2 Playback Volume',index=0
138138
------------------------------------
139139
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.
142142

143143
name='Line2 Capture Volume',index=1
144144
-----------------------------------
145145
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.
148148

149149
name='Analog Mix Playback Volume',index=0
150150
-----------------------------------------
151151
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, ....
155154

156155
name='Analog Mix Capture Volume',index=1
157156
----------------------------------------
158157
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.
161159

162160
name='Aux2 Playback Volume',index=0
163161
-----------------------------------
164162
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.
167165

168166
name='Aux2 Capture Volume',index=1
169167
----------------------------------
170168
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.
173171

174172
name='Front Playback Volume',index=0
175173
------------------------------------
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.
179176

180177
name='Surround Playback Volume',index=0
181178
---------------------------------------
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.
185186

186187
name='Center Playback Volume',index=0
187188
-------------------------------------
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.
190191

191192
name='LFE Playback Volume',index=0
192193
----------------------------------
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.
195196

196197
name='Tone Control - Switch',index=0
197198
------------------------------------
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.
200201

201202
name='Tone Control - Bass',index=0
202203
----------------------------------
@@ -212,8 +213,7 @@ The closest value to pure signal is 20.
212213

213214
name='Master Playback Volume',index=0
214215
-------------------------------------
215-
This control is used to attenuate samples for front, surround, center and
216-
LFE outputs.
216+
This control is used to attenuate samples forwarded to the speaker outputs.
217217

218218
name='IEC958 Optical Raw Playback Switch',index=0
219219
-------------------------------------------------

Documentation/sound/cards/sb-live-mixer.rst

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,61 +61,61 @@ FX-bus
6161

6262
``name='Wave Playback Volume',index=0``
6363
---------------------------------------
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
6565
accumulators. ALSA uses accumulators 0 and 1 for left and right PCM samples.
6666
The result samples are forwarded to the front DAC PCM slots of the AC97 codec.
6767

6868
``name='Wave Surround Playback Volume',index=0``
6969
------------------------------------------------
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
7171
accumulators. ALSA uses accumulators 0 and 1 for left and right PCM samples.
7272
The result samples are forwarded to the rear I2S DACs. These DACs operates
7373
separately (they are not inside the AC97 codec).
7474

7575
``name='Wave Center Playback Volume',index=0``
7676
----------------------------------------------
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
7878
accumulators. ALSA uses accumulators 0 and 1 for left and right PCM samples.
7979
The result is mixed to mono signal (single channel) and forwarded to
8080
the ??rear?? right DAC PCM slot of the AC97 codec.
8181

8282
``name='Wave LFE Playback Volume',index=0``
8383
-------------------------------------------
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
8585
accumulators. ALSA uses accumulators 0 and 1 for left and right PCM.
8686
The result is mixed to mono signal (single channel) and forwarded to
8787
the ??rear?? left DAC PCM slot of the AC97 codec.
8888

8989
``name='Wave Capture Volume',index=0``, ``name='Wave Capture Switch',index=0``
9090
------------------------------------------------------------------------------
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
9292
accumulator. ALSA uses accumulators 0 and 1 for left and right PCM.
9393
The result is forwarded to the ADC capture FIFO (thus to the standard capture
9494
PCM device).
9595

9696
``name='Synth Playback Volume',index=0``
9797
----------------------------------------
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
9999
accumulators. ALSA uses accumulators 4 and 5 for left and right MIDI samples.
100100
The result samples are forwarded to the front DAC PCM slots of the AC97 codec.
101101

102102
``name='Synth Capture Volume',index=0``, ``name='Synth Capture Switch',index=0``
103103
--------------------------------------------------------------------------------
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.
106106
The result is forwarded to the ADC capture FIFO (thus to the standard capture
107107
PCM device).
108108

109109
``name='Surround Playback Volume',index=0``
110110
-------------------------------------------
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
112112
accumulators. ALSA uses accumulators 2 and 3 for left and right rear PCM samples.
113113
The result samples are forwarded to the rear I2S DACs. These DACs operate
114114
separately (they are not inside the AC97 codec).
115115

116116
``name='Surround Capture Volume',index=0``, ``name='Surround Capture Switch',index=0``
117117
--------------------------------------------------------------------------------------
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
119119
accumulators. ALSA uses accumulators 2 and 3 for left and right rear PCM samples.
120120
The result is forwarded to the ADC capture FIFO (thus to the standard capture
121121
PCM device).
@@ -134,7 +134,7 @@ to the ??rear?? left DAC PCM slot of the AC97 codec.
134134

135135
``name='AC97 Playback Volume',index=0``
136136
---------------------------------------
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
138138
of the AC97 codec. The result samples are forwarded to the front DAC PCM
139139
slots of the AC97 codec.
140140

@@ -145,7 +145,7 @@ slots of the AC97 codec.
145145

146146
``name='AC97 Capture Volume',index=0``
147147
--------------------------------------
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
149149
of the AC97 codec. The result is forwarded to the ADC capture FIFO (thus to
150150
the standard capture PCM device).
151151

0 commit comments

Comments
 (0)