From c2b1239a9f22f19c53543b460b24507d0e21ea0c Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 21 Aug 2007 15:20:26 +0200 Subject: [ALSA] wavefront - Use standard firmware loader Use the standard firmware loader for loading ICS2115 OS firmware file. This is the last old bad guy that is still using sys_open() and sys_read() calls, and now all should be gone. The patch also adds the missing description of module options related with wavefront_synth.c. Due to this rewrite, user will have to copy or make symlink the firmware file appropriately to the standard firmware path such as /lib/firmware. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela --- sound/isa/Kconfig | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'sound/isa/Kconfig') diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig index ea5084abe60f..6b6aa2c3b85c 100644 --- a/sound/isa/Kconfig +++ b/sound/isa/Kconfig @@ -414,7 +414,7 @@ config SND_SSCAPE config SND_WAVEFRONT tristate "Turtle Beach Maui,Tropez,Tropez+ (Wavefront)" depends on SND - select FW_LOADER if !SND_WAVEFRONT_FIRMWARE_IN_KERNEL + select FW_LOADER select SND_OPL3_LIB select SND_MPU401_UART select SND_CS4231_LIB @@ -430,8 +430,9 @@ config SND_WAVEFRONT_FIRMWARE_IN_KERNEL depends on SND_WAVEFRONT default y help - Say Y here to include the static firmware built in the kernel - for the Wavefront driver. If you choose N here, you need to - install the firmware files from the alsa-firmware package. + Say Y here to include the static firmware for FX DSP built in + the kernel for the Wavefront driver. If you choose N here, + you need to install the firmware files from the + alsa-firmware package. endmenu -- cgit v1.2.3 From e307258d5b27e3f9cde56df4038c89470710e2e4 Mon Sep 17 00:00:00 2001 From: Krzysztof Helt Date: Tue, 11 Sep 2007 21:53:05 +0200 Subject: [ALSA] Gallant SC-6000 driver This is port of the Gallant SC-6000 driver from the OSS aedsp16 driver. This card was also sold as AudioExcel DSP 16 and Zoltrix AV302 (Audio Plus True 16). Signed-off-by: Krzysztof Helt Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela --- sound/isa/Kconfig | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'sound/isa/Kconfig') diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig index 6b6aa2c3b85c..08a26d8bce13 100644 --- a/sound/isa/Kconfig +++ b/sound/isa/Kconfig @@ -191,6 +191,19 @@ config SND_ES18XX To compile this driver as a module, choose M here: the module will be called snd-es18xx. +config SND_SC6000 + tristate "Gallant SC-6000, Audio Excel DSP 16" + depends on SND + select SND_AD1848_LIB + select SND_OPL3_LIB + select SND_MPU401_UART + help + Say Y here to include support for Gallant SC-6000 card and clones: + Audio Excel DSP 16 and Zoltrix AV302. + + To compile this driver as a module, choose M here: the module + will be called snd-sc6000. + config SND_GUS_SYNTH tristate -- cgit v1.2.3 From 5683bc6e9eff5b40c56d1683419a9770140aee94 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 12 Sep 2007 13:29:51 +0200 Subject: [ALSA] SC6000 driver - add HAS_IOPORT dependency Signed-off-by: Jaroslav Kysela --- sound/isa/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sound/isa/Kconfig') diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig index 08a26d8bce13..2639a6ab8f2e 100644 --- a/sound/isa/Kconfig +++ b/sound/isa/Kconfig @@ -193,7 +193,7 @@ config SND_ES18XX config SND_SC6000 tristate "Gallant SC-6000, Audio Excel DSP 16" - depends on SND + depends on SND && HAS_IOPORT select SND_AD1848_LIB select SND_OPL3_LIB select SND_MPU401_UART -- cgit v1.2.3