Reorganized configuration files (card->type removal).

src/conf/cards/CMI8338.conf

@@ -0,0 +1,103 @@
+#
+# Configuration for the CMI8338 chip
+#
+
+CMI8338.pcm.front.0 {
+	@args [ CARD ]
+	@args.CARD {
+		type string
+	}
+	type hw
+	card $CARD
+	device 0
+}	
+
+# 2nd DAC
+# FIXME: we need a volume attenuator for rear channel.
+CMI8338.pcm.rear.0 {
+	@args [ CARD ]
+	@args.CARD {
+		type string
+	}
+	type hw
+	card $CARD
+	device 1
+}
+
+# for the old CM8738 with 2nd DAC for rear
+CMI8338.pcm.surround40.0 {
+	@args [ CARD ]
+	@args.CARD {
+		type string
+	}
+	type multi
+	master 1
+	slaves [
+		{
+			pcm {
+				@func concat
+				strings [
+					"cards.CMI8338.pcm.front.0:CARD=" $CARD
+				]
+			}
+			channels 2
+		}
+		{
+			pcm {
+				@func concat
+				strings [
+					"cards.CMI8338.pcm.rear.0:CARD=" $CARD
+				]
+			}
+			channels 2
+		}
+	]
+	bindings [
+		{ slave 0 channel 0 }
+		{ slave 0 channel 1 }
+		{ slave 1 channel 0 }
+		{ slave 1 channel 1 }
+	]
+}
+
+
+CMI8338.pcm.iec958.0 {
+	@args [ CARD DEV AES0 AES1 AES2 AES3 ]
+	@args.CARD {
+		type string
+	}
+	@args.DEV {
+		type integer
+	}
+	@args.AES0 {
+		type integer
+	}
+	@args.AES1 {
+		type integer
+	}
+	@args.AES2 {
+		type integer
+	}
+	@args.AES3 {
+		type integer
+	}
+	type hooks
+	hooks.0 {
+		type ctl_elems
+		hook_args [
+			{
+				name "IEC958 Enable"
+				value 1
+				lock true
+				preserve true
+			}
+			{
+				interface PCM
+				name "IEC958 Playback PCM Stream"
+				lock true
+				preserve true
+				value [ $AES0 $AES1 $AES2 $AES3 ]
+			}
+		]
+	}
+}

src/conf/cards/Makefile.am

@@ -1,6 +1,6 @@
 alsadir = $(datadir)/alsa/cards
-cfg_files = SI_7018.conf EMU10K1.conf TRID4DWAVENX.conf ENS1370.conf \
-	    INTEL8X0.conf YMFPCI.conf FM801.conf ICE1712.conf CMIPCI.conf
+cfg_files = aliases.conf SI7018.conf EMU10K1.conf TRID4DWAVENX.conf ENS1370.conf \
+	    INTEL8X0.conf YMF744.conf FM801.conf ICE1712.conf CMI8338.conf CMI8x38.conf
 
 EXTRA_DIST = $(cfg_files)
 alsa_DATA = $(cfg_files)

src/conf/cards/SI7018.conf

@@ -4,7 +4,7 @@
 
 <confdir:pcm/front.conf>
 
-SI_7018.pcm.front.0 {
+SI7018.pcm.front.0 {
 	@args [ CARD ]
 	@args.CARD {
 		type string
@@ -16,7 +16,7 @@ SI_7018.pcm.front.0 {
 
 <confdir:pcm/rear.conf>
 
-SI_7018.pcm.rear.0 {
+SI7018.pcm.rear.0 {
 	@args [ CARD ]
 	@args.CARD {
 		type string
@@ -42,7 +42,7 @@ SI_7018.pcm.rear.0 {
 
 <confdir:pcm/surround40.conf>
 
-SI_7018.pcm.surround40.0 {
+SI7018.pcm.surround40.0 {
 	@args [ CARD ]
 	@args.CARD {
 		type string
@@ -53,7 +53,7 @@ SI_7018.pcm.surround40.0 {
 			pcm {
 				@func concat
 				strings [
-					"cards.SI_7018.pcm.front.0:CARD=" $CARD
+					"cards.SI7018.pcm.front.0:CARD=" $CARD
 				]
 			}
 			channels 2
@@ -62,7 +62,7 @@ SI_7018.pcm.surround40.0 {
 			pcm {
 				@func concat
 				strings [
-					"cards.SI_7018.pcm.rear.0:CARD=" $CARD
+					"cards.SI7018.pcm.rear.0:CARD=" $CARD
 				]
 			}
 			channels 2

src/conf/cards/aliases.conf

@@ -0,0 +1,11 @@
+#
+#  Define aliases for various drivers
+#
+
+YMF724 cards.YMF744
+YMF724F cards.YMF744
+YMF740 cards.YMF744
+YMF740C cards.YMF744
+YMF754 cards.YMF744
+CMI8378 cards.CMI8338
+'E-mu APS' cards.EMU10K1