alsa-lib: added surround51 configuration for CS46xx cards

PATCH In review Benny Sjostrand 3 participants 5 messages Mar 30, 2003 – Apr 7, 2003

lore

Share & tools

lore

Benny Sjostrand

author

2003-03-30 22:24 UTC #0 lore raw

PATCH 1/1 alsa-lib: added surround51 configuration for CS46xx cards

Hi!

With the latest cs46xx patches it's finally posible to have surround51 with cs46xx soundcards (only dual CODEC's). This patch just updates the alsa-lib/src/conf/cards/CS46xx.conf file.

$ aplay -D plug:surround51 ... seems to work fine!

/Benny

cvs/alsa-lib/src/conf/cards/CS46xx.conf renamed from src/conf/cards/CS46xx.conf +59 -0

@@ -26,6 +26,18 @@
 	device 1
 }	
 
+<confdir:pcm/center_lfe.conf>
+
+CS46xx.pcm.center_lfe.0 {
+	@args [ CARD ]
+	@args.CARD {
+		type string
+	}
+	type hw
+	card $CARD
+	device 3
+}	
+
 <confdir:pcm/surround40.conf>
 
 CS46xx.pcm.surround40.0 {

@@ -59,6 +71,53 @@
 		{ slave 0 channel 1 }
 		{ slave 1 channel 0 }
 		{ slave 1 channel 1 }
+	]
+}
+
+<confdir:pcm/surround51.conf>
+
+CS46xx.pcm.surround51.0 {
+	@args [ CARD ]
+	@args.CARD {
+		type string
+	}
+	type multi
+	slaves [
+		{
+			pcm {
+				@func concat
+				strings [
+					"cards.CS46xx.pcm.front.0:CARD=" $CARD
+				]
+			}
+			channels 2
+		}
+		{
+			pcm {
+				@func concat
+				strings [
+					"cards.CS46xx.pcm.rear.0:CARD=" $CARD
+				]
+			}
+			channels 2
+		}
+		{
+			pcm {
+				@func concat
+				strings [
+					"cards.CS46xx.pcm.center_lfe.0:CARD=" $CARD
+				]
+			}
+			channels 2
+		}
+	]
+	bindings [
+		{ slave 0 channel 0 }
+		{ slave 0 channel 1 }
+		{ slave 1 channel 0 }
+		{ slave 1 channel 1 }
+		{ slave 2 channel 0 }
+		{ slave 2 channel 1 }
 	]
 }

Andrei Boros

2003-04-07 07:03 UTC #1 lore raw

alsa-cvs linking error

I wanted to see if latest updates to alsa-cvs tree will make my opti924 work, so I updated.

This is the configuration requested:
./configure --with-cards=dummy,cs46xx,opti92x-ad1848 --with-oss=yes --with-sequencer=yes --with-isapnp=yes --with-debug=detect --enable-verbose-printk

This is the error I got during make

ld -r -o snd-opl4-lib.o opl4_lib.o opl4_mixer.o opl4_proc.o opl4_mixer.o(.modinfo+0x0): multiple definition of `__module_kernel_version'
opl4_lib.o(.modinfo+0x0): first defined here opl4_mixer.o(.modinfo+0x16): multiple definition of `__module_using_checksums'
opl4_lib.o(.modinfo+0x16): first defined here opl4_proc.o(.modinfo+0x0): multiple definition of `__module_kernel_version'
opl4_lib.o(.modinfo+0x0): first defined here opl4_proc.o(.modinfo+0x16): multiple definition of `__module_using_checksums'
opl4_lib.o(.modinfo+0x16): first defined here
make[2]: *** [snd-opl4-lib.o] Error 1
make[2]: Leaving directory `/serve/install/alsa-cvs/alsa-driver/drivers/opl4'
make[1]: *** [_modsubdir_opl4] Error 2
make[1]: Leaving directory `/serve/install/alsa-cvs/alsa-driver/drivers'
make: *** [compile] Error 1

Signature · 11 lines

ing. Andrei Boros
mailto:[email protected] / +40-21-303-1870
Centrul pt. Tehnologia Informatiei
Societatea Romana de Radiodifuziune


-------------------------------------------------------
This SF.net email is sponsored by: ValueWeb: 
Dedicated Hosting for just $79/mo with 500 GB of bandwidth! 
No other company gives more support or power for your dedicated server
http://click.atdmt.com/AFF/go/sdnxxaff00300020aff/direct/01/

Jaroslav Kysela

2003-04-07 08:05 UTC #2 lore raw

Re: alsa-cvs linking error

Quoted 21 lines · Andrei Boros

I wanted to see if latest updates to alsa-cvs tree will make my opti924 work, so I updated.
This is the configuration requested:
./configure --with-cards=dummy,cs46xx,opti92x-ad1848 --with-oss=yes --with-sequencer=yes --with-isapnp=yes --with-debug=detect --enable-verbose-printk
This is the error I got during make
ld -r -o snd-opl4-lib.o opl4_lib.o opl4_mixer.o opl4_proc.o opl4_mixer.o(.modinfo+0x0): multiple definition of __module_kernel_version' opl4_lib.o(.modinfo+0x0): first defined here opl4_mixer.o(.modinfo+0x16): multiple definition of __module_using_checksums' opl4_lib.o(.modinfo+0x16): first defined here opl4_proc.o(.modinfo+0x0): multiple definition of `__module_kernel_version' opl4_lib.o(.modinfo+0x0): first defined here opl4_proc.o(.modinfo+0x16): multiple definition of

Quoted 8 lines

`__module_using_checksums'
opl4_lib.o(.modinfo+0x16): first defined here
make[2]: *** [snd-opl4-lib.o] Error 1
make[2]: Leaving directory `/serve/install/alsa-cvs/alsa-driver/drivers/opl4'
make[1]: *** [_modsubdir_opl4] Error 2
make[1]: Leaving directory `/serve/install/alsa-cvs/alsa-driver/drivers'
make: *** [compile] Error 1

Fixed in CVS. Thanks.

Jaroslav

-----
Jaroslav Kysela <[email protected]>
Linux Kernel Sound Maintainer
ALSA Project, SuSE Labs

-------------------------------------------------------
This SF.net email is sponsored by: ValueWeb:
Dedicated Hosting for just $79/mo with 500 GB of bandwidth! No other company gives more support or power for your dedicated server
http://click.atdmt.com/AFF/go/sdnxxaff00300020aff/direct/01/

Andrei Boros

2003-04-07 10:32 UTC #3 lore raw

Re: alsa-cvs linking error

Quoted 3 lines

Fixed in CVS. Thanks.

Just updated. New problems:

gcc -D__KERNEL__ -DMODULE=1 -I/serve/install/alsa-cvs/alsa-driver/include -I/usr/src/linux/include -O2 -march=i586 -DLINUX -Wall -Wstrict-prototypes -fomit-frame-pointer -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -DALSA_BUILD -DEXPORT_SYMTAB -c pnp.c
pnp.c:324: parse error before `pnp_exit'
pnp.c:325: warning: return-type defaults to `int'
pnp.c: In function `pnp_exit':
pnp.c:326: warning: control reaches end of non-void function pnp.c: In function `__cleanup_module_inline':
pnp.c:329: warning: return from incompatible pointer type make[2]: *** [pnp.o] Error 1
make[2]: Leaving directory `/serve/install/alsa-cvs/alsa-driver/support/pnp'
make[1]: *** [_modsubdir_pnp] Error 2
make[1]: Leaving directory `/serve/install/alsa-cvs/alsa-driver/support'
make: *** [compile] Error 1

Signature · 11 lines

ing. Andrei Boros
mailto:[email protected] / +40-21-303-1870
Centrul pt. Tehnologia Informatiei
Societatea Romana de Radiodifuziune


-------------------------------------------------------
This SF.net email is sponsored by: ValueWeb: 
Dedicated Hosting for just $79/mo with 500 GB of bandwidth! 
No other company gives more support or power for your dedicated server
http://click.atdmt.com/AFF/go/sdnxxaff00300020aff/direct/01/

Jaroslav Kysela

2003-04-07 10:51 UTC #4 lore raw

Re: alsa-cvs linking error

Quoted 15 lines · Andrei Boros

Quoted 3 lines
Fixed in CVS. Thanks.
Just updated. New problems:
gcc -D__KERNEL__ -DMODULE=1
(quoted diff) +0 -4
-I/serve/install/alsa-cvs/alsa-driver/include  -I/usr/src/linux/include
-O2 -march=i586 -DLINUX -Wall -Wstrict-prototypes -fomit-frame-pointer
-Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe -DALSA_BUILD  
-DEXPORT_SYMTAB -c pnp.c
pnp.c:324: parse error before pnp_exit' pnp.c:325: warning: return-type defaults to int' pnp.c: In function `pnp_exit':
pnp.c:326: warning: control reaches end of non-void function

Quoted 8 lines

pnp.c: In function `__cleanup_module_inline':
pnp.c:329: warning: return from incompatible pointer type make[2]: *** [pnp.o] Error 1
make[2]: Leaving directory `/serve/install/alsa-cvs/alsa-driver/support/pnp'
make[1]: *** [_modsubdir_pnp] Error 2
make[1]: Leaving directory `/serve/install/alsa-cvs/alsa-driver/support'
make: *** [compile] Error 1

Are you using 2.2 kernel? Please, try again. I've tried to fix this problem in CVS.

Jaroslav

-----
Jaroslav Kysela <[email protected]>
Linux Kernel Sound Maintainer
ALSA Project, SuSE Labs