[PATCH 2/2] alsa-lib: add LaCie Firewire Speakers/Griffin FireWave Surround driver

[Clemens Ladisch <clemens@ladisch.de>]

Add configuration files for the "default"/"front"/"surround40"/
"surround51" devices for the snd-firewire-speakers driver.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
---
 src/conf/cards/Makefile.am     |    2 +
 src/conf/cards/FWSpeakers.conf |   26 ++++++++++++++
 src/conf/cards/FireWave.conf   |   61 +++++++++++++++++++++++++++++++++
 3 files changed, 89 insertions(+)

--- alsa-lib/src/conf/cards/Makefile.am
+++ alsa-lib/src/conf/cards/Makefile.am
@@ -25,6 +25,8 @@ cfg_files = aliases.conf \
 	ENS1371.conf \
 	ES1968.conf \
 	FM801.conf \
+	FWSpeakers.conf \
+	FireWave.conf \
 	GUS.conf \
 	HDA-Intel.conf \
 	ICE1712.conf \
--- /dev/null
+++ alsa-lib/src/conf/cards/FWSpeakers.conf
@@ -0,0 +1,26 @@
+#
+# Configuration for the LaCie Firewire speakers
+#
+
+FWSpeakers.pcm.default {
+	@args [ CARD ]
+	@args.CARD {
+		type string
+	}
+	type plug
+	slave.pcm {
+		@func concat
+		strings [ "dmix:" $CARD ",FORMAT=S32" ]
+	}
+}
+
+<confdir:pcm/front.conf>
+
+FWSpeakers.pcm.front.0 {
+	@args [ CARD ]
+	@args.CARD {
+		type string
+	}
+	type hw
+	card $CARD
+}
--- /dev/null
+++ alsa-lib/src/conf/cards/FireWave.conf
@@ -0,0 +1,61 @@
+#
+# Configuration for the Griffin FireWave Surround
+#
+
+FireWave.pcm.default {
+	@args [ CARD ]
+	@args.CARD {
+		type string
+	}
+	type plug
+	slave.pcm {
+		@func concat
+		strings [ "dmix:" $CARD ",FORMAT=S32" ]
+	}
+}
+
+<confdir:pcm/front.conf>
+
+FireWave.pcm.front.0 {
+	@args [ CARD ]
+	@args.CARD {
+		type string
+	}
+	type hw
+	card $CARD
+}
+
+<confdir:pcm/surround40.conf>
+
+FireWave.pcm.surround40.0 {
+	@args [ CARD ]
+	@args.CARD {
+		type string
+	}
+	type hw
+	card $CARD
+}
+
+<confdir:pcm/surround41.conf>
+<confdir:pcm/surround50.conf>
+<confdir:pcm/surround51.conf>
+
+FireWave.pcm.surround51.0 {
+	@args [ CARD ]
+	@args.CARD {
+		type string
+	}
+	type route
+	ttable [
+		[ 1 0 0 0 0 0 ]
+		[ 0 1 0 0 0 0 ]
+		[ 0 0 0 0 1 0 ]
+		[ 0 0 0 0 0 1 ]
+		[ 0 0 1 0 0 0 ]
+		[ 0 0 0 1 0 0 ]
+	]
+	slave.pcm {
+		type hw
+		card $CARD
+	}
+}