From 841ca3491738eb1d0559ed3cc118142b86014280 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 19 Sep 2005 12:40:02 +0000
Subject: [PATCH] Fix endianess of PMac driver

Fix endianess of PMac driver for the latest change of dmix.
Now need to specify the (big-endian) format explicitly.
---
 src/conf/cards/Makefile.am     |  1 +
 src/conf/cards/PMac.conf       | 38 ++++++++++++++++++++++++++++++++++
 src/conf/cards/PMacToonie.conf | 15 +++++---------
 3 files changed, 44 insertions(+), 10 deletions(-)
 create mode 100644 src/conf/cards/PMac.conf

diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am
index 961ae8ed..39930b96 100644
--- a/src/conf/cards/Makefile.am
+++ b/src/conf/cards/Makefile.am
@@ -33,6 +33,7 @@ cfg_files = aliases.conf \
 	Maestro3.conf \
 	NFORCE.conf \
 	PC-Speaker.conf \
+	PMac.conf \
 	PMacToonie.conf \
 	RME9636.conf \
 	RME9652.conf \
diff --git a/src/conf/cards/PMac.conf b/src/conf/cards/PMac.conf
new file mode 100644
index 00000000..15ba699d
--- /dev/null
+++ b/src/conf/cards/PMac.conf
@@ -0,0 +1,38 @@
+#
+# Configuration for PMac
+#
+
+<confdir:pcm/front.conf>
+
+PMac.pcm.front.0 {
+	@args [ CARD ]
+	@args.CARD {
+		type string
+	}
+	type hw
+	card $CARD
+	device 0
+}	
+
+# default with dmix/dsnoop
+PMac.pcm.default {
+	@args [ CARD ]
+	@args.CARD {
+		type string
+	}
+	type asym
+	playback.pcm {
+		type plug
+		slave.pcm {
+			@func concat
+			strings [ "dmix:CARD=" $CARD ",FORMAT=S16" ]
+		}
+	}
+	capture.pcm {
+		type plug
+		slave.pcm {
+			@func concat
+			strings [ "dsnoop:CARD=" $CARD ",FORMAT=S16" ]
+		}
+	}
+}
diff --git a/src/conf/cards/PMacToonie.conf b/src/conf/cards/PMacToonie.conf
index 44db11ca..8c6777ca 100644
--- a/src/conf/cards/PMacToonie.conf
+++ b/src/conf/cards/PMacToonie.conf
@@ -21,23 +21,19 @@ PMacToonie.pcm.front.0 {
 	}
 }	
 
-# once when dmix is confirmed to work on ppc, we should enable dmix/dsnoop
-# for default, too
-
+# default with dmix+softvol & dsnoop
 PMacToonie.pcm.default {
 	@args [ CARD ]
 	@args.CARD {
 		type string
 	}
 	type asym
-	playback.pcm {
 		type plug
 		slave.pcm {
 			type softvol
 			slave.pcm {
-				type hw
-				card $CARD
-				device 0
+				@func concat
+				strings [ "dmix:CARD=" $CARD ",FORMAT=S16" ]
 			}
 			control {
 				name "PCM Playback Volume"
@@ -48,9 +44,8 @@ PMacToonie.pcm.default {
 	capture.pcm {
 		type plug
 		slave.pcm {
-			type hw
-			card $CARD
-			device 0
+			@func concat
+			strings [ "dsnoop:CARD=" $CARD ",FORMAT=S16" ]
 		}
 	}
 }
-- 
2.47.1