From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 12 Jul 2004 16:22:26 +0000 (+0000)
Subject: Added atiixp-modem and intel8x0-modem definitions.
X-Git-Tag: v1.0.6~10
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=e871cdc00597f1172a6d20b7415009ccb39104ed;p=alsa-lib.git

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
index 00000000..d4d33062
--- /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
index 00000000..2cea3a50
--- /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 729d0efd..efe8a828 100644
--- 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 26505b9c..6b940b1f 100644
--- 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 \