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

stlinkv2: Use stlink_usb_get_rw_status() where possible.

This commit is contained in:
Uwe Bonnes 2019-07-20 18:53:45 +02:00
parent 5107a29699
commit d92635b6a3
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -488,7 +488,6 @@ static int send_recv_retry(uint8_t *txbuf, size_t txsize,
timersub(&now, &start, &diff); timersub(&now, &start, &diff);
if ((diff.tv_sec >= 1) || (res != STLINK_ERROR_WAIT)) { if ((diff.tv_sec >= 1) || (res != STLINK_ERROR_WAIT)) {
DEBUG_STLINK("Failed: "); DEBUG_STLINK("Failed: ");
stlink_usb_error_check(rxbuf, true);
return res; return res;
} }
} }
@ -503,22 +502,15 @@ static int read_retry(uint8_t *txbuf, size_t txsize,
struct timeval diff; struct timeval diff;
gettimeofday(&start, NULL); gettimeofday(&start, NULL);
int res; int res;
uint8_t cmd[16] = {
STLINK_DEBUG_COMMAND,
STLINK_DEBUG_APIV2_GETLASTRWSTATUS2
};
uint8_t data[12];
while(1) { while(1) {
send_recv(txbuf, txsize, rxbuf, rxsize); send_recv(txbuf, txsize, rxbuf, rxsize);
send_recv(cmd, 16, data, 12); res = stlink_usb_get_rw_status();
res = stlink_usb_error_check(data, false);
if (res == STLINK_ERROR_OK) if (res == STLINK_ERROR_OK)
return res; return res;
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
timersub(&now, &start, &diff); timersub(&now, &start, &diff);
if ((diff.tv_sec >= 1) || (res != STLINK_ERROR_WAIT)) { if ((diff.tv_sec >= 1) || (res != STLINK_ERROR_WAIT)) {
DEBUG_STLINK("Failed: "); DEBUG_STLINK("Failed: ");
stlink_usb_error_check(data, true);
return res; return res;
} }
} }
@ -533,23 +525,16 @@ static int write_retry(uint8_t *cmdbuf, size_t cmdsize,
struct timeval diff; struct timeval diff;
gettimeofday(&start, NULL); gettimeofday(&start, NULL);
int res; int res;
uint8_t cmd[16] = {
STLINK_DEBUG_COMMAND,
STLINK_DEBUG_APIV2_GETLASTRWSTATUS2
};
uint8_t data[12];
while(1) { while(1) {
send_recv(cmdbuf, cmdsize, NULL, 0); send_recv(cmdbuf, cmdsize, NULL, 0);
send_recv(txbuf, txsize, NULL, 0); send_recv(txbuf, txsize, NULL, 0);
send_recv(cmd, 16, data, 12); res = stlink_usb_get_rw_status();
res = stlink_usb_error_check(data, false);
if (res == STLINK_ERROR_OK) if (res == STLINK_ERROR_OK)
return res; return res;
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
timersub(&now, &start, &diff); timersub(&now, &start, &diff);
if ((diff.tv_sec >= 1) || (res != STLINK_ERROR_WAIT)) { if ((diff.tv_sec >= 1) || (res != STLINK_ERROR_WAIT)) {
DEBUG_STLINK("failed"); DEBUG_STLINK("failed");
stlink_usb_error_check(data, true);
return res; return res;
} }
} }
@ -985,7 +970,8 @@ uint32_t stlink_dp_error(ADIv5_DP_t *dp)
adiv5_dp_write(dp, ADIV5_DP_ABORT, clr); adiv5_dp_write(dp, ADIV5_DP_ABORT, clr);
dp->fault = 0; dp->fault = 0;
if (err)
DEBUG("stlink_dp_error %d\n", err);
return err; return err;
} }