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 <perex@perex.cz>

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 deacaad4c4f0a9c1a5aa8cbc7bae6d5f54038be6..c61f8297cd27e44b1ad722d9048cc2b183b03b93 100644 (file)
--- 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 (file)
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 e308ac7d0dda480524900d0dcb05337cebd23a2c..ca0703765cc4169541ab6513c5c318adb8a8deb6 100644 (file)
--- 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 08e3961d4cf33550b9701a6296d70dd3abb9d652..1cb15c61143ad54bbe9140def8194dd05035f283 100644 (file)
--- 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