openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 23:22:37 +02:00
Code Issues Releases Wiki Activity

cli_classic: replace enum programmer with programmer_entry*

Browse Source 
Change-Id: I4c45f278addeea0d486a316435e8dc15d93cbd70
Signed-off-by: Thomas Heijligen <thomas.heijligen@secunet.de>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/55122
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Thomas Heijligen 2021-06-01 14:51:13 +02:00 committed by Nico Huber
parent 5d25f04fd5
commit bf0396a600
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cli_classic.c
View File

@ -172,7 +172,8 @@ int main(int argc, char *argv[])
int read_it = 0, extract_it = 0, write_it = 0, erase_it = 0, verify_it = 0; int read_it = 0, extract_it = 0, write_it = 0, erase_it = 0, verify_it = 0;
int dont_verify_it = 0, dont_verify_all = 0, list_supported = 0, operation_specified = 0; int dont_verify_it = 0, dont_verify_all = 0, list_supported = 0, operation_specified = 0;
struct flashrom_layout *layout = NULL; struct flashrom_layout *layout = NULL;
enum programmer prog = PROGRAMMER_INVALID; // enum programmer prog = PROGRAMMER_INVALID;
static const struct programmer_entry *prog = NULL;
enum { enum {
OPTION_IFD = 0x0100, OPTION_IFD = 0x0100,
OPTION_FMAP, OPTION_FMAP,
@ -399,15 +400,16 @@ int main(int argc, char *argv[])
#endif #endif
break; break;
case 'p': case 'p':
if (prog != PROGRAMMER_INVALID) { if (prog != NULL) {
cli_classic_abort_usage("Error: --programmer specified " cli_classic_abort_usage("Error: --programmer specified "
"more than once. You can separate " "more than once. You can separate "
"multiple\nparameters for a programmer " "multiple\nparameters for a programmer "
"with \",\". Please see the man page " "with \",\". Please see the man page "
"for details.\n"); "for details.\n");
} }
for (prog = 0; prog < programmer_table_size; prog++) { size_t p;
name = programmer_table[prog]->name; for (p = 0; p < programmer_table_size; p++) {
name = programmer_table[p]->name;
namelen = strlen(name); namelen = strlen(name);
if (strncmp(optarg, name, namelen) == 0) { if (strncmp(optarg, name, namelen) == 0) {
switch (optarg[namelen]) { switch (optarg[namelen]) {
@ -417,8 +419,10 @@ int main(int argc, char *argv[])
free(pparam); free(pparam);
pparam = NULL; pparam = NULL;
} }
prog = programmer_table[p];
break; break;
case '\0': case '\0':
prog = programmer_table[p];
break; break;
default: default:
/* The continue refers to the /* The continue refers to the
@ -431,7 +435,7 @@ int main(int argc, char *argv[])
break; break;
} }
} }
if (prog == PROGRAMMER_INVALID) { if (prog == NULL) {
fprintf(stderr, "Error: Unknown programmer \"%s\". Valid choices are:\n", fprintf(stderr, "Error: Unknown programmer \"%s\". Valid choices are:\n",
optarg); optarg);
list_programmers_linebreak(0, 80, 0); list_programmers_linebreak(0, 80, 0);
@ -539,9 +543,9 @@ int main(int argc, char *argv[])
/* Keep chip around for later usage in case a forced read is requested. */ /* Keep chip around for later usage in case a forced read is requested. */
} }
if (prog == PROGRAMMER_INVALID) { if (prog == NULL) {
if (CONFIG_DEFAULT_PROGRAMMER != PROGRAMMER_INVALID) { if (CONFIG_DEFAULT_PROGRAMMER != PROGRAMMER_INVALID) {
prog = CONFIG_DEFAULT_PROGRAMMER; prog = programmer_table[CONFIG_DEFAULT_PROGRAMMER];
/* We need to strdup here because we free(pparam) unconditionally later. */ /* We need to strdup here because we free(pparam) unconditionally later. */
pparam = strdup(CONFIG_DEFAULT_PROGRAMMER_ARGS); pparam = strdup(CONFIG_DEFAULT_PROGRAMMER_ARGS);
msg_pinfo("Using default programmer \"%s\" with arguments \"%s\".\n", msg_pinfo("Using default programmer \"%s\" with arguments \"%s\".\n",
@ -562,7 +566,7 @@ int main(int argc, char *argv[])
/* FIXME: Delay calibration should happen in programmer code. */ /* FIXME: Delay calibration should happen in programmer code. */
myusec_calibrate_delay(); myusec_calibrate_delay();
if (programmer_init(programmer_table[prog], pparam)) { if (programmer_init(prog, pparam)) {
msg_perr("Error: Programmer initialization failed.\n"); msg_perr("Error: Programmer initialization failed.\n");
ret = 1; ret = 1;
goto out_shutdown; goto out_shutdown;