Added more configurations and enhanced Trident NX conf

diff --git a/src/cards/EMU10K1.conf b/src/cards/EMU10K1.conf
index 5beb3427ac4371ce5b3ab7b75c65df7051b76ef5..a1ac35ee57b10ae36a4e47868e5367d7a62076a5 100644 (file)
--- a/src/cards/EMU10K1.conf
+++ b/src/cards/EMU10K1.conf
@@ -258,10 +258,14 @@ pcm.iec958_0 {
                hook_args [
                        {
                                name "IEC958 Playback Default"
+                               lock true
+                               preserve true
                                value [ $(AES0) $(AES1) $(AES2) $(AES3) ]
                        }
                        {
                                name "IEC958 Optical Raw Playback Switch"
+                               lock true
+                               preserve true
                                value [ 1 1 ]
                        }
                ]

diff --git a/src/cards/ENS1370.conf b/src/cards/ENS1370.conf
new file mode 100644 (file)
index 0000000..3a2c6ab
--- /dev/null
+++ b/src/cards/ENS1370.conf
@@ -0,0 +1,118 @@
+#
+# Configuration for the ENS1370 chip
+#
+
+pcm.ens1370_front {
+       @args [ CARD DEV SUBDEV ]
+       @args.CARD {
+               type integer
+       }
+       @args.DEV {
+               type integer
+       }
+       @args.SUBDEV {
+               type integer
+               default -1
+       }
+       type hw
+       card $(CARD)
+       device $(DEV)
+       subdevice $(SUBDEV)
+}      
+
+pcm.front_0 {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       @func refer
+       name {
+               @func concat
+               strings [ "pcm.ens1370_front:" $(CARD) ",0,-1" ]
+       }
+}
+
+pcm.ens1370_rear {
+       @args [ CARD DEV SUBDEV ]
+       @args.CARD {
+               type integer
+       }
+       @args.DEV {
+               type integer
+       }
+       @args.SUBDEV {
+               type integer
+               default -1
+       }
+       type hooks
+       slave.pcm {
+               @func concat
+               strings [
+                       "pcm.ens1370_front:" $(CARD) "," $(DEV) "," $(SUBDEV)
+               ]
+       }
+       hooks.0 {
+               type ctl_elems
+               hook_args [
+                       {
+                               name "PCM 0 Output also on Line-In Jack"
+                               preserve true
+                               lock true
+                               value true
+                       }
+                       {
+                               name "PCM Switch"
+                               preserve true
+                               lock true
+                               value [ false false ]
+                       }
+               ]
+       }
+}      
+
+pcm.rear_0 {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       @func refer
+       name {
+               @func concat
+               strings [ "pcm.ens1370_rear:" $(CARD) ",0,-1" ]
+       }
+}
+
+pcm.surround40_0 {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       type multi
+       master 1
+       slaves [
+               {
+                       pcm {
+                               @func concat
+                               strings [
+                                       "pcm.ens1370_front:" $(CARD) ",0,-1"
+                               ]
+                       }
+                       channels 2
+               }
+               {
+                       pcm {
+                               @func concat
+                               strings [
+                                       "pcm.ens1370_rear:" $(CARD) ",0,-1"
+                               ]
+                       }
+                       channels 2
+               }
+       ]
+       bindings [
+               { slave 0 channel 0 }
+               { slave 0 channel 1 }
+               { slave 1 channel 0 }
+               { slave 1 channel 1 }
+       ]
+}

diff --git a/src/cards/FM801.conf b/src/cards/FM801.conf
new file mode 100644 (file)
index 0000000..55dbdfc
--- /dev/null
+++ b/src/cards/FM801.conf
@@ -0,0 +1,101 @@
+#
+# Configuration for the FM801 chip
+#
+
+pcm.fm801_front {
+       @args [ CARD DEV SUBDEV ]
+       @args.CARD {
+               type integer
+       }
+       @args.DEV {
+               type integer
+       }
+       @args.SUBDEV {
+               type integer
+               default -1
+       }
+       type hw
+       card $(CARD)
+       device $(DEV)
+       subdevice $(SUBDEV)
+}      
+
+pcm.front_0 {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       @func refer
+       name {
+               @func concat
+               strings [ "pcm.fm801_front:" $(CARD) ",0,-1" ]
+       }
+}
+
+pcm.surround40_0 {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       type hw
+       card $(CARD)
+       device 0
+       subdevice 0
+}
+
+pcm.surround51_0 {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       type hw
+       card $(CARD)
+       device 0
+       subdevice 0
+}
+
+pcm.iec958_0 {
+       @args [ CARD DEV AES0 AES1 AES2 AES3 ]
+       @args.CARD {
+               type integer
+       }
+       @args.DEV {
+               type integer
+       }
+       @args.AES0 {
+               type integer
+       }
+       @args.AES1 {
+               type integer
+       }
+       @args.AES2 {
+               type integer
+       }
+       @args.AES3 {
+               type integer
+       }
+       type hooks
+       slave.pcm {
+               @func concat
+               strings [
+                       "hw:"
+                       "CARD=" $(CARD) ","
+                       "DEV=0,"
+                       "SUBDEV=0"
+               ]
+       }
+       hooks.0 {
+               type ctl_elems
+               hook_args [
+                       # {
+                       #       name "IEC958 Playback Default"
+                       #       value [ $(AES0) $(AES1) $(AES2) $(AES3) ]
+                       # }
+                       {
+                               name "IEC958 Raw Data Playback Switch"
+                               preserve true
+                               value true
+                       }
+               ]
+       }
+}

diff --git a/src/cards/INTEL8X0.conf b/src/cards/INTEL8X0.conf
new file mode 100644 (file)
index 0000000..a80ccec
--- /dev/null
+++ b/src/cards/INTEL8X0.conf
@@ -0,0 +1,140 @@
+#
+# Configuration for the INTEL8X0 chip
+#
+
+pcm.intel8x0_front {
+       @args [ CARD DEV SUBDEV ]
+       @args.CARD {
+               type integer
+       }
+       @args.DEV {
+               type integer
+       }
+       @args.SUBDEV {
+               type integer
+               default -1
+       }
+       type hw
+       card $(CARD)
+       device $(DEV)
+       subdevice $(SUBDEV)
+}      
+
+pcm.front_0 {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       @func refer
+       name {
+               @func concat
+               strings [ "pcm.intel8x0_front:" $(CARD) ",0,-1" ]
+       }
+}
+
+pcm.surround40_0 {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       type multi
+       slaves [
+               {
+                       pcm {
+                               @func concat
+                               strings [
+                                       "pcm.intel8x0_front:" $(CARD) ",0,-1"
+                               ]
+                       }
+                       channels 4
+               }
+       ]
+       bindings [
+               { slave 0 channel 0 }
+               { slave 0 channel 1 }
+               { slave 1 channel 0 }
+               { slave 1 channel 1 }
+       ]
+}
+
+pcm.surround51_0 {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       type multi
+       slaves [
+               {
+                       pcm {
+                               @func concat
+                               strings [
+                                       "pcm.intel8x0_front:" $(CARD) ",0,-1"
+                               ]
+                       }
+                       channels 2
+               }
+       ]
+       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 }
+       ]
+}
+
+pcm.iec958_0 {
+       @args [ CARD DEV AES0 AES1 AES2 AES3 ]
+       @args.CARD {
+               type integer
+       }
+       @args.DEV {
+               type integer
+       }
+       @args.AES0 {
+               type integer
+       }
+       @args.AES1 {
+               type integer
+       }
+       @args.AES2 {
+               type integer
+       }
+       @args.AES3 {
+               type integer
+       }
+       type hooks
+       slave.pcm {
+               @func concat
+               strings [
+                       "hw:"
+                       "CARD=" $(CARD) ","
+                       "DEV=0,"
+                       "SUBDEV=0"
+               ]
+       }
+       hooks.0 {
+               type ctl_elems
+               hook_args [
+                       {
+                               name "IEC958 Playback AC97-SPSA"
+                               lock true
+                               preserve true
+                               value 0
+                       }
+                       {
+                               name "IEC958 Playback Default"
+                               lock true
+                               preserve true
+                               value [ $(AES0) $(AES1) $(AES2) $(AES3) ]
+                       }
+                       {
+                               name "IEC958 Playback Switch"
+                               lock true
+                               preserve true
+                               value true
+                       }
+               ]
+       }
+}

diff --git a/src/cards/Makefile.am b/src/cards/Makefile.am
index 4d21c9e410ab389e05e89f853f0daa83f39247d3..b37061db1e5429e10bcd37fef83f57e12088f126 100644 (file)
--- a/src/cards/Makefile.am
+++ b/src/cards/Makefile.am
@@ -1,5 +1,6 @@
 alsadir = $(datadir)/alsa/cards
-cfg_files = SI_7018.conf EMU10K1.conf TRID4DWAVENX.conf
+cfg_files = SI_7018.conf EMU10K1.conf TRID4DWAVENX.conf ENS1370.conf \
+           INTEL8X0.conf YMFPCI.conf FM801.conf
 
 EXTRA_DIST = $(cfg_files)
 alsa_DATA = $(cfg_files)

diff --git a/src/cards/TRID4DWAVENX.conf b/src/cards/TRID4DWAVENX.conf
index f308a59431ba7b8856ce1dc15c38696bcb4626af..c3a9f6f90edb498ef6e3593576bc653e2de94e04 100644 (file)
--- a/src/cards/TRID4DWAVENX.conf
+++ b/src/cards/TRID4DWAVENX.conf
@@ -1,3 +1,130 @@
+#
+# Configuration for the Trident 4D-Wave NX chip
+#
+
+pcm.trid4dwavenx_front {
+       @args [ CARD DEV SUBDEV ]
+       @args.CARD {
+               type integer
+       }
+       @args.DEV {
+               type integer
+       }
+       @args.SUBDEV {
+               type integer
+               default -1
+       }
+       type hw
+       card $(CARD)
+       device $(DEV)
+       subdevice $(SUBDEV)
+}      
+
+pcm.front_0 {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       @func refer
+       name {
+               @func concat
+               strings [ "pcm.trid4dwavenx_front:" $(CARD) ",0,-1" ]
+       }
+}
+
+pcm.trid4dwavenx_rear {
+       @args [ CARD DEV SUBDEV ]
+       @args.CARD {
+               type integer
+       }
+       @args.DEV {
+               type integer
+       }
+       @args.SUBDEV {
+               type integer
+               default -1
+       }
+       type hooks
+       slave.pcm {
+               @func concat
+               strings [
+                       "pcm.trid4dwavenx_front:CARD=" $(CARD) ",DEV=" $(DEV) ",SUBDEV=" $(SUBDEV)
+               ]
+       }
+       hooks.0 {
+               type ctl_elems
+               hook_args [
+                       {
+                               name "Rear Path"
+                               index &(subdevice)
+                               lock true
+                               preserve true
+                               value true
+                       }
+                       {
+                               name "PCM Front Playback Volume"
+                               index &(subdevice)
+                               lock true
+                               preserve true
+                               value [ 0 0 ]
+                       }
+                       {
+                               name "PCM Reverb Playback Volume"
+                               index &(subdevice)
+                               lock true
+                               preserve true
+                               value [ 127 127 ]
+                       }
+               ]
+       }
+}      
+
+pcm.rear_0 {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       @func refer
+       name {
+               @func concat
+               strings [ "pcm.trid4dwavenx_rear:" $(CARD) ]
+       }
+}
+
+pcm.surround40_0 {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       type multi
+       slaves [
+               {
+                       pcm {
+                               @func concat
+                               strings [
+                                       "pcm.trid4dwavenx_front:" $(CARD) ",0,-1"
+                               ]
+                       }
+                       channels 2
+               }
+               {
+                       pcm {
+                               @func concat
+                               strings [
+                                       "pcm.trid4dwavenx_rear:" $(CARD) ",0,-1"
+                               ]
+                       }
+                       channels 2
+               }
+       ]
+       bindings [
+               { slave 0 channel 0 }
+               { slave 0 channel 1 }
+               { slave 1 channel 0 }
+               { slave 1 channel 1 }
+       ]
+}
+
 pcm.iec958_0 {
        @args [ CARD DEV AES0 AES1 AES2 AES3 ]
        @args.CARD {

diff --git a/src/cards/YMFPCI.conf b/src/cards/YMFPCI.conf
new file mode 100644 (file)
index 0000000..8245c5c
--- /dev/null
+++ b/src/cards/YMFPCI.conf
@@ -0,0 +1,134 @@
+#
+# Configuration for the YMFPCI chip
+#
+
+pcm.ymfpci_front {
+       @args [ CARD DEV SUBDEV ]
+       @args.CARD {
+               type integer
+       }
+       @args.DEV {
+               type integer
+       }
+       @args.SUBDEV {
+               type integer
+               default -1
+       }
+       type hw
+       card $(CARD)
+       device $(DEV)
+       subdevice $(SUBDEV)
+}      
+
+pcm.front_0 {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       @func refer
+       name {
+               @func concat
+               strings [ "pcm.ymfpci_front:" $(CARD) ",0,-1" ]
+       }
+}
+
+pcm.ymfpci_rear {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       type hw
+       card $(CARD)
+       device 2
+       subdevice 0
+}      
+
+pcm.rear_0 {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       @func refer
+       name {
+               @func concat
+               strings [ "pcm.ymfpci_rear:" $(CARD) ]
+       }
+}
+
+pcm.surround40_0 {
+       @args [ CARD ]
+       @args.CARD {
+               type integer
+       }
+       type multi
+       slaves [
+               {
+                       pcm {
+                               @func concat
+                               strings [
+                                       "pcm.ymfpci_front:" $(CARD) ",0,-1"
+                               ]
+                       }
+                       channels 2
+               }
+               {
+                       pcm {
+                               @func concat
+                               strings [
+                                       "pcm.ymfpci_rear:" $(CARD)
+                               ]
+                       }
+                       channels 2
+               }
+       ]
+       bindings [
+               { slave 0 channel 0 }
+               { slave 0 channel 1 }
+               { slave 1 channel 0 }
+               { slave 1 channel 1 }
+       ]
+}
+
+pcm.iec958_0 {
+       @args [ CARD DEV AES0 AES1 AES2 AES3 ]
+       @args.CARD {
+               type integer
+       }
+       @args.DEV {
+               type integer
+       }
+       @args.AES0 {
+               type integer
+       }
+       @args.AES1 {
+               type integer
+       }
+       @args.AES2 {
+               type integer
+       }
+       @args.AES3 {
+               type integer
+       }
+       type hooks
+       slave.pcm {
+               @func concat
+               strings [
+                       "hw:"
+                       "CARD=" $(CARD) ","
+                       "DEV=1,"
+                       "SUBDEV=0"
+               ]
+       }
+       hooks.0 {
+               type ctl_elems
+               hook_args [
+                       {
+                               interface PCM
+                               name "IEC958 Playback PCM Stream"
+                               lock true
+                               preserve true
+                               value [ $(AES0) $(AES1) $(AES2) $(AES3) ]
+                       }
+               ]
+       }
+}