sys64738
/
mspdebug
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use symbolic constants for long arguments.

This commit is contained in:
Daniel Beer 2013-01-31 13:21:20 +13:00
parent 85c023d758
commit 6d8a58c9c2
1 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
ui/main.c
View File

@ -204,20 +204,34 @@ static int list_devices(void)
static int parse_cmdline_args(int argc, char **argv, static int parse_cmdline_args(int argc, char **argv,
struct cmdline_args *args) struct cmdline_args *args)
{ {
int opt; enum {
LOPT_HELP = 0x100,
LOPT_FET_LIST,
LOPT_FET_FORCE_ID,
LOPT_USB_LIST,
LOPT_VERSION,
LOPT_LONG_PASSWORD,
LOPT_FORCE_RESET,
LOPT_ALLOW_FW_UPDATE,
LOPT_REQUIRE_FW_UPDATE,
LOPT_EMBEDDED
};
static const struct option longopts[] = { static const struct option longopts[] = {
{"help", 0, 0, 'H'}, {"help", 0, 0, LOPT_HELP},
{"fet-list", 0, 0, 'L'}, {"fet-list", 0, 0, LOPT_FET_LIST},
{"fet-force-id", 1, 0, 'F'}, {"fet-force-id", 1, 0, LOPT_FET_FORCE_ID},
{"usb-list", 0, 0, 'I'}, {"usb-list", 0, 0, LOPT_USB_LIST},
{"version", 0, 0, 'V'}, {"version", 0, 0, LOPT_VERSION},
{"long-password", 0, 0, 'P'}, {"long-password", 0, 0, LOPT_LONG_PASSWORD},
{"force-reset", 0, 0, 'R'}, {"force-reset", 0, 0, LOPT_FORCE_RESET},
{"allow-fw-update", 0, 0, 'A'}, {"allow-fw-update", 0, 0, LOPT_ALLOW_FW_UPDATE},
{"require-fw-update", 1, 0, 'M'}, {"require-fw-update", 1, 0, LOPT_REQUIRE_FW_UPDATE},
{"embedded", 0, 0, 'E'}, {"embedded", 0, 0, LOPT_EMBEDDED},
{NULL, 0, 0, 0} {NULL, 0, 0, 0}
}; };
int opt;
int want_usb = 0; int want_usb = 0;
while ((opt = getopt_long(argc, argv, "d:jv:nU:s:q", while ((opt = getopt_long(argc, argv, "d:jv:nU:s:q",
@ -233,15 +247,15 @@ static int parse_cmdline_args(int argc, char **argv,
} }
break; break;
case 'E': case LOPT_EMBEDDED:
args->flags |= OPT_EMBEDDED; args->flags |= OPT_EMBEDDED;
break; break;
case 'A': case LOPT_ALLOW_FW_UPDATE:
args->devarg.flags |= DEVICE_FLAG_DO_FWUPDATE; args->devarg.flags |= DEVICE_FLAG_DO_FWUPDATE;
break; break;
case 'I': case LOPT_USB_LIST:
usb_init(); usb_init();
usb_find_busses(); usb_find_busses();
usb_find_devices(); usb_find_devices();
@ -253,7 +267,7 @@ static int parse_cmdline_args(int argc, char **argv,
args->devarg.flags |= DEVICE_FLAG_TTY; args->devarg.flags |= DEVICE_FLAG_TTY;
break; break;
case 'M': case LOPT_REQUIRE_FW_UPDATE:
args->devarg.require_fwupdate = optarg; args->devarg.require_fwupdate = optarg;
break; break;
@ -266,18 +280,18 @@ static int parse_cmdline_args(int argc, char **argv,
args->devarg.requested_serial = optarg; args->devarg.requested_serial = optarg;
break; break;
case 'L': case LOPT_FET_LIST:
exit(list_devices()); exit(list_devices());
case 'F': case LOPT_FET_FORCE_ID:
args->devarg.forced_chip_id = optarg; args->devarg.forced_chip_id = optarg;
break; break;
case 'H': case LOPT_HELP:
usage(argv[0]); usage(argv[0]);
exit(0); exit(0);
case 'V': case LOPT_VERSION:
printc("%s", version_text); printc("%s", version_text);
exit(0); exit(0);
@ -293,11 +307,11 @@ static int parse_cmdline_args(int argc, char **argv,
args->flags |= OPT_NO_RC; args->flags |= OPT_NO_RC;
break; break;
case 'P': case LOPT_LONG_PASSWORD:
args->devarg.flags |= DEVICE_FLAG_LONG_PW; args->devarg.flags |= DEVICE_FLAG_LONG_PW;
break; break;
case 'R': case LOPT_FORCE_RESET:
args->devarg.flags |= DEVICE_FLAG_FORCE_RESET; args->devarg.flags |= DEVICE_FLAG_FORCE_RESET;
break; break;