Skip to content

ui/main.c: add --expect-id cmd line parameter #127

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

Open
maribu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ui/main.c: add --expect-id cmd line parameter #127

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions drivers/device.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ struct device_args {
int vcc_mv;
const char *path;
const char *forced_chip_id;
const char *expect_chip_id;
const char *requested_serial;
const char *require_fwupdate;
const char *bsl_entry_seq;
Expand Down
18 changes: 18 additions & 0 deletions ui/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,8 @@ static void usage(const char *progname)
" Show a list of devices supported by the FET driver.\n"
" --fet-force-id string\n"
" Override the device ID returned by the FET.\n"
" --expect-id string\n"
" Abort if the MCU detected is not matching the given string.\n"
" --fet-skip-close\n"
" Skip the JTAG close procedure when using the FET driver.\n"
" --usb-list\n"
Expand Down Expand Up @@ -297,6 +299,7 @@ static int parse_cmdline_args(int argc, char **argv,
LOPT_HELP = 0x100,
LOPT_FET_LIST,
LOPT_FET_FORCE_ID,
LOPT_EXPECT_ID,
LOPT_FET_SKIP_CLOSE,
LOPT_USB_LIST,
LOPT_VERSION,
Expand All @@ -315,6 +318,7 @@ static int parse_cmdline_args(int argc, char **argv,
{"help", 0, 0, LOPT_HELP},
{"fet-list", 0, 0, LOPT_FET_LIST},
{"fet-force-id", 1, 0, LOPT_FET_FORCE_ID},
{"expect-id", 1, 0, LOPT_EXPECT_ID},
{"fet-skip-close", 0, 0, LOPT_FET_SKIP_CLOSE},
{"usb-list", 0, 0, LOPT_USB_LIST},
{"version", 0, 0, LOPT_VERSION},
Expand Down Expand Up @@ -426,6 +430,10 @@ static int parse_cmdline_args(int argc, char **argv,
args->devarg.forced_chip_id = optarg;
break;

case LOPT_EXPECT_ID:
args->devarg.expect_chip_id = optarg;
break;

case LOPT_FET_SKIP_CLOSE:
args->devarg.flags |= DEVICE_FLAG_SKIP_CLOSE;
break;
Expand Down Expand Up @@ -573,6 +581,15 @@ int main(int argc, char **argv)
if (device_probe_id(device_default, args.devarg.forced_chip_id) < 0)
printc_err("warning: device ID probe failed\n");

if (args.devarg.expect_chip_id) {
if (strcmp(args.devarg.expect_chip_id, device_default->chip->name)) {
printf("Detected %s, but %s was expected\n",
device_default->chip->name, args.devarg.expect_chip_id);
ret = -1;
goto fail_expect_id;
}
}

if (!(args.flags & OPT_NO_RC))
process_rc_file(args.alt_config);

Expand All @@ -588,6 +605,7 @@ int main(int argc, char **argv)
reader_loop();
}

fail_expect_id:
simio_exit();
device_destroy();
stab_exit();
Expand Down