[alsa-devel] [PATCH 092/199] Documentation/sound/oss/ALS: Checkpatch cleanup
Documentation/sound/oss/ALS:15: ERROR: trailing whitespace Documentation/sound/oss/ALS:40: ERROR: trailing whitespace Documentation/sound/oss/ALS:55: ERROR: trailing whitespace Documentation/sound/oss/ALS:56: ERROR: trailing whitespace
Signed-off-by: Andrea Gelmini andrea.gelmini@gelma.net --- Documentation/sound/oss/ALS | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/sound/oss/ALS b/Documentation/sound/oss/ALS index d01ffbf..282a2e1 100644 --- a/Documentation/sound/oss/ALS +++ b/Documentation/sound/oss/ALS @@ -12,7 +12,7 @@ SB16 driver). To use an ALS sound card under Linux, enable the following options as modules in the sound configuration section of the kernel config: - 100% Sound Blaster compatibles (SB16/32/64, ESS, Jazz16) support - - FM synthesizer (YM3812/OPL-3) support + - FM synthesizer (YM3812/OPL-3) support - standalone MPU401 support may be required for some cards; for the ALS-007, when using isapnptools, it is required Since the ALS-007/100/200 are PnP cards, ISAPnP support should probably be @@ -37,7 +37,7 @@ requires they be different. For "sb", "io", "irq" and "dma" should be set to the same values used to configure the audio section of the card with isapnp. "dma16" should be explicitly set to "-1" for an ALS-007 since this card does not have a 16 bit dma channel; if not specified the kernel will -default to using channel 5 anyway which will cause audio not to work. +default to using channel 5 anyway which will cause audio not to work. "mpu_io" should be set to 0. The "io" parameter of the "opl3" module should also agree with the setting used by isapnp. To get the MPU401 interface working on an ALS-007 card, the "mpu401" module will be required since this @@ -52,8 +52,8 @@ The resulting sound driver will provide the following capabilities: - Software selection of record source (line in, CD, FM, mic, master) - Record and playback of midi data via the external MPU-401 - Playback of midi data using inbuilt FM synthesizer - - Control of the ALS-007 mixer via any OSS-compatible mixer programs. - Controls available are Master (L&R), Line in (L&R), CD (L&R), + - Control of the ALS-007 mixer via any OSS-compatible mixer programs. + Controls available are Master (L&R), Line in (L&R), CD (L&R), DSP/PCM/audio out (L&R), FM (L&R) and Mic in (mono).
Jonathan Woithe
Documentation/sound/oss/ESS:4: ERROR: trailing whitespace Documentation/sound/oss/ESS:15: ERROR: trailing whitespace
Signed-off-by: Andrea Gelmini andrea.gelmini@gelma.net --- Documentation/sound/oss/ESS | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/sound/oss/ESS b/Documentation/sound/oss/ESS index bba93b4..e21c21c 100644 --- a/Documentation/sound/oss/ESS +++ b/Documentation/sound/oss/ESS @@ -1,7 +1,7 @@ Documentation for the ESS AudioDrive chips
In 2.4 kernels the SoundBlaster driver not only tries to detect an ESS chip, it -tries to detect the type of ESS chip too. The correct detection of the chip +tries to detect the type of ESS chip too. The correct detection of the chip doesn't always succeed however, so unless you use the kernel isapnp facilities (and you chip is pnp capable) the default behaviour is 2.0 behaviour which means: only detect ES688 and ES1688. @@ -12,7 +12,7 @@ people who want to use their ESS for recording sound. Every chip that's detected as a later-than-es1688 chip has a 6 bits logarithmic master volume control.
-Every chip that's detected as a ES1887 now has Full Duplex support. Made a +Every chip that's detected as a ES1887 now has Full Duplex support. Made a little testprogram that shows that is works, haven't seen a real program that needs this however.
Documentation/sound/oss/MultiSound:17: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:21: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:22: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:25: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:36: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:43: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:44: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:47: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:59: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:60: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:68: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:94: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:113: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:118: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:123: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:128: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:153: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:157: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:159: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:163: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:165: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:170: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:173: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:177: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:180: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:183: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:187: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:212: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:215: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:220: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:224: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:225: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:228: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:245: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:246: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:281: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:282: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:285: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:287: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:288: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:290: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:292: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:295: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:298: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:307: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:308: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:311: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:315: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:330: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:333: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:339: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:344: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:517: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:526: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:654: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:676: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:698: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:726: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:806: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:849: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:875: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:909: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:922: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:933: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:980: ERROR: trailing whitespace Documentation/sound/oss/MultiSound:1117: ERROR: trailing whitespace
Signed-off-by: Andrea Gelmini andrea.gelmini@gelma.net --- Documentation/sound/oss/MultiSound | 132 ++++++++++++++++++------------------ 1 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/Documentation/sound/oss/MultiSound b/Documentation/sound/oss/MultiSound index e4a18bb..7a7a882 100644 --- a/Documentation/sound/oss/MultiSound +++ b/Documentation/sound/oss/MultiSound @@ -14,15 +14,15 @@ # # -=-=- Getting Firmware -=-=- # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# +# # See the section `Obtaining and Creating Firmware Files' in this # document for instructions on obtaining the necessary firmware # files. -# -# +# +# # Supported Features # ~~~~~~~~~~~~~~~~~~ -# +# # Currently, full-duplex digital audio (/dev/dsp only, /dev/audio is # not currently available) and mixer functionality (/dev/mixer) are # supported (memory mapped digital audio is not yet supported). @@ -33,18 +33,18 @@ # Support for the Turtle Beach MultiSound Hurricane architecture is # composed of the following modules (these can also operate compiled # into the kernel): -# +# # msnd - MultiSound base (requires soundcore) # # msnd_classic - Base audio/mixer support for Classic, Monetery and # Tahiti cards # # msnd_pinnacle - Base audio/mixer support for Pinnacle and Fiji cards -# -# +# +# # Important Notes - Read Before Using # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# +# # The firmware files are not included (may change in future). You # must obtain these images from Turtle Beach (they are included in # the MultiSound Development Kits), and place them in /etc/sound for @@ -56,8 +56,8 @@ # Please note these files must be binary files, not assembler. See # the section later in this document for instructions to obtain these # files. -# -# +# +# # Configuring Card Resources # ~~~~~~~~~~~~~~~~~~~~~~~~~~ # @@ -65,7 +65,7 @@ # or your machine may crash if you do not do this correctly. ** # # * Classic/Monterey/Tahiti -# +# # These cards are configured through the driver msnd_classic. You must # know the io port, then the driver will select the irq and memory resources # on the card. It is up to you to know if these are free locations or now, @@ -91,7 +91,7 @@ # # # *** PnP mode -# +# # Use pnpdump to obtain a sample configuration if you can; I was able # to obtain one with the command `pnpdump 1 0x203' -- this may vary # for you (running pnpdump by itself did not work for me). Then, @@ -110,22 +110,22 @@ # (READPORT 0x0203) # (CSN 2) # (IDENTIFY *) -# +# # # DSP # (CONFIGURE BVJ0440/-1 (LD 0 # (INT 0 (IRQ 5 (MODE +E))) (IO 0 (BASE 0x0210)) (MEM 0 (BASE 0x0d8000)) # (ACT Y))) -# +# # # Kurzweil Synth (Pinnacle Only) # (CONFIGURE BVJ0440/-1 (LD 1 # (IO 0 (BASE 0x0330)) (INT 0 (IRQ 9 (MODE +E))) # (ACT Y))) -# +# # (WAITFORKEY) # # # *** Non-PnP mode -# +# # The second way is by running the card in non-PnP mode. This # actually has some advantages in that you can access some other # devices on the card, such as the joystick and IDE controller. To @@ -150,41 +150,41 @@ # # ** It is very easy to cause problems in your machine if you choose a # resource value which is incorrect. ** -# +# # # Examples # ~~~~~~~~ -# +# # * MultiSound Classic/Monterey/Tahiti: -# +# # modprobe soundcore # insmod msnd # insmod msnd_classic io=0x290 irq=7 mem=0xd0000 -# +# # * MultiSound Pinnacle in PnP mode: -# +# # modprobe soundcore # insmod msnd # isapnp mypinnacle.conf # insmod msnd_pinnacle io=0x210 irq=5 mem=0xd8000 <-- match mypinnacle.conf values -# +# # * MultiSound Pinnacle in non-PnP mode (replace 0x250 with your configuration port, # one of 0x250, 0x260 or 0x270): -# +# # insmod soundcore # insmod msnd # insmod msnd_pinnacle cfg=0x250 io=0x290 irq=5 mem=0xd0000 -# +# # * To use the MPU-compatible Kurzweil synth on the Pinnacle in PnP # mode, add the following (assumes you did `isapnp mypinnacle.conf'): -# +# # insmod sound # insmod mpu401 io=0x330 irq=9 <-- match mypinnacle.conf values -# +# # * To use the MPU-compatible Kurzweil synth on the Pinnacle in non-PnP # mode, add the following. Note how we first configure the peripheral's # resources, _then_ install a Linux driver for it: -# +# # insmod sound # pinnaclecfg 0x250 mpu 0x330 9 # insmod mpu401 io=0x330 irq=9 @@ -209,23 +209,23 @@ # insmod msnd # insmod msnd_pinnacle cfg=0x250 io=0x290 irq=5 mem=0xd0000 joystick_io=0x200 # -# +# # msnd_classic, msnd_pinnacle Required Options # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# +# # If the following options are not given, the module will not load. # Examine the kernel message log for informative error messages. # WARNING--probing isn't supported so try to make sure you have the # correct shared memory area, otherwise you may experience problems. -# +# # io I/O base of DSP, e.g. io=0x210 # irq IRQ number, e.g. irq=5 # mem Shared memory area, e.g. mem=0xd8000 -# -# +# +# # msnd_classic, msnd_pinnacle Additional Options # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# +# # fifosize The digital audio FIFOs, in kilobytes. If not # specified, the default will be used. Increasing # this value will reduce the chance of a FIFO @@ -242,8 +242,8 @@ # calibrate_signal Setting this to one calibrates the ADCs to the # signal, zero calibrates to the card (defaults # to zero). -# -# +# +# # msnd_pinnacle Additional Options # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # @@ -278,24 +278,24 @@ # ide_io1 Second I/O port of IDE controller # ide_irq IRQ IDE controller # joystick_io I/O port of joystick -# -# +# +# # Obtaining and Creating Firmware Files # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# +# # For the Classic/Tahiti/Monterey -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# # Download to /tmp and unzip the following file from Turtle Beach: -# +# # ftp://ftp.voyetra.com/pub/tbs/msndcl/msndvkit.zip -# +# # When unzipped, unzip the file named MsndFiles.zip. Then copy the # following firmware files to /etc/sound (note the file renaming): -# +# # cp DSPCODE/MSNDINIT.BIN /etc/sound/msndinit.bin # cp DSPCODE/MSNDPERM.REB /etc/sound/msndperm.bin -# +# # When configuring the Linux kernel, specify /etc/sound/msndinit.bin and # /etc/sound/msndperm.bin for the two firmware files (Linux kernel # versions older than 2.2 do not ask for firmware paths, and are @@ -304,15 +304,15 @@ # If you are compiling the driver into the kernel, these files must # be accessible during compilation, but will not be needed later. # The files must remain, however, if the driver is used as a module. -# -# +# +# # For the Pinnacle/Fiji # ~~~~~~~~~~~~~~~~~~~~~ -# +# # Download to /tmp and unzip the following file from Turtle Beach (be # sure to use the entire URL; some have had trouble navigating to the # URL): -# +# # ftp://ftp.voyetra.com/pub/tbs/pinn/pnddk100.zip # # Unpack this shell archive, and run make in the created directory @@ -327,21 +327,21 @@ # To generating the firmware files with the `conv' program, we create # the binary firmware files by doing the following conversion # (assuming the archive unpacked into a directory named PINNDDK): -# +# # ./conv < PINNDDK/dspcode/pndspini.asm > /etc/sound/pndspini.bin # ./conv < PINNDDK/dspcode/pndsperm.asm > /etc/sound/pndsperm.bin -# +# # The conv (and conv.l) program is not needed after conversion and can # be safely deleted. Then, when configuring the Linux kernel, specify # /etc/sound/pndspini.bin and /etc/sound/pndsperm.bin for the two # firmware files (Linux kernel versions older than 2.2 do not ask for # firmware paths, and are hardcoded to /etc/sound). -# +# # If you are compiling the driver into the kernel, these files must # be accessible during compilation, but will not be needed later. # The files must remain, however, if the driver is used as a module. # -# +# # Using Digital I/O with the S/PDIF Port # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # @@ -514,7 +514,7 @@ X exit(1); X } X X recsrc |= SOUND_MASK_DIGITAL1; -X +X X if (ioctl(fd, SOUND_MIXER_WRITE_RECSRC, &recsrc) < 0) { X fprintf(stderr, "error: ioctl write recording source failed\n"); X perror("ioctl"); @@ -523,7 +523,7 @@ X exit(1); X } X X close(fd); -X +X X return 0; } SHAR_EOF @@ -651,7 +651,7 @@ static int msnd_read_cfg_io0(int cfg, int num, WORD *io) { X if (msnd_write_cfg(cfg, IREG_LOGDEVICE, num)) X return -EIO; -X +X X *io = MAKEWORD(msnd_read_cfg(cfg, IREG_IO0_BASELO), X msnd_read_cfg(cfg, IREG_IO0_BASEHI)); X @@ -673,7 +673,7 @@ static int msnd_read_cfg_io1(int cfg, int num, WORD *io) { X if (msnd_write_cfg(cfg, IREG_LOGDEVICE, num)) X return -EIO; -X +X X *io = MAKEWORD(msnd_read_cfg(cfg, IREG_IO1_BASELO), X msnd_read_cfg(cfg, IREG_IO1_BASEHI)); X @@ -695,7 +695,7 @@ static int msnd_read_cfg_irq(int cfg, int num, WORD *irq) { X if (msnd_write_cfg(cfg, IREG_LOGDEVICE, num)) X return -EIO; -X +X X *irq = msnd_read_cfg(cfg, IREG_IRQ_NUMBER); X X return 0; @@ -723,7 +723,7 @@ static int msnd_read_cfg_mem(int cfg, int num, int *mem) { X if (msnd_write_cfg(cfg, IREG_LOGDEVICE, num)) X return -EIO; -X +X X *mem = MAKEWORD(msnd_read_cfg(cfg, IREG_MEMBASELO), X msnd_read_cfg(cfg, IREG_MEMBASEHI)); X *mem <<= 8; @@ -803,7 +803,7 @@ X int i; X X for (i = 0; i < 4; ++i) X msnd_write_cfg_logical(config_port, i, 0, 0, 0, 0); -X +X X return 0; } X @@ -846,7 +846,7 @@ X } X X if (count == 0) X fprintf(stderr, "no devices configured\n"); -X +X X return 0; } X @@ -872,7 +872,7 @@ X fprintf(stderr, "error: io must be one of " X "210, 220, 230, 240, 250, 260, 290, or 3E0\n"); X usage(); X } -X +X X if (!(irq == 5 || X irq == 7 || X irq == 9 || @@ -906,7 +906,7 @@ X if (argc < 2 || X sscanf(argv[0], "0x%x", &io) != 1 || X sscanf(argv[1], "%d", &irq) != 1) X usage(); -X +X X return msnd_write_cfg_logical(config_port, 1, io, 0, irq, 0); } X @@ -919,7 +919,7 @@ X sscanf(argv[0], "0x%x", &io0) != 1 || X sscanf(argv[0], "0x%x", &io1) != 1 || X sscanf(argv[1], "%d", &irq) != 1) X usage(); -X +X X return msnd_write_cfg_logical(config_port, 2, io0, io1, irq, 0); } X @@ -930,7 +930,7 @@ X X if (argc < 1 || X sscanf(argv[0], "0x%x", &io) != 1) X usage(); -X +X X return msnd_write_cfg_logical(config_port, 3, io, 0, 0, 0); } X @@ -977,7 +977,7 @@ X } X X if (rv) X fprintf(stderr, "error: device configuration failed\n"); -X +X X return 0; } SHAR_EOF @@ -1114,7 +1114,7 @@ X exit(1); X } X X close(fd); -X +X X return 0; } SHAR_EOF
Documentation/sound/oss/Opti:86: ERROR: trailing whitespace
Signed-off-by: Andrea Gelmini andrea.gelmini@gelma.net --- Documentation/sound/oss/Opti | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/sound/oss/Opti b/Documentation/sound/oss/Opti index c15af3c..d5cb3e9 100644 --- a/Documentation/sound/oss/Opti +++ b/Documentation/sound/oss/Opti @@ -83,7 +83,7 @@ options opl3 io=0x388 install mad16 /sbin/modprobe -i mad16 && /sbin/ad1848_mixer_reroute 14 8 15 3 16 6
If you have an MPU daughtercard or onboard MPU you will want to add to the -"options mad16" line - eg +"options mad16" line - eg
options mad16 irq=5 dma=0 dma16=3 io=0x530 mpu_io=0x330 mpu_irq=9
Documentation/sound/oss/PAS16:35: ERROR: trailing whitespace Documentation/sound/oss/PAS16:127: ERROR: trailing whitespace Documentation/sound/oss/PAS16:131: ERROR: trailing whitespace Documentation/sound/oss/PAS16:155: ERROR: trailing whitespace Documentation/sound/oss/PAS16:161: ERROR: trailing whitespace Documentation/sound/oss/PAS16:163: ERROR: trailing whitespace
Signed-off-by: Andrea Gelmini andrea.gelmini@gelma.net --- Documentation/sound/oss/PAS16 | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/sound/oss/PAS16 b/Documentation/sound/oss/PAS16 index 951b3dc..fbf0a6a 100644 --- a/Documentation/sound/oss/PAS16 +++ b/Documentation/sound/oss/PAS16 @@ -32,7 +32,7 @@ when answering to these questions since answering y to a question may prevent some later ones from being asked. For example don't answer y to the question about (PAS16) if you don't really have a PAS16. Sound configuration may also be made modular by answering m to configuration -options presented. +options presented.
Note also that all questions may not be asked. The configuration program may disable some questions depending on the earlier choices. It may also @@ -124,11 +124,11 @@ CONFIG_SOUND_YM3812 If you compile the driver into the kernel, you have to add "opl3=<io>" to the kernel command line.
- If you compile your drivers into the kernel, you MUST configure + If you compile your drivers into the kernel, you MUST configure OPL3 support as a module for PAS16 support to work properly. You can then get OPL3 functionality by issuing the command: insmod opl3 - In addition, you must either add the following line to + In addition, you must either add the following line to /etc/modprobe.conf: options opl3 io=0x388 or else add the following line to /etc/lilo.conf: @@ -152,12 +152,12 @@ I have also included the following append line in /etc/lilo.conf: append="pas2=0x388,10,3,-1,0x220,5,1,-1 sb=0x220,5,1,-1 opl3=0x388"
The io address of 0x388 is default configuration on the PAS16. The -irq of 10 and dma of 3 may not match your installation. The above +irq of 10 and dma of 3 may not match your installation. The above configuration enables PAS16, 8-bit Soundblaster and OPL3 functionality. If Soundblaster functionality is not desired, the following line would be appropriate: append="pas2=0x388,10,3,-1,0,-1,-1,-1 opl3=0x388"
-If sound is built totally modular, the above options may be +If sound is built totally modular, the above options may be specified in /etc/modprobe.conf for pas2, sb and opl3 -respectively. +respectively.
Documentation/sound/oss/PSS:1: ERROR: trailing whitespace Documentation/sound/oss/PSS:2: ERROR: trailing whitespace Documentation/sound/oss/PSS:3: ERROR: trailing whitespace Documentation/sound/oss/PSS:4: ERROR: trailing whitespace Documentation/sound/oss/PSS:17: ERROR: trailing whitespace Documentation/sound/oss/PSS:21: ERROR: trailing whitespace Documentation/sound/oss/PSS:31: ERROR: trailing whitespace Documentation/sound/oss/PSS:34: ERROR: trailing whitespace
Signed-off-by: Andrea Gelmini andrea.gelmini@gelma.net --- Documentation/sound/oss/PSS | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Documentation/sound/oss/PSS b/Documentation/sound/oss/PSS index 187b952..f173ecf 100644 --- a/Documentation/sound/oss/PSS +++ b/Documentation/sound/oss/PSS @@ -1,7 +1,7 @@ -The PSS cards and other ECHO based cards provide an onboard DSP with -downloadable programs and also has an AD1848 "Microsoft Sound System" -device. The PSS driver enables MSS and MPU401 modes of the card. SB -is not enabled since it doesn't work concurrently with MSS. +The PSS cards and other ECHO based cards provide an onboard DSP with +downloadable programs and also has an AD1848 "Microsoft Sound System" +device. The PSS driver enables MSS and MPU401 modes of the card. SB +is not enabled since it doesn't work concurrently with MSS.
If you build this driver as a module then the driver takes the following parameters @@ -14,11 +14,11 @@ mss_io The base address of the Microsoft Sound System interface.
mss_irq The interrupt assigned to the Microsoft Sound System emulation. IRQ's 3,5,7,9,10,11 and 12 are available. If you - get IRQ errors be sure to check the interrupt is set to + get IRQ errors be sure to check the interrupt is set to "ISA/Legacy" in the BIOS on modern machines.
mss_dma The DMA channel used by the Microsoft Sound System. - This can be 0, 1, or 3. DMA 0 is not available on older + This can be 0, 1, or 3. DMA 0 is not available on older machines and will cause a crash on them.
mpu_io The MPU emulation base address. This sets the base of the @@ -28,10 +28,10 @@ mpu_irq The interrupt to use for the synthesizer. It must differ from the IRQ used by the Microsoft Sound System port.
-The mpu_io/mpu_irq fields are optional. If they are not specified the +The mpu_io/mpu_irq fields are optional. If they are not specified the synthesizer parts are not configured.
-When the module is loaded it looks for a file called +When the module is loaded it looks for a file called /etc/sound/pss_synth. This is the firmware file from the DOS install disks. This fil holds a general MIDI emulation. The file expected is called genmidi.ld on newer DOS driver install disks and synth.ld on older ones.
Documentation/sound/oss/PSS-updates:1: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:4: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:5: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:6: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:11: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:12: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:13: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:14: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:15: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:16: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:17: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:22: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:23: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:24: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:25: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:26: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:27: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:28: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:29: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:30: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:31: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:32: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:33: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:36: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:37: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:42: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:43: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:44: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:45: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:46: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:47: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:48: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:49: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:50: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:51: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:56: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:57: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:58: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:59: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:60: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:61: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:62: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:67: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:68: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:69: ERROR: trailing whitespace Documentation/sound/oss/PSS-updates:70: ERROR: trailing whitespace
Signed-off-by: Andrea Gelmini andrea.gelmini@gelma.net --- Documentation/sound/oss/PSS-updates | 92 +++++++++++++++++----------------- 1 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/Documentation/sound/oss/PSS-updates b/Documentation/sound/oss/PSS-updates index c84dd75..83a94c4 100644 --- a/Documentation/sound/oss/PSS-updates +++ b/Documentation/sound/oss/PSS-updates @@ -1,73 +1,73 @@ - This file contains notes for users of PSS sound cards who wish to use the + This file contains notes for users of PSS sound cards who wish to use the newly added features of the newest version of this driver.
- The major enhancements present in this new revision of this driver is the -addition of two new module parameters that allow you to take full advantage of -all the features present on your PSS sound card. These features include the + The major enhancements present in this new revision of this driver is the +addition of two new module parameters that allow you to take full advantage of +all the features present on your PSS sound card. These features include the ability to enable both the builtin CDROM and joystick ports.
pss_enable_joystick
- This parameter is basically a flag. A 0 will leave the joystick port -disabled, while a non-zero value would enable the joystick port. The default -setting is pss_enable_joystick=0 as this keeps this driver fully compatible -with systems that were using previous versions of this driver. If you wish to -enable the joystick port you will have to add pss_enable_joystick=1 as an -argument to the driver. To actually use the joystick port you will then have -to load the joystick driver itself. Just remember to load the joystick driver + This parameter is basically a flag. A 0 will leave the joystick port +disabled, while a non-zero value would enable the joystick port. The default +setting is pss_enable_joystick=0 as this keeps this driver fully compatible +with systems that were using previous versions of this driver. If you wish to +enable the joystick port you will have to add pss_enable_joystick=1 as an +argument to the driver. To actually use the joystick port you will then have +to load the joystick driver itself. Just remember to load the joystick driver AFTER the pss sound driver.
pss_cdrom_port
- This parameter takes a port address as its parameter. Any available port -address can be specified to enable the CDROM port, except for 0x0 and -1 as -these values would leave the port disabled. Like the joystick port, the cdrom -port will require that an appropriate CDROM driver be loaded before you can make -use of the newly enabled CDROM port. Like the joystick port option above, -remember to load the CDROM driver AFTER the pss sound driver. While it may -differ on some PSS sound cards, all the PSS sound cards that I have seen have a -builtin Wearnes CDROM port. If this is the case with your PSS sound card you -should load aztcd with the appropriate port option that matches the port you -assigned to the CDROM port when you loaded your pss sound driver. (ex. -modprobe pss pss_cdrom_port=0x340 && modprobe aztcd aztcd=0x340) The default -setting of this parameter leaves the CDROM port disabled to maintain full + This parameter takes a port address as its parameter. Any available port +address can be specified to enable the CDROM port, except for 0x0 and -1 as +these values would leave the port disabled. Like the joystick port, the cdrom +port will require that an appropriate CDROM driver be loaded before you can make +use of the newly enabled CDROM port. Like the joystick port option above, +remember to load the CDROM driver AFTER the pss sound driver. While it may +differ on some PSS sound cards, all the PSS sound cards that I have seen have a +builtin Wearnes CDROM port. If this is the case with your PSS sound card you +should load aztcd with the appropriate port option that matches the port you +assigned to the CDROM port when you loaded your pss sound driver. (ex. +modprobe pss pss_cdrom_port=0x340 && modprobe aztcd aztcd=0x340) The default +setting of this parameter leaves the CDROM port disabled to maintain full compatibility with systems using previous versions of this driver.
- Other options have also been added for the added convenience and utility -of the user. These options are only available if this driver is loaded as a + Other options have also been added for the added convenience and utility +of the user. These options are only available if this driver is loaded as a module.
pss_no_sound
- This module parameter is a flag that can be used to tell the driver to -just configure non-sound components. 0 configures all components, a non-0 -value will only attept to configure the CDROM and joystick ports. This -parameter can be used by a user who only wished to use the builtin joystick -and/or CDROM port(s) of his PSS sound card. If this driver is loaded with this -parameter and with the parameter below set to true then a user can safely unload -this driver with the following command "rmmod pss && rmmod ad1848 && rmmod -mpu401 && rmmod sound && rmmod soundcore" and retain the full functionality of -his CDROM and/or joystick port(s) while gaining back the memory previously used -by the sound drivers. This default setting of this parameter is 0 to retain + This module parameter is a flag that can be used to tell the driver to +just configure non-sound components. 0 configures all components, a non-0 +value will only attept to configure the CDROM and joystick ports. This +parameter can be used by a user who only wished to use the builtin joystick +and/or CDROM port(s) of his PSS sound card. If this driver is loaded with this +parameter and with the parameter below set to true then a user can safely unload +this driver with the following command "rmmod pss && rmmod ad1848 && rmmod +mpu401 && rmmod sound && rmmod soundcore" and retain the full functionality of +his CDROM and/or joystick port(s) while gaining back the memory previously used +by the sound drivers. This default setting of this parameter is 0 to retain full behavioral compatibility with previous versions of this driver.
pss_keep_settings
- This parameter can be used to specify whether you want the driver to reset -all emulations whenever its unloaded. This can be useful for those who are -sharing resources (io ports, IRQ's, DMA's) between different ISA cards. This -flag can also be useful in that future versions of this driver may reset all -emulations by default on the driver's unloading (as it probably should), so -specifying it now will ensure that all future versions of this driver will -continue to work as expected. The default value of this parameter is 1 to + This parameter can be used to specify whether you want the driver to reset +all emulations whenever its unloaded. This can be useful for those who are +sharing resources (io ports, IRQ's, DMA's) between different ISA cards. This +flag can also be useful in that future versions of this driver may reset all +emulations by default on the driver's unloading (as it probably should), so +specifying it now will ensure that all future versions of this driver will +continue to work as expected. The default value of this parameter is 1 to retain full behavioral compatibility with previous versions of this driver.
pss_firmware
- This parameter can be used to specify the file containing the firmware -code so that a user could tell the driver where that file is located instead -of having to put it in a predefined location with a predefined name. The -default setting of this parameter is "/etc/sound/pss_synth" as this was the + This parameter can be used to specify the file containing the firmware +code so that a user could tell the driver where that file is located instead +of having to put it in a predefined location with a predefined name. The +default setting of this parameter is "/etc/sound/pss_synth" as this was the path and filename the hardcoded value in the previous versions of this driver.
Examples:
Documentation/sound/oss/README.OSS:25: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:87: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:108: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:158: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:159: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:190: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:201: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:234: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:236: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:266: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:277: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:284: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:312: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:322: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:323: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:380: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:467: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:468: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:473: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:487: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:488: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:515: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:546: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:559: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:571: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:612: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:618: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:632: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:645: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:647: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:685: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:701: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:702: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:725: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:766: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:798: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:803: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:819: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:825: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:836: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:843: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:922: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:952: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:959: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:963: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:984: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:1062: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:1071: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:1095: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:1139: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:1248: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:1255: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:1261: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:1262: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:1363: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:1373: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:1376: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:1382: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:1390: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:1391: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:1414: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:1415: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:1417: ERROR: trailing whitespace Documentation/sound/oss/README.OSS:1419: ERROR: trailing whitespace
Signed-off-by: Andrea Gelmini andrea.gelmini@gelma.net --- Documentation/sound/oss/README.OSS | 128 ++++++++++++++++++------------------ 1 files changed, 64 insertions(+), 64 deletions(-)
diff --git a/Documentation/sound/oss/README.OSS b/Documentation/sound/oss/README.OSS index fd42b05..e56a64a 100644 --- a/Documentation/sound/oss/README.OSS +++ b/Documentation/sound/oss/README.OSS @@ -22,7 +22,7 @@ document can be still interesting and very helpful. OSS/Free version 3.8 release notes ----------------------------------
-Please read the SOUND-HOWTO (available from sunsite.unc.edu and other Linux FTP +Please read the SOUND-HOWTO (available from sunsite.unc.edu and other Linux FTP sites). It gives instructions about using sound with Linux. It's bit out of date but still very useful. Information about bug fixes and such things is available from the web page (see above). @@ -84,7 +84,7 @@ contributors. (I could have forgotten some names.) James Hightower Spotting a tiny but important bug in CS423x support. Denis Sablic OPTi 82C924 specific enhancements (non PnP mode) Tim MacKenzie Full duplex support for OPTi 82C930. - + Please look at lowlevel/README for more contributors.
There are probably many other names missing. If you have sent me some @@ -105,7 +105,7 @@ sending me patches relative to production kernels. Sponsors etc. -------------
-The following companies have greatly helped development of this driver +The following companies have greatly helped development of this driver in form of a free copy of their product:
Novell, Inc. UnixWare personal edition + SDK @@ -155,8 +155,8 @@ The following errors are likely with /dev/dsp and /dev/audio. device file or the sound driver has been compiled without support for this particular device. For example /dev/audio and /dev/dsp will not work if "digitized voice support" was not enabled during "make config". - - - "Device or resource busy". Probably the IRQ (or DMA) channel + + - "Device or resource busy". Probably the IRQ (or DMA) channel required by the sound card is in use by some other device/driver.
- "I/O error". Almost certainly (99%) it's an IRQ or DMA conflict. @@ -187,7 +187,7 @@ IMPORTANT! Read this if you are installing a separately sources). Remove old version of linux/drivers/sound directory before installing new files.
-- To build the device files you need to run the enclosed shell script +- To build the device files you need to run the enclosed shell script (see below). You need to do this only when installing sound driver first time or when upgrading to much recent version than the earlier one. @@ -198,7 +198,7 @@ IMPORTANT! Read this if you are installing a separately contains card specific instructions for configuring this driver for use with various sound cards.
-Boot time configuration (using lilo and insmod) +Boot time configuration (using lilo and insmod) -----------------------------------------------
This information has been removed. Too many users didn't believe @@ -231,9 +231,9 @@ Configuring version 3.8 (for Linux) with some common sound cards
This document describes configuring sound cards with the freeware version of Open Sound Systems (OSS/Free). Information about the commercial version -(OSS/Linux) and its configuration is available from +(OSS/Linux) and its configuration is available from http://www.opensound.com/linux.html. Information presented here is -not valid for OSS/Linux. +not valid for OSS/Linux.
If you are unsure about how to configure OSS/Free you can download the free evaluation version of OSS/Linux from the above @@ -263,7 +263,7 @@ Sound Blaster. Only the cards made by Creative Technology or which have one or more chips labeled by Creative are SB compatible. In addition there are few sound chipsets which are SB compatible in Linux such as ESS1688 or Jazz16. Note that SB compatibility in DOS/Windows does _NOT_ mean anything -in Linux. +in Linux.
IF YOU REALLY ARE 150% SURE YOU HAVE A SOUND BLASTER YOU CAN SKIP THE REST OF THIS CHAPTER. @@ -274,14 +274,14 @@ in SB mode but in general it's a complete waste of time. There are several problems which you will encounter by using SB mode with cards that are not truly SB compatible:
-- The SB emulation is at most SB Pro (DSP version 3.x) which means that +- The SB emulation is at most SB Pro (DSP version 3.x) which means that you get only 8 bit audio (there is always an another ("native") mode which gives the 16 bit capability). The 8 bit only operation is the reason why many users claim that sound quality in Linux is much worse than in DOS. In addition some applications require 16 bit mode and they produce just noise with a 8 bit only device. - The card may work only in some cases but refuse to work most of the -time. The SB compatible mode always requires special initialization which is +time. The SB compatible mode always requires special initialization which is done by the DOS/Windows drivers. This kind of cards work in Linux after you have warm booted it after DOS but they don't work after cold boot (power on or reset). @@ -309,7 +309,7 @@ appended to it (sometimes not). This causes major confusion since the non-PnP model works with Linux but the PnP one doesn't.
You should carefully check if "Plug & Play" or "PnP" is mentioned in the name -of the card or in the documentation or package that came with the card. +of the card or in the documentation or package that came with the card. Everything described in the rest of this document is not necessarily valid for PnP models of sound cards even you have managed to wake up the card properly. Many PnP cards are simply too different from their non-PnP ancestors which are @@ -319,8 +319,8 @@ covered by this document. Cards that are not (fully) supported by this driver ===================================================
-See http://www.opensound.com/ossfree for information about sound cards -to be supported in future. +See http://www.opensound.com/ossfree for information about sound cards +to be supported in future.
How to use sound without recompiling kernel and/or sound driver @@ -377,7 +377,7 @@ versions of isapnptools so at least version 1.6 is required with sound cards.
Yet another way to use PnP cards is to use (commercial) OSS/Linux drivers. See http://www.opensound.com/linux.html for more info. This is probably the way you -should do it if you don't want to spend time recompiling the kernel and +should do it if you don't want to spend time recompiling the kernel and required tools.
@@ -464,13 +464,13 @@ MPU-401 and compatibles in the list of supported cards before enabling MPU401.
Windows Sound System (MSS/WSS) - Even when Microsoft has discontinued their own Sound System card - they managed to make it a standard. MSS compatible cards are based on + Even when Microsoft has discontinued their own Sound System card + they managed to make it a standard. MSS compatible cards are based on a codec chip which is easily available from at least two manufacturers (AD1848 by Analog Devices and CS4231/CS4248 by Crystal Semiconductor). Currently most sound cards are based on one of the MSS compatible codec chips. The CS4231 is used in the high quality cards such as GUS MAX, - MediaTrix AudioTrix Pro and TB Tropez (GUS MAX is not MSS compatible). + MediaTrix AudioTrix Pro and TB Tropez (GUS MAX is not MSS compatible).
Having a AD1848, CS4248 or CS4231 codec chip on the card is a good sign. Even if the card is not MSS compatible, it could be easy to write @@ -484,8 +484,8 @@ Windows Sound System (MSS/WSS) Yamaha FM synthesizers (OPL2, OPL3 (not OPL3-SA) and OPL4) Most sound cards have a FM synthesizer chip. The OPL2 is a 2 operator chip used in the original AdLib card. Currently it's used - only in the cheapest (8 bit mono) cards. The OPL3 is a 4 operator - FM chip which provides better sound quality and/or more available + only in the cheapest (8 bit mono) cards. The OPL3 is a 4 operator + FM chip which provides better sound quality and/or more available voices than the OPL2. The OPL4 is a new chip that has an OPL3 and a wave table synthesizer packed onto the same chip. The driver supports just the OPL3 mode directly. Most cards with an OPL4 (like @@ -512,7 +512,7 @@ Yamaha OPL3-SA1 (not used in OSS/Free) in addition to the OPL3 FM synth.
There are also chips called OPL3-SA2, OPL3-SA3, ..., OPL3SA-N. They - are PnP chips and will not work with the OPL3-SA1 driver. You should + are PnP chips and will not work with the OPL3-SA1 driver. You should use the standard MSS, MPU401 and OPL3 options with these chips and to activate the card using isapnptools.
@@ -543,7 +543,7 @@ Yamaha OPL3-SA1 SoftOSS keeps the samples loaded on the system's RAM so much RAM is required. SoftOSS should never be used on machines with less than 16 MB of RAM since this is potentially dangerous (you may accidentally run out - of memory which probably crashes the machine). + of memory which probably crashes the machine).
SoftOSS implements the wave table API originally designed for GUS. For this reason all applications designed for GUS should work (at least @@ -556,7 +556,7 @@ Yamaha OPL3-SA1 sites.
********************************************************************* - IMPORTANT NOTICE! The original patch set distributed with the Gravis + IMPORTANT NOTICE! The original patch set distributed with the Gravis Ultrasound card is not in public domain (even though it's available from some FTP sites). You should contact Voice Crystal (www.voicecrystal.com) if you like to use these patches with SoftOSS included in OSS/Free. @@ -568,7 +568,7 @@ PSS based cards (AD1848 + ADSP-2115 + Echo ESC614 ASIC) for emulation of SB Pro, FM and General MIDI/MT32.
There are several cards based on this architecture. The most known - ones are Orchid SW32 and Cardinal DSP16. + ones are Orchid SW32 and Cardinal DSP16.
The driver supports downloading DSP algorithms to these cards.
@@ -609,13 +609,13 @@ OPTi MAD16 and Mozart based cards (without need to use isapnptools or DOS to initialize it). All OPTi chips are supported by OSS/Linux (both in PnP and non-PnP modes).
-Audio Excel DSP16 +Audio Excel DSP16 Support for this card was written by Riccardo Faccetti (riccardo@cdc8g5.cdc.polimi.it). The AEDSP16 driver included in the lowlevel/ directory. To use it you should enable the "Additional low level drivers" option.
-Crystal CS4232 and CS4236 based cards such as AcerMagic S23, TB Tropez _Plus_ and +Crystal CS4232 and CS4236 based cards such as AcerMagic S23, TB Tropez _Plus_ and many PC motherboards (Compaq, HP, Intel, ...) CS4232 is a PnP multimedia chip which contains a CS3231A codec, SB and MPU401 emulations. There is support for OPL3 too. @@ -629,7 +629,7 @@ Crystal CS4232 and CS4236 based cards such as AcerMagic S23, TB Tropez _Plus_ an
Turtle Beach Maui and Tropez "classic" This driver version supports sample, patch and program loading commands - described in the Maui/Tropez User's manual. + described in the Maui/Tropez User's manual. There is now full initialization support too. The audio side of the Tropez is based on the MAD16 chip (see above). NOTE! Tropez Plus is different card than Tropez "classic" and will not @@ -642,9 +642,9 @@ Jumpers and software configuration
Some of the earliest sound cards were jumper configurable. You have to configure the driver use I/O, IRQ and DMA settings -that match the jumpers. Just few 8 bit cards are fully jumper +that match the jumpers. Just few 8 bit cards are fully jumper configurable (SB 1.x/2.x, SB Pro and clones). -Some cards made by Aztech have an EEPROM which contains the +Some cards made by Aztech have an EEPROM which contains the config info. These cards behave much like hardware jumpered cards.
Most cards have jumper for the base I/O address but other parameters @@ -682,7 +682,7 @@ listed above. Also look at the end of this file for list of unsupported cards and the ones which could be supported later.
The last resort is to send _exact_ name and model information of the card -to me together with a list of the major IC chips (manufactured, model) to +to me together with a list of the major IC chips (manufactured, model) to me. I could then try to check if your card looks like something familiar.
There are many more cards in the world than listed above. The first thing to @@ -698,8 +698,8 @@ should work OK. Configuring sound driver (with Linux) =====================================
-The sound driver is currently distributed as part of the Linux kernel. The -files are in /usr/src/linux/drivers/sound/. +The sound driver is currently distributed as part of the Linux kernel. The +files are in /usr/src/linux/drivers/sound/.
**************************************************************************** * ALWAYS USE THE SOUND DRIVER VERSION WHICH IS DISTRIBUTED WITH * @@ -722,7 +722,7 @@ To configure the driver, run "make config" in the kernel source directory (after the questions about mouse, CD-ROM, ftape, etc. support). Questions about options for sound will then be asked.
-After configuring the kernel and sound driver and compile the kernel +After configuring the kernel and sound driver and compile the kernel following instructions in the kernel README.
The sound driver configuration dialog @@ -763,7 +763,7 @@ select some options automatically as well. or a full 100% hardware compatible clone (like Thunderboard or SM Games). If your card was in the list of supported cards (above), please look at the card specific instructions later in this file - before answering this question. For an unknown card you may answer + before answering this question. For an unknown card you may answer 'y' if the card claims to be SB compatible. Enable this option also with PAS16 (changed since v3.5-beta9).
@@ -795,12 +795,12 @@ select some options automatically as well. sound card to work. Support for the MPU401 compatible MIDI port of SB16, ESS1688 and MV Jazz16 cards is included in the SB driver. Use it instead - of this separate MPU401 driver with these cards. As well + of this separate MPU401 driver with these cards. As well Soundscape, PSS and Maui drivers include their own MPU401 options.
It's safe to answer 'y' if you have a true MPU401 MIDI interface - card. + card. "6850 UART Midi support", - It's safe to answer 'n' to this question in all cases. The 6850 UART interface is so rarely used. @@ -816,13 +816,13 @@ select some options automatically as well. - Answer 'y' only if you have a GUS MAX. "Microsoft Sound System support", - Again think carefully before answering 'y' to this question. It's - safe to answer 'y' in case you have the original Windows Sound + safe to answer 'y' in case you have the original Windows Sound System card made by Microsoft or Aztech SG 16 Pro (or NX16 Pro). Also you may answer 'y' in case your card was not listed earlier in this file. For cards having native support in the driver, consult the card specific instructions later in this file. Some drivers have their own MSS support and enabling this option will cause a - conflict. + conflict. Note! The MSS driver permits configuring two DMA channels. This is a "nonstandard" feature and works only with very few cards (if any). In most cases the second DMA channel should be disabled or set to @@ -833,14 +833,14 @@ select some options automatically as well. - Answer 'y' if you have a sound card based on the Ensoniq SoundScape chipset. Such cards are being manufactured at least by Ensoniq, Spea and Reveal (note that Reveal makes other cards also). The oldest - cards made by Spea don't work properly with Linux. + cards made by Spea don't work properly with Linux. Soundscape PnP as well as Ensoniq VIVO work only with the commercial OSS/Linux version. "MediaTrix AudioTrix Pro support", - Answer 'y' if you have the AudioTrix Pro. "Support for MAD16 and/or Mozart based cards", - Answer y if your card has a Mozart (OAK OTI-601) or MAD16 - (OPTi 82C928, 82C929, 82C924/82C925 or 82C930) audio interface chip. + (OPTi 82C928, 82C929, 82C924/82C925 or 82C930) audio interface chip. These chips are currently quite common so it's possible that many no-name cards have one of them. In addition the MAD16 chip is used in some @@ -919,7 +919,7 @@ SB2_BASE, SB2_IRQ, SB2_DMA and SB2_DMA2 for the second one. You can't get the OPL3, MIDI and EMU8000 devices of the second card to work. If you are going to use two PnP Sound Blasters, ensure that they are of different model and have different PnP IDs. There is no way to get two cards with the same -card ID and serial number to work. The easiest way to check this is trying +card ID and serial number to work. The easiest way to check this is trying if isapnptools can see both cards or just one.
NOTE! Don't enable the SM Games option (asked by the configuration program) @@ -949,18 +949,18 @@ the following way: card should work.
If your card is both SB and MSS compatible, I recommend using the MSS mode. -Most cards of this kind are not able to work in the SB and the MSS mode +Most cards of this kind are not able to work in the SB and the MSS mode simultaneously. Using the MSS mode provides 16 bit recording and playback.
ProAudioSpectrum 16 and compatibles -----------------------------------
PAS16 has a SB emulation chip which can be used together with the native -(16 bit) mode of the card. To enable this emulation you should configure +(16 bit) mode of the card. To enable this emulation you should configure the driver to have SB support too (this has been changed since version 3.5-beta9 of this driver).
-With current driver versions it's also possible to use PAS16 together with +With current driver versions it's also possible to use PAS16 together with another SB compatible card. In this case you should configure SB support for the other card and to disable the SB emulation of PAS16 (there is a separate questions about this). @@ -981,7 +981,7 @@ to select the channel as a recording source and to use volume above 10%.
GUS 3.7 has a hardware mixer.
-GUS MAX and the 16 bit sampling daughtercard have a CS4231 codec chip which +GUS MAX and the 16 bit sampling daughtercard have a CS4231 codec chip which also contains a mixer.
Configuring GUS is simple. Just enable the GUS support and GUS MAX or @@ -1059,7 +1059,7 @@ enable these options when configuring the driver. The configuration program handles these options itself. (You may use the SB, MPU and MSS options together with PSS if you have another card on the system).
-The PSS driver enables MSS and MPU401 modes of the card. SB is not enabled +The PSS driver enables MSS and MPU401 modes of the card. SB is not enabled since it doesn't work concurrently with MSS. The driver loads also a DSP algorithm which is used to for the general MIDI emulation. The algorithm file (.ld) is read by the config program and written to a @@ -1068,7 +1068,7 @@ program asks if you want to download the file. Use the genmidi.ld file distributed with the DOS/Windows drivers of the card (don't use the mt32.ld). With some cards the file is called 'synth.ld'. You must have access to the file when configuring the driver. The easiest way is to mount the DOS -partition containing the file with Linux. +partition containing the file with Linux.
It's possible to load your own DSP algorithms and run them with the card. Look at the directory pss_test of snd-util-3.0.tar.gz for more info. @@ -1092,7 +1092,7 @@ Also the ATP has a microcontroller for the General MIDI emulation (OPL4). For this reason the driver asks for the name of a file containing the microcode (TRXPRO.HEX). This file is usually located in the directory where the DOS drivers were installed. You must have access to this file -when configuring the driver. +when configuring the driver.
If you have the effects daughtercard, it must be initialized by running the setfx program of snd-util-3.0.tar.gz package. This step is not required @@ -1136,7 +1136,7 @@ The SoundScape card has a Motorola microcontroller which must initialized _after_ boot (the driver doesn't initialize it during boot). The initialization is done by running the 'ssinit' program which is distributed in the snd-util-3.0.tar.gz package. You have to edit two -defines in the ssinit.c and then compile the program. You may run ssinit +defines in the ssinit.c and then compile the program. You may run ssinit manually (after each boot) or add it to /etc/rc.d/rc.local.
The ssinit program needs the microcode file that comes with the DOS/Windows @@ -1245,21 +1245,21 @@ versions (pre 3.5-alpha8)).
NOTE! Don't answer 'y' when the driver asks about SM Games support (the next question after the MIDI0001.BIN name). However - answering 'y' doesn't cause damage your computer so don't panic. + answering 'y' doesn't cause damage your computer so don't panic.
Sound Galaxies --------------
There are many different Sound Galaxy cards made by Aztech. The 8 bit ones are fully SB or SB Pro compatible and there should be no problems -with them. +with them.
The older 16 bit cards (SG Pro16, SG NX Pro16, Nova and Lyra) have an EEPROM chip for storing the configuration data. There is a microcontroller which initializes the card to match the EEPROM settings when the machine is powered on. These cards actually behave just like they have jumpers -for all of the settings. Configure driver for MSS, MPU, SB/SB Pro and OPL3 -supports with these cards. +for all of the settings. Configure driver for MSS, MPU, SB/SB Pro and OPL3 +supports with these cards.
There are some new Sound Galaxies in the market. I have no experience with them so read the card's manual carefully. @@ -1360,7 +1360,7 @@ strength value. See aci.[ch] and miropcm20*.[ch] for more details.
The following configuration parameters have worked fine for the PCM12 in Markus Kuhn's system, many other configurations might work, too: -CONFIG_MAD16_BASE=0x530, CONFIG_MAD16_IRQ=11, CONFIG_MAD16_DMA=3, +CONFIG_MAD16_BASE=0x530, CONFIG_MAD16_IRQ=11, CONFIG_MAD16_DMA=3, CONFIG_MAD16_DMA2=0, CONFIG_MAD16_MPU_BASE=0x330, CONFIG_MAD16_MPU_IRQ=10, DSP_BUFFSIZE=65536, SELECTED_SOUND_OPTIONS=0x00281000.
@@ -1370,16 +1370,16 @@ differs in: CONFIG_MAD16_IRQ=7, CONFIG_MAD16_DMA=1, CONFIG_MAD16_MPU_IRQ=9 Compaq Deskpro XL -----------------
-The builtin sound hardware of Compaq Deskpro XL is now supported. +The builtin sound hardware of Compaq Deskpro XL is now supported. You need to configure the driver with MSS and OPL3 supports enabled. In addition you need to manually edit linux/drivers/sound/local.h and -to add a line containing "#define DESKPROXL" if you used +to add a line containing "#define DESKPROXL" if you used make menuconfig/xconfig.
Others? -------
-Since there are so many different sound cards, it's likely that I have +Since there are so many different sound cards, it's likely that I have forgotten to mention many of them. Please inform me if you know yet another card which works with Linux, please inform me (or is anybody else willing to maintain a database of supported cards (just like in XF86)?). @@ -1387,8 +1387,8 @@ willing to maintain a database of supported cards (just like in XF86)?). Cards not supported yet =======================
-Please check the version of sound driver you are using before -complaining that your card is not supported. It's possible you are +Please check the version of sound driver you are using before +complaining that your card is not supported. It's possible you are using a driver version which was released months before your card was introduced.
@@ -1411,12 +1411,12 @@ Adding support for a new card requires much work and increases time required in maintaining the driver (some changes need to be done to all low level drivers and be tested too, maybe with multiple operating systems). For this reason I have made a decision to not support -obsolete cards. It's possible that someone else makes a separately -distributed driver (diffs) for the card. +obsolete cards. It's possible that someone else makes a separately +distributed driver (diffs) for the card.
-Writing a driver for a new card is not possible if there are no +Writing a driver for a new card is not possible if there are no programming information available about the card. If you don't -find your new card from this file, look from the home page +find your new card from this file, look from the home page (http://www.opensound.com/ossfree). Then please contact manufacturer of the card and ask if they have (or are willing to) released technical details of the card. Do this before contacting me. I
Documentation/sound/oss/README.modules:11: ERROR: trailing whitespace Documentation/sound/oss/README.modules:13: ERROR: trailing whitespace Documentation/sound/oss/README.modules:17: ERROR: trailing whitespace Documentation/sound/oss/README.modules:18: ERROR: trailing whitespace
Signed-off-by: Andrea Gelmini andrea.gelmini@gelma.net --- Documentation/sound/oss/README.modules | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/sound/oss/README.modules b/Documentation/sound/oss/README.modules index e691d74..a7cbf8a 100644 --- a/Documentation/sound/oss/README.modules +++ b/Documentation/sound/oss/README.modules @@ -8,14 +8,14 @@ making sound modular. First, configure your kernel. This is an idea of what you should be setting in the sound section:
-<M> Sound card support +<M> Sound card support
-<M> 100% Sound Blaster compatibles (SB16/32/64, ESS, Jazz16) support +<M> 100% Sound Blaster compatibles (SB16/32/64, ESS, Jazz16) support
I have SoundBlaster. Select your card from the list.
-<M> Generic OPL2/OPL3 FM synthesizer support -<M> FM synthesizer (YM3812/OPL-3) support +<M> Generic OPL2/OPL3 FM synthesizer support +<M> FM synthesizer (YM3812/OPL-3) support
If you don't set these, you will probably find you can play .wav files but not .midi. As the help for them says, set them unless you know your
Documentation/sound/oss/README.ymfsb:72: ERROR: trailing whitespace
Signed-off-by: Andrea Gelmini andrea.gelmini@gelma.net --- Documentation/sound/oss/README.ymfsb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/sound/oss/README.ymfsb b/Documentation/sound/oss/README.ymfsb index af8a7d3..138f553 100644 --- a/Documentation/sound/oss/README.ymfsb +++ b/Documentation/sound/oss/README.ymfsb @@ -69,7 +69,7 @@ SPDIF OUT
With installing modules with option 'spdif_out=1', you can enjoy your sounds from SPDIF-out of your card (if it had). - Its Fs is fixed to 48kHz (It never means the sample frequency become + Its Fs is fixed to 48kHz (It never means the sample frequency become up to 48kHz. All sounds via SPDIF-out also 22kHz samples). So your digital-in capable components has to be able to handle 48kHz Fs.
Documentation/sound/oss/SoundPro:77: ERROR: trailing whitespace
Signed-off-by: Andrea Gelmini andrea.gelmini@gelma.net --- Documentation/sound/oss/SoundPro | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/sound/oss/SoundPro b/Documentation/sound/oss/SoundPro index 9d4db1f..4c1a538 100644 --- a/Documentation/sound/oss/SoundPro +++ b/Documentation/sound/oss/SoundPro @@ -74,7 +74,7 @@ butting heads with another device. If you do not see the chipset version message, and none of the other messages present in the system log are helpful, try adding 'debug=1' to the ad1848 parameters, email me the syslog results and I'll do -my best to help. +my best to help.
Lastly, if you're using modules and want to set up automatic module loading with kmod, the kernel module loader, here is the section I
Documentation/sound/oss/Tropez+:16: ERROR: trailing whitespace
Signed-off-by: Andrea Gelmini andrea.gelmini@gelma.net --- Documentation/sound/oss/Tropez+ | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/sound/oss/Tropez+ b/Documentation/sound/oss/Tropez+ index b93a6b7..1fe82b3 100644 --- a/Documentation/sound/oss/Tropez+ +++ b/Documentation/sound/oss/Tropez+ @@ -13,7 +13,7 @@ driver: options cs4232 synthirq=9 synthio=0x200 io=0x530 irq=5 dma=1 dma2=0 options opl3 io=0x388
-Things to note: +Things to note:
the wavefront options "io" and "irq" ***MUST*** match the "synthio" and "synthirq" cs4232 options.
Documentation/sound/oss/WaveArtist:101: ERROR: trailing whitespace
Signed-off-by: Andrea Gelmini andrea.gelmini@gelma.net --- Documentation/sound/oss/WaveArtist | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/Documentation/sound/oss/WaveArtist b/Documentation/sound/oss/WaveArtist index f4f3407..b368045 100644 --- a/Documentation/sound/oss/WaveArtist +++ b/Documentation/sound/oss/WaveArtist @@ -1,4 +1,3 @@ - (the following is from the armlinux CVS)
WaveArtist mixer and volume levels can be accessed via these commands: @@ -98,7 +97,7 @@ *------->mute>--> Gain >--> X >-->AMP>--* | +----+ +------+ | | +-^-+ | | | | | | - | +----+ +------+ | | r2b1-3 | + | +----+ +------+ | | r2b1-3 | | /----->mute>--> Gain >--> E | | | | +----+ +------+ | | | | | | | |
Documentation/sound/oss/btaudio:91: ERROR: trailing whitespace
Signed-off-by: Andrea Gelmini andrea.gelmini@gelma.net --- Documentation/sound/oss/btaudio | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/Documentation/sound/oss/btaudio b/Documentation/sound/oss/btaudio index 1a693e6..a3ca133 100644 --- a/Documentation/sound/oss/btaudio +++ b/Documentation/sound/oss/btaudio @@ -1,4 +1,3 @@ - Intro =====
@@ -88,5 +87,5 @@ Have fun,
Gerd
--- +-- Gerd Knorr kraxel@bytesex.org
participants (1)
-
Andrea Gelmini