ucm2: use new SetLED macro to hide the implementation details

Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/517
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/HDA/HDA.conf b/ucm2/HDA/HDA.conf
index d18bede30aa28ffe5620ed568be82a6a43e37cb9..a58fa49c1b87438b1e5ca33e00c0ca59df7a92b1 100644 (file)
--- a/ucm2/HDA/HDA.conf
+++ b/ucm2/HDA/HDA.conf
@@ -1,5 +1,7 @@
 Syntax 6
 
+Include.led.File "/common/ctl/led.conf"
+
 Define.Use ""  # a non-empty string to use UCM configuration for HDA devices
 Define.Done "" # a non-empty string to skip the end error
 
@@ -51,11 +53,10 @@ If.use {
                        True {
                                Include.init.File "/HDA/init.conf"
 
-                               FixedBootSequence [
-                                       cset-new "name='Mic ACP LED Capture Switch' type=bool,count=1 off"
-                                       exec "-/sbin/modprobe snd_ctl_led"
-                                       sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:Mic ACP LED Capture Switch"
-                                       sysw "-/class/sound/ctl-led/mic/card${CardNumber}/detach:Capture Switch"
+                               Macro [
+                                       { CtlNew { Arg="name='Mic ACP LED Capture Switch' type=bool,count=1 off" } }
+                                       { SetLED { LED="mic" Action="attach" CtlId="Mic ACP LED Capture Switch" } }
+                                       { SetLED { LED="mic" Action="detach" CtlId="Capture Switch" } }
                                ]
                        }
                }

diff --git a/ucm2/Intel/bytcr-rt5640/bytcr-rt5640.conf b/ucm2/Intel/bytcr-rt5640/bytcr-rt5640.conf
index 13a73adff972ab35d70e45b78967ea497148e322..d0271aca0b8340836a3c9d14d28c31eabca40a07 100644 (file)
--- a/ucm2/Intel/bytcr-rt5640/bytcr-rt5640.conf
+++ b/ucm2/Intel/bytcr-rt5640/bytcr-rt5640.conf
@@ -1,16 +1,16 @@
-Syntax 4
+Syntax 6
 
 SectionUseCase."HiFi" {
        File "/Intel/bytcr-rt5640/HiFi.conf"
        Comment "Play HiFi quality Music"
 }
 
+Include.led.File "/common/ctl/led.conf"
 Include.card-init.File "/lib/card-init.conf"
 Include.ctl-remap.File "/lib/ctl-remap.conf"
 Include.codec-init.File "/codecs/rt5640/init.conf"
 
-FixedBootSequence [
-       exec "-/sbin/modprobe snd_ctl_led"
-       sysw "-/class/sound/ctl-led/speaker/card${CardNumber}/attach:Speaker Channel Switch"
-       sysw "-/class/sound/ctl-led/speaker/card${CardNumber}/attach:HP Channel Switch"
+Macro [
+       { SetLED { LED="speaker" Action="attach" CtlId="Speaker Channel Switch" } }
+       { SetLED { LED="speaker" Action="attach" CtlId="HP Channel Switch" } }
 ]

diff --git a/ucm2/Intel/cht-bsw-rt5672/cht-bsw-rt5672.conf b/ucm2/Intel/cht-bsw-rt5672/cht-bsw-rt5672.conf
index 426facc892c044282c73844e3e2fe5d01befa315..181137e5800278ead8fe5628f2b76dd6d6bdb587 100644 (file)
--- a/ucm2/Intel/cht-bsw-rt5672/cht-bsw-rt5672.conf
+++ b/ucm2/Intel/cht-bsw-rt5672/cht-bsw-rt5672.conf
@@ -1,14 +1,15 @@
 # Adapted from https://github.com/plbossart/UCM/tree/master/cht-bsw-rt5672
 
-Syntax 3
+Syntax 6
 
 SectionUseCase."HiFi" {
        File "/Intel/cht-bsw-rt5672/HiFi.conf"
        Comment "Play HiFi quality Music"
 }
 
-FixedBootSequence [
-       exec "-/sbin/modprobe snd_ctl_led"
-       sysw "-/class/sound/ctl-led/speaker/card${CardNumber}/attach:DAC1 Playback Switch"
-       sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:ADC Capture Switch"
+Include.led.File "/common/ctl/led.conf"
+
+Macro [
+       { SetLED { LED="speaker" Action="attach" CtlId="DAC1 Playback Switch" } }
+       { SetLED { LED="mic" Action="attach" CtlId="ADC Capture Switch" } }
 ]

diff --git a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf
index c14ecb85a56d21e46f61116b71699e925ba9a28a..571c207d833806b6a281d35cec9dc0687d3da3eb 100644 (file)
--- a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf
+++ b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf
@@ -1,5 +1,6 @@
 Syntax 7
 
+Include.led.File "/common/ctl/led.conf"
 Include.card-init.File "/lib/card-init.conf"
 Include.dsp-variables.File "dsp.conf"
 
@@ -25,13 +26,13 @@ If.devdmic {
        True {
                Define.DeviceDmic "Mic1"
                Define.DeviceMic "Mic2"
+               #
+               # users expect to turn the LED on when only internal
+               # mic is off, but it makes sense to turn this LED
+               # when all internal inputs are off
+               #
+               Macro [{ SetLED { LED="mic" Action="detach" CtlId="Capture Switch" } }]
                FixedBootSequence [
-                       #
-                       # users expect to turn the LED on when only internal
-                       # mic is off, but it makes sense to turn this LED
-                       # when all internal inputs are off
-                       #
-                       sysw "-/class/sound/ctl-led/mic/card${CardNumber}/detach:Capture Switch"
                        # dmic array info
                        exec "-nhlt-dmic-info -o ${var:LibDir}/dmics-nhlt.json"
                ]
@@ -82,11 +83,7 @@ If.DellMuteLed {
                Haystack "$${sys:class/leds/platform::mute/device}"
                Needle "dell-laptop"
        }
-       True {
-               FixedBootSequence [
-                       sysw "-/class/sound/ctl-led/speaker/card${CardNumber}/attach:Master Playback Switch"
-               ]
-       }
+       True.Macro [{ SetLED { LED="speaker" Action="detach" CtlId="Master Playback Switch" } }]
 }
 
 If.headphone {

diff --git a/ucm2/codecs/cs42l43-dmic/init.conf b/ucm2/codecs/cs42l43-dmic/init.conf
index 824a2cea7db9fb10a17a49f4c3838acc43463598..e8df2c156558546893adfafb13ee53dcd952f824 100644 (file)
--- a/ucm2/codecs/cs42l43-dmic/init.conf
+++ b/ucm2/codecs/cs42l43-dmic/init.conf
@@ -18,8 +18,7 @@ BootSequence [
        cset "name='cs42l43 Decimator 4 Switch' 0"
 ]
 
-FixedBootSequence [
-       exec "-/sbin/modprobe snd_ctl_led"
-       sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:cs42l43 Decimator 3 Switch"
-       sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:cs42l43 Decimator 4 Switch"
+Macro [
+       { SetLED { LED="mic" Action="attach" CtlId="cs42l43 Decimator 3 Switch" } }
+       { SetLED { LED="mic" Action="attach" CtlId="cs42l43 Decimator 4 Switch" } }
 ]

diff --git a/ucm2/codecs/cs42l43/init.conf b/ucm2/codecs/cs42l43/init.conf
index c9c1ecf8d22b168503b9d16dc367325dae61b2b2..0e987c21b9c2477225465b0b77e0ed9ebc383400 100644 (file)
--- a/ucm2/codecs/cs42l43/init.conf
+++ b/ucm2/codecs/cs42l43/init.conf
@@ -15,7 +15,4 @@ BootSequence [
        cset "name='cs42l43 Decimator 1 Switch' 0"
 ]
 
-FixedBootSequence [
-       exec "-/sbin/modprobe snd_ctl_led"
-       sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:cs42l43 Decimator 1 Switch"
-]
+Macro [{ SetLED { LED="mic" Action="attach" CtlId="cs42l43 Decimator 1 Switch" } }]

diff --git a/ucm2/codecs/rt715-sdca/init.conf b/ucm2/codecs/rt715-sdca/init.conf
index a3b22898e5ebd47be4d23aad849c1a71c25f74f6..99fb452aa13d624b4aaea25ecd5e5eece2b7761a 100644 (file)
--- a/ucm2/codecs/rt715-sdca/init.conf
+++ b/ucm2/codecs/rt715-sdca/init.conf
@@ -8,7 +8,4 @@ BootSequence [
        cset "name='rt714 FU02 Capture Volume' 47"
 ]
 
-FixedBootSequence [
-       exec "-/sbin/modprobe snd_ctl_led"
-       sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:rt714 FU02 Capture Switch"
-]
+Macro [{ SetLED { LED="mic" Action="attach" CtlId="rt714 FU02 Capture Switch" } }]

diff --git a/ucm2/codecs/rt715/init.conf b/ucm2/codecs/rt715/init.conf
index 2bbff0736a510a46549aecd3255eeb3e3021972a..ed37ae591bc48e7f477091aad516cd1d572eb040 100644 (file)
--- a/ucm2/codecs/rt715/init.conf
+++ b/ucm2/codecs/rt715/init.conf
@@ -24,8 +24,5 @@ If.capturesw {
                Type ControlExists
                Control "name='rt715 Capture Switch'"
        }
-       True.FixedBootSequence [
-               exec "-/sbin/modprobe snd_ctl_led"
-               sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:rt715 Capture Switch"
-       ]
+       Macro [{ SetLED { LED="mic" Action="attach" CtlId="rt715 Capture Switch" } }]
 }

diff --git a/ucm2/codecs/rt722/init.conf b/ucm2/codecs/rt722/init.conf
index 84e6e9d60d47d6e9f0e2da220cf990c382ee9cc9..c820e55e471197809da54b92573d647d690eadd5 100644 (file)
--- a/ucm2/codecs/rt722/init.conf
+++ b/ucm2/codecs/rt722/init.conf
@@ -10,7 +10,4 @@ BootSequence [
        cset "name='rt722 FU0F Capture Volume' 63"
 ]
 
-FixedBootSequence [
-       exec "-/sbin/modprobe snd_ctl_led"
-       sysw "-/class/sound/ctl-led/mic/card${CardNumber}/attach:rt722 FU1E Capture Switch"
-]
+Macro [{ SetLED { LED="mic" Action="attach" CtlId="rt722 FU1E Capture Switch" } }]

diff --git a/ucm2/sof-soundwire/sof-soundwire.conf b/ucm2/sof-soundwire/sof-soundwire.conf
index 57e5610135626676b04bf452eaf0330cbb4f34f0..f458815f633eeed890d4018da9853f5d91f2d1e8 100644 (file)
--- a/ucm2/sof-soundwire/sof-soundwire.conf
+++ b/ucm2/sof-soundwire/sof-soundwire.conf
@@ -5,6 +5,7 @@ SectionUseCase."HiFi" {
        Comment "Play HiFi quality Music"
 }
 
+Include.led.File "/common/ctl/led.conf"
 Include.card-init.File "/lib/card-init.conf"
 Include.ctl-remap.File "/lib/ctl-remap.conf"
 
@@ -126,9 +127,7 @@ If.mic_init_rt715 {
                Needle "rt715"
                Haystack "${var:MicCodec1}"
        }
-       True.BootSequence [
-               sysw "-/class/sound/ctl-led/mic/card${CardNumber}/detach:PGA5.0 5 Master Capture Switch"
-       ]
+       True.Macro [{ SetLED { LED="mic" Action="detach" CtlId="PGA5.0 5 Master Capture Switch" } }]
 }
 
 If.pga_init_pga2 {