From: Spencer Oliver <spen@spen-soft.co.uk>
Date: Thu, 1 Nov 2012 11:19:29 +0000 (+0000)
Subject: hla: add ability to configure read/write buffer size
X-Git-Tag: v0.7.0-rc1~128
X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=c7a6f065d2a48730e05eb95bb44ca6a7032d2a31

hla: add ability to configure read/write buffer size

Other adapters (TI ICDI) that use this driver can use a larger
read/write buffer size than the original stlink could.

Change-Id: I9beb7748049097cbe29a2340799c450bd74e199d
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/948
Tested-by: jenkins
---

diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c
index 2a78f7956a..bb4df23918 100644
--- a/src/jtag/drivers/stlink_usb.c
+++ b/src/jtag/drivers/stlink_usb.c
@@ -1160,6 +1160,9 @@ static int stlink_usb_open(struct hl_interface_param_s *param, void **fd)
 
 	h->transport = param->transport;
 
+	/* set max read/write buffer size in bytes */
+	param->max_buffer = 512;
+
 	const uint16_t vids[] = { param->vid, 0 };
 	const uint16_t pids[] = { param->pid, 0 };
 
diff --git a/src/jtag/hla/hla_interface.c b/src/jtag/hla/hla_interface.c
index eb9b43dc69..5f493ffe24 100644
--- a/src/jtag/hla/hla_interface.c
+++ b/src/jtag/hla/hla_interface.c
@@ -37,7 +37,7 @@
 
 #include <target/target.h>
 
-static struct hl_interface_s hl_if = { {0, 0, 0, 0, 0, 0}, 0, 0 };
+static struct hl_interface_s hl_if = { {0, 0, 0, 0, 0, 0, 0}, 0, 0 };
 
 int hl_interface_open(enum hl_transports tr)
 {
diff --git a/src/jtag/hla/hla_interface.h b/src/jtag/hla/hla_interface.h
index cbeee5a144..5b63ab855c 100644
--- a/src/jtag/hla/hla_interface.h
+++ b/src/jtag/hla/hla_interface.h
@@ -44,6 +44,8 @@ struct hl_interface_param_s {
 	unsigned api;
 	/** */
 	enum hl_transports transport;
+	/** */
+	int max_buffer;
 };
 
 struct hl_interface_s {
diff --git a/src/jtag/hla/hla_layout.c b/src/jtag/hla/hla_layout.c
index 04b50d7f5b..55657294c2 100644
--- a/src/jtag/hla/hla_layout.c
+++ b/src/jtag/hla/hla_layout.c
@@ -50,6 +50,12 @@ static int hl_layout_open(struct hl_interface_s *adapter)
 		return res;
 	}
 
+	/* make sure adapter has set the buffer size */
+	if (!adapter->param.max_buffer) {
+		LOG_ERROR("buffer size not set");
+		return ERROR_FAIL;
+	}
+
 	return ERROR_OK;
 }
 
diff --git a/src/target/hla_target.c b/src/target/hla_target.c
index 3c3b841757..8d2a4291a6 100644
--- a/src/target/hla_target.c
+++ b/src/target/hla_target.c
@@ -671,11 +671,11 @@ static int adapter_read_memory(struct target *target, uint32_t address,
 		uint32_t size, uint32_t count,
 		uint8_t *buffer)
 {
+	struct hl_interface_s *adapter = target_to_adapter(target);
 	int res;
-	uint32_t buffer_threshold = 128;
+	uint32_t buffer_threshold = (adapter->param.max_buffer / 4);
 	uint32_t addr_increment = 4;
 	uint32_t c;
-	struct hl_interface_s *adapter = target_to_adapter(target);
 
 	if (!count || !buffer)
 		return ERROR_COMMAND_SYNTAX_ERROR;
@@ -687,7 +687,7 @@ static int adapter_read_memory(struct target *target, uint32_t address,
 	 */
 	if (size != 4) {
 		count *= size;
-		buffer_threshold = 64;
+		buffer_threshold = (adapter->param.max_buffer / 4) / 2;
 		addr_increment = 1;
 	}
 
@@ -719,11 +719,11 @@ static int adapter_write_memory(struct target *target, uint32_t address,
 		uint32_t size, uint32_t count,
 		const uint8_t *buffer)
 {
+	struct hl_interface_s *adapter = target_to_adapter(target);
 	int res;
-	uint32_t buffer_threshold = 128;
+	uint32_t buffer_threshold = (adapter->param.max_buffer / 4);
 	uint32_t addr_increment = 4;
 	uint32_t c;
-	struct hl_interface_s *adapter = target_to_adapter(target);
 
 	if (!count || !buffer)
 		return ERROR_COMMAND_SYNTAX_ERROR;
@@ -735,7 +735,7 @@ static int adapter_write_memory(struct target *target, uint32_t address,
 	 */
 	if (size != 4) {
 		count *= size;
-		buffer_threshold = 64;
+		buffer_threshold = (adapter->param.max_buffer / 4) / 2;
 		addr_increment = 1;
 	}