added CMI8338-SWIEC for cmipci with software IEC958

diff --git a/src/conf/cards/CMI8338-SWIEC.conf b/src/conf/cards/CMI8338-SWIEC.conf
new file mode 100644 (file)
index 0000000..5e89505
--- /dev/null
+++ b/src/conf/cards/CMI8338-SWIEC.conf
@@ -0,0 +1,104 @@
+#
+# Configuration for the CMI8338/8738 chip (w/o multi-channel support)
+# using software IEC958 subframe conversion
+#
+
+<confdir:pcm/front.conf>
+
+CMI8338-SWIEC.pcm.front.0 {
+       @args [ CARD ]
+       @args.CARD {
+               type string
+       }
+       type hw
+       card $CARD
+       device 0
+}      
+
+<confdir:pcm/rear.conf>
+
+# 2nd DAC
+# FIXME: we need a volume attenuator for rear channel.
+CMI8338-SWIEC.pcm.rear.0 {
+       @args [ CARD ]
+       @args.CARD {
+               type string
+       }
+       type hw
+       card $CARD
+       device 1
+}
+
+<confdir:pcm/surround40.conf>
+
+# for the old CM8738 with 2nd DAC for rear
+CMI8338-SWIEC.pcm.surround40.0 {
+       @args [ CARD ]
+       @args.CARD {
+               type string
+       }
+       type multi
+       master 1
+       slaves [
+               {
+                       pcm {
+                               @func concat
+                               strings [
+                                       "cards.CMI8338-SWIEC.pcm.front.0:CARD=" $CARD
+                               ]
+                       }
+                       channels 2
+               }
+               {
+                       pcm {
+                               @func concat
+                               strings [
+                                       "cards.CMI8338-SWIEC.pcm.rear.0:CARD=" $CARD
+                               ]
+                       }
+                       channels 2
+               }
+       ]
+       bindings [
+               { slave 0 channel 0 }
+               { slave 0 channel 1 }
+               { slave 1 channel 0 }
+               { slave 1 channel 1 }
+       ]
+}
+
+<confdir:pcm/iec958.conf>
+
+CMI8338-SWIEC.pcm.iec958.0 {
+       @args [ CARD AES0 AES1 AES2 AES3 ]
+       @args.CARD {
+               type string
+       }
+       @args.AES0 {
+               type integer
+       }
+       @args.AES1 {
+               type integer
+       }
+       @args.AES2 {
+               type integer
+       }
+       @args.AES3 {
+               type integer
+       }
+       type asym
+       playback.pcm {
+               type iec958
+               slave.pcm {
+                       type hw
+                       card $CARD
+                       device 2
+               }
+               status [ $AES0 $AES1 $AES2 $AES3 ]
+       }
+       capture.pcm {
+               type hw
+               card $CARD
+               device 2
+       }
+}

diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am
index 7700456072be7f14b9f0ccc27f8da2f3b1cad8ee..04d6d257f4620eea0a6aed39aa86f4a088d883f3 100644 (file)
--- a/src/conf/cards/Makefile.am
+++ b/src/conf/cards/Makefile.am
@@ -8,6 +8,7 @@ cfg_files = aliases.conf \
        Audigy.conf \
        Audigy2.conf \
        CMI8338.conf \
+       CMI8338-SWIEC.conf \
        CMI8738-MC6.conf \
        CS46xx.conf \
        EMU10K1.conf \

diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
index 0953fadb66410204fb9300cdc12c886b2c6b095a..667b4aefef2d0e2961a39256ecc5d9cf60a78726 100644 (file)
--- a/src/conf/cards/aliases.conf
+++ b/src/conf/cards/aliases.conf
@@ -9,6 +9,7 @@ YMF740C cards.YMF744
 YMF754 cards.YMF744
 CMIPCI cards.CMI8338
 CMI8738 cards.CMI8338
+CMI8738-SWIEC cards.CMI8338-SWIEC
 CMI8738-MC4 cards.CMI8738-MC6
 'E-mu APS' cards.EMU10K1
 'GUS Max' cards.GUS