From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 16 Nov 2021 14:11:24 +0000 (+0100)
Subject: USB-Audio: move Dell configs to own subdirectory
X-Git-Tag: v1.2.6~37
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=9320885d52757dd311ae5e0a53cbdf92af6f103e;p=alsa-ucm-conf.git

USB-Audio: move Dell configs to own subdirectory

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/ucm2/USB-Audio/Dell-Desktop-Front-Headset.conf b/ucm2/USB-Audio/Dell/Desktop-Front-Headset.conf
similarity index 100%
rename from ucm2/USB-Audio/Dell-Desktop-Front-Headset.conf
rename to ucm2/USB-Audio/Dell/Desktop-Front-Headset.conf
diff --git a/ucm2/USB-Audio/Dell-Desktop-Front-Speaker.conf b/ucm2/USB-Audio/Dell/Desktop-Front-Speaker.conf
similarity index 100%
rename from ucm2/USB-Audio/Dell-Desktop-Front-Speaker.conf
rename to ucm2/USB-Audio/Dell/Desktop-Front-Speaker.conf
diff --git a/ucm2/USB-Audio/Dell-Desktop-Front.conf b/ucm2/USB-Audio/Dell/Desktop-Front.conf
similarity index 68%
rename from ucm2/USB-Audio/Dell-Desktop-Front.conf
rename to ucm2/USB-Audio/Dell/Desktop-Front.conf
index 4c6f9f9..758e768 100644
--- a/ucm2/USB-Audio/Dell-Desktop-Front.conf
+++ b/ucm2/USB-Audio/Dell/Desktop-Front.conf
@@ -2,10 +2,10 @@ Syntax 2
 Comment "USB-audio on the front of Dell Desktop"
 SectionUseCase."Speaker" {
 	Comment "Internal Speaker"
-	File "Dell-Desktop-Front-Speaker.conf"
+	File "Dell/Desktop-Front-Speaker.conf"
 }
 
 SectionUseCase."Headset" {
 	Comment "Front Headset"
-	File "Dell-Desktop-Front-Headset.conf"
+	File "Dell/Desktop-Front-Headset.conf"
 }
diff --git a/ucm2/USB-Audio/Dell-Desktop-Rear-Line.conf b/ucm2/USB-Audio/Dell/Desktop-Rear-Line.conf
similarity index 100%
rename from ucm2/USB-Audio/Dell-Desktop-Rear-Line.conf
rename to ucm2/USB-Audio/Dell/Desktop-Rear-Line.conf
diff --git a/ucm2/USB-Audio/Dell-Desktop-Rear.conf b/ucm2/USB-Audio/Dell/Desktop-Rear.conf
similarity index 74%
rename from ucm2/USB-Audio/Dell-Desktop-Rear.conf
rename to ucm2/USB-Audio/Dell/Desktop-Rear.conf
index 3c1f87b..7df353b 100644
--- a/ucm2/USB-Audio/Dell-Desktop-Rear.conf
+++ b/ucm2/USB-Audio/Dell/Desktop-Rear.conf
@@ -2,5 +2,5 @@ Syntax 2
 Comment "USB-audio on the rear of Dell Desktop"
 SectionUseCase."Line" {
 	Comment "Line Out"
-	File "Dell-Desktop-Rear-Line.conf"
+	File "Dell/Desktop-Rear-Line.conf"
 }
diff --git a/ucm2/USB-Audio/Dell-WD15-Dock-HiFi.conf b/ucm2/USB-Audio/Dell/WD15-Dock-HiFi.conf
similarity index 100%
rename from ucm2/USB-Audio/Dell-WD15-Dock-HiFi.conf
rename to ucm2/USB-Audio/Dell/WD15-Dock-HiFi.conf
diff --git a/ucm2/USB-Audio/Dell-WD15-Dock.conf b/ucm2/USB-Audio/Dell/WD15-Dock.conf
similarity index 75%
rename from ucm2/USB-Audio/Dell-WD15-Dock.conf
rename to ucm2/USB-Audio/Dell/WD15-Dock.conf
index 1fbac9e..682ff41 100644
--- a/ucm2/USB-Audio/Dell-WD15-Dock.conf
+++ b/ucm2/USB-Audio/Dell/WD15-Dock.conf
@@ -1,6 +1,6 @@
 Syntax 2
 Comment "USB-audio on Dell WD15 docking station"
 SectionUseCase."HiFi" {
-	File "Dell-WD15-Dock-HiFi.conf"
+	File "Dell/WD15-Dock-HiFi.conf"
 	Comment "Default"
 }
diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf
index a3b1cf3..a9385a3 100644
--- a/ucm2/USB-Audio/USB-Audio.conf
+++ b/ucm2/USB-Audio/USB-Audio.conf
@@ -2,13 +2,22 @@ Syntax 3
 
 Define.ProfileName ""
 
+If.dell-wd15 {
+	Condition {
+		Type RegexMatch
+		String "${CardComponents}"
+		Regex "USB0bda:40(14|2e)"
+	}
+	True.Define.ProfileName "Dell/WD15-Dock"
+}
+
 If.dell-desktop-front {
 	Condition {
 		Type String
 		Haystack "${CardComponents}"
 		Needle "USB0bda:4c54"
 	}
-	True.Define.ProfileName "Dell-Desktop-Front"
+	True.Define.ProfileName "Dell/Desktop-Front"
 }
 
 If.dell-desktop-rear {
@@ -17,7 +26,7 @@ If.dell-desktop-rear {
 		Haystack "${CardComponents}"
 		Needle "USB0bda:4c55"
 	}
-	True.Define.ProfileName "Dell-Desktop-Rear"
+	True.Define.ProfileName "Dell/Desktop-Rear"
 }
 
 If.inc {