From b260bdfa626236330597d9752674b4d35d02fb4f Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 22 Nov 2021 09:56:04 +0100 Subject: [PATCH] USB-Audio: move Lenovo P620 configs to separate directory Signed-off-by: Jaroslav Kysela --- .../ThinkStation-P620-Main-HiFi.conf} | 0 .../ThinkStation-P620-Main.conf} | 3 +-- .../ThinkStation-P620-Rear-HiFi.conf} | 0 .../ThinkStation-P620-Rear.conf} | 3 +-- ucm2/USB-Audio/USB-Audio.conf | 18 ++++++++++++++++++ 5 files changed, 20 insertions(+), 4 deletions(-) rename ucm2/USB-Audio/{Lenovo-ThinkStation-P620-Main-HiFi.conf => Lenovo/ThinkStation-P620-Main-HiFi.conf} (100%) rename ucm2/USB-Audio/{Lenovo-ThinkStation-P620-Main.conf => Lenovo/ThinkStation-P620-Main.conf} (64%) rename ucm2/USB-Audio/{Lenovo-ThinkStation-P620-Rear-HiFi.conf => Lenovo/ThinkStation-P620-Rear-HiFi.conf} (100%) rename ucm2/USB-Audio/{Lenovo-ThinkStation-P620-Rear.conf => Lenovo/ThinkStation-P620-Rear.conf} (64%) diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-HiFi.conf b/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Main-HiFi.conf similarity index 100% rename from ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main-HiFi.conf rename to ucm2/USB-Audio/Lenovo/ThinkStation-P620-Main-HiFi.conf diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main.conf b/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Main.conf similarity index 64% rename from ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main.conf rename to ucm2/USB-Audio/Lenovo/ThinkStation-P620-Main.conf index 53ef729..f4d8f48 100644 --- a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Main.conf +++ b/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Main.conf @@ -1,6 +1,5 @@ -Syntax 2 Comment "USB-audio on Lenovo ThinkStation P620 Main Audio" SectionUseCase."HiFi" { Comment "Default" - File "Lenovo-ThinkStation-P620-Main-HiFi.conf" + File "Lenovo/ThinkStation-P620-Main-HiFi.conf" } diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-HiFi.conf b/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Rear-HiFi.conf similarity index 100% rename from ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear-HiFi.conf rename to ucm2/USB-Audio/Lenovo/ThinkStation-P620-Rear-HiFi.conf diff --git a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear.conf b/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Rear.conf similarity index 64% rename from ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear.conf rename to ucm2/USB-Audio/Lenovo/ThinkStation-P620-Rear.conf index f97efcb..7229c6d 100644 --- a/ucm2/USB-Audio/Lenovo-ThinkStation-P620-Rear.conf +++ b/ucm2/USB-Audio/Lenovo/ThinkStation-P620-Rear.conf @@ -1,6 +1,5 @@ -Syntax 2 Comment "USB-audio on Lenovo ThinkStation P620 Rear Audio" SectionUseCase."HiFi" { Comment "Default" - File "Lenovo-ThinkStation-P620-Rear-HiFi.conf" + File "Lenovo/ThinkStation-P620-Rear-HiFi.conf" } diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf index 209853f..6dd7cbb 100644 --- a/ucm2/USB-Audio/USB-Audio.conf +++ b/ucm2/USB-Audio/USB-Audio.conf @@ -57,6 +57,24 @@ If.goxlr { True.Define.ProfileName "GoXLR/GoXLR" } +If.lenovo-p620-rear { + Condition { + Type String + Haystack "${CardComponents}" + Needle "USB17aa:1046" + } + True.Define.ProfileName "Lenovo/ThinkStation-P620-Rear" +} + +If.lenovo-p620-main { + Condition { + Type String + Haystack "${CardComponents}" + Needle "USB17aa:104d" + } + True.Define.ProfileName "Lenovo/ThinkStation-P620-Main" +} + If.inc { Condition { Type String -- 2.47.1