Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9295aea1 authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Jaroslav Kysela
Browse files

ALSA: wss_lib: move cs4231_lib into wss_lib 



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: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Reviewed-by: default avatarRene Herman <rene.herman@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 740dc9c4

sound/isa/Kconfig

+14 −14
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ config SND_AD1848_LIB 
        tristate

        select SND_PCM



config SND_CS4231_LIB

config SND_WSS_LIB

        tristate

        select SND_PCM
@@ -86,7 +86,7 @@ config SND_AZT2320 
	select ISAPNP

	select SND_OPL3_LIB

	select SND_MPU401_UART

	select SND_CS4231_LIB

	select SND_WSS_LIB

	help

	  Say Y here to include support for soundcards based on the

	  Aztech Systems AZT2320 chip.
@@ -108,7 +108,7 @@ config SND_CMI8330 
config SND_CS4231

	tristate "Generic Cirrus Logic CS4231 driver"

	select SND_MPU401_UART

	select SND_CS4231_LIB

	select SND_WSS_LIB

	help

	  Say Y here to include support for CS4231 chips from Cirrus

	  Logic - Crystal Semiconductors.
@@ -120,7 +120,7 @@ config SND_CS4232 
	tristate "Generic Cirrus Logic CS4232 driver"

	select SND_OPL3_LIB

	select SND_MPU401_UART

	select SND_CS4231_LIB

	select SND_WSS_LIB

	help

	  Say Y here to include support for CS4232 chips from Cirrus

	  Logic - Crystal Semiconductors.
@@ -132,7 +132,7 @@ config SND_CS4236 
	tristate "Generic Cirrus Logic CS4236+ driver"

	select SND_OPL3_LIB

	select SND_MPU401_UART

	select SND_CS4231_LIB

	select SND_WSS_LIB

	help

	  Say Y to include support for CS4235,CS4236,CS4237B,CS4238B,

	  CS4239 chips from Cirrus Logic - Crystal Semiconductors.
@@ -228,7 +228,7 @@ config SND_GUSEXTREME 
config SND_GUSMAX

	tristate "Gravis UltraSound MAX"

	select SND_RAWMIDI

	select SND_CS4231_LIB

	select SND_WSS_LIB

	help

	  Say Y here to include support for Gravis UltraSound MAX

	  soundcards.
@@ -240,7 +240,7 @@ config SND_INTERWAVE 
	tristate "AMD InterWave, Gravis UltraSound PnP"

	depends on PNP

	select SND_RAWMIDI

	select SND_CS4231_LIB

	select SND_WSS_LIB

	help

	  Say Y here to include support for AMD InterWave based

	  soundcards (Gravis UltraSound Plug & Play, STB SoundRage32,
@@ -253,7 +253,7 @@ config SND_INTERWAVE_STB 
	tristate "AMD InterWave + TEA6330T (UltraSound 32-Pro)"

	depends on PNP

	select SND_RAWMIDI

	select SND_CS4231_LIB

	select SND_WSS_LIB

	help

	  Say Y here to include support for AMD InterWave based

	  soundcards with a TEA6330T bass and treble regulator
@@ -266,7 +266,7 @@ config SND_OPL3SA2 
	tristate "Yamaha OPL3-SA2/SA3"

	select SND_OPL3_LIB

	select SND_MPU401_UART

	select SND_CS4231_LIB

	select SND_WSS_LIB

	help

	  Say Y here to include support for Yamaha OPL3-SA2 and OPL3-SA3

	  chips.
@@ -292,7 +292,7 @@ config SND_OPTI92X_CS4231 
	select SND_OPL3_LIB

	select SND_OPL4_LIB

	select SND_MPU401_UART

	select SND_CS4231_LIB

	select SND_WSS_LIB

	help

	  Say Y here to include support for soundcards based on Opti

	  82C92x chips and using a CS4231 codec.
@@ -304,7 +304,7 @@ config SND_OPTI93X 
	tristate "OPTi 82C93x"

	select SND_OPL3_LIB

	select SND_MPU401_UART

	select SND_CS4231_LIB

	select SND_WSS_LIB

	help

	  Say Y here to include support for soundcards based on Opti

	  82C93x chips.
@@ -315,7 +315,7 @@ config SND_OPTI93X 
config SND_MIRO

	tristate "Miro miroSOUND PCM1pro/PCM12/PCM20radio driver"

	select SND_OPL4_LIB

	select SND_CS4231_LIB

	select SND_WSS_LIB

	select SND_MPU401_UART

	select SND_PCM

	help
@@ -384,7 +384,7 @@ config SND_SSCAPE 
	tristate "Ensoniq SoundScape PnP driver"

	select SND_HWDEP

	select SND_MPU401_UART

	select SND_CS4231_LIB

	select SND_WSS_LIB

	help

	  Say Y here to include support for Ensoniq SoundScape PnP

	  soundcards.
@@ -397,7 +397,7 @@ config SND_WAVEFRONT 
	select FW_LOADER

	select SND_OPL3_LIB

	select SND_MPU401_UART

	select SND_CS4231_LIB

	select SND_WSS_LIB

	help

	  Say Y here to include support for Turtle Beach Maui, Tropez

	  and Tropez+ soundcards based on the Wavefront chip.

sound/isa/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -27,4 +27,4 @@ obj-$(CONFIG_SND_SGALAXY) += snd-sgalaxy.o 
obj-$(CONFIG_SND_SSCAPE) += snd-sscape.o



obj-$(CONFIG_SND) += ad1816a/ ad1848/ cs423x/ es1688/ gus/ opti9xx/ \

		     sb/ wavefront/
 
		     sb/ wavefront/ wss/

sound/isa/cs423x/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -3,14 +3,12 @@ 
# Copyright (c) 2001 by Jaroslav Kysela <perex@perex.cz>

#



snd-cs4231-lib-objs := cs4231_lib.o

snd-cs4236-lib-objs := cs4236_lib.o

snd-cs4231-objs := cs4231.o

snd-cs4232-objs := cs4232.o

snd-cs4236-objs := cs4236.o



# Toplevel Module Dependency

obj-$(CONFIG_SND_CS4231_LIB) += snd-cs4231-lib.o

obj-$(CONFIG_SND_CS4231) += snd-cs4231.o

obj-$(CONFIG_SND_CS4232) += snd-cs4232.o

obj-$(CONFIG_SND_CS4236) += snd-cs4236.o snd-cs4236-lib.o

sound/isa/wss/Makefile

0 → 100644
+10 −0
Original line number Diff line number Diff line 
#

# 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

sound/isa/cs423x/cs4231_lib.c→sound/isa/wss/wss_lib.c

+22 −22

File changed and moved.

Contains only whitespace changes.