topology2: cavs-mixin-mixout-ssp: Use macros for pipeline IDs

Use macros for pipeline IDs for better maintainability. Signed-off-by: Yong Zhi <yong.zhi@intel.com>
yongzhi1 · Nov 3, 2023 · 34ed649 · 34ed649
1 parent 244df9f
commit 34ed649
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/tools/topology/topology2/cavs-mixin-mixout-ssp.conf b/tools/topology/topology2/cavs-mixin-mixout-ssp.conf
@@ -10,7 +10,7 @@ Object.Pipeline {
 	# playback pipelines
 	host-copier-gain-mixin-playback [
 		{
-			index	1
+			index	$HEADSET_HOST_PIPELINE_ID
 
 			Object.Widget.host-copier.1 {
 				stream_name	'$HEADSET_PLAYBACK_PCM_STREAM_NAME'
@@ -23,7 +23,7 @@ Object.Pipeline {
 			}
 		}
 		{
-			index	3
+			index	$SPEAKER_HOST_PIPELINE_ID
 
 			Object.Widget.host-copier.1 {
 				stream_name	'$SPEAKER_PLAYBACK_PCM_STREAM_NAME'
@@ -39,7 +39,7 @@ Object.Pipeline {
 
         mixout-gain-dai-copier-playback [
             {
-                index   2
+                index   $HEADSET_DAI_PIPELINE_ID
 
                 Object.Widget.dai-copier.1 {
                     dai_index $HEADSET_SSP_DAI_INDEX
@@ -56,7 +56,7 @@ Object.Pipeline {
                 }
             }
             {
-                index   4
+                index   $SPEAKER_DAI_PIPELINE_ID
 
                 Object.Widget.dai-copier.1 {
                     dai_index   $SPEAKER_SSP_DAI_INDEX
@@ -77,19 +77,19 @@ Object.Pipeline {
 
 Object.Base.route [
         {
-            	source  "gain.2.1"
-            	sink    "dai-copier.SSP.$HEADSET_CODEC_NAME.playback"
+		source  "gain.$HEADSET_DAI_PIPELINE_ID.1"
+		sink    "dai-copier.SSP.$HEADSET_CODEC_NAME.playback"
         }
         {
-            	source  "mixin.1.1"
-            	sink    "mixout.2.1"
+		source  "mixin.$HEADSET_HOST_PIPELINE_ID.1"
+		sink    "mixout.$HEADSET_DAI_PIPELINE_ID.1"
         }
         {
-            	source  "gain.4.1"
-            	sink    "dai-copier.SSP.$SPEAKER_CODEC_NAME.playback"
+		source  "gain.$SPEAKER_DAI_PIPELINE_ID.1"
+		sink    "dai-copier.SSP.$SPEAKER_CODEC_NAME.playback"
         }
         {
-            	source  "mixin.3.1"
-            	sink    "mixout.4.1"
+		source  "mixin.$SPEAKER_HOST_PIPELINE_ID.1"
+		sink    "mixout.$SPEAKER_DAI_PIPELINE_ID.1"
         }
 ]
diff --git a/tools/topology/topology2/cavs-rt5682.conf b/tools/topology/topology2/cavs-rt5682.conf
@@ -85,6 +85,10 @@ Define {
 	SPEAKER_PLAYBACK_PCM_STREAM_NAME 'Speaker Playback'
 	SPEAKER_SSP_DAI_INDEX		1
 	SPEAKER_HW_CONFIG_NAME		'SPEAKER HWCFG'
+	HEADSET_HOST_PIPELINE_ID	1
+	HEADSET_DAI_PIPELINE_ID		2
+	SPEAKER_HOST_PIPELINE_ID	3
+	SPEAKER_DAI_PIPELINE_ID		4
 	INCLUDE_ECHO_REF		false
 	ECHO_REF_HOST_PIPELINE_ID	7
 	ECHO_REF_DAI_PIPELINE_ID	8