Merge with 2.3.99-pre6.

5 files changed, 33 insertions, 22 deletions

diff --git a/Documentation/sound/ALS b/Documentation/sound/ALS
index db98daf30..c5e55d5b7 100644
--- a/Documentation/sound/ALS
+++ b/Documentation/sound/ALS
@@ -13,9 +13,12 @@ To use an ALS sound card under Linux, enable the following options 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 
-Since the ALS-007/100/200 is a PnP card, the sound driver probably should be
-compiled as a module, with the isapnptools used to wake up the sound card.
-Set the "I/O base for SB", "Sound Blaster IRQ" and "Sound Blaster DMA" (8 bit -
+Since the ALS-007/100/200 are PnP cards, ISAPnP support should probably be
+compiled in.
+
+Alternatively, if you decide not to use kernel level ISAPnP, you can use the
+user mode isapnptools to wake up the sound card, as in 2.2.X. Set the "I/O 
+base for SB", "Sound Blaster IRQ" and "Sound Blaster DMA" (8 bit -
 either 0, 1 or 3) to the values used in your particular installation (they
 should match the values used to configure the card using isapnp).  The
 ALS-007 does NOT implement 16 bit DMA, so the "Sound Blaster 16 bit DMA"
@@ -41,3 +44,4 @@ jwoithe@physics.adelaide.edu.au
 30 March 1998
 
 Modified 2000-02-26 by Dave Forrest, drf5n@virginia.edu to add ALS100/ALS200
+Modified 2000-04-10 by Paul Laufer, pelaufer@csupomona.edu to add ISAPnP info.
diff --git a/Documentation/sound/AWE32 b/Documentation/sound/AWE32
index a0f18d640..8cf3966ed 100644
--- a/Documentation/sound/AWE32
+++ b/Documentation/sound/AWE32
@@ -9,9 +9,10 @@ important, because the driver works only with real Creative cards.
 2) If your card is NOT "Plug-n-Play" then go to 5th step now. In the other case
 proceed to step 3.
 
-3) You should obtain isapnptools. I looked through other PnP packages 
-for Linux, but all they are either in deep unstable beta/alpha releases or 
-they are much worse than isapnptools. In my case isapnptools were included in 
+3) You should compile in kernel ISAPnP support or you should obtain isapnptools.
+If you choose kernel level ISAPnP skip to step 5. I looked through other PnP 
+packages for Linux, but all they are either in deep unstable beta/alpha releases
+or they are much worse than isapnptools. In my case isapnptools were included in
 a Linux distribution (Red Hat 5.x). If you also already have them then go to 
 step 4.
 
@@ -67,11 +68,7 @@ support" as <M> (module).
 
 In "make (x,menu)config" select in "Sound":
 select "OSS sound modules" as <M> (module)
-
-In "Additional low level sound drivers":
-"Additional low level sound drivers", "AWE32 synth" as <M> (module).
-Select "Additional low level sound drivers" as [y] (or [*] (yes)) (If it is not
-available as [y], select it as <M> (module))
+select "AWE32 Synth" as <M> (module)
 
 Now recompile the kernel (make dep; make (b)zImage, b(z)lilo, etc...;
 make modules; make modules_install), update your boot loader (if required) and
@@ -87,9 +84,7 @@ http://members.xoom.com/yar/synthgm.sbk.gz. Copy it to /usr and gunzip it there.
 
 alias midi awe_wave
 post-install awe_wave /usr/bin/sfxload /usr/synthfm.sbk
-options sb io=0x220 irq=5 dma=1 dma16=5 mpu_io=0x330
 
-(on io=0xaaa irq=b.... you should use your own settings)
 That will enable the Sound Blaster and AWE wave synthesis.
 
 To play midi files you should get one of these programs:
@@ -107,4 +102,4 @@ welcome.
 			    Yaroslav Rosomakho (alons55@dialup.ptt.ru)
 				    http://www.yar.opennet.ru
 
-Last Updated: 3Jan99
+Last Updated: 10Apr2000
diff --git a/Documentation/sound/README.awe b/Documentation/sound/README.awe
index b0dc82427..80054cd8f 100644
--- a/Documentation/sound/README.awe
+++ b/Documentation/sound/README.awe
@@ -23,11 +23,10 @@ not frequent now.
 
 * NOTE TO LINUX USERS
 
-To enable this driver on linux-2.[01].x kernels, you need turn on both 
-"lowlevel drivers support" and "AWE32 synth support" options in sound
-menu when configure your linux kernel and modules.  The precise
-installation procedure is described in the AWE64-Mini-HOWTO and
-linux-kernel/Documetation/sound/AWE32.
+To enable this driver on linux-2.[01].x kernels, you need turn on 
+"AWE32 synth" options in sound menu when configure your linux kernel
+and modules.  The precise installation procedure is described in the
+AWE64-Mini-HOWTO and linux-kernel/Documetation/sound/AWE32.
 
 If you're using PnP cards, the card must be initialized before loading
 the sound driver.  There're several options to do this:
diff --git a/Documentation/sound/README.modules b/Documentation/sound/README.modules
index 9cc30a3ac..39f7d954a 100644
--- a/Documentation/sound/README.modules
+++ b/Documentation/sound/README.modules
@@ -33,6 +33,12 @@ post-install sb /sbin/modprobe "-k" "adlib_card"
 options sb io=0x220 irq=7 dma=1 dma16=5 mpu_io=0x330
 options adlib_card io=0x388     # FM synthesizer
 
+ Alternatively, if you have compiled in kernel level ISAPnP support:
+
+alias char-major-14 sb
+post-install sb /sbin/modprobe "-k" "adlib_card"
+options adlib_card io=0x388
+
   The effect of this is that the sound driver and all necessary bits and
 pieces autoload on demand, assuming you use kerneld (a sound choice) and
 autoclean when not in use. Also, options for the device drivers are
diff --git a/Documentation/sound/Soundblaster b/Documentation/sound/Soundblaster
index 160763f53..515c4ec77 100644
--- a/Documentation/sound/Soundblaster
+++ b/Documentation/sound/Soundblaster
@@ -13,12 +13,19 @@ dma     	8-bit DMA channel for the Sound Blaster (0,1,3)
 dma16   	16-bit DMA channel for SB16 and equivalent cards (5,6,7)
 mpu_io		I/O for MPU chip if present (0x300,0x330)
 
-mad16=1 	Set when loading this as part of the MAD16 setup only
-trix=1  	Set when loading this as part of the Audiotrix setup only
-pas2=1		Set when loading this as part of the Pas2 setup only
 sm_games=1	Set if you have a Logitech soundman games
 acer=1		Set this to detect cards in some ACER notebooks
 mwave_bug=1	Set if you are trying to use this driver with mwave (see on)
+type		Use this to specify a specific card type
+
+The following arguments are taken if ISAPnP support is compiled in
+
+isapnp=0	Set this to disable ISAPnP detection (use io=0xXXX etc. above)
+multiple=1	Set to enable detection of multiple Soundblaster cards.
+reverse=1	Reverses the order of the search in the PnP table.
+uart401=1	Set to enable detection of mpu devices on some clones.
+isapnpjump	Jumps to a specific slot in the driver's PnP table. Use the
+		source, Luke.
 
 You may well want to load the opl3 driver for synth music on most SB and
 clone SB devices