diff options
| author | Peter A. Bigot <pab@pabigot.com> | 2016-01-04 14:37:43 -0600 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2016-01-06 20:01:28 +0000 |
| commit | 554313b68b4791924a145c3db8082932afb91fbc (patch) | |
| tree | af1e1e52a903dc013f4b3a5d582194520af8d67c /src/jtag | |
| parent | 48768db9d6420013ccd88107a67de85fdcd5bbd8 (diff) | |
| download | riscv-openocd-554313b68b4791924a145c3db8082932afb91fbc.zip riscv-openocd-554313b68b4791924a145c3db8082932afb91fbc.tar.gz riscv-openocd-554313b68b4791924a145c3db8082932afb91fbc.tar.bz2 | |
jlink: deconflict local variables from global symbols
BeagleBone debian 7 builds produce:
jlink.c: In function 'jlink_speed':
jlink.c:218:11: error: declaration of 'div' shadows a global declaration [-Werror=shadow]
jlink.c: In function 'check_trace_freq':
jlink.c:1065:54: error: declaration of 'div' shadows a global declaration [-Werror=shadow]
jlink.c: In function 'config_trace':
jlink.c:1101:11: error: declaration of 'div' shadows a global declaration [-Werror=shadow]
Fix this by changing the local variable to 'divider'.
Change-Id: I96a0cc0f7d4d4af5a56aa1e918e5416d3c61cbfe
Signed-off-by: Peter A. Bigot <pab@pabigot.com>
Reviewed-on: http://openocd.zylin.com/3185
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Diffstat (limited to 'src/jtag')
| -rw-r--r-- | src/jtag/drivers/jlink.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c index 04297ca..84127ab 100644 --- a/src/jtag/drivers/jlink.c +++ b/src/jtag/drivers/jlink.c @@ -215,11 +215,11 @@ static int jlink_speed(int speed) { int ret; uint32_t freq; - uint16_t div; + uint16_t divider; int max_speed; if (jaylink_has_cap(caps, JAYLINK_DEV_CAP_GET_SPEEDS)) { - ret = jaylink_get_speeds(devh, &freq, &div); + ret = jaylink_get_speeds(devh, &freq, ÷r); if (ret != JAYLINK_OK) { LOG_ERROR("jaylink_get_speeds() failed: %s.", @@ -228,7 +228,7 @@ static int jlink_speed(int speed) } freq = freq / 1000; - max_speed = freq / div; + max_speed = freq / divider; } else { max_speed = JLINK_MAX_SPEED; } @@ -1062,26 +1062,26 @@ static uint32_t calculate_trace_buffer_size(void) return tmp & 0xffffff00; } -static bool check_trace_freq(uint32_t freq, uint32_t div, uint32_t trace_freq) +static bool check_trace_freq(uint32_t freq, uint32_t divider, uint32_t trace_freq) { double min; double deviation; - min = fabs(1.0 - (freq / ((double)trace_freq * div))); + min = fabs(1.0 - (freq / ((double)trace_freq * divider))); - while (freq / div > 0) { - deviation = fabs(1.0 - (freq / ((double)trace_freq * div))); + while (freq / divider > 0) { + deviation = fabs(1.0 - (freq / ((double)trace_freq * divider))); if (deviation < 0.03) { LOG_DEBUG("Found suitable frequency divider %u with deviation of " - "%.02f %%.", div, deviation); + "%.02f %%.", divider, deviation); return true; } if (deviation < min) min = deviation; - div++; + divider++; } LOG_ERROR("Selected trace frequency is not supported by the device. " @@ -1098,7 +1098,7 @@ static int config_trace(bool enabled, enum tpio_pin_protocol pin_protocol, int ret; uint32_t buffer_size; uint32_t freq; - uint32_t div; + uint32_t divider; if (!jaylink_has_cap(caps, JAYLINK_DEV_CAP_SWO)) { LOG_ERROR("Trace capturing is not supported by the device."); @@ -1137,7 +1137,7 @@ static int config_trace(bool enabled, enum tpio_pin_protocol pin_protocol, return ERROR_FAIL; } - ret = jaylink_swo_get_speeds(devh, JAYLINK_SWO_MODE_UART, &freq, &div); + ret = jaylink_swo_get_speeds(devh, JAYLINK_SWO_MODE_UART, &freq, ÷r); if (ret != JAYLINK_OK) { LOG_ERROR("jaylink_swo_get_speeds() failed: %s.", @@ -1146,9 +1146,9 @@ static int config_trace(bool enabled, enum tpio_pin_protocol pin_protocol, } if (!*trace_freq) - *trace_freq = freq / div; + *trace_freq = freq / divider; - if (!check_trace_freq(freq, div, *trace_freq)) + if (!check_trace_freq(freq, divider, *trace_freq)) return ERROR_FAIL; LOG_DEBUG("Using %u bytes device memory for trace capturing.", buffer_size); |