jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

cmsis_dap: Always write full reportsize + 1 buffers

Browse Source 
Expect short reads and other errors else
This commit is contained in:
Uwe Bonnes 2021-02-13 17:42:00 +01:00
parent d6ade4d94e
commit 61e237ec87
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,7 +67,7 @@ int dap_init(bmp_info_t *info)
*/ */
if ((info->vid == 0x1fc9) && (info->pid == 0x0132)) { if ((info->vid == 0x1fc9) && (info->pid == 0x0132)) {
DEBUG_WARN("Blacklist\n"); DEBUG_WARN("Blacklist\n");
report_size = 64 + 1; report_size = 64;
} }
handle = hid_open(info->vid, info->pid, (serial[0]) ? serial : NULL); handle = hid_open(info->vid, info->pid, (serial[0]) ? serial : NULL);
if (!handle) if (!handle)
@ -100,6 +100,11 @@ int dap_init(bmp_info_t *info)
DEBUG_INFO(", SWO_MANCHESTER"); DEBUG_INFO(", SWO_MANCHESTER");
if (dap_caps & 0x10) if (dap_caps & 0x10)
DEBUG_INFO(", Atomic Cmds"); DEBUG_INFO(", Atomic Cmds");
size = dap_info(DAP_INFO_PACKET_SIZE, hid_buffer, sizeof(hid_buffer));
if (size) {
report_size = hid_buffer[0];
DEBUG_INFO(", Reportsize %d", hid_buffer[0]);
}
DEBUG_INFO("\n"); DEBUG_INFO("\n");
return 0; return 0;
} }
@ -171,16 +176,17 @@ int dbg_dap_cmd(uint8_t *data, int size, int rsize)
char cmd = data[0]; char cmd = data[0];
int res; int res;
memset(hid_buffer, 0xff, report_size + 1); memset(hid_buffer, 0, report_size + 1);
hid_buffer[0] = 0x00; // Report ID??
memcpy(&hid_buffer[1], data, rsize); memcpy(&hid_buffer[1], data, rsize);
DEBUG_WIRE("cmd : "); DEBUG_WIRE("cmd : ");
for(int i = 1; (i < 16) && (i < rsize + 1); i++) for(int i = 0; (i < 16) && (i < rsize + 1); i++)
DEBUG_WIRE("%02x.", hid_buffer[i]); DEBUG_WIRE("%02x.", hid_buffer[i]);
DEBUG_WIRE("\n"); DEBUG_WIRE("\n");
res = hid_write(handle, hid_buffer, rsize + 1); /* Write must be as long as we expect the result, at least
* for Dappermime 20210213 */
res = hid_write(handle, hid_buffer, report_size + 1);
if (res < 0) { if (res < 0) {
DEBUG_WARN( "Error: %ls\n", hid_error(handle)); DEBUG_WARN( "Error: %ls\n", hid_error(handle));
exit(-1); exit(-1);
@ -190,14 +196,14 @@ int dbg_dap_cmd(uint8_t *data, int size, int rsize)
DEBUG_WARN( "debugger read(): %ls\n", hid_error(handle)); DEBUG_WARN( "debugger read(): %ls\n", hid_error(handle));
exit(-1); exit(-1);
} }
DEBUG_WIRE("res %2d: ", res);
for(int i = 0; (i < 16) && (i < res + 1); i++)
DEBUG_WIRE("%02x.", hid_buffer[i]);
DEBUG_WIRE("\n");
if (hid_buffer[0] != cmd) { if (hid_buffer[0] != cmd) {
DEBUG_WARN("cmd %02x invalid response received %02x\n", DEBUG_WARN("cmd %02x invalid response received %02x\n",
cmd, hid_buffer[0]); cmd, hid_buffer[0]);
} }
DEBUG_WIRE("cmd res:");
for(int i = 0; (i < 16) && (i < size + 1); i++)
DEBUG_WIRE("%02x.", hid_buffer[i]);
DEBUG_WIRE("\n");
if (size) if (size)
memcpy(data, &hid_buffer[1], (size < res) ? size : res); memcpy(data, &hid_buffer[1], (size < res) ? size : res);
return res; return res;

15
src/platforms/hosted/dap.c
View File

@ -198,7 +198,7 @@ void dap_connect(bool jtag)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void dap_disconnect(void) void dap_disconnect(void)
{ {
uint8_t buf[1]; uint8_t buf[65];
buf[0] = ID_DAP_DISCONNECT; buf[0] = ID_DAP_DISCONNECT;
dbg_dap_cmd(buf, sizeof(buf), 1); dbg_dap_cmd(buf, sizeof(buf), 1);
@ -213,7 +213,7 @@ uint32_t dap_swj_clock(uint32_t clock)
{ {
if (clock == 0) if (clock == 0)
return swj_clock; return swj_clock;
uint8_t buf[5]; uint8_t buf[65];
buf[0] = ID_DAP_SWJ_CLOCK; buf[0] = ID_DAP_SWJ_CLOCK;
buf[1] = clock & 0xff; buf[1] = clock & 0xff;
buf[2] = (clock >> 8) & 0xff; buf[2] = (clock >> 8) & 0xff;
@ -254,7 +254,7 @@ void dap_swd_configure(uint8_t cfg)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
int dap_info(int info, uint8_t *data, int size) int dap_info(int info, uint8_t *data, int size)
{ {
uint8_t buf[256]; uint8_t buf[32];
int rsize; int rsize;
buf[0] = ID_DAP_INFO; buf[0] = ID_DAP_INFO;
@ -786,7 +786,7 @@ void dap_swdptap_seq_out_parity(uint32_t MS, int ticks)
#define SWD_SEQUENCE_IN 0x80 #define SWD_SEQUENCE_IN 0x80
uint32_t dap_swdptap_seq_in(int ticks) uint32_t dap_swdptap_seq_in(int ticks)
{ {
uint8_t buf[5] = { uint8_t buf[16] = {
ID_DAP_SWD_SEQUENCE, ID_DAP_SWD_SEQUENCE,
1, 1,
ticks + SWD_SEQUENCE_IN ticks + SWD_SEQUENCE_IN
@ -804,10 +804,11 @@ uint32_t dap_swdptap_seq_in(int ticks)
bool dap_swdptap_seq_in_parity(uint32_t *ret, int ticks) bool dap_swdptap_seq_in_parity(uint32_t *ret, int ticks)
{ {
(void)ticks; (void)ticks;
uint8_t buf[8] = { uint8_t buf[16] = {
ID_DAP_SWD_SEQUENCE, ID_DAP_SWD_SEQUENCE,
1, 2,
33 + SWD_SEQUENCE_IN, 32 + SWD_SEQUENCE_IN,
1 + SWD_SEQUENCE_IN,
}; };
dbg_dap_cmd(buf, 7, 4); dbg_dap_cmd(buf, 7, 4);
uint32_t res = 0; uint32_t res = 0;