INTEL8X0->ICH change

diff --git a/src/conf/cards/ICH.conf b/src/conf/cards/ICH.conf
index 3f2a1ce9c6013d61771747b267969504c220e5d1..aab74f7f43171466694251d92b9f90ccecbb1bc0 100644 (file)
--- a/src/conf/cards/ICH.conf
+++ b/src/conf/cards/ICH.conf
@@ -1,10 +1,10 @@
 #
-# Configuration for the INTEL8X0 chip
+# Configuration for the Intel ICH/ICH2/ICH3 chips
 #
 
 <confdir:pcm/front.conf>
 
-INTEL8X0.pcm.front.0 {
+ICH.pcm.front.0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -16,11 +16,11 @@ INTEL8X0.pcm.front.0 {
 
 <confdir:pcm/surround40.conf>
 
-INTEL8X0.pcm.surround40.0 "cards.INTEL8X0.pcm.front.0"
+ICH.pcm.surround40.0 "cards.ICH.pcm.front.0"
 
 <confdir:pcm/surround51.conf>
 
-INTEL8X0.pcm.surround51.0 {
+ICH.pcm.surround51.0 {
        @args [ CARD ]
        @args.CARD {
                type string
@@ -31,7 +31,7 @@ INTEL8X0.pcm.surround51.0 {
                        pcm {
                                @func concat
                                strings [
-                                       "cards.INTEL8X0.pcm.front.0:CARD=" $CARD
+                                       "cards.ICH.pcm.front.0:CARD=" $CARD
                                ]
                        }
                        channels 6
@@ -40,16 +40,16 @@ INTEL8X0.pcm.surround51.0 {
        bindings [
                { slave 0 channel 0 }
                { slave 0 channel 1 }
-               { slave 2 channel 0 }
-               { slave 2 channel 1 }
-               { slave 1 channel 0 }
-               { slave 1 channel 1 }
+               { slave 0 channel 4 }
+               { slave 0 channel 5 }
+               { slave 0 channel 2 }
+               { slave 0 channel 3 }
        ]
 }
 
 <confdir:pcm/iec958.conf>
 
-INTEL8X0.pcm.iec958.0 {
+ICH.pcm.iec958.0 {
        @args [ CARD DEV AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string