From: Vasily Khoruzhick <anarsoul@gmail.com>
Date: Fri, 3 Feb 2023 08:13:34 +0000 (-0800)
Subject: ucm: USB-Audio - Add support for Focusrite Scarlett 2i2 gen3
X-Git-Tag: v1.2.9~30
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=a9d56db5267f13f8abf29c11723b6864b7f43fea;p=alsa-ucm-conf.git

ucm: USB-Audio - Add support for Focusrite Scarlett 2i2 gen3

Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/273
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/ucm2/USB-Audio/Focusrite/Scarlett-2i-gen2-HiFi.conf b/ucm2/USB-Audio/Focusrite/Scarlett-2i-HiFi.conf
similarity index 100%
rename from ucm2/USB-Audio/Focusrite/Scarlett-2i-gen2-HiFi.conf
rename to ucm2/USB-Audio/Focusrite/Scarlett-2i-HiFi.conf
diff --git a/ucm2/USB-Audio/Focusrite/Scarlett-2i-gen2.conf b/ucm2/USB-Audio/Focusrite/Scarlett-2i-gen2.conf
deleted file mode 100644
index ee5b0b5..0000000
--- a/ucm2/USB-Audio/Focusrite/Scarlett-2i-gen2.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-Define.PlaybackChannels 4
-
-If.scarlett_2i4 {
-	Condition {
-		Type String
-		Haystack "${CardComponents}"
-		Needle "USB1235:8202"
-	}
-	True.Define.PlaybackChannels 2
-}
-
-Comment "Focusrite Scarlett 2i${var:PlaybackChannels} Gen 2"
-
-SectionUseCase."HiFi" {
-    Comment "Default"
-    File "/USB-Audio/Focusrite/Scarlett-2i-gen2-HiFi.conf"
-}
-
-Define.DirectPlaybackChannels "${var:PlaybackChannels}"
-Define.DirectCaptureChannels 2
-
-Include.dhw.File "/common/direct.conf"
diff --git a/ucm2/USB-Audio/Focusrite/Scarlett-2i.conf b/ucm2/USB-Audio/Focusrite/Scarlett-2i.conf
new file mode 100644
index 0000000..ff63971
--- /dev/null
+++ b/ucm2/USB-Audio/Focusrite/Scarlett-2i.conf
@@ -0,0 +1,38 @@
+Define.PlaybackChannels 4
+Define.DirectPlaybackChannels 4
+Define.DirectCaptureChannels 2
+Define.Generation 2
+
+If.scarlett_2i2 {
+	Condition {
+		Type String
+		Haystack "${CardComponents}"
+		Needle "USB1235:8202"
+	}
+	True.Define {
+		PlaybackChannels 2
+		DirectPlaybackChannels 2
+	}
+}
+
+If.scarlett_2i2_gen3 {
+	Condition {
+		Type String
+		Haystack "${CardComponents}"
+		Needle "USB1235:8210"
+	}
+	True.Define {
+		PlaybackChannels 2
+		DirectPlaybackChannels 2
+		Generation 3
+	}
+}
+
+Comment "Focusrite Scarlett 2i${var:PlaybackChannels} Gen ${var:Generation}"
+
+SectionUseCase."HiFi" {
+	Comment "Default"
+	File "/USB-Audio/Focusrite/Scarlett-2i-HiFi.conf"
+}
+
+Include.dhw.File "/common/direct.conf"
diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf
index 9718347..691aedc 100644
--- a/ucm2/USB-Audio/USB-Audio.conf
+++ b/ucm2/USB-Audio/USB-Audio.conf
@@ -163,14 +163,14 @@ If.goxlr {
 	True.Define.ProfileName "GoXLR/GoXLR"
 }
 
-If.focusrite-scarlett-2i-gen2 {
+If.focusrite-scarlett-2i {
 	Condition {
 		Type RegexMatch
 		String "${CardComponents}"
-		Regex "USB1235:820[02]"
+		Regex "USB1235:82(0[02]|10)"
 	}
 	True.Define {
-		ProfileName "Focusrite/Scarlett-2i-gen2"
+		ProfileName "Focusrite/Scarlett-2i"
 	}
 }