Renamed from CMIPCI to CMI8738.

IEC958 Enable switch is removed along with the change of cmipci driver.

diff --git a/src/cards/CMIPCI.conf b/src/cards/CMI8738.conf
similarity index 73%
rename from src/cards/CMIPCI.conf
rename to src/cards/CMI8738.conf
index 37f77e701e59c452da25e65f0bdb5c22ba9da556..7d4dce17e381c5aafdb40503193f8a9a7a45dcf5 100644 (file)
--- a/src/cards/CMIPCI.conf
+++ b/src/cards/CMI8738.conf
@@ -2,7 +2,7 @@
 # Configuration for the CMIPCI chip
 #
 
-cards.CMIPCI.pcm.front.0 {
+cards.CMI8738.pcm.front.0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -14,7 +14,7 @@ cards.CMIPCI.pcm.front.0 {
 
 # 2nd DAC
 # FIXME: we need a volume attenuator for rear channel.
-cards.CMIPCI.pcm.rear.0 {
+cards.CMI8738.pcm.rear.0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -25,11 +25,11 @@ cards.CMIPCI.pcm.rear.0 {
 }
 
 # for the recent CM8738 chips
-# cards.CMIPCI.pcm.surround40.0 "cards.CMIPCI.pcm.front.0"
-cards.CMIPCI.pcm.surround51.0 "cards.CMIPCI.pcm.front.0"
+# cards.CMI8738.pcm.surround40.0 "cards.CMI8738.pcm.front.0"
+cards.CMI8738.pcm.surround51.0 "cards.CMI8738.pcm.front.0"
 
 # for the old CM8738 with 2nd DAC for rear
-cards.CMIPCI.pcm.surround40.0 {
+cards.CMI8738.pcm.surround40.0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -41,7 +41,7 @@ cards.CMIPCI.pcm.surround40.0 {
                        pcm {
                                @func concat
                                strings [
-                                       "cards.CMIPCI.pcm.front.0:CARD=" $CARD
+                                       "cards.CMI8738.pcm.front.0:CARD=" $CARD
                                ]
                        }
                        channels 2
@@ -50,7 +50,7 @@ cards.CMIPCI.pcm.surround40.0 {
                        pcm {
                                @func concat
                                strings [
-                                       "cards.CMIPCI.pcm.rear.0:CARD=" $CARD
+                                       "cards.CMI8738.pcm.rear.0:CARD=" $CARD
                                ]
                        }
                        channels 2
@@ -65,7 +65,7 @@ cards.CMIPCI.pcm.surround40.0 {
 }
 
 
-cards.CMIPCI.pcm.iec958.0 {
+cards.CMI8738.pcm.iec958.0 {
        @args [ CARD DEV AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string
@@ -86,18 +86,18 @@ cards.CMIPCI.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 ]