Merge with Linux 2.4.0-test9. Please check DECstation, I had a number

of rejects to fixup while integrating Linus patches.  I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages.  I commit this anyway
since I found that the last CVS versions had the same problem.

7 files changed, 167 insertions, 106 deletions

diff --git a/Documentation/sound/AD1816 b/Documentation/sound/AD1816
index b43d13be8..c5085a9a7 100644
--- a/Documentation/sound/AD1816
+++ b/Documentation/sound/AD1816
@@ -1,52 +1,15 @@
 Documentation for the AD1816(A) sound driver
 ============================================
 
-NOTE: This driver is still EXPERIMENTAL, so don't use it on production
-systems!
-
-
 Installation:
 -------------
 
-To get your AD1816(A) based sound card work, you'll have to enable
-module support ("Enable loadable module support") and support for
-experimental code ("Prompt for development and/or incomplete
-code/drivers") during kernel configuration. Enable "Sound card
-support", "OSS modules support" and "Support for AD1816(A) based cards
-(EXPERIMENTAL)" in the sound configuration menu, too. Be sure, that
-you build "Support for AD1816(A) based cards (EXPERIMENTAL)" as a MODULE,
-otherwise you may run into problems later.
-Now build, install and reboot the new kernel as usual.
-
-Since the AD1816(A) is a P'n'P sound chip you'll usually have to
-configure it using the isapnptools. See isapnptools documentation for
-details on configuring P'n'P cards.
-
-After you have successfully configured the card using isapnp, you may
-load the AD1816 driver using modprobe. A typical modprobe call should
-look like this:
-
-  modprobe ad1816 io=0x530 irq=5 dma=1 dma2=3 ad1816_clockfreq=33000
-
-if your isapnp.conf file looks like this (relevant lines only):
-
- (INT 0 (IRQ 5 (MODE +E)))
- (DMA 0 (CHANNEL 1))
- (DMA 1 (CHANNEL 3))
- (IO 0 (BASE 0x0220))
- (IO 1 (BASE 0x0388))
- (IO 2 (BASE 0x0530))
-
-NOTE: Be sure, that you use the address IO 2 (in our example 0x530) when
-loading the module!
-
-If your setup was correct, you should see the following messages in  
-/var/log/messages (numbers may be different):
-
-Nov  6 17:07:26 tek01 kernel: ad1816_detect(530)
-Nov  6 17:07:26 tek01 kernel: ad1816_detect() - Detected OK
-Nov  6 17:07:26 tek01 kernel: AD1816 Version: 3
-
+To get your AD1816(A) based sound card work, you'll have to enable support for
+experimental code ("Prompt for development and/or incomplete code/drivers")
+and isapnp ("Plug and Play support", "ISA Plug and Play support"). Enable
+"Sound card support", "OSS modules support" and "Support for AD1816(A) based
+cards (EXPERIMENTAL)" in the sound configuration menu, too. Now build, install
+and reboot the new kernel as usual.
 
 Features:
 ---------
@@ -86,13 +49,7 @@ Troubleshooting:
 ----------------
 
 First of all you should check, if the driver has been loaded
-properly. If you get the following message in your /var/log/messages:
-
-Nov  6 17:06:31 tek01 kernel: ad1816_detect(530)
-Nov  6 17:06:31 tek01 kernel: Chip is not an AD1816 or chip is not active 
-
-you either used the wrong address for loading the driver, your chip is
-not an AD1816 or you forgot to initialize the card with isapnp.
+properly.
 
 If loading of the driver succeeds, but playback/capture fails, check
 if you used the correct values for irq, dma and dma2 when loading the module.
@@ -122,6 +79,6 @@ or:
 Bugreports, bugfixes and related questions should be sent via E-Mail to:
   tek@rbg.informatik.tu-darmstadt.de
 
-
 Thorsten Knabe <tek@rbg.informatik.tu-darmstadt.de>
-          Last modified: 1999/05/02
+Christoph Hellwig <hch@caldera.de>
+	Last modified: 2000/09/20
diff --git a/Documentation/sound/ESS b/Documentation/sound/ESS
index 38d97ba97..bba93b4d2 100644
--- a/Documentation/sound/ESS
+++ b/Documentation/sound/ESS
@@ -1,9 +1,10 @@
 Documentation for the ESS AudioDrive chips
 
-In 2.2 kernels the SoundBlaster driver not only tries to detect an ESS chip, it
+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 
-doesn't always succeed however, so the default behaviour is 2.0 behaviour
-which means: only detect ES688 and ES1688.
+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.
 
 All ESS chips now have a recording level setting. This is a need-to-have for
 people who want to use their ESS for recording sound.
diff --git a/Documentation/sound/ESS1868 b/Documentation/sound/ESS1868
index 8fb778925..55e922f21 100644
--- a/Documentation/sound/ESS1868
+++ b/Documentation/sound/ESS1868
@@ -2,17 +2,21 @@ Documentation for the ESS1868F AudioDrive PnP sound card
 
 The ESS1868 sound card is a PnP ESS1688-compatible 16-bit sound card.
 
-Notes about configuring the sound card:
+It should be automatically detected by the Linux Kernel isapnp support when you
+load the sb.o module. Otherwise you should take care of:
 
   *  The ESS1868 does not allow use of a 16-bit DMA, thus DMA 0, 1, 2, and 3
      may only be used.
 
   *  isapnptools version 1.14 does work with ESS1868.  Earlier versions might
      not.
-  
+
   *  Sound support MUST be compiled as MODULES, not statically linked
      into the kernel.
-  
+
+
+NOTE: this is only needed when not using the kernel isapnp support!
+
 For configuring the sound card's I/O addresses, IRQ and DMA, here is a
 sample copy of the isapnp.conf directives regarding the ESS1868:
 
@@ -47,38 +51,5 @@ the sound modules with the proper I/O information.  Here is my setup:
 /sbin/insmod opl3 io=0x388
 /sbin/insmod v_midi
 
-opl3 is the FM synthesizer--I have not tried the SoftOSS wavetable
-synthesizer yet, but I assume it would work as well.  Also, doing:
-/sbin/insmod opl3
-/sbin/insmod adlib_card io=0x388
-works, but I believe the sound quality is a bit distorted when playing MIDI
-files.
-
-When using the above setup, my /proc/sound gives the following:
-
-OSS/Free:3.8s2++-971130
-Load type: Driver loaded as a module
-Kernel: Linux scitus.dyn.ml.org 2.1.104 #1 SMP Sun May 24 11:04:27 EDT 1998 i486
-Config options: 0
-
-Installed drivers: 
-
-Card config: 
-
-Audio devices:
-0: ESS ES1688 AudioDrive (rev 11) (3.1)
-
-Synth devices:
-0: Yamaha OPL-3
-
-Midi devices:
-0: Loopback MIDI Port 1
-1: Loopback MIDI Port 2
-
-Timers:
-0: System clock
-
-Mixers:
-0: Sound Blaster
-
-
+opl3 is the FM synthesizer
+/sbin/insmod opl3 io=0x388
diff --git a/Documentation/sound/INSTALL.awe b/Documentation/sound/INSTALL.awe
index 629084d60..72219acb2 100644
--- a/Documentation/sound/INSTALL.awe
+++ b/Documentation/sound/INSTALL.awe
@@ -9,12 +9,9 @@
 If you're using PnP cards, the initialization of PnP is required
 before loading this driver.  You have now three options:
   1. Use isapnptools.
-  2. Install PnP kernel driver patch.
+  2. Use in-kernel isapnp support.
   3. Initialize PnP on DOS/Windows, then boot linux by loadlin.
 In this document, only the case 1 case is treated.
-For the case 2, please refer to the instruction in PnP driver project.
-The home page of PnP driver project is the following URL:
-	http://www-jcr.lmh.ox.ac.uk/~pnp/
 
 ----------------------------------------------------------------
 * Installation on Red Hat 5.0 Sound Driver
diff --git a/Documentation/sound/Introduction b/Documentation/sound/Introduction
index 86aa069c1..289e03c7e 100644
--- a/Documentation/sound/Introduction
+++ b/Documentation/sound/Introduction
@@ -27,6 +27,8 @@ History:
                    added info on OSS and ALSA.
 1.1.1  19991031	   Added notes on sound-slot- and sound-service.
 			(Alan Cox)
+1.1.2  20000920    Modified for Kernel 2.4 (Christoph Hellwig)
+
 
 Modular Sound Drivers:
 ======================
@@ -46,17 +48,13 @@ Alan's comments in linux/drivers/sound/README.FIRST:
   forums for bug reporting.
 
 The modular sound drivers may be loaded via insmod or modprobe.  
-To support all the various sound modules, there are three general 
+To support all the various sound modules, there are two general 
 support modules that must be loaded first:
  
    soundcore.o:   Top level handler for the sound system, provides
                   a set of functions for registration of devices
                   by type.
 
-   soundlow.o:    Low-level sound drivers which are not part of 
-                  OSS/Lite (Open Sound System), including SB32/AWE
-                  synthesizer, etc.
-
    sound.o:       Common sound functions required by all modules.
 
 For the specific sound modules (e.g., sb.o for the Soundblaster), 
@@ -255,6 +253,9 @@ send me an E-MAIL.  PCI sound cards should not have this problem.a
 Since this was originally release, I have received a couple of 
 mails from people who have accomplished this!
 
+NOTE: In Linux 2.4 the Sound Blaster driver (and only this one yet)
+supports multiple cards with one module by default.
+Read the file 'Soundblaster' in this directory for details.
 
 Sound Problems:
 ===============
@@ -277,8 +278,7 @@ in the Sound-HOWTO).
       and /proc/dma.  Are you trying to use an address,
       IRQ or DMA port that another device is using?
   
-  C)  Check (cat) /proc/sys/pnp (if this exists, you 
-      may need a kernel patch to get this device).
+  C)  Check (cat) /proc/isapnp
   
   D)  Inspect your /var/log/messages file.  Often that will 
       indicate what IRQ or IO port could not be obtained.
@@ -332,8 +332,9 @@ Configuring Sound:
 
 There are several ways of configuring your sound:
 
-1)  Hardcoded in the kernel at compile time (not applicable when
-    using sound modules).  This was the OLD way!
+1)  On the kernel command line (when using the sound driver(s)
+    compiled in the kernel). Check the driver source and
+    documentation for details.
 
 2)  On the command line when using insmod or in a bash script
     using command line calls to load sound.
@@ -345,6 +346,10 @@ There are several ways of configuring your sound:
 5)  Via the OSS soundconf program (with the commercial version
     of the OSS driver.
 
+6)  By just loading the module and let isapnp do everything relevant
+    for you. This works only with a few drivers yet and - of course -
+    only with isapnp hardware.
+
 And I am sure, several other ways.  
 
 Anyone want to write a linuxconf module for configuring sound?
diff --git a/Documentation/sound/NEWS b/Documentation/sound/NEWS
new file mode 100644
index 000000000..0486771e2
--- /dev/null
+++ b/Documentation/sound/NEWS
@@ -0,0 +1,42 @@
+Linux 2.4 Sound Changes
+2000-September-25
+Christoph Hellwig, <hch@caldera.de>
+
+
+
+=== isapnp support
+
+The Linux 2.4 Kernel does have reliable in-kernel isapnp support.
+Some drivers (sb.o, ad1816.o awe_wave.o) do now support automatically
+detecting and configuring isapnp devices.
+If you have a not yet supported isapnp soundcard, mail me the content
+of '/proc/isapnp' on your system and some information about your card
+and its driver(s) so I can try to get isapnp working for it.
+
+
+
+=== soundcard resources on kernel commandline
+
+Before Linux 2.4 you had to specify the resources for sounddrivers
+statically linked into the kernel at compile time
+(in make config/menuconfig/xconfig). In Linux 2.4 the ressources are
+now specified at the boot-time kernel commandline (e.g. the lilo
+'append=' line or everything that's after the kernel name in grub).
+Read the Configure.help entry for your card for the parameters.
+
+
+=== softoss is gone
+
+In Linux 2.4 the softoss in-kernel software synthesizer is no more aviable.
+Use a user space software synthesizer like timidity instead.
+
+
+
+=== /dev/sndstat and /proc/sound are gone
+
+In older Linux versions those files exported some information about the
+OSS/Free configuration to userspace. In Linux 2.3 they were removed because
+they did not support the growing number of pci soundcards and there were
+some general problems with this interface.
+
+
diff --git a/Documentation/sound/PSS-updates b/Documentation/sound/PSS-updates
new file mode 100644
index 000000000..004e894af
--- /dev/null
+++ b/Documentation/sound/PSS-updates
@@ -0,0 +1,88 @@
+	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 
+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 compatable 
+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 appropiate 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 appropiate 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 
+compatability 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 
+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 paramter 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 compatability 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 
+retain full behavioral compatability 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 
+path and filename the hardcoded value in the previous versions of this driver.
+
+Examples:
+
+# Normal PSS sound card system, loading of drivers.
+# Should be specified in an rc file (ex. Slackware uses /etc/rc.d/rc.modules).
+
+/sbin/modprobe pss pss_io=0x220 mpu_io=0x338 mpu_irq=9 mss_io=0x530 mss_irq=10 mss_dma=1 pss_cdrom_port=0x340 pss_enable_joystick=1
+/sbin/modprobe aztcd aztcd=0x340
+/sbin/modprobe joystick
+
+# System using the PSS sound card just for its CDROM and joystick ports.
+# Should be specified in an rc file (ex. Slackware uses /etc/rc.d/rc.modules).
+
+/sbin/modprobe pss pss_io=0x220 pss_cdrom_port=0x340 pss_enable_joystick=1 pss_no_sound=1
+/sbin/rmmod pss && /sbin/rmmod ad1848 && /sbin/rmmod mpu401 && /sbin/rmmod sound && /sbin/rmmod soundcore  # This line not needed, but saves memory.
+/sbin/modprobe aztcd aztcd=0x340
+/sbin/modprobe joystick