From: Jaroslav Kysela Date: Mon, 23 May 2022 11:33:24 +0000 (+0200) Subject: HDMI - use new Macro syntax X-Git-Tag: v1.2.7~13 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=e2cfda5b53f4718f1128fb4df75ec8fb7274d36b;p=alsa-ucm-conf.git HDMI - use new Macro syntax Signed-off-by: Jaroslav Kysela --- diff --git a/ucm2/HDA/HDA.conf b/ucm2/HDA/HDA.conf index 411f2e7..64ffe83 100644 --- a/ucm2/HDA/HDA.conf +++ b/ucm2/HDA/HDA.conf @@ -1,4 +1,4 @@ -Syntax 4 +Syntax 6 Define.Use "" # a non-empty string to use UCM configuration for HDA devices Define.Done "" # a non-empty string to skip the end error diff --git a/ucm2/HDA/Hdmi.conf b/ucm2/HDA/Hdmi.conf index c533e49..e24c3c5 100644 --- a/ucm2/HDA/Hdmi.conf +++ b/ucm2/HDA/Hdmi.conf @@ -1,79 +1,57 @@ -# Use case Configuration for sof-hda-dsp +# HDA HDMI devices + +Include.hdmi.File "/codecs/hda/hdmi.conf" If.hdmi1 { - Condition { Type String Empty "" } - True { - Define { - HdmiNum 1 - HdmiPCM 3 - HdmiCtlIndex 0 - HdmiPrio 1100 - } - Include.hdmi1.File "/codecs/hda/hdmi.conf" + Condition { Type AlwaysTrue } + True.Macro.hdmi1.HDMI { + Number 1 + Device 3 + Priority 1100 } } If.hdmi2 { - Condition { Type String Empty "" } - True { - Define { - HdmiNum 2 - HdmiPCM 7 - HdmiCtlIndex 1 - HdmiPrio 1200 - } - Include.hdmi2.File "/codecs/hda/hdmi.conf" + Condition { Type AlwaysTrue } + True.Macro.hdmi2.HDMI { + Number 2 + Device 7 + Priority 1200 } } If.hdmi3 { - Condition { Type String Empty "" } - True { - Define { - HdmiNum 3 - HdmiPCM 8 - HdmiCtlIndex 2 - HdmiPrio 1300 - } - Include.hdmi3.File "/codecs/hda/hdmi.conf" + Condition { Type AlwaysTrue } + True.Macro.hdmi3.HDMI { + Number 3 + Device 8 + Priority 1300 } } If.hdmi4 { - Condition { Type String Empty "" } - True { - Define { - HdmiNum 4 - HdmiPCM 9 - HdmiCtlIndex 3 - HdmiPrio 1400 - } - Include.hdmi4.File "/codecs/hda/hdmi.conf" + Condition { Type AlwaysTrue } + True.Macro.hdmi4.HDMI { + Number 4 + Device 9 + Priority 1400 } } If.hdmi5 { - Condition { Type String Empty "" } - True { - Define { - HdmiNum 5 - HdmiPCM 10 - HdmiCtlIndex 4 - HdmiPrio 1500 - } - Include.hdmi5.File "/codecs/hda/hdmi.conf" + Condition { Type AlwaysTrue } + True.Macro.hdmi5.HDMI { + Number 5 + Device 10 + Priority 1500 } } If.hdmi6 { - Condition { Type String Empty "" } - True { - Define { - HdmiNum 6 - HdmiPCM 11 - HdmiCtlIndex 5 - HdmiPrio 1600 - } - Include.hdmi6.File "/codecs/hda/hdmi.conf" + Condition { Type AlwaysTrue } + True.Macro.hdmi5.HDMI { + Number 6 + Device 11 + Priority 1600 } } diff --git a/ucm2/Intel/sof-essx8336/Hdmi.conf b/ucm2/Intel/sof-essx8336/Hdmi.conf index 8912b4f..d77b92d 100644 --- a/ucm2/Intel/sof-essx8336/Hdmi.conf +++ b/ucm2/Intel/sof-essx8336/Hdmi.conf @@ -1,40 +1,30 @@ # Use case Configuration for sof-es8336 +Include.hdmi.File "/codecs/hda/hdmi.conf" + If.hdmi1 { - Condition { Type String Empty "" } - True { - Define { - HdmiNum 1 - HdmiPCM 5 - HdmiCtlIndex 0 - HdmiPrio 500 - } - Include.hdmi1.File "/codecs/hda/hdmi.conf" + Condition { Type AlwaysTrue } + True.Macro.hdmi1.HDMI { + Number 1 + Device 5 + Priority 500 } } If.hdmi2 { - Condition { Type String Empty "" } - True { - Define { - HdmiNum 2 - HdmiPCM 6 - HdmiCtlIndex 1 - HdmiPrio 600 - } - Include.hdmi2.File "/codecs/hda/hdmi.conf" + Condition { Type AlwaysTrue } + True.Macro.hdmi2.HDMI { + Number 2 + Device 6 + Priority 600 } } If.hdmi3 { - Condition { Type String Empty "" } - True { - Define { - HdmiNum 3 - HdmiPCM 7 - HdmiCtlIndex 2 - HdmiPrio 700 - } - Include.hdmi3.File "/codecs/hda/hdmi.conf" + Condition { Type AlwaysTrue } + True.Macro.hdmi3.HDMI { + Number 3 + Device 7 + Priority 700 } } diff --git a/ucm2/Intel/sof-essx8336/sof-essx8336.conf b/ucm2/Intel/sof-essx8336/sof-essx8336.conf index da92e31..f74e007 100644 --- a/ucm2/Intel/sof-essx8336/sof-essx8336.conf +++ b/ucm2/Intel/sof-essx8336/sof-essx8336.conf @@ -1,4 +1,4 @@ -Syntax 4 +Syntax 6 BootSequence [ # Setup muxes / switches diff --git a/ucm2/Intel/sof-hda-dsp/Hdmi.conf b/ucm2/Intel/sof-hda-dsp/Hdmi.conf index 1726567..2bf450b 100644 --- a/ucm2/Intel/sof-hda-dsp/Hdmi.conf +++ b/ucm2/Intel/sof-hda-dsp/Hdmi.conf @@ -1,40 +1,30 @@ # Use case Configuration for sof-hda-dsp +Include.hdmi.File "/codecs/hda/hdmi.conf" + If.hdmi1 { - Condition { Type String Empty "" } - True { - Define { - HdmiNum 1 - HdmiPCM 3 - HdmiCtlIndex 0 - HdmiPrio 500 - } - Include.hdmi1.File "/codecs/hda/hdmi.conf" + Condition { Type AlwaysTrue } + True.Macro.hdmi1.HDMI { + Number 1 + Device 3 + Priority 500 } } If.hdmi2 { - Condition { Type String Empty "" } - True { - Define { - HdmiNum 2 - HdmiPCM 4 - HdmiCtlIndex 1 - HdmiPrio 600 - } - Include.hdmi2.File "/codecs/hda/hdmi.conf" + Condition { Type AlwaysTrue } + True.Macro.hdmi1.HDMI { + Number 2 + Device 4 + Priority 600 } } If.hdmi3 { - Condition { Type String Empty "" } - True { - Define { - HdmiNum 3 - HdmiPCM 5 - HdmiCtlIndex 2 - HdmiPrio 700 - } - Include.hdmi3.File "/codecs/hda/hdmi.conf" + Condition { Type AlwaysTrue } + True.Macro.hdmi1.HDMI { + Number 3 + Device 5 + Priority 700 } } diff --git a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf index eb243d1..e6a8a15 100644 --- a/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf +++ b/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf @@ -1,4 +1,4 @@ -Syntax 4 +Syntax 6 Define.DeviceMic "Mic" Define.DeviceDmic "" diff --git a/ucm2/Tegra/tegra-hda/tegra-hda-HiFi.conf b/ucm2/Tegra/tegra-hda/tegra-hda-HiFi.conf index 859c34f..3277f6d 100644 --- a/ucm2/Tegra/tegra-hda/tegra-hda-HiFi.conf +++ b/ucm2/Tegra/tegra-hda/tegra-hda-HiFi.conf @@ -1,12 +1,10 @@ +Include.hdmi.File "/codecs/hda/hdmi.conf" + If.hdmi { - Condition { Type String Empty "" } - True { - Define { - HdmiNum 1 - HdmiPCM 3 - HdmiCtlIndex 0 - HdmiPrio 1100 - } - Include.hdmi.File "/codecs/hda/hdmi.conf" + Condition { Type AlwaysTrue } + True.Macro.hdmi.HDMI { + Number 1 + Device 3 + Priority 1100 } } diff --git a/ucm2/Tegra/tegra-hda/tegra-hda.conf b/ucm2/Tegra/tegra-hda/tegra-hda.conf index 410d973..fc6a83a 100644 --- a/ucm2/Tegra/tegra-hda/tegra-hda.conf +++ b/ucm2/Tegra/tegra-hda/tegra-hda.conf @@ -1,6 +1,6 @@ # UCM for Nvidia Tegra30 HDMI Audio -Syntax 4 +Syntax 6 SectionUseCase."HiFi" { File "/Tegra/tegra-hda/tegra-hda-HiFi.conf" diff --git a/ucm2/codecs/hda/hdmi.conf b/ucm2/codecs/hda/hdmi.conf index c7b7ba4..5bd9f03 100644 --- a/ucm2/codecs/hda/hdmi.conf +++ b/ucm2/codecs/hda/hdmi.conf @@ -1,24 +1,34 @@ -If.hdmi { +# +# Macro HDMI +# +# Arguments: +# +# Number HDMI number +# Device PCM device number +# Priority UCM device priority +# + +DefineMacro.HDMI.If.hdmi { Condition { Type ControlExists - Control "iface=CARD,name='HDMI/DP,pcm=${var:HdmiPCM} Jack'" + Control "iface=CARD,name='HDMI/DP,pcm=${var:__Device} Jack'" } True { - SectionDevice."HDMI${var:HdmiNum}" { - Comment "HDMI / DisplayPort ${var:HdmiNum} Output" + SectionDevice."HDMI${var:__Number}" { + Comment "HDMI / DisplayPort ${var:__Number} Output" EnableSequence [ - cset "name='IEC958 Playback Switch',index=${var:HdmiCtlIndex} on" + cset "name='IEC958 Playback Switch',index=${eval:($__Number-1)} on" ] DisableSequence [ - cset "name='IEC958 Playback Switch',index=${var:HdmiCtlIndex} off" + cset "name='IEC958 Playback Switch',index=${eval:($__Number-1)} off" ] Value { - PlaybackPriority "${var:HdmiPrio}" - PlaybackPCM "hw:${CardId},${var:HdmiPCM}" - JackControl "HDMI/DP,pcm=${var:HdmiPCM} Jack" + PlaybackPriority "${var:__Priority}" + PlaybackPCM "hw:${CardId},${var:__Device}" + JackControl "HDMI/DP,pcm=${var:__Device} Jack" } } } diff --git a/ucm2/sof-soundwire/Hdmi.conf b/ucm2/sof-soundwire/Hdmi.conf index d5ee9c6..0507d8d 100644 --- a/ucm2/sof-soundwire/Hdmi.conf +++ b/ucm2/sof-soundwire/Hdmi.conf @@ -1,40 +1,30 @@ # Use case Configuration for sof-soundwire +Include.hdmi.File "/codecs/hda/hdmi.conf" + If.hdmi1 { - Condition { Type String Empty "" } - True { - Define { - HdmiNum 1 - HdmiPCM 5 - HdmiCtlIndex 0 - HdmiPrio 500 - } - Include.hdmi1.File "/codecs/hda/hdmi.conf" + Condition { Type AlwaysTrue } + True.Macro.hdmi1.HDMI { + Number 1 + Device 5 + Priority 500 } } If.hdmi2 { - Condition { Type String Empty "" } - True { - Define { - HdmiNum 2 - HdmiPCM 6 - HdmiCtlIndex 1 - HdmiPrio 600 - } - Include.hdmi2.File "/codecs/hda/hdmi.conf" + Condition { Type AlwaysTrue } + True.Macro.hdmi2.HDMI { + Number 2 + Device 6 + Priority 600 } } If.hdmi3 { - Condition { Type String Empty "" } - True { - Define { - HdmiNum 3 - HdmiPCM 7 - HdmiCtlIndex 2 - HdmiPrio 700 - } - Include.hdmi3.File "/codecs/hda/hdmi.conf" + Condition { Type AlwaysTrue } + True.Macro.hdmi2.HDMI { + Number 3 + Device 7 + Priority 700 } } diff --git a/ucm2/sof-soundwire/sof-soundwire.conf b/ucm2/sof-soundwire/sof-soundwire.conf index 2442854..03df16c 100644 --- a/ucm2/sof-soundwire/sof-soundwire.conf +++ b/ucm2/sof-soundwire/sof-soundwire.conf @@ -1,4 +1,4 @@ -Syntax 4 +Syntax 6 SectionUseCase."HiFi" { File "/sof-soundwire/HiFi.conf"