Skip to content
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

st-flash: minor usage fix, and make cmdline parsing more user friendly #925

Merged
merged 2 commits into from
Apr 13, 2020
Merged

st-flash: minor usage fix, and make cmdline parsing more user friendly #925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42c5fd7
st-flash: minor usage fix, and make cmdline parsing more user friendly
sderr Apr 13, 2020
eb24304
src/tools/flash_opts.c: fix style issues
sderr Apr 13, 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
2 changes: 1 addition & 1 deletion src/tools/flash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ static void usage(void)
{
puts("stlinkv1 command line: ./st-flash [--debug] [--reset] [--opt] [--format <format>] [--flash=<fsize>] {read|write} /dev/sgX <path> <addr> <size>");
puts("stlinkv1 command line: ./st-flash [--debug] /dev/sgX erase");
puts("stlinkv2/3 command line: ./st-flash [--debug] [--reset] [--opt] [--serial <serial>] [--format <format>] [--flash=<fsize>] {read|write} <path> <addr> <size>");
puts("stlinkv2/3 command line: ./st-flash [--debug] [--reset] [--opt] [--serial <serial>] [--format <format>] [--flash=<fsize>] {read|write} <path> [addr] [size]");
puts("stlinkv2/3 command line: ./st-flash [--debug] [--serial <serial>] erase");
puts("stlinkv2/3 command line: ./st-flash [--debug] [--serial <serial>] reset");
puts(" <addr>, <serial> and <size>: Use hex format.");
Expand Down
25 changes: 18 additions & 7 deletions src/tools/flash_opts.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,16 @@ static bool starts_with(const char * str, const char * prefix) {
return (0 == strncmp(str, prefix, n));
}

static int invalid_args(const char *expected) {
fprintf(stderr, "*** Error: Expected args for this command: %s\n", expected);
return -1;
}

static int bad_arg(const char *arg) {
fprintf(stderr, "*** Error: Invalid value for %s\n", arg);
return -1;
}

int flash_get_opts(struct flash_opts* o, int ac, char** av) {
bool serial_specified = false;

Expand Down Expand Up @@ -94,7 +104,7 @@ int flash_get_opts(struct flash_opts* o, int ac, char** av) {
else if (strcmp(format, "ihex") == 0)
o->format = FLASH_FORMAT_IHEX;
else
return -1;
return bad_arg("format");
}
else if ( starts_with(av[0], "--flash=") ) {
const char *arg = av[0] + strlen("--flash=");
Expand Down Expand Up @@ -168,12 +178,13 @@ int flash_get_opts(struct flash_opts* o, int ac, char** av) {

case FLASH_CMD_READ: // expect filename, addr and size
if((o->area == FLASH_OPTION_BYTES) &&(ac == 0)) break;
if (ac != 3) return invalid_args("read <path> <addr> <size>");
if (ac != 3) return -1;
o->filename = av[0];
o->addr = (uint32_t) strtoul(av[1], &tail, 16);
if(tail[0] != '\0') return -1;
if(tail[0] != '\0') return bad_arg("addr");
o->size = strtoul(av[2], &tail, 16);
if(tail[0] != '\0') return -1;
if(tail[0] != '\0') return bad_arg("size");
break;

case FLASH_CMD_WRITE:
Expand All @@ -182,17 +193,17 @@ int flash_get_opts(struct flash_opts* o, int ac, char** av) {
o->val = (uint32_t)strtoul(av[0], &tail, 16);
}
else if(o->format == FLASH_FORMAT_BINARY) { // expect filename and addr
if (ac != 2) return -1;
if (ac != 2) return invalid_args("write <path> <addr>");
o->filename = av[0];
o->addr = (uint32_t) strtoul(av[1], &tail, 16);
if(tail[0] != '\0') return -1;
if(tail[0] != '\0') return bad_arg("addr");
}
else if(o->format == FLASH_FORMAT_IHEX) { // expect filename
if (ac != 1) return -1;
if (ac != 1) return invalid_args("write <path>");
o->filename = av[0];
}
else {
return -1;
return -1; // should have been caught during format parsing
}
break;

Expand Down