Audio: Crossover: Prefix top level functions names with sof_

singalsu · lgirdwood · commit fcf3d65f0383 · 2024-09-02T11:28:58.000+01:00
The names are changed to avoid any collisions with multiple
Octave or Matlab paths enabled.

Signed-off-by: Seppo Ingalsuo &lt;seppo.ingalsuo@linux.intel.com&gt;
diff --git a/src/audio/crossover/tune/sof_crossover_build_blob.m b/src/audio/crossover/tune/sof_crossover_build_blob.m
diff --git a/src/audio/crossover/tune/sof_crossover_coef_quant.m b/src/audio/crossover/tune/sof_crossover_coef_quant.m
@@ -1,4 +1,4 @@
-function crossover_quant = crossover_coef_quant(lowpass, highpass);
+function crossover_quant = sof_crossover_coef_quant(lowpass, highpass);
 
 bits_iir = 32; % Q2.30
 qf_iir = 30;
diff --git a/src/audio/crossover/tune/sof_crossover_gen_coefs.m b/src/audio/crossover/tune/sof_crossover_gen_coefs.m
@@ -1,4 +1,4 @@
-function crossover = crossover_gen_coefs(fs, fc_low, fc_mid, fc_high)
+function crossover = sof_crossover_gen_coefs(fs, fc_low, fc_mid, fc_high)
 
 switch nargin
 	case 2, crossover = crossover_generate_2way(fs, fc_low);
diff --git a/src/audio/crossover/tune/sof_crossover_generate_config.m b/src/audio/crossover/tune/sof_crossover_generate_config.m
@@ -1,4 +1,4 @@
-function config = crossover_generate_config(crossover_bqs, num_sinks, assign_sinks);
+function config = sof_crossover_generate_config(crossover_bqs, num_sinks, assign_sinks);
 
 config.num_sinks = num_sinks;
 config.assign_sinks = assign_sinks;
diff --git a/src/audio/crossover/tune/sof_crossover_paths.m b/src/audio/crossover/tune/sof_crossover_paths.m
@@ -1,6 +1,6 @@
-function crossover_paths(enable)
+function sof_crossover_paths(enable)
 
-% crossover_paths(enable)
+% sof_crossover_paths(enable)
 % enable - set to true to enable needed search path
 %          set to false to disable the search paths
 %
diff --git a/src/audio/crossover/tune/sof_crossover_plot_freq.m b/src/audio/crossover/tune/sof_crossover_plot_freq.m
@@ -1,4 +1,4 @@
-function crossover_plot_freq(lp, hp, fs, num_sinks);
+function sof_crossover_plot_freq(lp, hp, fs, num_sinks);
 % Plot the transfer function of each sink. We need to reconstruct a filter
 % that represents the path the samples go through for each sinks.
 % Example 4-way crossover:
diff --git a/src/audio/crossover/tune/sof_example_crossover.m b/src/audio/crossover/tune/sof_example_crossover.m
@@ -1,4 +1,4 @@
-function example_crossover()
+function sof_example_crossover()
 
 % Sampling Frequency and Frequency cut-offs for crossover
 cr.fs = 48e3;
@@ -32,7 +32,7 @@ function example_crossover()
 
 function export_crossover(cr)
 
-crossover_paths(true);
+sof_crossover_paths(true);
 
 endian = "little";
 sof_tools = '../../../../tools';
@@ -64,24 +64,24 @@ function export_crossover(cr)
 % Generate zeros, poles and gain for crossover with the given frequencies
 switch cr.num_sinks
 	case 2
-		crossover = crossover_gen_coefs(cr.fs, cr.fc_low); % 2 way crossover
+		crossover = sof_crossover_gen_coefs(cr.fs, cr.fc_low); % 2 way crossover
 	case 3
-		crossover = crossover_gen_coefs(cr.fs, cr.fc_low, cr.fc_med); % 3 way crossover
+		crossover = sof_crossover_gen_coefs(cr.fs, cr.fc_low, cr.fc_med); % 3 way crossover
 	case 4
-		crossover = crossover_gen_coefs(cr.fs, cr.fc_low, cr.fc_med, cr.fc_high); % 4 way crossover
+		crossover = sof_crossover_gen_coefs(cr.fs, cr.fc_low, cr.fc_med, cr.fc_high); % 4 way crossover
 	otherwise
 		error('Illegal number of sinks %d\n', num_sinks);
 end
 
 % Convert the [a,b] coefficients to values usable with SOF
-crossover_bqs = crossover_coef_quant(crossover.lp, crossover.hp);
+crossover_bqs = sof_crossover_coef_quant(crossover.lp, crossover.hp);
 
 % Convert coefficients to sof_crossover_config struct
-config = crossover_generate_config(crossover_bqs, cr.num_sinks, assign_sinks);
+config = sof_crossover_generate_config(crossover_bqs, cr.num_sinks, assign_sinks);
 
 % Convert struct to binary blob
-blob8 = crossover_build_blob(config, endian, 3);
-blob8_ipc4 = crossover_build_blob(config, endian, 4);
+blob8 = sof_crossover_build_blob(config, endian, 3);
+blob8_ipc4 = sof_crossover_build_blob(config, endian, 4);
 
 % Generate output files
 
@@ -97,9 +97,9 @@ function export_crossover(cr)
 alsactl_write(alsa4_fn, blob8_ipc4);
 
 % Plot Magnitude and Phase Response of each sink
-crossover_plot_freq(crossover.lp, crossover.hp, cr.fs, cr.num_sinks);
+sof_crossover_plot_freq(crossover.lp, crossover.hp, cr.fs, cr.num_sinks);
 
-crossover_paths(false);
+sof_crossover_paths(false);
 end
 
 % Frequencies part for filename

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-function crossover_quant = crossover_coef_quant(lowpass, highpass);`
	`1`	`+function crossover_quant = sof_crossover_coef_quant(lowpass, highpass);`
`2`	`2`
`3`	`3`	`bits_iir = 32; % Q2.30`
`4`	`4`	`qf_iir = 30;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-function crossover = crossover_gen_coefs(fs, fc_low, fc_mid, fc_high)`
	`1`	`+function crossover = sof_crossover_gen_coefs(fs, fc_low, fc_mid, fc_high)`
`2`	`2`
`3`	`3`	`switch nargin`
`4`	`4`	`case 2, crossover = crossover_generate_2way(fs, fc_low);`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-function config = crossover_generate_config(crossover_bqs, num_sinks, assign_sinks);`
	`1`	`+function config = sof_crossover_generate_config(crossover_bqs, num_sinks, assign_sinks);`
`2`	`2`
`3`	`3`	`config.num_sinks = num_sinks;`
`4`	`4`	`config.assign_sinks = assign_sinks;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-function crossover_paths(enable)`
	`1`	`+function sof_crossover_paths(enable)`
`2`	`2`
`3`		`-% crossover_paths(enable)`
	`3`	`+% sof_crossover_paths(enable)`
`4`	`4`	`% enable - set to true to enable needed search path`
`5`	`5`	`% set to false to disable the search paths`
`6`	`6`	`%`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-function crossover_plot_freq(lp, hp, fs, num_sinks);`
	`1`	`+function sof_crossover_plot_freq(lp, hp, fs, num_sinks);`
`2`	`2`	`% Plot the transfer function of each sink. We need to reconstruct a filter`
`3`	`3`	`% that represents the path the samples go through for each sinks.`
`4`	`4`	`% Example 4-way crossover:`