projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tcl: [3/3] prepare for jimtcl 0.81 'expr' syntax change
[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 20b308179833b08488342d5eb73b07a268c710c1..00b2f9675e0b77e08defcc8f88e2e8aa9408e9a0 100644
(file)
--- a/
src/jtag/drivers/ti_icdi_usb.c
+++ b/
src/jtag/drivers/ti_icdi_usb.c
@@
-14,9
+14,7
@@
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
#ifdef HAVE_CONFIG_H
***************************************************************************/
#ifdef HAVE_CONFIG_H
@@
-33,7
+31,7
@@
#include <target/cortex_m.h>
#include <target/cortex_m.h>
-#include
<libusb.h>
+#include
"libusb_helper.h"
#define ICDI_WRITE_ENDPOINT 0x02
#define ICDI_READ_ENDPOINT 0x83
#define ICDI_WRITE_ENDPOINT 0x02
#define ICDI_READ_ENDPOINT 0x83
@@
-46,8
+44,7
@@
#define PACKET_END "#"
struct icdi_usb_handle_s {
#define PACKET_END "#"
struct icdi_usb_handle_s {
- libusb_context *usb_ctx;
- libusb_device_handle *usb_dev;
+ struct libusb_device_handle *usb_dev;
char *read_buffer;
char *write_buffer;
char *read_buffer;
char *write_buffer;
@@
-244,7
+241,8
@@
static int icdi_send_remote_cmd(void *handle, const char *data)
struct icdi_usb_handle_s *h = handle;
size_t cmd_len = sprintf(h->write_buffer, PACKET_START "qRcmd,");
struct icdi_usb_handle_s *h = handle;
size_t cmd_len = sprintf(h->write_buffer, PACKET_START "qRcmd,");
- cmd_len += hexify(h->write_buffer + cmd_len, data, 0, h->max_packet - cmd_len);
+ cmd_len += hexify(h->write_buffer + cmd_len, (const uint8_t *)data,
+ strlen(data), h->max_packet - cmd_len);
return icdi_send_packet(handle, cmd_len);
}
return icdi_send_packet(handle, cmd_len);
}
@@
-268,7
+266,7
@@
static int icdi_get_cmd_result(void *handle)
if (h->read_buffer[offset] == 'E') {
/* get error code */
if (h->read_buffer[offset] == 'E') {
/* get error code */
-
char
result;
+
uint8_t
result;
if (unhexify(&result, h->read_buffer + offset + 1, 1) != 1)
return ERROR_FAIL;
return result;
if (unhexify(&result, h->read_buffer + offset + 1, 1) != 1)
return ERROR_FAIL;
return result;
@@
-330,7
+328,7
@@
static int icdi_usb_version(void *handle)
}
/* convert reply */
}
/* convert reply */
- if (unhexify(version, h->read_buffer + 2, 4) != 4) {
+ if (unhexify(
(uint8_t *)
version, h->read_buffer + 2, 4) != 4) {
LOG_WARNING("unable to get ICDI version");
return ERROR_OK;
}
LOG_WARNING("unable to get ICDI version");
return ERROR_OK;
}
@@
-477,13
+475,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;
@@
-497,7
+495,7
@@
static int icdi_usb_read_reg(void *handle, int num, uint32_t *val)
/* convert result */
uint8_t buf[4];
/* convert result */
uint8_t buf[4];
- if (unhexify(
(char *)
buf, h->read_buffer + 2, 4) != 4) {
+ if (unhexify(buf, h->read_buffer + 2, 4) != 4) {
LOG_ERROR("failed to convert result");
return ERROR_FAIL;
}
LOG_ERROR("failed to convert result");
return ERROR_FAIL;
}
@@
-506,15
+504,15
@@
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
);
- hexify(cmd + cmd_len,
(const char *)
buf, 4, sizeof(cmd));
+ int cmd_len = snprintf(cmd, sizeof(cmd), "P%x=",
regsel
);
+ hexify(cmd + cmd_len, buf, 4, sizeof(cmd));
result = icdi_send_cmd(handle, cmd);
if (result != ERROR_OK)
result = icdi_send_cmd(handle, cmd);
if (result != ERROR_OK)
@@
-645,29
+643,30
@@
static int icdi_usb_write_mem(void *handle, uint32_t addr, uint32_t size,
return retval;
}
return retval;
}
+static int icdi_usb_override_target(const char *targetname)
+{
+ return !strcmp(targetname, "cortex_m");
+}
+
static int icdi_usb_close(void *handle)
{
struct icdi_usb_handle_s *h = handle;
static int icdi_usb_close(void *handle)
{
struct icdi_usb_handle_s *h = handle;
- if (h->usb_dev)
- libusb_close(h->usb_dev);
-
- if (h->usb_ctx)
- libusb_exit(h->usb_ctx);
-
- if (h->read_buffer)
- free(h->read_buffer);
+ if (!h)
+ return ERROR_OK;
- if (h->
write_buffer
)
-
free(h->write_buffer
);
+ if (h->
usb_dev
)
+
jtag_libusb_close(h->usb_dev
);
+ free(h->read_buffer);
+ free(h->write_buffer);
free(handle);
free(handle);
-
return ERROR_OK;
}
static int icdi_usb_open(struct hl_interface_param_s *param, void **fd)
{
return ERROR_OK;
}
static int icdi_usb_open(struct hl_interface_param_s *param, void **fd)
{
+ /* TODO: Convert remaining libusb_ calls to jtag_libusb_ */
int retval;
struct icdi_usb_handle_s *h;
int retval;
struct icdi_usb_handle_s *h;
@@
-680,15
+679,14
@@
static int icdi_usb_open(struct hl_interface_param_s *param, void **fd)
return ERROR_FAIL;
}
return ERROR_FAIL;
}
- LOG_DEBUG("transport: %d vid: 0x%04x pid: 0x%04x", param->transport,
- param->vid, param->pid);
+ 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 : "");
- if (libusb_init(&h->usb_ctx) != 0) {
- LOG_ERROR("libusb init failed");
- goto error_open;
- }
+ /* 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);
- h->usb_dev = libusb_open_device_with_vid_pid(h->usb_ctx, param->vid, param->pid);
if (!h->usb_dev) {
LOG_ERROR("open failed");
goto error_open;
if (!h->usb_dev) {
LOG_ERROR("open failed");
goto error_open;
@@
-770,5
+768,7
@@
struct hl_layout_api_s icdi_usb_layout_api = {
.write_reg = icdi_usb_write_reg,
.read_mem = icdi_usb_read_mem,
.write_mem = icdi_usb_write_mem,
.write_reg = icdi_usb_write_reg,
.read_mem = icdi_usb_read_mem,
.write_mem = icdi_usb_write_mem,
- .write_debug_reg = icdi_usb_write_debug_reg
+ .write_debug_reg = icdi_usb_write_debug_reg,
+ .override_target = icdi_usb_override_target,
+ .custom_command = icdi_send_remote_cmd,
};
};