X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Fti_icdi_usb.c;h=c9b8435f2c9297e404be405a5f913d95676d3def;hp=c0c0718796ea5f513a165df75cbf912397d25907;hb=ff94e02b7cfe5df892824e60140dcdd07ed2b01c;hpb=08d4411b59dd8bd0e7d8009003b71d23acbf6eee

diff --git a/src/jtag/drivers/ti_icdi_usb.c b/src/jtag/drivers/ti_icdi_usb.c
index c0c0718796..c9b8435f2c 100644
--- a/src/jtag/drivers/ti_icdi_usb.c
+++ b/src/jtag/drivers/ti_icdi_usb.c
@@ -33,7 +33,7 @@
 
 #include <target/cortex_m.h>
 
-#include <libusb-1.0/libusb.h>
+#include <libusb.h>
 
 #define ICDI_WRITE_ENDPOINT 0x02
 #define ICDI_READ_ENDPOINT 0x83
@@ -53,10 +53,13 @@ struct icdi_usb_handle_s {
 	char *write_buffer;
 	int max_packet;
 	int read_count;
+	uint32_t max_rw_packet; /* max X packet (read/write memory) transfers */
 };
 
-static int icdi_usb_read_mem32(void *handle, uint32_t addr, uint16_t len, uint8_t *buffer);
-static int icdi_usb_write_mem32(void *handle, uint32_t addr, uint16_t len, const uint8_t *buffer);
+static int icdi_usb_read_mem(void *handle, uint32_t addr, uint32_t size,
+		uint32_t count, uint8_t *buffer);
+static int icdi_usb_write_mem(void *handle, uint32_t addr, uint32_t size,
+		uint32_t count, const uint8_t *buffer);
 
 static int remote_escape_output(const char *buffer, int len, char *out_buf, int *out_len, int out_maxlen)
 {
@@ -281,12 +284,13 @@ static int icdi_get_cmd_result(void *handle)
 
 static int icdi_usb_idcode(void *handle, uint32_t *idcode)
 {
+	*idcode = 0;
 	return ERROR_OK;
 }
 
 static int icdi_usb_write_debug_reg(void *handle, uint32_t addr, uint32_t val)
 {
-	return icdi_usb_write_mem32(handle, addr, 1, (uint8_t *)&val);
+	return icdi_usb_write_mem(handle, addr, 4, 1, (uint8_t *)&val);
 }
 
 static enum target_state icdi_usb_state(void *handle)
@@ -297,7 +301,7 @@ static enum target_state icdi_usb_state(void *handle)
 
 	h = (struct icdi_usb_handle_s *)handle;
 
-	result = icdi_usb_read_mem32(h, DCB_DHCSR, 1, (uint8_t *)&dhcsr);
+	result = icdi_usb_read_mem(h, DCB_DHCSR, 4, 1, (uint8_t *)&dhcsr);
 	if (result != ERROR_OK)
 		return TARGET_UNKNOWN;
 
@@ -524,7 +528,7 @@ static int icdi_usb_write_reg(void *handle, int num, uint32_t val)
 	return result;
 }
 
-static int icdi_usb_read_mem(void *handle, uint32_t addr, uint32_t len, uint8_t *buffer)
+static int icdi_usb_read_mem_int(void *handle, uint32_t addr, uint32_t len, uint8_t *buffer)
 {
 	int result;
 	struct icdi_usb_handle_s *h;
@@ -554,7 +558,7 @@ static int icdi_usb_read_mem(void *handle, uint32_t addr, uint32_t len, uint8_t
 	return ERROR_OK;
 }
 
-static int icdi_usb_write_mem(void *handle, uint32_t addr, uint32_t len, const uint8_t *buffer)
+static int icdi_usb_write_mem_int(void *handle, uint32_t addr, uint32_t len, const uint8_t *buffer)
 {
 	int result;
 	struct icdi_usb_handle_s *h;
@@ -587,24 +591,60 @@ static int icdi_usb_write_mem(void *handle, uint32_t addr, uint32_t len, const u
 	return ERROR_OK;
 }
 
-static int icdi_usb_read_mem8(void *handle, uint32_t addr, uint16_t len, uint8_t *buffer)
+static int icdi_usb_read_mem(void *handle, uint32_t addr, uint32_t size,
+		uint32_t count, uint8_t *buffer)
 {
-	return icdi_usb_read_mem(handle, addr, len, buffer);
-}
+	int retval = ERROR_OK;
+	struct icdi_usb_handle_s *h = (struct icdi_usb_handle_s *)handle;
+	uint32_t bytes_remaining;
 
-static int icdi_usb_write_mem8(void *handle, uint32_t addr, uint16_t len, const uint8_t *buffer)
-{
-	return icdi_usb_write_mem(handle, addr, len, buffer);
-}
+	/* calculate byte count */
+	count *= size;
 
-static int icdi_usb_read_mem32(void *handle, uint32_t addr, uint16_t len, uint8_t *buffer)
-{
-	return icdi_usb_read_mem(handle, addr, len * 4, buffer);
+	while (count) {
+
+		bytes_remaining = h->max_rw_packet;
+		if (count < bytes_remaining)
+			bytes_remaining = count;
+
+		retval = icdi_usb_read_mem_int(handle, addr, bytes_remaining, buffer);
+		if (retval != ERROR_OK)
+			return retval;
+
+		buffer += bytes_remaining;
+		addr += bytes_remaining;
+		count -= bytes_remaining;
+	}
+
+	return retval;
 }
 
-static int icdi_usb_write_mem32(void *handle, uint32_t addr, uint16_t len, const uint8_t *buffer)
+static int icdi_usb_write_mem(void *handle, uint32_t addr, uint32_t size,
+		uint32_t count, const uint8_t *buffer)
 {
-	return icdi_usb_write_mem(handle, addr, len * 4, buffer);
+	int retval = ERROR_OK;
+	struct icdi_usb_handle_s *h = (struct icdi_usb_handle_s *)handle;
+	uint32_t bytes_remaining;
+
+	/* calculate byte count */
+	count *= size;
+
+	while (count) {
+
+		bytes_remaining = h->max_rw_packet;
+		if (count < bytes_remaining)
+			bytes_remaining = count;
+
+		retval = icdi_usb_write_mem_int(handle, addr, bytes_remaining, buffer);
+		if (retval != ERROR_OK)
+			return retval;
+
+		buffer += bytes_remaining;
+		addr += bytes_remaining;
+		count -= bytes_remaining;
+	}
+
+	return retval;
 }
 
 static int icdi_usb_close(void *handle)
@@ -709,7 +749,7 @@ static int icdi_usb_open(struct hl_interface_param_s *param, void **fd)
 	 * as we are using gdb binary packets to transfer memory we have to
 	 * reserve half the buffer for any possible escape chars plus
 	 * at least 64 bytes for the gdb packet header */
-	param->max_buffer = (((h->max_packet - 64) / 4) * 4) / 2;
+	h->max_rw_packet = (((h->max_packet - 64) / 4) * 4) / 2;
 
 	return ERROR_OK;
 
@@ -732,9 +772,7 @@ struct hl_layout_api_s icdi_usb_layout_api = {
 	.read_regs = icdi_usb_read_regs,
 	.read_reg = icdi_usb_read_reg,
 	.write_reg = icdi_usb_write_reg,
-	.read_mem8 = icdi_usb_read_mem8,
-	.write_mem8 = icdi_usb_write_mem8,
-	.read_mem32 = icdi_usb_read_mem32,
-	.write_mem32 = icdi_usb_write_mem32,
+	.read_mem = icdi_usb_read_mem,
+	.write_mem = icdi_usb_write_mem,
 	.write_debug_reg = icdi_usb_write_debug_reg
 };