diff options
| author | Tim Newsome <tim@sifive.com> | 2019-09-27 16:35:03 -0700 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2019-09-27 16:35:03 -0700 |
| commit | 1107dc7e3f90f0ea9175269abb47f800e2c5571c (patch) | |
| tree | f75ca65f140d5781a46ea970c15aa1bda6b515ac | |
| parent | 53b87ddfc5ea01d87d7218b2417359e695428927 (diff) | |
| download | riscv-openocd-1107dc7e3f90f0ea9175269abb47f800e2c5571c.zip riscv-openocd-1107dc7e3f90f0ea9175269abb47f800e2c5571c.tar.gz riscv-openocd-1107dc7e3f90f0ea9175269abb47f800e2c5571c.tar.bz2 | |
Fix the build.
Change-Id: I3a314488136ec47611d660140fb5dd70c00be59c
| -rw-r--r-- | src/jtag/drivers/ftdi.c | 8 | ||||
| -rw-r--r-- | src/target/target.c | 15 |
2 files changed, 5 insertions, 18 deletions
diff --git a/src/jtag/drivers/ftdi.c b/src/jtag/drivers/ftdi.c index 48f8d83..ebe6016 100644 --- a/src/jtag/drivers/ftdi.c +++ b/src/jtag/drivers/ftdi.c @@ -85,8 +85,6 @@ /* FTDI access library includes */ #include "mpsse.h" -#define DEBUG_IO(expr...) DEBUG_JTAG_IO(expr) - #if BUILD_FTDI_OSCAN1 == 1 #define DO_CLOCK_DATA clock_data #define DO_CLOCK_TMS_CS clock_tms_cs @@ -801,7 +799,7 @@ static void oscan1_mpsse_clock_data(struct mpsse_ctx *ctx, const uint8_t *out, u static const uint8_t zero; static const uint8_t one = 1; - DEBUG_IO("oscan1_mpsse_clock_data: %sout %d bits", in ? "in" : "", length); + LOG_DEBUG_IO("oscan1_mpsse_clock_data: %sout %d bits", in ? "in" : "", length); for (unsigned i = 0; i < length; i++) { int bitnum; @@ -838,7 +836,7 @@ static void oscan1_mpsse_clock_tms_cs(struct mpsse_ctx *ctx, const uint8_t *out, static const uint8_t zero; static const uint8_t one = 1; - DEBUG_IO("oscan1_mpsse_clock_tms_cs: %sout %d bits, tdi=%d", in ? "in" : "", length, tdi); + LOG_DEBUG_IO("oscan1_mpsse_clock_tms_cs: %sout %d bits, tdi=%d", in ? "in" : "", length, tdi); for (unsigned i = 0; i < length; i++) { int bitnum; @@ -1276,7 +1274,7 @@ COMMAND_HANDLER(ftdi_handle_oscan1_mode_command) if (CMD_ARGC == 1) COMMAND_PARSE_ON_OFF(CMD_ARGV[0], oscan1_mode); - command_print(CMD_CTX, "oscan1 mode: %s.", oscan1_mode ? "on" : "off"); + command_print(CMD, "oscan1 mode: %s.", oscan1_mode ? "on" : "off"); return ERROR_OK; } #endif diff --git a/src/target/target.c b/src/target/target.c index cec46cc..2c4a7a0 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -1235,17 +1235,6 @@ int target_get_gdb_reg_list_noread(struct target *target, return target_get_gdb_reg_list(target, reg_list, reg_list_size, reg_class); } -int target_get_gdb_reg_list_noread(struct target *target, - struct reg **reg_list[], int *reg_list_size, - enum target_register_class reg_class) -{ - if (target->type->get_gdb_reg_list_noread && - target->type->get_gdb_reg_list_noread(target, reg_list, - reg_list_size, reg_class) == ERROR_OK) - return ERROR_OK; - return target_get_gdb_reg_list(target, reg_list, reg_list_size, reg_class); -} - bool target_supports_gdb_connection(struct target *target) { /* @@ -2873,7 +2862,7 @@ COMMAND_HANDLER(handle_reg_command) if (reg->valid) { value = buf_to_str(reg->value, reg->size, 16); - command_print(CMD_CTX, + command_print(CMD, "(%i) %s (/%" PRIu32 "): 0x%s%s", count, reg->name, reg->size, value, @@ -2882,7 +2871,7 @@ COMMAND_HANDLER(handle_reg_command) : ""); free(value); } else { - command_print(CMD_CTX, "(%i) %s (/%" PRIu32 ")", + command_print(CMD, "(%i) %s (/%" PRIu32 ")", count, reg->name, reg->size) ; } |