Skip to content

Commit

Permalink
ALSA: sscape: convert to firmware loader framework
Browse files Browse the repository at this point in the history
The conversion solves the problem that firmware size was set to 64KB
while non PnP cards have 128KB firmware files.

An additional firmware initialization code has been moved from the OSS
driver.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Krzysztof-H authored and tiwai committed Oct 1, 2009
1 parent f0968e3 commit acd4710
Show file tree
Hide file tree
Showing 4 changed files with 116 additions and 249 deletions.
8 changes: 4 additions & 4 deletions Documentation/sound/alsa/ALSA-Configuration.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
--------------------------------------
Expand Down
21 changes: 0 additions & 21 deletions include/sound/sscape_ioctl.h

This file was deleted.

8 changes: 6 additions & 2 deletions sound/isa/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading

0 comments on commit acd4710

Please sign in to comment.