Skip to content

Commit

Permalink
ALSA: emu10k1: documentation updates
Browse files Browse the repository at this point in the history
- Less misinformation
- Language and whitespace fixups

Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Link: https://lore.kernel.org/r/20230405201220.2197893-1-oswald.buddenhagen@gmx.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Oswald Buddenhagen authored and Takashi Iwai committed Apr 6, 2023
1 parent 3ab06bf commit d3330cb
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 21 deletions.
5 changes: 3 additions & 2 deletions Documentation/sound/alsa-configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -723,9 +723,10 @@ Module for EMU10K1/EMU10k2 based PCI sound cards.

* Sound Blaster Live!
* Sound Blaster PCI 512
* Emu APS (partially supported)
* Sound Blaster Audigy

* E-MU APS (partially supported)
* E-MU DAS

extin
bitmap of available external inputs for FX8010 (see below)
extout
Expand Down
27 changes: 15 additions & 12 deletions Documentation/sound/cards/audigy-mixer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ Digital mixer controls
These controls are built using the DSP instructions. They offer extended
functionality. Only the default built-in code in the ALSA driver is described
here. Note that the controls work as attenuators: the maximum value is the
neutral position leaving the signal unchanged. Note that if the same destination
is mentioned in multiple controls, the signal is accumulated and can be wrapped
(set to maximal or minimal value without checking of overflow).
neutral position leaving the signal unchanged. Note that if the same destination
is mentioned in multiple controls, the signal is accumulated and can be clipped
(set to maximal or minimal value without checking for overflow).


Explanation of used abbreviations:
Expand All @@ -32,17 +32,17 @@ ADC
analog to digital converter
I2S
one-way three wire serial bus for digital sound by Philips Semiconductors
(this standard is used for connecting standalone DAC and ADC converters)
(this standard is used for connecting standalone D/A and A/D converters)
LFE
low frequency effects (subwoofer signal)
low frequency effects (used as subwoofer signal)
AC97
a chip containing an analog mixer, DAC and ADC converters
a chip containing an analog mixer, D/A and A/D converters
IEC958
S/PDIF
FX-bus
the EMU10K2 chip has an effect bus containing 64 accumulators.
Each of the synthesizer voices can feed its output to these accumulators
and the DSP microcontroller can operate with the resulting sum.
Each of the synthesizer voices can feed its output to these accumulators
and the DSP microcontroller can operate with the resulting sum.

name='PCM Front Playback Volume',index=0
----------------------------------------
Expand Down Expand Up @@ -218,8 +218,8 @@ LFE outputs.
name='IEC958 Optical Raw Playback Switch',index=0
-------------------------------------------------
If this switch is on, then the samples for the IEC958 (S/PDIF) digital
output are taken only from the raw FX8010 PCM, otherwise standard front
PCM samples are taken.
output are taken only from the raw iec958 ALSA PCM device (which uses
accumulators 20 and 21 for left and right PCM by default).


PCM stream related controls
Expand All @@ -237,8 +237,8 @@ as follows:

name='EMU10K1 PCM Send Routing',index 0-31
------------------------------------------
This control specifies the destination - FX-bus accumulators. There 24
values with this mapping:
This control specifies the destination - FX-bus accumulators. There are 24
values in this mapping:

* 0 - mono, A destination (FX-bus 0-63), default 0
* 1 - mono, B destination (FX-bus 0-63), default 1
Expand Down Expand Up @@ -306,6 +306,9 @@ MANUALS/PATENTS
ftp://opensource.creative.com/pub/doc
-------------------------------------

Note that the site is defunct, but the documents are available
from various other locations.

LM4545.pdf
AC97 Codec

Expand Down
17 changes: 10 additions & 7 deletions Documentation/sound/cards/sb-live-mixer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The ALSA driver programs this portion of chip by default code
IEC958 (S/PDIF) raw PCM
=======================

This PCM device (it's the 4th PCM device (index 3!) and first subdevice
This PCM device (it's the 3rd PCM device (index 2!) and first subdevice
(index 0) for a given card) allows to forward 48kHz, stereo, 16-bit
little endian streams without any modifications to the digital output
(coaxial or optical). The universal interface allows the creation of up
Expand All @@ -33,9 +33,9 @@ Digital mixer controls
These controls are built using the DSP instructions. They offer extended
functionality. Only the default built-in code in the ALSA driver is described
here. Note that the controls work as attenuators: the maximum value is the
neutral position leaving the signal unchanged. Note that if the same destination
is mentioned in multiple controls, the signal is accumulated and can be wrapped
(set to maximal or minimal value without checking of overflow).
neutral position leaving the signal unchanged. Note that if the same destination
is mentioned in multiple controls, the signal is accumulated and can be clipped
(set to maximal or minimal value without checking for overflow).


Explanation of used abbreviations:
Expand All @@ -46,11 +46,11 @@ ADC
analog to digital converter
I2S
one-way three wire serial bus for digital sound by Philips Semiconductors
(this standard is used for connecting standalone DAC and ADC converters)
(this standard is used for connecting standalone D/A and A/D converters)
LFE
low frequency effects (subwoofer signal)
low frequency effects (used as subwoofer signal)
AC97
a chip containing an analog mixer, DAC and ADC converters
a chip containing an analog mixer, D/A and A/D converters
IEC958
S/PDIF
FX-bus
Expand Down Expand Up @@ -313,6 +313,9 @@ MANUALS/PATENTS
ftp://opensource.creative.com/pub/doc
-------------------------------------

Note that the site is defunct, but the documents are available
from various other locations.

LM4545.pdf
AC97 Codec
m2049.pdf
Expand Down

0 comments on commit d3330cb

Please sign in to comment.