#include "cmsis_dap.h"
-#define PACKET_SIZE (64 + 1) /* 64 bytes plus report id */
-
struct cmsis_dap_backend_data {
hid_device *dev_handle;
};
+static void cmsis_dap_hid_close(struct cmsis_dap *dap);
+static int cmsis_dap_hid_alloc(struct cmsis_dap *dap, unsigned int pkt_sz);
+
static int cmsis_dap_hid_open(struct cmsis_dap *dap, uint16_t vids[], uint16_t pids[], char *serial)
{
hid_device *dev = NULL;
* without this info we cannot communicate with the adapter.
* For the moment we have to hard code the packet size */
- dap->packet_size = PACKET_SIZE;
+ unsigned int packet_size = 64;
/* atmel cmsis-dap uses 512 byte reports */
/* except when it doesn't e.g. with mEDBG on SAMD10 Xplained
/* TODO: HID report descriptor should be parsed instead of
* hardcoding a match by VID */
if (target_vid == 0x03eb && target_pid != 0x2145 && target_pid != 0x2175)
- dap->packet_size = 512 + 1;
+ packet_size = 512;
dap->bdata->dev_handle = dev;
+ int retval = cmsis_dap_hid_alloc(dap, packet_size);
+ if (retval != ERROR_OK) {
+ cmsis_dap_hid_close(dap);
+ return ERROR_FAIL;
+ }
+
return ERROR_OK;
}
hid_exit();
free(dap->bdata);
dap->bdata = NULL;
+ free(dap->packet_buffer);
+ dap->packet_buffer = NULL;
}
static int cmsis_dap_hid_read(struct cmsis_dap *dap, int timeout_ms)
{
- int retval = hid_read_timeout(dap->bdata->dev_handle, dap->packet_buffer, dap->packet_size, timeout_ms);
+ int retval = hid_read_timeout(dap->bdata->dev_handle, dap->packet_buffer, dap->packet_buffer_size, timeout_ms);
if (retval == 0) {
return ERROR_TIMEOUT_REACHED;
(void) timeout_ms;
/* Pad the rest of the TX buffer with 0's */
- memset(dap->packet_buffer + txlen, 0, dap->packet_size - txlen);
+ memset(dap->packet_buffer + txlen, 0, dap->packet_buffer_size - txlen);
/* write data to device */
- int retval = hid_write(dap->bdata->dev_handle, dap->packet_buffer, dap->packet_size);
+ int retval = hid_write(dap->bdata->dev_handle, dap->packet_buffer, dap->packet_buffer_size);
if (retval == -1) {
LOG_ERROR("error writing data: %ls", hid_error(dap->bdata->dev_handle));
return ERROR_FAIL;
return retval;
}
+static int cmsis_dap_hid_alloc(struct cmsis_dap *dap, unsigned int pkt_sz)
+{
+ unsigned int packet_buffer_size = pkt_sz + REPORT_ID_SIZE;
+ uint8_t *buf = malloc(packet_buffer_size);
+ if (buf == NULL) {
+ LOG_ERROR("unable to allocate CMSIS-DAP packet buffer");
+ return ERROR_FAIL;
+ }
+
+ dap->packet_buffer = buf;
+ dap->packet_size = pkt_sz;
+ dap->packet_buffer_size = packet_buffer_size;
+
+ return ERROR_OK;
+}
+
const struct cmsis_dap_backend cmsis_dap_hid_backend = {
.name = "hid",
.open = cmsis_dap_hid_open,
.close = cmsis_dap_hid_close,
.read = cmsis_dap_hid_read,
.write = cmsis_dap_hid_write,
+ .packet_buffer_alloc = cmsis_dap_hid_alloc,
};