lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ALSA: wss_lib: move cs4231_lib into wss_lib

Browse Source 
Move the file sound/isa/cs423x/cs4231_lib.c
into sound/isa/cs423x/wss_lib.c
This is the first step toward merging all libraries
for Windows Sound System compatible chips
into a single library.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Reviewed-by: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Krzysztof Helt
2008-07-31 21:00:17 +02:00
committed by Jaroslav Kysela
parent 740dc9c476
commit 9295aea1e8
5 changed files with 47 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
sound/isa/Kconfig
View File

@@ -4,7 +4,7 @@ config SND_AD1848_LIB
tristate tristate
select SND_PCM select SND_PCM
config SND_CS4231_LIB config SND_WSS_LIB
tristate tristate
select SND_PCM select SND_PCM
@@ -86,7 +86,7 @@ config SND_AZT2320
select ISAPNP select ISAPNP
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
select SND_CS4231_LIB select SND_WSS_LIB
help help
Say Y here to include support for soundcards based on the Say Y here to include support for soundcards based on the
Aztech Systems AZT2320 chip. Aztech Systems AZT2320 chip.
@@ -108,7 +108,7 @@ config SND_CMI8330
config SND_CS4231 config SND_CS4231
tristate "Generic Cirrus Logic CS4231 driver" tristate "Generic Cirrus Logic CS4231 driver"
select SND_MPU401_UART select SND_MPU401_UART
select SND_CS4231_LIB select SND_WSS_LIB
help help
Say Y here to include support for CS4231 chips from Cirrus Say Y here to include support for CS4231 chips from Cirrus
Logic - Crystal Semiconductors. Logic - Crystal Semiconductors.
@@ -120,7 +120,7 @@ config SND_CS4232
tristate "Generic Cirrus Logic CS4232 driver" tristate "Generic Cirrus Logic CS4232 driver"
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
select SND_CS4231_LIB select SND_WSS_LIB
help help
Say Y here to include support for CS4232 chips from Cirrus Say Y here to include support for CS4232 chips from Cirrus
Logic - Crystal Semiconductors. Logic - Crystal Semiconductors.
@@ -132,7 +132,7 @@ config SND_CS4236
tristate "Generic Cirrus Logic CS4236+ driver" tristate "Generic Cirrus Logic CS4236+ driver"
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
select SND_CS4231_LIB select SND_WSS_LIB
help help
Say Y to include support for CS4235,CS4236,CS4237B,CS4238B, Say Y to include support for CS4235,CS4236,CS4237B,CS4238B,
CS4239 chips from Cirrus Logic - Crystal Semiconductors. CS4239 chips from Cirrus Logic - Crystal Semiconductors.
@@ -228,7 +228,7 @@ config SND_GUSEXTREME
config SND_GUSMAX config SND_GUSMAX
tristate "Gravis UltraSound MAX" tristate "Gravis UltraSound MAX"
select SND_RAWMIDI select SND_RAWMIDI
select SND_CS4231_LIB select SND_WSS_LIB
help help
Say Y here to include support for Gravis UltraSound MAX Say Y here to include support for Gravis UltraSound MAX
soundcards. soundcards.
@@ -240,7 +240,7 @@ config SND_INTERWAVE
tristate "AMD InterWave, Gravis UltraSound PnP" tristate "AMD InterWave, Gravis UltraSound PnP"
depends on PNP depends on PNP
select SND_RAWMIDI select SND_RAWMIDI
select SND_CS4231_LIB select SND_WSS_LIB
help help
Say Y here to include support for AMD InterWave based Say Y here to include support for AMD InterWave based
soundcards (Gravis UltraSound Plug & Play, STB SoundRage32, soundcards (Gravis UltraSound Plug & Play, STB SoundRage32,
@@ -253,7 +253,7 @@ config SND_INTERWAVE_STB
tristate "AMD InterWave + TEA6330T (UltraSound 32-Pro)" tristate "AMD InterWave + TEA6330T (UltraSound 32-Pro)"
depends on PNP depends on PNP
select SND_RAWMIDI select SND_RAWMIDI
select SND_CS4231_LIB select SND_WSS_LIB
help help
Say Y here to include support for AMD InterWave based Say Y here to include support for AMD InterWave based
soundcards with a TEA6330T bass and treble regulator soundcards with a TEA6330T bass and treble regulator
@@ -266,7 +266,7 @@ config SND_OPL3SA2
tristate "Yamaha OPL3-SA2/SA3" tristate "Yamaha OPL3-SA2/SA3"
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
select SND_CS4231_LIB select SND_WSS_LIB
help help
Say Y here to include support for Yamaha OPL3-SA2 and OPL3-SA3 Say Y here to include support for Yamaha OPL3-SA2 and OPL3-SA3
chips. chips.
@@ -292,7 +292,7 @@ config SND_OPTI92X_CS4231
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_OPL4_LIB select SND_OPL4_LIB
select SND_MPU401_UART select SND_MPU401_UART
select SND_CS4231_LIB select SND_WSS_LIB
help help
Say Y here to include support for soundcards based on Opti Say Y here to include support for soundcards based on Opti
82C92x chips and using a CS4231 codec. 82C92x chips and using a CS4231 codec.
@@ -304,7 +304,7 @@ config SND_OPTI93X
tristate "OPTi 82C93x" tristate "OPTi 82C93x"
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
select SND_CS4231_LIB select SND_WSS_LIB
help help
Say Y here to include support for soundcards based on Opti Say Y here to include support for soundcards based on Opti
82C93x chips. 82C93x chips.
@@ -315,7 +315,7 @@ config SND_OPTI93X
config SND_MIRO config SND_MIRO
tristate "Miro miroSOUND PCM1pro/PCM12/PCM20radio driver" tristate "Miro miroSOUND PCM1pro/PCM12/PCM20radio driver"
select SND_OPL4_LIB select SND_OPL4_LIB
select SND_CS4231_LIB select SND_WSS_LIB
select SND_MPU401_UART select SND_MPU401_UART
select SND_PCM select SND_PCM
help help
@@ -384,7 +384,7 @@ config SND_SSCAPE
tristate "Ensoniq SoundScape PnP driver" tristate "Ensoniq SoundScape PnP driver"
select SND_HWDEP select SND_HWDEP
select SND_MPU401_UART select SND_MPU401_UART
select SND_CS4231_LIB select SND_WSS_LIB
help help
Say Y here to include support for Ensoniq SoundScape PnP Say Y here to include support for Ensoniq SoundScape PnP
soundcards. soundcards.
@@ -397,7 +397,7 @@ config SND_WAVEFRONT
select FW_LOADER select FW_LOADER
select SND_OPL3_LIB select SND_OPL3_LIB
select SND_MPU401_UART select SND_MPU401_UART
select SND_CS4231_LIB select SND_WSS_LIB
help help
Say Y here to include support for Turtle Beach Maui, Tropez Say Y here to include support for Turtle Beach Maui, Tropez
and Tropez+ soundcards based on the Wavefront chip. and Tropez+ soundcards based on the Wavefront chip.

2
sound/isa/Makefile
View File

@@ -27,4 +27,4 @@ obj-$(CONFIG_SND_SGALAXY) += snd-sgalaxy.o
obj-$(CONFIG_SND_SSCAPE) += snd-sscape.o obj-$(CONFIG_SND_SSCAPE) += snd-sscape.o
obj-$(CONFIG_SND) += ad1816a/ ad1848/ cs423x/ es1688/ gus/ opti9xx/ \ obj-$(CONFIG_SND) += ad1816a/ ad1848/ cs423x/ es1688/ gus/ opti9xx/ \
sb/ wavefront/ sb/ wavefront/ wss/

2
sound/isa/cs423x/Makefile
View File

@@ -3,14 +3,12 @@
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz> # Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>
# #
snd-cs4231-lib-objs := cs4231_lib.o
snd-cs4236-lib-objs := cs4236_lib.o snd-cs4236-lib-objs := cs4236_lib.o
snd-cs4231-objs := cs4231.o snd-cs4231-objs := cs4231.o
snd-cs4232-objs := cs4232.o snd-cs4232-objs := cs4232.o
snd-cs4236-objs := cs4236.o snd-cs4236-objs := cs4236.o
# Toplevel Module Dependency # Toplevel Module Dependency
obj-$(CONFIG_SND_CS4231_LIB) += snd-cs4231-lib.o
obj-$(CONFIG_SND_CS4231) += snd-cs4231.o obj-$(CONFIG_SND_CS4231) += snd-cs4231.o
obj-$(CONFIG_SND_CS4232) += snd-cs4232.o obj-$(CONFIG_SND_CS4232) += snd-cs4232.o
obj-$(CONFIG_SND_CS4236) += snd-cs4236.o snd-cs4236-lib.o obj-$(CONFIG_SND_CS4236) += snd-cs4236.o snd-cs4236-lib.o

10
sound/isa/wss/Makefile Normal file
View File

@@ -0,0 +1,10 @@
#
# Makefile for ALSA
# Copyright (c) 2008 by Jaroslav Kysela <perex@perex.cz>
#
snd-wss-lib-objs := wss_lib.o
# Toplevel Module Dependency
obj-$(CONFIG_SND_WSS_LIB) += snd-wss-lib.o

8
sound/isa/cs423x/cs4231_lib.c → sound/isa/wss/wss_lib.c
View File

@@ -176,7 +176,7 @@ static void snd_cs4231_wait(struct snd_cs4231 *chip)
for (timeout = 250; for (timeout = 250;
timeout > 0 && (cs4231_inb(chip, CS4231P(REGSEL)) & CS4231_INIT); timeout > 0 && (cs4231_inb(chip, CS4231P(REGSEL)) & CS4231_INIT);
timeout--) timeout--)
udelay(100); udelay(100);
} }
static void snd_cs4231_outm(struct snd_cs4231 *chip, unsigned char reg, static void snd_cs4231_outm(struct snd_cs4231 *chip, unsigned char reg,
@@ -205,7 +205,7 @@ static void snd_cs4231_dout(struct snd_cs4231 *chip, unsigned char reg, unsigned
for (timeout = 250; for (timeout = 250;
timeout > 0 && (cs4231_inb(chip, CS4231P(REGSEL)) & CS4231_INIT); timeout > 0 && (cs4231_inb(chip, CS4231P(REGSEL)) & CS4231_INIT);
timeout--) timeout--)
udelay(10); udelay(10);
cs4231_outb(chip, CS4231P(REGSEL), chip->mce_bit | reg); cs4231_outb(chip, CS4231P(REGSEL), chip->mce_bit | reg);
cs4231_outb(chip, CS4231P(REG), value); cs4231_outb(chip, CS4231P(REG), value);
mb(); mb();
@@ -322,7 +322,7 @@ static void snd_cs4231_busy_wait(struct snd_cs4231 *chip)
for (timeout = 250; for (timeout = 250;
timeout > 0 && (cs4231_inb(chip, CS4231P(REGSEL)) & CS4231_INIT); timeout > 0 && (cs4231_inb(chip, CS4231P(REGSEL)) & CS4231_INIT);
timeout--) timeout--)
udelay(10); udelay(10);
} }
void snd_cs4231_mce_up(struct snd_cs4231 *chip) void snd_cs4231_mce_up(struct snd_cs4231 *chip)
@@ -1234,7 +1234,7 @@ static int snd_cs4231_playback_open(struct snd_pcm_substream *substream)
/* hardware bug in InterWave chipset */ /* hardware bug in InterWave chipset */
if (chip->hardware == CS4231_HW_INTERWAVE && chip->dma1 > 3) if (chip->hardware == CS4231_HW_INTERWAVE && chip->dma1 > 3)
runtime->hw.formats &= ~SNDRV_PCM_FMTBIT_MU_LAW; runtime->hw.formats &= ~SNDRV_PCM_FMTBIT_MU_LAW;
/* hardware limitation of cheap chips */ /* hardware limitation of cheap chips */
if (chip->hardware == CS4231_HW_CS4235 || if (chip->hardware == CS4231_HW_CS4235 ||