From 71408e4b34a433dcb17d069e7842e9c03bd30811 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 8 Oct 2024 10:16:59 +0200 Subject: [PATCH] ucm2: Intel: avs_nau8825 - reuse configurations Move identical pieces to one file. BugLink: https://github.com/alsa-project/alsa-ucm-conf/pull/418 Signed-off-by: Jaroslav Kysela --- ucm2/Intel/avs/avs_nau8825/Acer-Lars-1.0.conf | 2 +- .../avs/avs_nau8825/Google-Cave-1.0-HiFi.conf | 34 ------------------- .../avs/avs_nau8825/Google-Cave-1.0.conf | 2 +- .../Hewlett_Packard-Chell-1.0-HiFi.conf | 28 +-------------- ...rs-1.0-HiFi.conf => avs_nau8825-HiFi.conf} | 0 5 files changed, 3 insertions(+), 63 deletions(-) delete mode 100644 ucm2/Intel/avs/avs_nau8825/Google-Cave-1.0-HiFi.conf rename ucm2/Intel/avs/avs_nau8825/{Acer-Lars-1.0-HiFi.conf => avs_nau8825-HiFi.conf} (100%) diff --git a/ucm2/Intel/avs/avs_nau8825/Acer-Lars-1.0.conf b/ucm2/Intel/avs/avs_nau8825/Acer-Lars-1.0.conf index deacaad..c61f829 100644 --- a/ucm2/Intel/avs/avs_nau8825/Acer-Lars-1.0.conf +++ b/ucm2/Intel/avs/avs_nau8825/Acer-Lars-1.0.conf @@ -1,7 +1,7 @@ Syntax 6 SectionUseCase."HiFi" { - File "/Intel/avs/avs_nau8825/Acer-Lars-1.0-HiFi.conf" + File "/Intel/avs/avs_nau8825/avs_nau8825-HiFi.conf" Comment "Play HiFi quality Music" } diff --git a/ucm2/Intel/avs/avs_nau8825/Google-Cave-1.0-HiFi.conf b/ucm2/Intel/avs/avs_nau8825/Google-Cave-1.0-HiFi.conf deleted file mode 100644 index 3f3e6c9..0000000 --- a/ucm2/Intel/avs/avs_nau8825/Google-Cave-1.0-HiFi.conf +++ /dev/null @@ -1,34 +0,0 @@ -SectionDevice."Headphone" { - Comment "Headphones" - - Value { - PlaybackPCM "hw:${CardId},1" - JackControl "Headphone Jack" - } - - EnableSequence [ - cset "name='Headphone Jack Switch' on" - ] - - DisableSequence [ - cset "name='Headphone Jack Switch' off" - ] -} - -SectionDevice."Mic" { - Comment "Headset Microphone" - - Value { - CapturePCM "hw:${CardId},1" - CaptureCTL "Mic" - JackControl "Headset Mic" - } - - EnableSequence [ - cset "name='Headset Mic Switch' on" - ] - - DisableSequence [ - cset "name='Headset Mic Switch' off" - ] -} diff --git a/ucm2/Intel/avs/avs_nau8825/Google-Cave-1.0.conf b/ucm2/Intel/avs/avs_nau8825/Google-Cave-1.0.conf index e308ac7..ca07037 100644 --- a/ucm2/Intel/avs/avs_nau8825/Google-Cave-1.0.conf +++ b/ucm2/Intel/avs/avs_nau8825/Google-Cave-1.0.conf @@ -1,7 +1,7 @@ Syntax 6 SectionUseCase."HiFi" { - File "/Intel/avs/avs_nau8825/Google-Cave-1.0-HiFi.conf" + File "/Intel/avs/avs_nau8825/avs_nau8825-HiFi.conf" Comment "Play HiFi quality Music" } diff --git a/ucm2/Intel/avs/avs_nau8825/Hewlett_Packard-Chell-1.0-HiFi.conf b/ucm2/Intel/avs/avs_nau8825/Hewlett_Packard-Chell-1.0-HiFi.conf index 08e3961..1cb15c6 100644 --- a/ucm2/Intel/avs/avs_nau8825/Hewlett_Packard-Chell-1.0-HiFi.conf +++ b/ucm2/Intel/avs/avs_nau8825/Hewlett_Packard-Chell-1.0-HiFi.conf @@ -1,37 +1,11 @@ -SectionDevice."Headphone" { - Comment "Headphones" - - Value { - PlaybackPCM "hw:${CardId},1" - JackControl "Headphone Jack" - } - - EnableSequence [ - cset "name='Headphone Jack Switch' on" - ] - - DisableSequence [ - cset "name='Headphone Jack Switch' off" - ] -} +Include.top.File "/Intel/avs/avs_nau8825/avs_nau8825-HiFi.conf" SectionDevice."Mic" { - Comment "Headset Microphone" - - Value { - CapturePCM "hw:${CardId},1" - CaptureCTL "Mic" - JackControl "Headset Mic" - } - EnableSequence [ - cset "name='Headset Mic Switch' on" cset "name='BIQ Coefficients' 0,155,0,6,255,102,0,0,255,179,0,0,0,154,0,6,255,179,128,0" ] DisableSequence [ - cset "name='Headset Mic Switch' off" cset "name='BIQ Coefficients' 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" ] } - diff --git a/ucm2/Intel/avs/avs_nau8825/Acer-Lars-1.0-HiFi.conf b/ucm2/Intel/avs/avs_nau8825/avs_nau8825-HiFi.conf similarity index 100% rename from ucm2/Intel/avs/avs_nau8825/Acer-Lars-1.0-HiFi.conf rename to ucm2/Intel/avs/avs_nau8825/avs_nau8825-HiFi.conf -- 2.47.1