Skip to content

topology: fix setting mux uuid in m4#3688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgirdwood merged 1 commit into from
Dec 18, 2020
Merged

topology: fix setting mux uuid in m4 #3688

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions tools/topology/m4/muxdemux.m4
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,9 +43,7 @@ define(`W_MUXDEMUX',
`SectionVendorTuples."'N_MUXDEMUX($1)`_tuples_uuid" {'
` tokens "sof_comp_tokens"'
` tuples."uuid" {'
ifelse(`$2', `0',
` SOF_TKN_COMP_UUID' STR(mux_uuid),
` SOF_TKN_COMP_UUID' STR(demux_uuid))
`ifelse(`$2', `0',` SOF_TKN_COMP_UUID' STR(mux_uuid),` SOF_TKN_COMP_UUID' STR(demux_uuid))'

@keyonjiekeyonjieDec 15, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so it's actually a pair of ` and' to include the whole ifelse sentence is needed, no matter how much lines it occupies?

@juimonenjuimonenDec 15, 2020

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Keyon I guess so, I noticed that the string "mux/demux" setting below works, but this part didn't. I was debugging this for 3 days, since the string shows it is "MUX", but I never looked at the uuid. In the fw mux/demux share almost all function pointers, only copy function is different -> when copy crashed, the log was missing the last bits -> I didn't understand I was actually running demux instead of mux...

` }'
`}'
`SectionData."'N_MUXDEMUX($1)`_data_uuid" {'
Expand Down