diff options
| author | Øyvind Harboe <oyvind.harboe@zylin.com> | 2010-12-06 09:21:23 +0100 |
|---|---|---|
| committer | Øyvind Harboe <oyvind.harboe@zylin.com> | 2010-12-08 08:43:52 +0100 |
| commit | 740b9e25b410c164e661d0334a9ea4168406726b (patch) | |
| tree | 0c396aab2d3287a0bb38b6d9bf3921d12d273740 /src/jtag/core.c | |
| parent | 5cd931ed1ccc75bdbaab821686ceff04c3cb002b (diff) | |
| download | openocd_libswd-740b9e25b410c164e661d0334a9ea4168406726b.tar.gz openocd_libswd-740b9e25b410c164e661d0334a9ea4168406726b.tar.bz2 openocd_libswd-740b9e25b410c164e661d0334a9ea4168406726b.tar.xz openocd_libswd-740b9e25b410c164e661d0334a9ea4168406726b.zip | |
jtag: getting the JTAG speed can fail
If the JTAG speed has not been set, then it has no defined
value, add code to propagate the error.
No change to actual behavior as no new failure paths have
been introduced. This is a no-op patch to make subsequent patches
smaller.
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Diffstat (limited to 'src/jtag/core.c')
| -rw-r--r-- | src/jtag/core.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/src/jtag/core.c b/src/jtag/core.c index c1b64bba..b8953094 100644 --- a/src/jtag/core.c +++ b/src/jtag/core.c @@ -1384,9 +1384,13 @@ int adapter_init(struct command_context *cmd_ctx) int requested_khz = jtag_get_speed_khz(); int actual_khz = requested_khz; - int retval = jtag_get_speed_readable(&actual_khz); + int jtag_speed_var; + int retval = jtag_get_speed(&jtag_speed_var); + if (retval != ERROR_OK) + return retval; + retval = jtag_get_speed_readable(&actual_khz); if (ERROR_OK != retval) - LOG_INFO("adapter-specific clock speed value %d", jtag_get_speed()); + LOG_INFO("adapter-specific clock speed value %d", jtag_speed_var); else if (actual_khz) { /* Adaptive clocking -- JTAG-specific */ @@ -1632,30 +1636,33 @@ int jtag_config_rclk(unsigned fallback_speed_khz) return (ERROR_OK != retval) ? retval : jtag_set_speed(speed); } -int jtag_get_speed(void) +int jtag_get_speed(int *speed) { - int speed = 0; /* avoid -O3 warning */ switch(clock_mode) { case CLOCK_MODE_SPEED: - speed = jtag_speed; + *speed = jtag_speed; break; case CLOCK_MODE_KHZ: - adapter_khz_to_speed(jtag_get_speed_khz(), &speed); + adapter_khz_to_speed(jtag_get_speed_khz(), speed); break; case CLOCK_MODE_RCLK: - jtag_rclk_to_speed(rclk_fallback_speed_khz, &speed); + jtag_rclk_to_speed(rclk_fallback_speed_khz, speed); break; default: LOG_ERROR("BUG: unknown jtag clock mode"); - break; + return ERROR_FAIL; } - return speed; + return ERROR_OK; } int jtag_get_speed_readable(int *khz) { - return jtag ? jtag->speed_div(jtag_get_speed(), khz) : ERROR_OK; + int jtag_speed_var; + int retval = jtag_get_speed(&jtag_speed_var); + if (retval != ERROR_OK) + return retval; + return jtag ? jtag->speed_div(jtag_speed_var, khz) : ERROR_OK; } void jtag_set_verify(bool enable) |