ucm: Set default include path

Many UCM profiles include the UCM profile components under ucm/*
subdirectories and thusly put <searchdir:ucm> at each place.  This is
rather cumbersome.

This patch makes the UCM parser to set the default include path, so
that each profile no longer needs to set searchdir.  All the
<searchdir:ucm> lines currently found in the profiles are removed
gracefully, too.

For the needed implementation, a new helper,
_snd_config_load_with_include() is introduced.  It's not exported,
only for the use inside alsa-lib.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/ucm/PIPO-W2S-Defaultstring-CherryTrailCR/HiFi.conf b/ucm/PIPO-W2S-Defaultstring-CherryTrailCR/HiFi.conf
index facc73a..b931b79 100644 (file)
--- a/ucm/PIPO-W2S-Defaultstring-CherryTrailCR/HiFi.conf
+++ b/ucm/PIPO-W2S-Defaultstring-CherryTrailCR/HiFi.conf
@@ -1,4 +1,3 @@
-<searchdir:ucm>
 
 SectionVerb {
 

diff --git a/ucm/bytcr-rt5640-mono-spk-dmic1-mic/HiFi.conf b/ucm/bytcr-rt5640-mono-spk-dmic1-mic/HiFi.conf
index c78cdfb..0e21d6e 100644 (file)
--- a/ucm/bytcr-rt5640-mono-spk-dmic1-mic/HiFi.conf
+++ b/ucm/bytcr-rt5640-mono-spk-dmic1-mic/HiFi.conf
@@ -1,6 +1,5 @@
 # Use case Configuration for bytcr-rt5640
 
-<searchdir:ucm>
 
 SectionVerb {
        EnableSequence [

diff --git a/ucm/bytcr-rt5640-mono-spk-in1-mic/HiFi.conf b/ucm/bytcr-rt5640-mono-spk-in1-mic/HiFi.conf
index 34a5d53..d8ca499 100644 (file)
--- a/ucm/bytcr-rt5640-mono-spk-in1-mic/HiFi.conf
+++ b/ucm/bytcr-rt5640-mono-spk-in1-mic/HiFi.conf
@@ -1,6 +1,5 @@
 # Use case Configuration for bytcr-rt5640
 
-<searchdir:ucm>
 
 SectionVerb {
        EnableSequence [

diff --git a/ucm/bytcr-rt5640-mono-spk-in3-mic/HiFi.conf b/ucm/bytcr-rt5640-mono-spk-in3-mic/HiFi.conf
index 0aa0c02..e4fb28d 100644 (file)
--- a/ucm/bytcr-rt5640-mono-spk-in3-mic/HiFi.conf
+++ b/ucm/bytcr-rt5640-mono-spk-in3-mic/HiFi.conf
@@ -1,6 +1,5 @@
 # Use case Configuration for bytcr-rt5640
 
-<searchdir:ucm>
 
 SectionVerb {
        EnableSequence [

diff --git a/ucm/bytcr-rt5640-stereo-spk-dmic1-mic/HiFi.conf b/ucm/bytcr-rt5640-stereo-spk-dmic1-mic/HiFi.conf
index e358d4f..bb31bf5 100644 (file)
--- a/ucm/bytcr-rt5640-stereo-spk-dmic1-mic/HiFi.conf
+++ b/ucm/bytcr-rt5640-stereo-spk-dmic1-mic/HiFi.conf
@@ -1,6 +1,5 @@
 # Use case Configuration for bytcr-rt5640
 
-<searchdir:ucm>
 
 SectionVerb {
        EnableSequence [

diff --git a/ucm/bytcr-rt5640-stereo-spk-in1-mic/HiFi.conf b/ucm/bytcr-rt5640-stereo-spk-in1-mic/HiFi.conf
index 097560d..9474a64 100644 (file)
--- a/ucm/bytcr-rt5640-stereo-spk-in1-mic/HiFi.conf
+++ b/ucm/bytcr-rt5640-stereo-spk-in1-mic/HiFi.conf
@@ -1,6 +1,5 @@
 # Use case Configuration for bytcr-rt5640
 
-<searchdir:ucm>
 
 SectionVerb {
        EnableSequence [

diff --git a/ucm/bytcr-rt5640-stereo-spk-in3-mic/HiFi.conf b/ucm/bytcr-rt5640-stereo-spk-in3-mic/HiFi.conf
index 8a018f6..478130e 100644 (file)
--- a/ucm/bytcr-rt5640-stereo-spk-in3-mic/HiFi.conf
+++ b/ucm/bytcr-rt5640-stereo-spk-in3-mic/HiFi.conf
@@ -1,6 +1,5 @@
 # Use case Configuration for bytcr-rt5640
 
-<searchdir:ucm>
 
 SectionVerb {
        EnableSequence [

diff --git a/ucm/bytcr-rt5640/HiFi.conf b/ucm/bytcr-rt5640/HiFi.conf
index 20ebe2d..54dd251 100644 (file)
--- a/ucm/bytcr-rt5640/HiFi.conf
+++ b/ucm/bytcr-rt5640/HiFi.conf
@@ -1,6 +1,5 @@
 # Use case Configuration for bytcr-rt5640
 
-<searchdir:ucm>
 
 SectionVerb {
        EnableSequence [

diff --git a/ucm/bytcr-rt5651-mono-spk-in1-mic/HiFi.conf b/ucm/bytcr-rt5651-mono-spk-in1-mic/HiFi.conf
index ca8a7d9..b93e0be 100644 (file)
--- a/ucm/bytcr-rt5651-mono-spk-in1-mic/HiFi.conf
+++ b/ucm/bytcr-rt5651-mono-spk-in1-mic/HiFi.conf
@@ -1,6 +1,5 @@
 # Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
 
-<searchdir:ucm>
 
 SectionVerb {
        EnableSequence [

diff --git a/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/HiFi.conf b/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/HiFi.conf
index 60ef6b3..ef04862 100644 (file)
--- a/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/HiFi.conf
+++ b/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/HiFi.conf
@@ -1,6 +1,5 @@
 # Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
 
-<searchdir:ucm>
 
 SectionVerb {
        EnableSequence [

diff --git a/ucm/bytcr-rt5651-mono-spk-in2-mic/HiFi.conf b/ucm/bytcr-rt5651-mono-spk-in2-mic/HiFi.conf
index e75210d..c324c14 100644 (file)
--- a/ucm/bytcr-rt5651-mono-spk-in2-mic/HiFi.conf
+++ b/ucm/bytcr-rt5651-mono-spk-in2-mic/HiFi.conf
@@ -1,6 +1,5 @@
 # Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
 
-<searchdir:ucm>
 
 SectionVerb {
        EnableSequence [

diff --git a/ucm/bytcr-rt5651-stereo-spk-in1-mic/HiFi.conf b/ucm/bytcr-rt5651-stereo-spk-in1-mic/HiFi.conf
index 2b7675b..aa1a1cd 100644 (file)
--- a/ucm/bytcr-rt5651-stereo-spk-in1-mic/HiFi.conf
+++ b/ucm/bytcr-rt5651-stereo-spk-in1-mic/HiFi.conf
@@ -1,6 +1,5 @@
 # Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
 
-<searchdir:ucm>
 
 SectionVerb {
        EnableSequence [

diff --git a/ucm/bytcr-rt5651-stereo-spk-in12-mic/HiFi.conf b/ucm/bytcr-rt5651-stereo-spk-in12-mic/HiFi.conf
index 7a8c94b..343aed2 100644 (file)
--- a/ucm/bytcr-rt5651-stereo-spk-in12-mic/HiFi.conf
+++ b/ucm/bytcr-rt5651-stereo-spk-in12-mic/HiFi.conf
@@ -1,6 +1,5 @@
 # Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
 
-<searchdir:ucm>
 
 SectionVerb {
        EnableSequence [

diff --git a/ucm/bytcr-rt5651-stereo-spk-in2-mic/HiFi.conf b/ucm/bytcr-rt5651-stereo-spk-in2-mic/HiFi.conf
index 45c7837..6f6d74c 100644 (file)
--- a/ucm/bytcr-rt5651-stereo-spk-in2-mic/HiFi.conf
+++ b/ucm/bytcr-rt5651-stereo-spk-in2-mic/HiFi.conf
@@ -1,6 +1,5 @@
 # Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
 
-<searchdir:ucm>
 
 SectionVerb {
        EnableSequence [

diff --git a/ucm/bytcr-rt5651/HiFi.conf b/ucm/bytcr-rt5651/HiFi.conf
index d3928e9..fddd8a3 100644 (file)
--- a/ucm/bytcr-rt5651/HiFi.conf
+++ b/ucm/bytcr-rt5651/HiFi.conf
@@ -1,6 +1,5 @@
 # Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
 
-<searchdir:ucm>
 
 SectionVerb {
        EnableSequence [

diff --git a/ucm/chtnau8824/HiFi.conf b/ucm/chtnau8824/HiFi.conf
index 97a7ac7..845cbca 100644 (file)
--- a/ucm/chtnau8824/HiFi.conf
+++ b/ucm/chtnau8824/HiFi.conf
@@ -1,4 +1,3 @@
-<searchdir:ucm>
 
 SectionVerb {
 

diff --git a/ucm/chtrt5645/HiFi.conf b/ucm/chtrt5645/HiFi.conf
index 6a3c687..422f3b7 100644 (file)
--- a/ucm/chtrt5645/HiFi.conf
+++ b/ucm/chtrt5645/HiFi.conf
@@ -1,4 +1,3 @@
-<searchdir:ucm>
 
 SectionVerb {
        # ALSA PCM

diff --git a/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/HiFi.conf b/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/HiFi.conf
index facc73a..b931b79 100644 (file)
--- a/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/HiFi.conf
+++ b/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/HiFi.conf
@@ -1,4 +1,3 @@
-<searchdir:ucm>
 
 SectionVerb {