sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

stlinkv2: Do not loop endless when Read DP fails.

This commit is contained in:
Uwe Bonnes 2019-05-26 22:10:42 +02:00
parent 9ed26645d3
commit 3388e48d92
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/platforms/pc-stlinkv2/stlinkv2.c
View File

@ -311,7 +311,7 @@ static int submit_wait(struct libusb_transfer * trans) {
return 0; return 0;
} }
#define STLINK_ERROR_DP_FAULT -2
static int send_recv(uint8_t *txbuf, size_t txsize, static int send_recv(uint8_t *txbuf, size_t txsize,
uint8_t *rxbuf, size_t rxsize) uint8_t *rxbuf, size_t rxsize)
{ {
@ -421,7 +421,7 @@ static int stlink_usb_error_check(uint8_t *data, bool verbose)
*/ */
if (verbose) if (verbose)
DEBUG("STLINK_SWD_AP_FAULT\n"); DEBUG("STLINK_SWD_AP_FAULT\n");
return STLINK_ERROR_FAIL; return STLINK_ERROR_DP_FAULT;
case STLINK_SWD_AP_ERROR: case STLINK_SWD_AP_ERROR:
if (verbose) if (verbose)
DEBUG("STLINK_SWD_AP_ERROR\n"); DEBUG("STLINK_SWD_AP_ERROR\n");
@ -1015,10 +1015,13 @@ uint32_t stlink_dp_low_access(ADIv5_DP_t *dp, uint8_t RnW,
if (res == STLINK_ERROR_WAIT) if (res == STLINK_ERROR_WAIT)
raise_exception(EXCEPTION_TIMEOUT, "DP ACK timeout"); raise_exception(EXCEPTION_TIMEOUT, "DP ACK timeout");
if(res == STLINK_ERROR_FAIL) { if(res == STLINK_ERROR_DP_FAULT) {
dp->fault = 1; dp->fault = 1;
return 0; return 0;
} }
if(res == STLINK_ERROR_FAIL)
raise_exception(EXCEPTION_ERROR, "SWDP invalid ACK");
return response; return response;
} }