From eecfed7569438d28d480a968e7b338a437d2d784 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 17 Mar 2006 18:14:23 +0000
Subject: [PATCH] Add channels parameter to surround40/51 definitions

Add channels parameter to surround40/51 definitions for drivers
using a single device.
---
 src/conf/cards/ATIIXP-SPDMA.conf |  2 +
 src/conf/cards/ATIIXP.conf       |  2 +
 src/conf/cards/Aureon51.conf     |  2 +
 src/conf/cards/Aureon71.conf     |  2 +
 src/conf/cards/CMI8738-MC6.conf  | 27 ++++++++++++-
 src/conf/cards/CMI8738-MC8.conf  | 65 +++++++++++++++++++++++++++++++-
 src/conf/cards/ICH.conf          |  2 +
 src/conf/cards/ICH4.conf         |  2 +
 src/conf/cards/NFORCE.conf       |  2 +
 src/conf/cards/VIA8233.conf      |  2 +
 src/conf/cards/VIA8233A.conf     |  2 +
 src/conf/cards/VIA8237.conf      |  2 +
 12 files changed, 108 insertions(+), 4 deletions(-)

diff --git a/src/conf/cards/ATIIXP-SPDMA.conf b/src/conf/cards/ATIIXP-SPDMA.conf
index dbed4a0c..e8899e92 100644
--- a/src/conf/cards/ATIIXP-SPDMA.conf
+++ b/src/conf/cards/ATIIXP-SPDMA.conf
@@ -49,6 +49,7 @@ ATIIXP-SPDMA.pcm.surround40.0 {
 		type hw
 		card $CARD
 		device 0
+		channels 4
 	}
 	hooks.0 {
 		type ctl_elems
@@ -92,6 +93,7 @@ ATIIXP-SPDMA.pcm.surround51.0 {
 		type hw
 		card $CARD
 		device 0
+		channels 6
 	}
 	hooks.0 {
 		type ctl_elems
diff --git a/src/conf/cards/ATIIXP.conf b/src/conf/cards/ATIIXP.conf
index 3aee38ba..911eb5de 100644
--- a/src/conf/cards/ATIIXP.conf
+++ b/src/conf/cards/ATIIXP.conf
@@ -49,6 +49,7 @@ ATIIXP.pcm.surround40.0 {
 		type hw
 		card $CARD
 		device 0
+		channels 4
 	}
 	hooks.0 {
 		type ctl_elems
@@ -92,6 +93,7 @@ ATIIXP.pcm.surround51.0 {
 		type hw
 		card $CARD
 		device 0
+		channels 6
 	}
 	hooks.0 {
 		type ctl_elems
diff --git a/src/conf/cards/Aureon51.conf b/src/conf/cards/Aureon51.conf
index 983a903a..d63d8b7d 100644
--- a/src/conf/cards/Aureon51.conf
+++ b/src/conf/cards/Aureon51.conf
@@ -84,6 +84,7 @@ Aureon51.pcm.surround40.0 {
 	}
 	type hw
 	card $CARD
+	channels 4
 }	
 
 <confdir:pcm/surround41.conf>
@@ -97,6 +98,7 @@ Aureon51.pcm.surround51.0 {
 	}
 	type hw
 	card $CARD
+	channels 6
 }
 
 <confdir:pcm/iec958.conf>
diff --git a/src/conf/cards/Aureon71.conf b/src/conf/cards/Aureon71.conf
index 98fa59a4..8e05098c 100644
--- a/src/conf/cards/Aureon71.conf
+++ b/src/conf/cards/Aureon71.conf
@@ -84,6 +84,7 @@ Aureon71.pcm.surround40.0 {
 	}
 	type hw
 	card $CARD
+	channels 4
 }	
 
 <confdir:pcm/surround41.conf>
@@ -97,6 +98,7 @@ Aureon71.pcm.surround51.0 {
 	}
 	type hw
 	card $CARD
+	channels 6
 }
 
 <confdir:pcm/surround71.conf>
diff --git a/src/conf/cards/CMI8738-MC6.conf b/src/conf/cards/CMI8738-MC6.conf
index 6cd270e2..f38488ec 100644
--- a/src/conf/cards/CMI8738-MC6.conf
+++ b/src/conf/cards/CMI8738-MC6.conf
@@ -63,6 +63,7 @@ CMI8738-MC6.pcm.surround40.0 {
 		type hw
 		card $CARD
 		device 1
+		channels 4
 	}
 	hooks.0 {
 		type ctl_elems
@@ -77,12 +78,34 @@ CMI8738-MC6.pcm.surround40.0 {
 	}
 }	
 
-
 <confdir:pcm/surround41.conf>
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
 
-CMI8738-MC6.pcm.surround51.0 "cards.CMI8738-MC6.pcm.surround40.0"
+CMI8738-MC6.pcm.surround51.0 {
+	@args [ CARD ]
+	@args.CARD {
+		type string
+	}
+	type hooks
+	slave.pcm {
+		type hw
+		card $CARD
+		device 1
+		channels 6
+	}
+	hooks.0 {
+		type ctl_elems
+		hook_args [
+			{
+				name "Four Channel Mode"
+				lock true
+				preserve true
+				value false
+			}
+		]
+	}
+}	
 
 <confdir:pcm/iec958.conf>
 
diff --git a/src/conf/cards/CMI8738-MC8.conf b/src/conf/cards/CMI8738-MC8.conf
index 603fc798..d33a61a3 100644
--- a/src/conf/cards/CMI8738-MC8.conf
+++ b/src/conf/cards/CMI8738-MC8.conf
@@ -85,6 +85,7 @@ CMI8738-MC8.pcm.surround40.0 {
 			type hw
 			card $CARD
 			device 1
+			channels 4
 		}
 		hooks.0 {
 			type ctl_elems
@@ -109,11 +110,71 @@ CMI8738-MC8.pcm.surround40.0 {
 <confdir:pcm/surround50.conf>
 <confdir:pcm/surround51.conf>
 
-CMI8738-MC8.pcm.surround51.0 "cards.CMI8738-MC8.pcm.surround40.0"
+CMI8738-MC8.pcm.surround51.0 {
+	@args [ CARD ]
+	@args.CARD {
+		type string
+	}
+	type softvol
+	slave.pcm {
+		type hooks
+		slave.pcm {
+			type hw
+			card $CARD
+			device 1
+			channels 6
+		}
+		hooks.0 {
+			type ctl_elems
+			hook_args [
+			{
+				name "Four Channel Mode"
+				lock true
+				preserve true
+				value false
+			}
+			]
+		}
+	}
+	control {
+		name "PCM Playback Volume"
+		card $CARD
+	}
+}	
 
 <confdir:pcm/surround71.conf>
 
-CMI8738-MC8.pcm.surround71.0 "cards.CMI8738-MC8.pcm.surround40.0"
+CMI8738-MC8.pcm.surround71.0 {
+	@args [ CARD ]
+	@args.CARD {
+		type string
+	}
+	type softvol
+	slave.pcm {
+		type hooks
+		slave.pcm {
+			type hw
+			card $CARD
+			device 1
+			channels 8
+		}
+		hooks.0 {
+			type ctl_elems
+			hook_args [
+			{
+				name "Four Channel Mode"
+				lock true
+				preserve true
+				value false
+			}
+			]
+		}
+	}
+	control {
+		name "PCM Playback Volume"
+		card $CARD
+	}
+}	
 
 <confdir:pcm/iec958.conf>
 
diff --git a/src/conf/cards/ICH.conf b/src/conf/cards/ICH.conf
index a48268b5..d21638b4 100644
--- a/src/conf/cards/ICH.conf
+++ b/src/conf/cards/ICH.conf
@@ -65,6 +65,7 @@ ICH.pcm.surround40.0 {
 			type hw
 			card $CARD
 			device 0
+			channels 4
 		}
 		hooks.0 {
 			type ctl_elems
@@ -123,6 +124,7 @@ ICH.pcm.surround51.0 {
 				type hw
 				card $CARD
 				device 0
+				channels 6
 			}
 			hooks.0 {
 				type ctl_elems
diff --git a/src/conf/cards/ICH4.conf b/src/conf/cards/ICH4.conf
index ddcd7c9d..a5d1aa48 100644
--- a/src/conf/cards/ICH4.conf
+++ b/src/conf/cards/ICH4.conf
@@ -65,6 +65,7 @@ ICH4.pcm.surround40.0 {
 			type hw
 			card $CARD
 			device 0
+			channels 4
 		}
 		hooks.0 {
 			type ctl_elems
@@ -115,6 +116,7 @@ ICH4.pcm.surround51.0 {
 			type hw
 			card $CARD
 			device 0
+			channels 6
 		}
 		hooks.0 {
 			type ctl_elems
diff --git a/src/conf/cards/NFORCE.conf b/src/conf/cards/NFORCE.conf
index 607906e4..0e051aef 100644
--- a/src/conf/cards/NFORCE.conf
+++ b/src/conf/cards/NFORCE.conf
@@ -65,6 +65,7 @@ NFORCE.pcm.surround40.0 {
 			type hw
 			card $CARD
 			device 0
+			channels 4
 		}
 		hooks.0 {
 			type ctl_elems
@@ -123,6 +124,7 @@ NFORCE.pcm.surround51.0 {
 				type hw
 				card $CARD
 				device 0
+				channels 6
 			}
 			hooks.0 {
 				type ctl_elems
diff --git a/src/conf/cards/VIA8233.conf b/src/conf/cards/VIA8233.conf
index b7a21aef..b2ec9452 100644
--- a/src/conf/cards/VIA8233.conf
+++ b/src/conf/cards/VIA8233.conf
@@ -58,6 +58,7 @@ VIA8233.pcm.surround40.0 {
 		type hw
 		card $CARD
 		device 1
+		channels 4
 	}
 	hooks.0 {
 		type ctl_elems
@@ -103,6 +104,7 @@ VIA8233.pcm.surround51.0 {
 		type hw
 		card $CARD
 		device 1
+		channels 6
 	}
 	hooks.0 {
 		type ctl_elems
diff --git a/src/conf/cards/VIA8233A.conf b/src/conf/cards/VIA8233A.conf
index 50972641..637fee9c 100644
--- a/src/conf/cards/VIA8233A.conf
+++ b/src/conf/cards/VIA8233A.conf
@@ -49,6 +49,7 @@ VIA8233A.pcm.surround40.0 {
 		type hw
 		card $CARD
 		device 0
+		channels 4
 	}
 	hooks.0 {
 		type ctl_elems
@@ -100,6 +101,7 @@ VIA8233A.pcm.surround51.0 {
 		type hw
 		card $CARD
 		device 0
+		channels 6
 	}
 	hooks.0 {
 		type ctl_elems
diff --git a/src/conf/cards/VIA8237.conf b/src/conf/cards/VIA8237.conf
index 5f93570e..a0985b0d 100644
--- a/src/conf/cards/VIA8237.conf
+++ b/src/conf/cards/VIA8237.conf
@@ -58,6 +58,7 @@ VIA8237.pcm.surround40.0 {
 		type hw
 		card $CARD
 		device 1
+		channels 4
 	}
 	hooks.0 {
 		type ctl_elems
@@ -104,6 +105,7 @@ VIA8237.pcm.surround51.0 {
 			type hw
 			card $CARD
 			device 1
+			channels 6
 		}
 		hooks.0 {
 			type ctl_elems
-- 
2.47.1