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 4c6f9f98126f9f4e270e9b2cfbcc21c3125d0401..758e768c76572d8bd8ca835ffaaebbf809c43bcd 100644 (file)
--- 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 3c1f87bf948e2afaeb3dfd429ee3f9356a43850d..7df353b118760b263fc148ab8c9bf24bc32cb72d 100644 (file)
--- 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 1fbac9e5c1bd49a7bd4262e911c13720069ba55d..682ff41fdb2087a198c16a65169a9bb8b9c2fc30 100644 (file)
--- 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 a3b1cf3dd6b68f7f75f07314db3b51989a8d45ef..a9385a37a8a5dab7b9354ab8c174de055056b59e 100644 (file)
--- 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 {