Added ENS1371 configuration and fixes for iec958 definition (dev arg removal)

diff --git a/src/conf/cards/Audigy.conf b/src/conf/cards/Audigy.conf
index 8184320f399ac86108084ae5baaa49d39a9179bd..e0f73c4ce315d07767a6d1b7d2219b210055716b 100644 (file)
--- a/src/conf/cards/Audigy.conf
+++ b/src/conf/cards/Audigy.conf
@@ -176,13 +176,10 @@ Audigy.pcm.surround51.0 {
 <confdir:pcm/iec958.conf>
 
 Audigy.pcm.iec958.0 {
-       @args [ CARD DEV AES0 AES1 AES2 AES3 ]
+       @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string
        }
-       @args.DEV {
-               type integer
-       }
        @args.AES0 {
                type integer
        }

diff --git a/src/conf/cards/CMI8338.conf b/src/conf/cards/CMI8338.conf
index ef89f6c69d20e2fe511ddd6427069ac476c0b6a6..ab5df010b116768d58e163773ed43bc7a1169b9b 100644 (file)
--- a/src/conf/cards/CMI8338.conf
+++ b/src/conf/cards/CMI8338.conf
@@ -69,13 +69,10 @@ CMI8338.pcm.surround40.0 {
 <confdir:pcm/iec958.conf>
 
 CMI8338.pcm.iec958.0 {
-       @args [ CARD DEV AES0 AES1 AES2 AES3 ]
+       @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string
        }
-       @args.DEV {
-               type integer
-       }
        @args.AES0 {
                type integer
        }

diff --git a/src/conf/cards/CMI8738-MC6.conf b/src/conf/cards/CMI8738-MC6.conf
index 497f788384fd21adeb377528ba590d39a2a28342..e7fd18f2620b70bdd907b49cbdf55cd7d748f476 100644 (file)
--- a/src/conf/cards/CMI8738-MC6.conf
+++ b/src/conf/cards/CMI8738-MC6.conf
@@ -39,7 +39,7 @@ CMI8738-MC6.pcm.surround51.0 "cards.CMI8738-MC6.pcm.front.0"
 <confdir:pcm/iec958.conf>
 
 CMI8738-MC6.pcm.iec958.0 {
-       @args [ CARD DEV AES0 AES1 AES2 AES3 ]
+       @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string
        }

diff --git a/src/conf/cards/EMU10K1.conf b/src/conf/cards/EMU10K1.conf
index 02d98fc291d39c89f4d9da242ed8a4b0eec9ce3e..5acfc193356bd89e44fb7472d07ebfdd32ddc848 100644 (file)
--- a/src/conf/cards/EMU10K1.conf
+++ b/src/conf/cards/EMU10K1.conf
@@ -196,13 +196,10 @@ EMU10K1.pcm.surround51.0 {
 <confdir:pcm/iec958.conf>
 
 EMU10K1.pcm.iec958.0 {
-       @args [ CARD DEV AES0 AES1 AES2 AES3 ]
+       @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string
        }
-       @args.DEV {
-               type integer
-       }
        @args.AES0 {
                type integer
        }

diff --git a/src/conf/cards/ENS1371.conf b/src/conf/cards/ENS1371.conf
new file mode 100644 (file)
index 0000000..a9499da
--- /dev/null
+++ b/src/conf/cards/ENS1371.conf
@@ -0,0 +1,58 @@
+#
+# Configuration for the ENS1370 chip
+#
+
+<confdir:pcm/front.conf>
+
+ENS1371.pcm.front.0 {
+       @args [ CARD ]
+       @args.CARD {
+               type string
+       }
+       type hw
+       card $CARD
+       device 1
+}      
+
+
+<confdir:pcm/iec958.conf>
+
+ENS1371.pcm.iec958.0 {
+       @args [ CARD 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
+       slave.pcm {
+               type hw
+               card $CARD
+               device 0
+       }
+       hooks.0 {
+               type ctl_elems
+               hook_args [
+                       {
+                               interface PCM
+                               name "IEC958 Playback PCM Stream"
+                               lock true
+                               preserve true
+                               value [ $AES0 $AES1 $AES2 $AES3 ]
+                       }
+               ]
+       }
+}

diff --git a/src/conf/cards/FM801.conf b/src/conf/cards/FM801.conf
index 3d5f5b2dbf51e1cc7e3ab262503941c0992ac15d..47299c1c8b2e986bc74a48152962366a706a83d2 100644 (file)
--- a/src/conf/cards/FM801.conf
+++ b/src/conf/cards/FM801.conf
@@ -25,13 +25,10 @@ FM801.pcm.surround51.0 "cards.FM801.pcm.front.0"
 <confdir:pcm/iec958.conf>
 
 FM801.pcm.iec958.0 {
-       @args [ CARD DEV AES0 AES1 AES2 AES3 ]
+       @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string
        }
-       @args.DEV {
-               type integer
-       }
        @args.AES0 {
                type integer
        }

diff --git a/src/conf/cards/ICE1712.conf b/src/conf/cards/ICE1712.conf
index c3381f0f79016ea288e51d7c092047f0e0beff08..d680d8c20e4bcfd9285618d61153fcaf3e670a8a 100644 (file)
--- a/src/conf/cards/ICE1712.conf
+++ b/src/conf/cards/ICE1712.conf
@@ -59,13 +59,10 @@ ICE1712.pcm.surround51.0 {
 <confdir:pcm/iec958.conf>
 
 ICE1712.pcm.iec958.0 {
-       @args [ CARD DEV AES0 AES1 AES2 AES3 ]
+       @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string
        }
-       @args.DEV {
-               type integer
-       }
        @args.AES0 {
                type integer
        }

diff --git a/src/conf/cards/ICH.conf b/src/conf/cards/ICH.conf
index aab74f7f43171466694251d92b9f90ccecbb1bc0..0a8d4b1562e41d28074904991af3013fa39c83ee 100644 (file)
--- a/src/conf/cards/ICH.conf
+++ b/src/conf/cards/ICH.conf
@@ -50,13 +50,10 @@ ICH.pcm.surround51.0 {
 <confdir:pcm/iec958.conf>
 
 ICH.pcm.iec958.0 {
-       @args [ CARD DEV AES0 AES1 AES2 AES3 ]
+       @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string
        }
-       @args.DEV {
-               type integer
-       }
        @args.AES0 {
                type integer
        }

diff --git a/src/conf/cards/RME9636.conf b/src/conf/cards/RME9636.conf
index 21e0a223a72dd133a61b5b01faee1ad5e059919a..3db270c3ad71eba744616b7f55a7f36a5c9906c6 100644 (file)
--- a/src/conf/cards/RME9636.conf
+++ b/src/conf/cards/RME9636.conf
@@ -19,13 +19,10 @@ RME9636.pcm.front.0 {
 <confdir:pcm/iec958.conf>
 
 RME9636.pcm.iec958.0 {
-       @args [ CARD DEV AES0 AES1 AES2 AES3 ]
+       @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string
        }
-       @args.DEV {
-               type integer
-       }
        @args.AES0 {
                type integer
        }

diff --git a/src/conf/cards/RME9652.conf b/src/conf/cards/RME9652.conf
index d46874e2516aec1e61bc22c07d0324f8d29f9a3f..7dce4243832ed53a2f61fe2cca3d48777e3022f4 100644 (file)
--- a/src/conf/cards/RME9652.conf
+++ b/src/conf/cards/RME9652.conf
@@ -19,13 +19,10 @@ RME9636.pcm.front.0 {
 <confdir:pcm/iec958.conf>
 
 RME9636.pcm.iec958.0 {
-       @args [ CARD DEV AES0 AES1 AES2 AES3 ]
+       @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string
        }
-       @args.DEV {
-               type integer
-       }
        @args.AES0 {
                type integer
        }

diff --git a/src/conf/cards/SI7018.conf b/src/conf/cards/SI7018.conf
index f048d35aab73cea6e4e525514310f14bfe6e20d0..4c047a72fd4440d3a2e45778e02de011d5a02ad1 100644 (file)
--- a/src/conf/cards/SI7018.conf
+++ b/src/conf/cards/SI7018.conf
@@ -81,13 +81,10 @@ SI7018.pcm.surround40.0 {
 <confdir:pcm/iec958.conf>
 
 SI7018.pcm.iec958.0 {
-       @args [ CARD DEV AES0 AES1 AES2 AES3 ]
+       @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string
        }
-       @args.DEV {
-               type integer
-       }
        @args.AES0 {
                type integer
        }

diff --git a/src/conf/cards/YMF744.conf b/src/conf/cards/YMF744.conf
index 49c459edd67f261e204fe4de15b6297f17fcd77a..6243a09ae82a2cb191eed8eb9d1aa1d6aa0b92a3 100644 (file)
--- a/src/conf/cards/YMF744.conf
+++ b/src/conf/cards/YMF744.conf
@@ -65,13 +65,10 @@ YMF744.pcm.surround40.0 {
 <confdir:pcm/iec958.conf>
 
 YMF744.pcm.iec958.0 {
-       @args [ CARD DEV AES0 AES1 AES2 AES3 ]
+       @args [ CARD AES0 AES1 AES2 AES3 ]
        @args.CARD {
                type string
        }
-       @args.DEV {
-               type integer
-       }
        @args.AES0 {
                type integer
        }