Corrected configuration for CMI8338/8738.

- CMI8738 is aliased to CMI8338.
- New config file for multi channel cards with -MCx suffix

diff --git a/src/conf/cards/CMI8338.conf b/src/conf/cards/CMI8338.conf
index 5c9dd829f27d1d96c36924bc6cda5d7ed6f914c9..ef89f6c69d20e2fe511ddd6427069ac476c0b6a6 100644 (file)
--- a/src/conf/cards/CMI8338.conf
+++ b/src/conf/cards/CMI8338.conf
@@ -1,7 +1,9 @@
 #
-# Configuration for the CMI8338 chip
+# Configuration for the CMI8338/8738 chip (w/o multi-channel support)
 #
 
+<confdir:pcm/front.conf>
+
 CMI8338.pcm.front.0 {
        @args [ CARD ]
        @args.CARD {
@@ -12,6 +14,8 @@ CMI8338.pcm.front.0 {
        device 0
 }      
 
+<confdir:pcm/rear.conf>
+
 # 2nd DAC
 # FIXME: we need a volume attenuator for rear channel.
 CMI8338.pcm.rear.0 {
@@ -24,6 +28,8 @@ CMI8338.pcm.rear.0 {
        device 1
 }
 
+<confdir:pcm/surround40.conf>
+
 # for the old CM8738 with 2nd DAC for rear
 CMI8338.pcm.surround40.0 {
        @args [ CARD ]
@@ -60,6 +66,7 @@ CMI8338.pcm.surround40.0 {
        ]
 }
 
+<confdir:pcm/iec958.conf>
 
 CMI8338.pcm.iec958.0 {
        @args [ CARD DEV AES0 AES1 AES2 AES3 ]
@@ -82,18 +89,18 @@ CMI8338.pcm.iec958.0 {
                type integer
        }
        type hooks
+       slave.pcm {
+               type hw
+               card $CARD
+               device 2
+       }
        hooks.0 {
                type ctl_elems
                hook_args [
-                       {
-                               name "IEC958 Enable"
-                               value 1
-                               lock true
-                               preserve true
-                       }
                        {
                                interface PCM
                                name "IEC958 Playback PCM Stream"
+                               device 2
                                lock true
                                preserve true
                                value [ $AES0 $AES1 $AES2 $AES3 ]

diff --git a/src/conf/cards/CMI8x78.conf b/src/conf/cards/CMI8738-MC6.conf
similarity index 53%
rename from src/conf/cards/CMI8x78.conf
rename to src/conf/cards/CMI8738-MC6.conf
index 090dbf2d32b40a60f40271282b2b8f1c650ad5ab..497f788384fd21adeb377528ba590d39a2a28342 100644 (file)
--- a/src/conf/cards/CMI8x78.conf
+++ b/src/conf/cards/CMI8738-MC6.conf
@@ -1,10 +1,10 @@
 #
-# Configuration for the CMIPCI chip
+# Configuration for the CMI8738 chip with 4/6 multi-channel support
 #
 
 <confdir:pcm/front.conf>
 
-CMI8738.pcm.front.0 {
+CMI8738-MC6.pcm.front.0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -18,7 +18,7 @@ CMI8738.pcm.front.0 {
 
 # 2nd DAC
 # FIXME: we need a volume attenuator for rear channel.
-CMI8738.pcm.rear.0 {
+CMI8738-MC6.pcm.rear.0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -30,53 +30,15 @@ CMI8738.pcm.rear.0 {
 
 <confdir:pcm/surround40.conf>
 
-# for the old CM8738 with 2nd DAC for rear
-CMI8738.pcm.surround40.0 {
-       @args [ CARD ]
-       @args.CARD {
-               type string
-       }
-       type multi
-       master 1
-       slaves [
-               {
-                       pcm {
-                               @func concat
-                               strings [
-                                       "cards.CMI8738.pcm.front.0:CARD=" $CARD
-                               ]
-                       }
-                       channels 2
-               }
-               {
-                       pcm {
-                               @func concat
-                               strings [
-                                       "cards.CMI8738.pcm.rear.0:CARD=" $CARD
-                               ]
-                       }
-                       channels 2
-               }
-       ]
-       bindings [
-               { slave 0 channel 0 }
-               { slave 0 channel 1 }
-               { slave 1 channel 0 }
-               { slave 1 channel 1 }
-       ]
-}
-
-# for the recent CM8738 chips
-# cards.CMI8738.pcm.surround40.0 "cards.CMI8738.pcm.front.0"
-
+CMI8738-MC6.pcm.surround40.0 "cards.CMI8738-MC6.pcm.front.0"
 
 <confdir:pcm/surround51.conf>
 
-CMI8738.pcm.surround51.0 "cards.CMI8738.pcm.front.0"
+CMI8738-MC6.pcm.surround51.0 "cards.CMI8738-MC6.pcm.front.0"
 
 <confdir:pcm/iec958.conf>
 
-CMI8738.pcm.iec958.0 {
+CMI8738-MC6.pcm.iec958.0 {
        @args [ CARD DEV AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string

diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am
index 55b2753b19ea6d34da2bd132eb3b5cf27a2e6bc1..fba85b9ff509c47d22b7a448eae294f6f5f6eef6 100644 (file)
--- a/src/conf/cards/Makefile.am
+++ b/src/conf/cards/Makefile.am
@@ -1,6 +1,6 @@
 alsadir = $(datadir)/alsa/cards
 cfg_files = aliases.conf SI7018.conf EMU10K1.conf TRID4DWAVENX.conf ENS1370.conf \
-           ICH.conf YMF744.conf FM801.conf ICE1712.conf CMI8338.conf CMI8x78.conf
+           ICH.conf YMF744.conf FM801.conf ICE1712.conf CMI8338.conf CMI8738-MC6.conf
 
 EXTRA_DIST = $(cfg_files)
 alsa_DATA = $(cfg_files)

diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
index 2e88cd7e6ba00bf7cca11033474918b6644e8173..2d6ecc11b94ea65ad481515b2cfe1dc6bf4f3114 100644 (file)
--- a/src/conf/cards/aliases.conf
+++ b/src/conf/cards/aliases.conf
@@ -7,5 +7,7 @@ YMF724F cards.YMF744
 YMF740 cards.YMF744
 YMF740C cards.YMF744
 YMF754 cards.YMF744
-CMI8378 cards.CMI8338
+CMIPCI cards.CMI8338
+CMI8738 cards.CMI8338
+CMI8738-MC4 cards.CMI8738-MC6
 'E-mu APS' cards.EMU10K1