interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Try to fix some clang warnings.

This commit is contained in:
Tim Newsome 2017-09-18 14:03:33 -07:00
parent bf737b8985
commit 604dfa0dcc
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/target/riscv/debug_defines.h
View File

@ -926,7 +926,7 @@
*/ */
#define DMI_COMMAND_CMDTYPE_OFFSET 24 #define DMI_COMMAND_CMDTYPE_OFFSET 24
#define DMI_COMMAND_CMDTYPE_LENGTH 8 #define DMI_COMMAND_CMDTYPE_LENGTH 8
#define DMI_COMMAND_CMDTYPE (0xff << DMI_COMMAND_CMDTYPE_OFFSET) #define DMI_COMMAND_CMDTYPE (0xffu << DMI_COMMAND_CMDTYPE_OFFSET)
/* /*
* This field is interpreted in a command-specific manner, * This field is interpreted in a command-specific manner,
* described for each abstract command. * described for each abstract command.

7
src/target/riscv/riscv-013.c
View File

@ -421,7 +421,6 @@ static uint64_t dmi_read(struct target *target, uint16_t address)
{ {
select_dmi(target); select_dmi(target);
uint64_t value;
dmi_status_t status; dmi_status_t status;
uint16_t address_in; uint16_t address_in;
@ -429,7 +428,7 @@ static uint64_t dmi_read(struct target *target, uint16_t address)
// This first loop ensures that the read request was actually sent // This first loop ensures that the read request was actually sent
// to the target. Note that if for some reason this stays busy, // to the target. Note that if for some reason this stays busy,
// it is actually due to the Previous dmi_read or dmi_write. // it is actually due to the previous dmi_read or dmi_write.
for (i = 0; i < 256; i++) { for (i = 0; i < 256; i++) {
status = dmi_scan(target, NULL, NULL, DMI_OP_READ, address, 0, status = dmi_scan(target, NULL, NULL, DMI_OP_READ, address, 0,
false); false);
@ -444,14 +443,14 @@ static uint64_t dmi_read(struct target *target, uint16_t address)
} }
if (status != DMI_STATUS_SUCCESS) { if (status != DMI_STATUS_SUCCESS) {
LOG_ERROR("Failed read from 0x%x; value=0x%" PRIx64 ", status=%d", LOG_ERROR("Failed read from 0x%x; status=%d", address, status);
address, value, status);
abort(); abort();
} }
// This second loop ensures that we got the read // This second loop ensures that we got the read
// data back. Note that NOP can result in a 'busy' result as well, but // data back. Note that NOP can result in a 'busy' result as well, but
// that would be noticed on the next DMI access we do. // that would be noticed on the next DMI access we do.
uint64_t value;
for (i = 0; i < 256; i++) { for (i = 0; i < 256; i++) {
status = dmi_scan(target, &address_in, &value, DMI_OP_NOP, address, 0, status = dmi_scan(target, &address_in, &value, DMI_OP_NOP, address, 0,
false); false);