zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jlink: Use error description in log messages 

Use a human-readable error description rather than just the error name
in log messages.

Change-Id: Iab4ff7a7e4d9993983a07eab9f462820d4ee8190
Signed-off-by: Marc Schink <openocd-dev@marcschink.de>
Reviewed-on: http://openocd.zylin.com/4212
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
fence_i_fix_for_release
Marc Schink 2017-09-02 09:50:44 +02:00 committed by Spencer Oliver
parent 7d8d2654e6
commit f981730fe7
1 changed files with 35 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/jtag/drivers/jlink.c
View File

@ -322,7 +322,7 @@ static int jlink_speed(int speed)
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
LOG_ERROR("jaylink_get_speeds() failed: %s.", LOG_ERROR("jaylink_get_speeds() failed: %s.",
jaylink_strerror_name(ret)); jaylink_strerror(ret));
return ERROR_JTAG_DEVICE_ERROR; return ERROR_JTAG_DEVICE_ERROR;
} }
@ -349,7 +349,7 @@ static int jlink_speed(int speed)
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
LOG_ERROR("jaylink_set_speed() failed: %s.", LOG_ERROR("jaylink_set_speed() failed: %s.",
jaylink_strerror_name(ret)); jaylink_strerror(ret));
return ERROR_JTAG_DEVICE_ERROR; return ERROR_JTAG_DEVICE_ERROR;
} }
@ -378,7 +378,7 @@ static bool read_device_config(struct device_config *cfg)
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
LOG_ERROR("jaylink_read_raw_config() failed: %s.", LOG_ERROR("jaylink_read_raw_config() failed: %s.",
jaylink_strerror_name(ret)); jaylink_strerror(ret));
return false; return false;
} }
@ -409,7 +409,7 @@ static int select_interface(void)
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
LOG_ERROR("jaylink_get_available_interfaces() failed: %s.", LOG_ERROR("jaylink_get_available_interfaces() failed: %s.",
jaylink_strerror_name(ret)); jaylink_strerror(ret));
return ERROR_JTAG_INIT_FAILED; return ERROR_JTAG_INIT_FAILED;
} }
@ -422,7 +422,7 @@ static int select_interface(void)
if (ret < 0) { if (ret < 0) {
LOG_ERROR("jaylink_select_interface() failed: %s.", LOG_ERROR("jaylink_select_interface() failed: %s.",
jaylink_strerror_name(ret)); jaylink_strerror(ret));
return ERROR_JTAG_INIT_FAILED; return ERROR_JTAG_INIT_FAILED;
} }
@ -442,8 +442,7 @@ static int jlink_register(void)
ret = jaylink_register(devh, &conn, connlist, &count); ret = jaylink_register(devh, &conn, connlist, &count);
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
LOG_ERROR("jaylink_register() failed: %s.", LOG_ERROR("jaylink_register() failed: %s.", jaylink_strerror(ret));
jaylink_strerror_name(ret));
return ERROR_FAIL; return ERROR_FAIL;
} }
@ -482,7 +481,7 @@ static bool adjust_swd_buffer_size(void)
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
LOG_ERROR("jaylink_get_free_memory() failed: %s.", LOG_ERROR("jaylink_get_free_memory() failed: %s.",
jaylink_strerror_name(ret)); jaylink_strerror(ret));
return false; return false;
} }
@ -559,8 +558,7 @@ static int jlink_init(void)
ret = jaylink_init(&jayctx); ret = jaylink_init(&jayctx);
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
LOG_ERROR("jaylink_init() failed: %s.", LOG_ERROR("jaylink_init() failed: %s.", jaylink_strerror(ret));
jaylink_strerror_name(ret));
return ERROR_JTAG_INIT_FAILED; return ERROR_JTAG_INIT_FAILED;
} }
@ -568,7 +566,7 @@ static int jlink_init(void)
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
LOG_ERROR("jaylink_log_set_callback() failed: %s.", LOG_ERROR("jaylink_log_set_callback() failed: %s.",
jaylink_strerror_name(ret)); jaylink_strerror(ret));
jaylink_exit(jayctx); jaylink_exit(jayctx);
return ERROR_JTAG_INIT_FAILED; return ERROR_JTAG_INIT_FAILED;
} }
@ -577,7 +575,7 @@ static int jlink_init(void)
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
LOG_ERROR("jaylink_discovery_scan() failed: %s.", LOG_ERROR("jaylink_discovery_scan() failed: %s.",
jaylink_strerror_name(ret)); jaylink_strerror(ret));
jaylink_exit(jayctx); jaylink_exit(jayctx);
return ERROR_JTAG_INIT_FAILED; return ERROR_JTAG_INIT_FAILED;
} }
@ -585,8 +583,7 @@ static int jlink_init(void)
ret = jaylink_get_devices(jayctx, &devs, NULL); ret = jaylink_get_devices(jayctx, &devs, NULL);
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
LOG_ERROR("jaylink_get_devices() failed: %s.", LOG_ERROR("jaylink_get_devices() failed: %s.", jaylink_strerror(ret));
jaylink_strerror_name(ret));
jaylink_exit(jayctx); jaylink_exit(jayctx);
return ERROR_JTAG_INIT_FAILED; return ERROR_JTAG_INIT_FAILED;
} }
@ -604,7 +601,7 @@ static int jlink_init(void)
continue; continue;
} else if (ret != JAYLINK_OK) { } else if (ret != JAYLINK_OK) {
LOG_WARNING("jaylink_device_get_serial_number() failed: %s.", LOG_WARNING("jaylink_device_get_serial_number() failed: %s.",
jaylink_strerror_name(ret)); jaylink_strerror(ret));
continue; continue;
} }
@ -619,7 +616,7 @@ static int jlink_init(void)
continue; continue;
} else if (ret != JAYLINK_OK) { } else if (ret != JAYLINK_OK) {
LOG_WARNING("jaylink_device_get_usb_address() failed: %s.", LOG_WARNING("jaylink_device_get_usb_address() failed: %s.",
jaylink_strerror_name(ret)); jaylink_strerror(ret));
continue; continue;
} }
@ -634,7 +631,7 @@ static int jlink_init(void)
break; break;
} }
LOG_ERROR("Failed to open device: %s.", jaylink_strerror_name(ret)); LOG_ERROR("Failed to open device: %s.", jaylink_strerror(ret));
} }
jaylink_free_devices(devs, true); jaylink_free_devices(devs, true);
@ -654,7 +651,7 @@ static int jlink_init(void)
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
LOG_ERROR("jaylink_get_firmware_version() failed: %s.", LOG_ERROR("jaylink_get_firmware_version() failed: %s.",
jaylink_strerror_name(ret)); jaylink_strerror(ret));
jaylink_close(devh); jaylink_close(devh);
jaylink_exit(jayctx); jaylink_exit(jayctx);
return ERROR_JTAG_INIT_FAILED; return ERROR_JTAG_INIT_FAILED;
@ -669,7 +666,7 @@ static int jlink_init(void)
ret = jaylink_get_caps(devh, caps); ret = jaylink_get_caps(devh, caps);
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
LOG_ERROR("jaylink_get_caps() failed: %s.", jaylink_strerror_name(ret)); LOG_ERROR("jaylink_get_caps() failed: %s.", jaylink_strerror(ret));
jaylink_close(devh); jaylink_close(devh);
jaylink_exit(jayctx); jaylink_exit(jayctx);
return ERROR_JTAG_INIT_FAILED; return ERROR_JTAG_INIT_FAILED;
@ -680,7 +677,7 @@ static int jlink_init(void)
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
LOG_ERROR("jaylink_get_extended_caps() failed: %s.", LOG_ERROR("jaylink_get_extended_caps() failed: %s.",
jaylink_strerror_name(ret)); jaylink_strerror(ret));
jaylink_close(devh); jaylink_close(devh);
jaylink_exit(jayctx); jaylink_exit(jayctx);
return ERROR_JTAG_INIT_FAILED; return ERROR_JTAG_INIT_FAILED;
@ -694,7 +691,7 @@ static int jlink_init(void)
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
LOG_ERROR("Failed to retrieve hardware version: %s.", LOG_ERROR("Failed to retrieve hardware version: %s.",
jaylink_strerror_name(ret)); jaylink_strerror(ret));
jaylink_close(devh); jaylink_close(devh);
jaylink_exit(jayctx); jaylink_exit(jayctx);
return ERROR_JTAG_INIT_FAILED; return ERROR_JTAG_INIT_FAILED;
@ -735,7 +732,7 @@ static int jlink_init(void)
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
LOG_ERROR("jaylink_get_hardware_status() failed: %s.", LOG_ERROR("jaylink_get_hardware_status() failed: %s.",
jaylink_strerror_name(ret)); jaylink_strerror(ret));
jaylink_close(devh); jaylink_close(devh);
jaylink_exit(jayctx); jaylink_exit(jayctx);
return ERROR_JTAG_INIT_FAILED; return ERROR_JTAG_INIT_FAILED;
@ -796,8 +793,7 @@ static int jlink_quit(void)
ret = jaylink_swo_stop(devh); ret = jaylink_swo_stop(devh);
if (ret != JAYLINK_OK) if (ret != JAYLINK_OK)
LOG_ERROR("jaylink_swo_stop() failed: %s.", LOG_ERROR("jaylink_swo_stop() failed: %s.", jaylink_strerror(ret));
jaylink_strerror_name(ret));
} }
if (jaylink_has_cap(caps, JAYLINK_DEV_CAP_REGISTER)) { if (jaylink_has_cap(caps, JAYLINK_DEV_CAP_REGISTER)) {
@ -805,7 +801,7 @@ static int jlink_quit(void)
if (ret != JAYLINK_OK) if (ret != JAYLINK_OK)
LOG_ERROR("jaylink_unregister() failed: %s.", LOG_ERROR("jaylink_unregister() failed: %s.",
jaylink_strerror_name(ret)); jaylink_strerror(ret));
} }
jaylink_close(devh); jaylink_close(devh);
@ -954,7 +950,7 @@ COMMAND_HANDLER(jlink_serial_command)
return ERROR_FAIL; return ERROR_FAIL;
} else if (ret != JAYLINK_OK) { } else if (ret != JAYLINK_OK) {
command_print(CMD_CTX, "jaylink_parse_serial_number() failed: %s.", command_print(CMD_CTX, "jaylink_parse_serial_number() failed: %s.",
jaylink_strerror_name(ret)); jaylink_strerror(ret));
return ERROR_FAIL; return ERROR_FAIL;
} }
@ -973,7 +969,7 @@ COMMAND_HANDLER(jlink_handle_hwstatus_command)
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
command_print(CMD_CTX, "jaylink_get_hardware_status() failed: %s.", command_print(CMD_CTX, "jaylink_get_hardware_status() failed: %s.",
jaylink_strerror_name(ret)); jaylink_strerror(ret));
return ERROR_FAIL; return ERROR_FAIL;
} }
@ -1005,7 +1001,7 @@ COMMAND_HANDLER(jlink_handle_free_memory_command)
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
command_print(CMD_CTX, "jaylink_get_free_memory() failed: %s.", command_print(CMD_CTX, "jaylink_get_free_memory() failed: %s.",
jaylink_strerror_name(ret)); jaylink_strerror(ret));
return ERROR_FAIL; return ERROR_FAIL;
} }
@ -1087,7 +1083,7 @@ COMMAND_HANDLER(jlink_handle_target_power_command)
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
command_print(CMD_CTX, "jaylink_set_target_power() failed: %s.", command_print(CMD_CTX, "jaylink_set_target_power() failed: %s.",
jaylink_strerror_name(ret)); jaylink_strerror(ret));
return ERROR_FAIL; return ERROR_FAIL;
} }
@ -1193,7 +1189,7 @@ static int poll_trace(uint8_t *buf, size_t *size)
ret = jaylink_swo_read(devh, buf, &length); ret = jaylink_swo_read(devh, buf, &length);
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
LOG_ERROR("jaylink_swo_read() failed: %s.", jaylink_strerror_name(ret)); LOG_ERROR("jaylink_swo_read() failed: %s.", jaylink_strerror(ret));
return ERROR_FAIL; return ERROR_FAIL;
} }
@ -1214,7 +1210,7 @@ static uint32_t calculate_trace_buffer_size(void)
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
LOG_ERROR("jaylink_get_free_memory() failed: %s.", LOG_ERROR("jaylink_get_free_memory() failed: %s.",
jaylink_strerror_name(ret)); jaylink_strerror(ret));
return ERROR_FAIL; return ERROR_FAIL;
} }
@ -1278,7 +1274,7 @@ static int config_trace(bool enabled, enum tpio_pin_protocol pin_protocol,
ret = jaylink_swo_stop(devh); ret = jaylink_swo_stop(devh);
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
LOG_ERROR("jaylink_swo_stop() failed: %s.", jaylink_strerror_name(ret)); LOG_ERROR("jaylink_swo_stop() failed: %s.", jaylink_strerror(ret));
return ERROR_FAIL; return ERROR_FAIL;
} }
@ -1304,7 +1300,7 @@ static int config_trace(bool enabled, enum tpio_pin_protocol pin_protocol,
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
LOG_ERROR("jaylink_swo_get_speeds() failed: %s.", LOG_ERROR("jaylink_swo_get_speeds() failed: %s.",
jaylink_strerror_name(ret)); jaylink_strerror(ret));
return ERROR_FAIL; return ERROR_FAIL;
} }
@ -1320,8 +1316,7 @@ static int config_trace(bool enabled, enum tpio_pin_protocol pin_protocol,
buffer_size); buffer_size);
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
LOG_ERROR("jaylink_start_swo() failed: %s.", LOG_ERROR("jaylink_start_swo() failed: %s.", jaylink_strerror(ret));
jaylink_strerror_name(ret));
return ERROR_FAIL; return ERROR_FAIL;
} }
@ -1580,7 +1575,7 @@ COMMAND_HANDLER(jlink_handle_config_write_command)
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
LOG_ERROR("jaylink_write_raw_config() failed: %s.", LOG_ERROR("jaylink_write_raw_config() failed: %s.",
jaylink_strerror_name(ret)); jaylink_strerror(ret));
return ERROR_FAIL; return ERROR_FAIL;
} }
@ -1665,8 +1660,7 @@ COMMAND_HANDLER(jlink_handle_emucom_write_command)
LOG_ERROR("Channel not supported by the device."); LOG_ERROR("Channel not supported by the device.");
return ERROR_FAIL; return ERROR_FAIL;
} else if (ret != JAYLINK_OK) { } else if (ret != JAYLINK_OK) {
LOG_ERROR("Failed to write to channel: %s.", LOG_ERROR("Failed to write to channel: %s.", jaylink_strerror(ret));
jaylink_strerror_name(ret));
return ERROR_FAIL; return ERROR_FAIL;
} }
@ -1714,8 +1708,7 @@ COMMAND_HANDLER(jlink_handle_emucom_read_command)
free(buf); free(buf);
return ERROR_FAIL; return ERROR_FAIL;
} else if (ret != JAYLINK_OK) { } else if (ret != JAYLINK_OK) {
LOG_ERROR("Failed to read from channel: %s.", LOG_ERROR("Failed to read from channel: %s.", jaylink_strerror(ret));
jaylink_strerror_name(ret));
free(buf); free(buf);
return ERROR_FAIL; return ERROR_FAIL;
} }
@ -1982,7 +1975,7 @@ static int jlink_flush(void)
tap_length, jtag_command_version); tap_length, jtag_command_version);
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
LOG_ERROR("jaylink_jtag_io() failed: %s.", jaylink_strerror_name(ret)); LOG_ERROR("jaylink_jtag_io() failed: %s.", jaylink_strerror(ret));
jlink_tap_init(); jlink_tap_init();
return ERROR_JTAG_QUEUE_FAILED; return ERROR_JTAG_QUEUE_FAILED;
} }
@ -2088,7 +2081,7 @@ static int jlink_swd_run_queue(void)
ret = jaylink_swd_io(devh, tms_buffer, tdi_buffer, tdo_buffer, tap_length); ret = jaylink_swd_io(devh, tms_buffer, tdi_buffer, tdo_buffer, tap_length);
if (ret != JAYLINK_OK) { if (ret != JAYLINK_OK) {
LOG_ERROR("jaylink_swd_io() failed: %s.", jaylink_strerror_name(ret)); LOG_ERROR("jaylink_swd_io() failed: %s.", jaylink_strerror(ret));
goto skip; goto skip;
} }