projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jtag/hla, jtag/stlink: switch to command 'adapter serial'
[fw/openocd]
/
src
/
jtag
/
drivers
/
ti_icdi_usb.c
diff --git
a/src/jtag/drivers/ti_icdi_usb.c
b/src/jtag/drivers/ti_icdi_usb.c
index 920be778380f5b296ef9d8cc43ae4ffff1e7a32a..a359dd17dceb6d7e40535675a155e24c22cca19f 100644
(file)
--- a/
src/jtag/drivers/ti_icdi_usb.c
+++ b/
src/jtag/drivers/ti_icdi_usb.c
@@
-23,6
+23,7
@@
/* project specific includes */
#include <helper/binarybuffer.h>
/* project specific includes */
#include <helper/binarybuffer.h>
+#include <jtag/adapter.h>
#include <jtag/interface.h>
#include <jtag/hla/hla_layout.h>
#include <jtag/hla/hla_transport.h>
#include <jtag/interface.h>
#include <jtag/hla/hla_layout.h>
#include <jtag/hla/hla_transport.h>
@@
-122,7
+123,7
@@
static int icdi_send_packet(void *handle, int len)
int result, retry = 0;
int transferred = 0;
int result, retry = 0;
int transferred = 0;
- assert(handle
!= NULL
);
+ assert(handle);
/* check we have a large enough buffer for checksum "#00" */
if (len + 3 > h->max_packet) {
/* check we have a large enough buffer for checksum "#00" */
if (len + 3 > h->max_packet) {
@@
-253,7
+254,7
@@
static int icdi_get_cmd_result(void *handle)
int offset = 0;
char ch;
int offset = 0;
char ch;
- assert(handle
!= NULL
);
+ assert(handle);
do {
ch = h->read_buffer[offset++];
do {
ch = h->read_buffer[offset++];
@@
-475,13
+476,13
@@
static int icdi_usb_read_regs(void *handle)
return ERROR_OK;
}
return ERROR_OK;
}
-static int icdi_usb_read_reg(void *handle,
int num
, uint32_t *val)
+static int icdi_usb_read_reg(void *handle,
unsigned int regsel
, uint32_t *val)
{
int result;
struct icdi_usb_handle_s *h = handle;
char cmd[10];
{
int result;
struct icdi_usb_handle_s *h = handle;
char cmd[10];
- snprintf(cmd, sizeof(cmd), "p%x",
num
);
+ snprintf(cmd, sizeof(cmd), "p%x",
regsel
);
result = icdi_send_cmd(handle, cmd);
if (result != ERROR_OK)
return result;
result = icdi_send_cmd(handle, cmd);
if (result != ERROR_OK)
return result;
@@
-504,14
+505,14
@@
static int icdi_usb_read_reg(void *handle, int num, uint32_t *val)
return result;
}
return result;
}
-static int icdi_usb_write_reg(void *handle,
int num
, uint32_t val)
+static int icdi_usb_write_reg(void *handle,
unsigned int regsel
, uint32_t val)
{
int result;
char cmd[20];
uint8_t buf[4];
h_u32_to_le(buf, val);
{
int result;
char cmd[20];
uint8_t buf[4];
h_u32_to_le(buf, val);
- int cmd_len = snprintf(cmd, sizeof(cmd), "P%x=",
num
);
+ int cmd_len = snprintf(cmd, sizeof(cmd), "P%x=",
regsel
);
hexify(cmd + cmd_len, buf, 4, sizeof(cmd));
result = icdi_send_cmd(handle, cmd);
hexify(cmd + cmd_len, buf, 4, sizeof(cmd));
result = icdi_send_cmd(handle, cmd);
@@
-681,11
+682,11
@@
static int icdi_usb_open(struct hl_interface_param_s *param, void **fd)
for (uint8_t i = 0; param->vid[i] && param->pid[i]; ++i)
LOG_DEBUG("transport: %d vid: 0x%04x pid: 0x%04x serial: %s", param->transport,
for (uint8_t i = 0; param->vid[i] && param->pid[i]; ++i)
LOG_DEBUG("transport: %d vid: 0x%04x pid: 0x%04x serial: %s", param->transport,
- param->vid[i], param->pid[i],
param->serial ? param->serial
: "");
+ param->vid[i], param->pid[i],
adapter_get_required_serial() ? adapter_get_required_serial()
: "");
/* TI (Stellaris) ICDI provides its serial number in the USB descriptor;
no need to provide a callback here. */
/* TI (Stellaris) ICDI provides its serial number in the USB descriptor;
no need to provide a callback here. */
- jtag_libusb_open(param->vid, param->pid,
param->serial
, &h->usb_dev, NULL);
+ jtag_libusb_open(param->vid, param->pid,
adapter_get_required_serial()
, &h->usb_dev, NULL);
if (!h->usb_dev) {
LOG_ERROR("open failed");
if (!h->usb_dev) {
LOG_ERROR("open failed");