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

Fix mingw32 build. 

Change-Id: If7a57749ba8c49385a4020ce8d2d8dbb94242122
This commit is contained in:
Tim Newsome 2018-04-20 16:28:24 -07:00
parent 4593659edf
commit 9a69c1c096
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/helper/log.h
View File

@ -149,7 +149,8 @@ extern int debug_level;
*/ */
#define ERROR_FAIL (-4) #define ERROR_FAIL (-4)
#define ERROR_WAIT (-5) #define ERROR_WAIT (-5)
#define ERROR_TIMEOUT (-6) /* ERROR_TIMEOUT is already taken by winerror.h. */
#define ERROR_TIMEOUT_REACHED (-6)
#endif /* OPENOCD_HELPER_LOG_H */ #endif /* OPENOCD_HELPER_LOG_H */

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

@ -521,7 +521,7 @@ static int dmi_op_timeout(struct target *target, uint32_t *data_in, int dmi_op,
return ERROR_FAIL; return ERROR_FAIL;
} }
if (time(NULL) - start > timeout_sec) if (time(NULL) - start > timeout_sec)
return ERROR_TIMEOUT; return ERROR_TIMEOUT_REACHED;
} }
if (status != DMI_STATUS_SUCCESS) { if (status != DMI_STATUS_SUCCESS) {
@ -545,7 +545,7 @@ static int dmi_op_timeout(struct target *target, uint32_t *data_in, int dmi_op,
return ERROR_FAIL; return ERROR_FAIL;
} }
if (time(NULL) - start > timeout_sec) if (time(NULL) - start > timeout_sec)
return ERROR_TIMEOUT; return ERROR_TIMEOUT_REACHED;
} }
if (status != DMI_STATUS_SUCCESS) { if (status != DMI_STATUS_SUCCESS) {
@ -567,7 +567,7 @@ static int dmi_op(struct target *target, uint32_t *data_in, int dmi_op,
{ {
int result = dmi_op_timeout(target, data_in, dmi_op, address, data_out, int result = dmi_op_timeout(target, data_in, dmi_op, address, data_out,
riscv_command_timeout_sec); riscv_command_timeout_sec);
if (result == ERROR_TIMEOUT) { if (result == ERROR_TIMEOUT_REACHED) {
LOG_ERROR("DMI operation didn't complete in %d seconds. The target is " LOG_ERROR("DMI operation didn't complete in %d seconds. The target is "
"either really slow or broken. You could increase the " "either really slow or broken. You could increase the "
"timeout with riscv set_command_timeout_sec.", "timeout with riscv set_command_timeout_sec.",
@ -1619,7 +1619,7 @@ static int deassert_reset(struct target *target)
while (1) { while (1) {
int result = dmstatus_read_timeout(target, &dmstatus, true, int result = dmstatus_read_timeout(target, &dmstatus, true,
riscv_reset_timeout_sec); riscv_reset_timeout_sec);
if (result == ERROR_TIMEOUT) if (result == ERROR_TIMEOUT_REACHED)
LOG_ERROR("Hart %d didn't complete a DMI read coming out of " LOG_ERROR("Hart %d didn't complete a DMI read coming out of "
"reset in %ds; Increase the timeout with riscv " "reset in %ds; Increase the timeout with riscv "
"set_reset_timeout_sec.", "set_reset_timeout_sec.",