interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix the build. 

Change-Id: I3a314488136ec47611d660140fb5dd70c00be59c
This commit is contained in:
Tim Newsome 2019-09-27 16:35:03 -07:00
parent 53b87ddfc5
commit 1107dc7e3f
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/jtag/drivers/ftdi.c
View File

@ -85,8 +85,6 @@
/* FTDI access library includes */ /* FTDI access library includes */
#include "mpsse.h" #include "mpsse.h"
#define DEBUG_IO(expr...) DEBUG_JTAG_IO(expr)
#if BUILD_FTDI_OSCAN1 == 1 #if BUILD_FTDI_OSCAN1 == 1
#define DO_CLOCK_DATA clock_data #define DO_CLOCK_DATA clock_data
#define DO_CLOCK_TMS_CS clock_tms_cs #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 zero;
static const uint8_t one = 1; 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++) { for (unsigned i = 0; i < length; i++) {
int bitnum; 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 zero;
static const uint8_t one = 1; 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++) { for (unsigned i = 0; i < length; i++) {
int bitnum; int bitnum;
@ -1276,7 +1274,7 @@ COMMAND_HANDLER(ftdi_handle_oscan1_mode_command)
if (CMD_ARGC == 1) if (CMD_ARGC == 1)
COMMAND_PARSE_ON_OFF(CMD_ARGV[0], oscan1_mode); 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; return ERROR_OK;
} }
#endif #endif

15
src/target/target.c
View File

@ -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); 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) bool target_supports_gdb_connection(struct target *target)
{ {
/* /*
@ -2873,7 +2862,7 @@ COMMAND_HANDLER(handle_reg_command)
if (reg->valid) { if (reg->valid) {
value = buf_to_str(reg->value, value = buf_to_str(reg->value,
reg->size, 16); reg->size, 16);
command_print(CMD_CTX, command_print(CMD,
"(%i) %s (/%" PRIu32 "): 0x%s%s", "(%i) %s (/%" PRIu32 "): 0x%s%s",
count, reg->name, count, reg->name,
reg->size, value, reg->size, value,
@ -2882,7 +2871,7 @@ COMMAND_HANDLER(handle_reg_command)
: ""); : "");
free(value); free(value);
} else { } else {
command_print(CMD_CTX, "(%i) %s (/%" PRIu32 ")", command_print(CMD, "(%i) %s (/%" PRIu32 ")",
count, reg->name, count, reg->name,
reg->size) ; reg->size) ;
} }