Add surround71 definition to NFORCE.conf

Now the board with ALC850 can work with 8-channel outputs.

diff --git a/include/sound/asound.h b/include/sound/asound.h
index fa1c9ab95f845201583bc12145e58ea2c7db951e..d86a457bff9afc460c9a194ad02c1ebd259a8601 100644 (file)
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -59,6 +59,7 @@
 #ifndef __KERNEL__
 #include <sys/time.h>
 #include <sys/types.h>
+#include <sys/ioctl.h>
 #endif
 
 /*

diff --git a/src/conf/cards/NFORCE.conf b/src/conf/cards/NFORCE.conf
index a60407978cbdc4e7a4903fab20bd6a535b444631..6ebefe3da29edbcf4afdd9cecdedb2fecca18ff1 100644 (file)
--- a/src/conf/cards/NFORCE.conf
+++ b/src/conf/cards/NFORCE.conf
@@ -171,6 +171,79 @@ NFORCE.pcm.surround51.0 {
        }
 }
 
+<confdir:pcm/surround71.conf>
+
+NFORCE.pcm.surround71.0 {
+    @args [ CARD ]
+    @args.CARD {
+        type string
+    }
+    type softvol
+    slave.pcm {
+        type route
+        ttable.0.0 1
+        ttable.1.1 1
+        ttable.2.4 1
+        ttable.3.5 1
+        ttable.4.2 1
+        ttable.5.3 1
+        ttable.6.6 1
+        ttable.7.7 1
+        slave.pcm {
+            type hooks
+            slave.pcm {
+                type hw
+                card $CARD
+                device 0
+            }
+            hooks.0 {
+                type ctl_elems
+                hook_args [
+                {
+                    name "Channel Mode"
+                    preserve true
+                    value "8ch"
+                    lock true
+                    optional true
+                }
+                # for old drivers
+                {
+                    name "Line-In As Surround"
+                    preserve true
+                    value true
+                    optional true
+                }
+                {
+                    name "Mic As Center/LFE"
+                    preserve true
+                    value true
+                    optional true
+                }
+                {
+                    name "Surround Down Mix"
+                    preserve true
+                    value off
+                    lock true
+                    optional true
+                }
+                {
+                    name "Center/LFE Down Mix"
+                    preserve true
+                    value off
+                    lock true
+                    optional true
+                }
+                ]
+            }
+        }
+        slave.channels 8
+    }
+    control {
+        name "PCM Playback Volume"
+        card $CARD
+    }
+}
+
 <confdir:pcm/iec958.conf>
 
 NFORCE.pcm.iec958.0 {