Skip to content

logger: Enable LDC and FW compatibility check by default #3326

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 2 commits into from
Sep 2, 2020
Merged

logger: Enable LDC and FW compatibility check by default #3326

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ce74e2
logger: Enable LDC and FW compatibility check by default
ktrzcinx Aug 19, 2020
6846267
logger: Add option to disable firmware compatibility check
ktrzcinx Aug 19, 2020
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
21 changes: 8 additions & 13 deletions tools/logger/logger.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ static void usage(void)
fprintf(stdout, "%s:\t -l *.ldc_file\t\t*.ldc files generated by smex\n",
APP_NAME);
fprintf(stdout, "%s:\t -p \t\t\tInput from stdin\n", APP_NAME);
fprintf(stdout, "%s:\t -e \t\t\tEnable checking firmware version with "
"default verification file\n", APP_NAME);
fprintf(stdout, "%s:\t -v ver_file\t\tEnable checking firmware version "
"with ver_file file\n", APP_NAME);
fprintf(stdout, "%s:\t -n\t\t\tDisable checking firmware version\n",
APP_NAME);
fprintf(stdout, "%s:\t -c clock\t\tSet timestamp clock in MHz\n",
APP_NAME);
fprintf(stdout, "%s:\t -s state_name\t\tTake a snapshot of state\n",
Expand Down Expand Up @@ -161,7 +161,7 @@ static int append_filter_config(struct convert_config *config, const char *input

int main(int argc, char *argv[])
{
static const char optstring[] = "ho:i:l:ps:c:u:tev:rd:Lf:gF:";
static const char optstring[] = "ho:i:l:ps:c:u:tv:rd:Lf:gFn";
struct convert_config config;
unsigned int baud = 0;
const char *snapshot_file = 0;
Expand All @@ -177,9 +177,9 @@ int main(int argc, char *argv[])
config.ldc_fd = NULL;
config.input_std = 0;
/* checking fw version is disabled by default */
config.version_file = NULL;
config.version_file = "/sys/kernel/debug/sof/fw_version";
config.version_fd = NULL;
config.version_fw = 0;
config.version_fw = 1;
config.use_colors = 1;
config.serial_fd = -EINVAL;
config.raw_output = 0;
Expand Down Expand Up @@ -215,13 +215,6 @@ int main(int argc, char *argv[])
case 'p':
config.input_std = 1;
break;
case 'e':
/* enabling checking fw version with default verification
* file
*/
config.version_fw = 1;
config.version_file = "/sys/kernel/debug/sof/fw_version";
break;
case 'u':
baud = atoi(optarg);
break;
Expand All @@ -230,9 +223,11 @@ int main(int argc, char *argv[])
break;
case 'v':
/* enabling checking fw version with ver_file file */
config.version_fw = 1;
config.version_file = optarg;
break;
case 'n':
config.version_fw = 0;
break;
case 'L':
config.hide_location = 1;
break;
Expand Down