Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/67886 )
Change subject: jlink_spi.c: Move variable `speed` into struct `jlink_spi_parameters` ......................................................................
jlink_spi.c: Move variable `speed` into struct `jlink_spi_parameters`
Signed-off-by: Felix Singer felixsinger@posteo.net Change-Id: I7af29e4bd107bfcda929155bbe603798d092fa79 --- M jlink_spi.c 1 file changed, 24 insertions(+), 10 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/86/67886/1
diff --git a/jlink_spi.c b/jlink_spi.c index 2c9e6cc..fbe3223 100644 --- a/jlink_spi.c +++ b/jlink_spi.c @@ -193,14 +193,18 @@ .probe_opcode = default_spi_probe_opcode, };
+struct jlink_spi_parameters { + unsigned long speed; +}; + static int jlink_spi_init(const struct programmer_cfg *cfg) { char *param_str; - unsigned long speed = 0; struct jaylink_context *jaylink_ctx = NULL; struct jaylink_device_handle *jaylink_devh = NULL; bool reset_cs; struct jlink_spi_data *jlink_data = NULL; + struct jlink_spi_parameters parameters = { 0 }; bool enable_target_power;
param_str = extract_programmer_param_str(cfg, "spispeed"); @@ -209,7 +213,7 @@ char *endptr;
errno = 0; - speed = strtoul(param_str, &endptr, 10); + parameters.speed = strtoul(param_str, &endptr, 10);
if (*endptr != '\0' || errno != 0) { msg_perr("Invalid SPI speed specified: %s.\n", param_str); @@ -217,7 +221,7 @@ return 1; }
- if (speed < 1) { + if (parameters.speed < 1) { msg_perr("SPI speed must be at least 1 kHz.\n"); free(param_str); return 1; @@ -473,25 +477,25 @@
msg_pdbg("Maximum SPI speed: %" PRIu32 " kHz\n", device_speeds.freq / device_speeds.div);
- if (!speed) { - speed = device_speeds.freq / device_speeds.div; - msg_pdbg("SPI speed not specified, using %lu kHz.\n", speed); + if (!parameters.speed) { + parameters.speed = device_speeds.freq / device_speeds.div; + msg_pdbg("SPI speed not specified, using %lu kHz.\n", parameters.speed); }
- if (speed > (device_speeds.freq / device_speeds.div)) { - msg_perr("Specified SPI speed of %lu kHz is too high. Maximum is %" PRIu32 " kHz.\n", speed, + if (parameters.speed > (device_speeds.freq / device_speeds.div)) { + msg_perr("Specified SPI speed of %lu kHz is too high. Maximum is %" PRIu32 " kHz.\n", parameters.speed, device_speeds.freq / device_speeds.div); goto init_err; }
- ret = jaylink_set_speed(jaylink_devh, speed); + ret = jaylink_set_speed(jaylink_devh, parameters.speed);
if (ret != JAYLINK_OK) { msg_perr("jaylink_set_speed() failed: %s.\n", jaylink_strerror(ret)); goto init_err; }
- msg_pdbg("SPI speed: %lu kHz\n", speed); + msg_pdbg("SPI speed: %lu kHz\n", parameters.speed);
jlink_data = calloc(1, sizeof(*jlink_data)); if (!jlink_data) {