Added atiixp-modem and intel8x0-modem definitions.

diff --git a/src/conf/cards/ATIIXP-MODEM.conf b/src/conf/cards/ATIIXP-MODEM.conf
new file mode 100644 (file)
index 0000000..d4d3306
--- /dev/null
+++ b/src/conf/cards/ATIIXP-MODEM.conf
@@ -0,0 +1,22 @@
+#
+# Configuration for the ATI IXP 150/200/250 modem controllers
+#
+
+<confdir:pcm/modem.conf>
+
+ATIIXP-MODEM.pcm.modem.0 {
+       @args [ CARD ]
+       @args.CARD {
+               type string
+       }
+       type route
+       slave.pcm {
+               type hw
+               card $CARD
+               device 0
+       }
+       slave.channels 2
+       slave.format S16_LE
+       ttable.0.1 1
+       ttable.1.0 0
+}

diff --git a/src/conf/cards/ICH-MODEM.conf b/src/conf/cards/ICH-MODEM.conf
new file mode 100644 (file)
index 0000000..2cea3a5
--- /dev/null
+++ b/src/conf/cards/ICH-MODEM.conf
@@ -0,0 +1,15 @@
+#
+# Configuration for the Intel/AMD modem controllers
+#
+
+<confdir:pcm/modem.conf>
+
+ICH-MODEM.pcm.modem.0 {
+       @args [ CARD ]
+       @args.CARD {
+               type string
+       }
+       type hw
+       card $CARD
+       device 0
+}

diff --git a/src/conf/cards/ICH.conf b/src/conf/cards/ICH.conf
index 729d0efda4406fc3dc88b8a897e4c4233bd19127..efe8a8287842b1d2cc9e1ee27bff1a2013dc29bf 100644 (file)
--- a/src/conf/cards/ICH.conf
+++ b/src/conf/cards/ICH.conf
@@ -141,6 +141,7 @@ ICH.pcm.iec958.0 {
                                lock true
                                preserve true
                                value 0
+                               optional true
                        }
                        {
                                name "IEC958 Playback Default"

diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am
index 26505b9c5e31da03562859feaa3394faf994c446..6b940b1fec994713df6ba4fb11ab0053bb32763f 100644 (file)
--- a/src/conf/cards/Makefile.am
+++ b/src/conf/cards/Makefile.am
@@ -2,6 +2,7 @@ alsadir = $(datadir)/alsa/cards
 cfg_files = aliases.conf \
        ATIIXP.conf \
        ATIIXP-SPDMA.conf \
+       ATIIXP-MODEM.conf \
        AU8810.conf \
        AU8820.conf \
        AU8830.conf \
@@ -21,6 +22,7 @@ cfg_files = aliases.conf \
        ICE1712.conf \
        ICE1724.conf \
        ICH.conf \
+       ICH-MODEM.conf \
        NFORCE.conf \
        RME9636.conf \
        RME9652.conf \