---

yaml --- r: 170063 b: refs/heads/master c: acd4710 h: refs/heads/master i: 170061: 13066e2 170059: 25b28f7 170055: 5b3e05e 170047: 0d29287 v: v3
git-mirror · Oct 1, 2009 · 0fc9183 · 0fc9183
1 parent ddf8c75
commit 0fc9183
Show file tree

Hide file tree

Showing 5 changed files with 117 additions and 250 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0968e3f7a8ea30728d2580d3043a30ea9994ec6
+refs/heads/master: acd47100914b2896d0699febefd077f85c4dd272
diff --git a/trunk/Documentation/sound/alsa/ALSA-Configuration.txt b/trunk/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -1631,7 +1631,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
   Module snd-sscape
   -----------------
 
-    Module for ENSONIQ SoundScape PnP cards.
+    Module for ENSONIQ SoundScape cards.
 
     port	- Port # (PnP setup)
     wss_port	- WSS Port # (PnP setup)
@@ -1640,9 +1640,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     dma		- DMA # (PnP setup)
     dma2	- 2nd DMA # (PnP setup, -1 to disable)
 
-    This module supports multiple cards.  ISA PnP must be enabled.
-    You need sscape_ctl tool in alsa-tools package for loading
-    the microcode.
+    This module supports multiple cards.
+
+    The driver requires the firmware loader support on kernel.
 
   Module snd-sun-amd7930 (on sparc only)
   --------------------------------------

diff --git a/trunk/include/sound/sscape_ioctl.h b/trunk/include/sound/sscape_ioctl.h
diff --git a/trunk/sound/isa/Kconfig b/trunk/sound/isa/Kconfig
@@ -372,17 +372,21 @@ config SND_SGALAXY
 
 config SND_SSCAPE
 	tristate "Ensoniq SoundScape driver"
-	select SND_HWDEP
 	select SND_MPU401_UART
 	select SND_WSS_LIB
+	select FW_LOADER
 	help
 	  Say Y here to include support for Ensoniq SoundScape 
 	  and Ensoniq OEM soundcards.
 
 	  The PCM audio is supported on SoundScape Classic, Elite, PnP
 	  and VIVO cards. The supported OEM cards are SPEA Media FX and
 	  Reveal SC-600.
-	  The MIDI support is very experimental.
+	  The MIDI support is very experimental and requires binary
+	  firmware files called "scope.cod" and "sndscape.co?" where the
+	  ? is digit 0, 1, 2, 3 or 4. The firmware files can be found
+	  in DOS or Windows driver packages. One has to put the firmware
+	  files into the /lib/firmware directory.
 
 	  To compile this driver as a module, choose M here: the module
 	  will be called snd-sscape.