Skip to content

logger: show version numbers with the ABI mismatch error #664

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 5, 2018
Merged

logger: show version numbers with the ABI mismatch error #664

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
17 changes: 16 additions & 1 deletion tools/logger/convert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,14 @@ int convert(struct convert_config *config) {
fprintf(stderr, "Error: abi version in %s file "
"does not coincide with abi version used "
"by logger.\n", config->version_file);
fprintf(stderr, "logger ABI Version is %d:%d:%d\n",
SOF_ABI_VERSION_MAJOR(SOF_ABI_VERSION),
SOF_ABI_VERSION_MINOR(SOF_ABI_VERSION),
SOF_ABI_VERSION_PATCH(SOF_ABI_VERSION));
fprintf(stderr, "version_file ABI Version is %d:%d:%d\n",
SOF_ABI_VERSION_MAJOR(ver.abi_version),
SOF_ABI_VERSION_MINOR(ver.abi_version),
SOF_ABI_VERSION_PATCH(ver.abi_version));
return -EINVAL;
}
}
Expand All @@ -336,8 +344,15 @@ int convert(struct convert_config *config) {
fprintf(stderr, "Error: abi version in %s file "
"does not coincide with abi version used "
"by logger.\n", config->ldc_file);
fprintf(stderr, "logger ABI Version is %d:%d:%d\n",
SOF_ABI_VERSION_MAJOR(SOF_ABI_VERSION),
SOF_ABI_VERSION_MINOR(SOF_ABI_VERSION),
SOF_ABI_VERSION_PATCH(SOF_ABI_VERSION));
fprintf(stderr, "ldc_file ABI Version is %d:%d:%d\n",
SOF_ABI_VERSION_MAJOR(snd.version.abi_version),
SOF_ABI_VERSION_MINOR(snd.version.abi_version),
SOF_ABI_VERSION_PATCH(snd.version.abi_version));
return -EINVAL;
}

return logger_read(config, &snd);
}