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

hosted/cmsis-dap: Various CMSIS-DAP implementation correctness improvements

This commit is contained in:
dragonmux 2022-06-11 19:38:59 -04:00 committed by Piotr Esden-Tempski
parent db4b568e52
commit fafe38ba19
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/platforms/hosted/cmsis_dap.c
View File

@ -45,6 +45,8 @@
uint8_t dap_caps; uint8_t dap_caps;
uint8_t mode; uint8_t mode;
#define TRANSFER_TIMEOUT_MS (100)
typedef enum cmsis_type_s { typedef enum cmsis_type_s {
CMSIS_TYPE_NONE = 0, CMSIS_TYPE_NONE = 0,
CMSIS_TYPE_HID, CMSIS_TYPE_HID,
@ -221,40 +223,46 @@ int dbg_dap_cmd(uint8_t *data, int size, int rsize)
memcpy(&buffer[1], data, rsize); memcpy(&buffer[1], data, rsize);
DEBUG_WIRE("cmd : "); DEBUG_WIRE("cmd : ");
for(int i = 0; (i < 32) && (i < rsize + 1); i++) for(int i = (type == CMSIS_TYPE_HID) ? 0 : 1; (i < rsize + 1); i++)
DEBUG_WIRE("%02x.", buffer[i]); DEBUG_WIRE("%02x.", buffer[i]);
DEBUG_WIRE("\n"); DEBUG_WIRE("\n");
if (type == CMSIS_TYPE_HID) { if (type == CMSIS_TYPE_HID) {
res = hid_write(handle, buffer, 65); res = hid_write(handle, buffer, 65);
if (res < 0) { if (res < 0) {
DEBUG_WARN( "Error: %ls\n", hid_error(handle)); DEBUG_WARN("Error: %ls\n", hid_error(handle));
exit(-1);
}
res = hid_read_timeout(handle, buffer, 65, 1000);
if (res < 0) {
DEBUG_WARN( "debugger read(): %ls\n", hid_error(handle));
exit(-1);
} else if (res == 0) {
DEBUG_WARN( "timeout\n");
exit(-1); exit(-1);
} }
do {
res = hid_read_timeout(handle, buffer, 65, 1000);
if (res < 0) {
DEBUG_WARN("debugger read(): %ls\n", hid_error(handle));
exit(-1);
} else if (res == 0) {
DEBUG_WARN("timeout\n");
exit(-1);
}
} while (buffer[0] != cmd);
} else if (type == CMSIS_TYPE_BULK) { } else if (type == CMSIS_TYPE_BULK) {
int transferred = 0; int transferred = 0;
res = libusb_bulk_transfer(usb_handle, out_ep, data, rsize, &transferred, 500); res = libusb_bulk_transfer(usb_handle, out_ep, data, rsize, &transferred, TRANSFER_TIMEOUT_MS);
if (res < 0) { if (res < 0) {
DEBUG_WARN("OUT error: %d\n", res); DEBUG_WARN("OUT error: %d\n", res);
return res; return res;
} }
res = libusb_bulk_transfer(usb_handle, in_ep, buffer, report_size, &transferred, 500);
if (res < 0) { /* We repeat the read in case we're out of step with the transmitter */
DEBUG_WARN("IN error: %d\n", res); do {
return res; res = libusb_bulk_transfer(usb_handle, in_ep, buffer, report_size, &transferred, TRANSFER_TIMEOUT_MS);
} if (res < 0) {
DEBUG_WARN("IN error: %d\n", res);
return res;
}
} while (buffer[0] != cmd);
res = transferred; res = transferred;
} }
DEBUG_WIRE("cmd res:"); DEBUG_WIRE("cmd res:");
for(int i = 0; (i < 16) && (i < size + 1); i++) for (int i = 0; i < res; i++)
DEBUG_WIRE("%02x.", buffer[i]); DEBUG_WIRE("%02x.", buffer[i]);
DEBUG_WIRE("\n"); DEBUG_WIRE("\n");
if (buffer[0] != cmd) { if (buffer[0] != cmd) {