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

rayer_spi.c: Move param parse logic into own func

Browse Source 
Deconvolve programmer parameter parse logic out of main
'rayer_spi_init()' entry-point function control flow.

Change-Id: I287aa2e5d94e872553d08c0750f8dc6d60b9caff
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/68230
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Edward O'Callaghan 2022-10-08 12:08:09 +11:00 committed by Edward O'Callaghan
parent d514c90f9a
commit 68e4d5cc4e
1 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
rayer_spi.c
View File

@ -235,20 +235,18 @@ static const struct bitbang_spi_master bitbang_spi_master_rayer = {
.half_period = 0, .half_period = 0,
}; };
static int rayer_spi_init(const struct programmer_cfg *cfg) static int get_params(const struct programmer_cfg *cfg, uint16_t *lpt_iobase, char **prog_type)
{ {
const struct rayer_programmer *prog = rayer_spi_types; /* Pick a default value for the I/O base. */
char *arg = NULL; *lpt_iobase = 0x378;
struct rayer_pinout *pinout = NULL; /* no programmer type specified. */
uint16_t lpt_iobase; *prog_type = NULL;
uint8_t lpt_outbyte;
/* Non-default port requested? */ /* Non-default port requested? */
arg = extract_programmer_param_str(cfg, "iobase"); char *arg = extract_programmer_param_str(cfg, "iobase");
if (arg) { if (arg) {
char *endptr = NULL; char *endptr = NULL;
unsigned long tmp; unsigned long tmp = strtoul(arg, &endptr, 0);
tmp = strtoul(arg, &endptr, 0);
/* Port 0, port >0x10000, unaligned ports and garbage strings /* Port 0, port >0x10000, unaligned ports and garbage strings
* are rejected. * are rejected.
*/ */
@ -262,35 +260,52 @@ static int rayer_spi_init(const struct programmer_cfg *cfg)
"given was invalid.\nIt must be a multiple of " "given was invalid.\nIt must be a multiple of "
"0x4 and lie between 0x100 and 0xfffc.\n"); "0x4 and lie between 0x100 and 0xfffc.\n");
free(arg); free(arg);
return 1; return -1;
} else { } else {
lpt_iobase = (uint16_t)tmp; *lpt_iobase = (uint16_t)tmp;
msg_pinfo("Non-default I/O base requested. This will " msg_pinfo("Non-default I/O base requested. This will "
"not change the hardware settings.\n"); "not change the hardware settings.\n");
} }
} else { free(arg);
/* Pick a default value for the I/O base. */ }
lpt_iobase = 0x378;
arg = extract_programmer_param_str(cfg, "type");
if (arg) {
*prog_type = strdup(arg);
free(arg);
}
return 0;
}
static int rayer_spi_init(const struct programmer_cfg *cfg)
{
const struct rayer_programmer *prog = rayer_spi_types;
struct rayer_pinout *pinout = NULL;
uint16_t lpt_iobase;
uint8_t lpt_outbyte;
char *prog_type;
if (get_params(cfg, &lpt_iobase, &prog_type) < 0)
return 1;
if (prog_type) {
for (; prog->type != NULL; prog++) {
if (strcasecmp(prog_type, prog->type) == 0) {
break;
}
}
free(prog_type);
if (prog->type == NULL) {
msg_perr("Error: Invalid device type specified.\n");
return 1;
}
} }
free(arg);
msg_pdbg("Using address 0x%x as I/O base for parallel port access.\n", msg_pdbg("Using address 0x%x as I/O base for parallel port access.\n",
lpt_iobase); lpt_iobase);
arg = extract_programmer_param_str(cfg, "type");
if (arg) {
for (; prog->type != NULL; prog++) {
if (strcasecmp(arg, prog->type) == 0) {
break;
}
}
if (prog->type == NULL) {
msg_perr("Error: Invalid device type specified.\n");
free(arg);
return 1;
}
free(arg);
}
msg_pinfo("Using %s pinout.\n", prog->description); msg_pinfo("Using %s pinout.\n", prog->description);
pinout = (struct rayer_pinout *)prog->dev_data; pinout = (struct rayer_pinout *)prog->dev_data;