zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
__archive__
Spencer Oliver 2012-11-01 11:19:29 +00:00
parent 561984c8f6
commit c7a6f065d2
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/jtag/drivers/stlink_usb.c
View File

@ -1160,6 +1160,9 @@ static int stlink_usb_open(struct hl_interface_param_s *param, void **fd)
h->transport = param->transport; 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 vids[] = { param->vid, 0 };
const uint16_t pids[] = { param->pid, 0 }; const uint16_t pids[] = { param->pid, 0 };

2
src/jtag/hla/hla_interface.c
View File

@ -37,7 +37,7 @@
#include <target/target.h> #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) int hl_interface_open(enum hl_transports tr)
{ {

2
src/jtag/hla/hla_interface.h
View File

@ -44,6 +44,8 @@ struct hl_interface_param_s {
unsigned api; unsigned api;
/** */ /** */
enum hl_transports transport; enum hl_transports transport;
/** */
int max_buffer;
}; };
struct hl_interface_s { struct hl_interface_s {

6
src/jtag/hla/hla_layout.c
View File

@ -50,6 +50,12 @@ static int hl_layout_open(struct hl_interface_s *adapter)
return res; 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; return ERROR_OK;
} }

12
src/target/hla_target.c
View File

@ -671,11 +671,11 @@ static int adapter_read_memory(struct target *target, uint32_t address,
uint32_t size, uint32_t count, uint32_t size, uint32_t count,
uint8_t *buffer) uint8_t *buffer)
{ {
struct hl_interface_s *adapter = target_to_adapter(target);
int res; int res;
uint32_t buffer_threshold = 128; uint32_t buffer_threshold = (adapter->param.max_buffer / 4);
uint32_t addr_increment = 4; uint32_t addr_increment = 4;
uint32_t c; uint32_t c;
struct hl_interface_s *adapter = target_to_adapter(target);
if (!count || !buffer) if (!count || !buffer)
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
@ -687,7 +687,7 @@ static int adapter_read_memory(struct target *target, uint32_t address,
*/ */
if (size != 4) { if (size != 4) {
count *= size; count *= size;
buffer_threshold = 64; buffer_threshold = (adapter->param.max_buffer / 4) / 2;
addr_increment = 1; addr_increment = 1;
} }
@ -719,11 +719,11 @@ static int adapter_write_memory(struct target *target, uint32_t address,
uint32_t size, uint32_t count, uint32_t size, uint32_t count,
const uint8_t *buffer) const uint8_t *buffer)
{ {
struct hl_interface_s *adapter = target_to_adapter(target);
int res; int res;
uint32_t buffer_threshold = 128; uint32_t buffer_threshold = (adapter->param.max_buffer / 4);
uint32_t addr_increment = 4; uint32_t addr_increment = 4;
uint32_t c; uint32_t c;
struct hl_interface_s *adapter = target_to_adapter(target);
if (!count || !buffer) if (!count || !buffer)
return ERROR_COMMAND_SYNTAX_ERROR; return ERROR_COMMAND_SYNTAX_ERROR;
@ -735,7 +735,7 @@ static int adapter_write_memory(struct target *target, uint32_t address,
*/ */
if (size != 4) { if (size != 4) {
count *= size; count *= size;
buffer_threshold = 64; buffer_threshold = (adapter->param.max_buffer / 4) / 2;
addr_increment = 1; addr_increment = 1;
} }