[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.10.0-1431-gebb88156c

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  ebb88156ce1a848aa34610872c6a3c0845a811fc (commit)
       via  e8f483139d15d824cfae48d950ec761184d89510 (commit)
      from  5829646343d78a6779794f67cde2f7c779969afc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ebb88156ce1a848aa34610872c6a3c0845a811fc
Author: John Pham <jh...@gm...>
Date:   Mon Feb 2 21:22:38 2015 -0500

    Added comment to ti-icdi.cfg
    
    Added comment to ti-icdi.cfg specifying how to get serial and an example of
    specifying hla_serial for ti-icdi devices. This has been implemented in revision
    2121a8f92969804611412b705af8114697a647dc
    
    Change-Id: I648458a4dea176beae6a3f1a4e5641d0206077eb
    Signed-off-by: John Pham <jh...@gm...>
    Reviewed-on: http://openocd.zylin.com/2528
    Tested-by: jenkins
    Reviewed-by: Matthew Trescott <mat...@gm...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/tcl/interface/ti-icdi.cfg b/tcl/interface/ti-icdi.cfg
index 9b46b437c..9decae9ab 100644
--- a/tcl/interface/ti-icdi.cfg
+++ b/tcl/interface/ti-icdi.cfg
@@ -11,3 +11,8 @@ adapter driver hla
 hla_layout ti-icdi
 hla_vid_pid 0x1cbe 0x00fd
 
+# Optionally specify the serial number of TI-ICDI devices, for when using
+# multiple devices. Serial numbers can be obtained using lsusb -v
+# Ex.
+#hla_serial "0F003065"
+

commit e8f483139d15d824cfae48d950ec761184d89510
Author: John Pham <jh...@gm...>
Date:   Mon Feb 2 05:23:32 2015 -0500

    Enable  hla_serial for TI ICDI devices
    
    Used jtag_libusb_open from libusb_helper.h instead of
    libusb_open_device_with_vid_pid to get device handle,
    as well as managing context, i.e. similar to stlink_usb.
    Direct calls to libusb1 are left in for the moment.
    
    (When this Gerrit revision was originally created,
    the jtag_libusb_ wrappers did not return error conditions.)
    
    Tested w/ a TM4C123GXL board
    
    Change-Id: I71e9a366356c125444d4813e58ddd9b6c6498bf0
    Signed-off-by: John Pham <jh...@gm...>
    Signed-off-by: Matthew Trescott <mat...@gm...>
    Reviewed-on: http://openocd.zylin.com/2527
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/jtag/drivers/ti_icdi_usb.c b/src/jtag/drivers/ti_icdi_usb.c
index d276e588f..920be7783 100644
--- a/src/jtag/drivers/ti_icdi_usb.c
+++ b/src/jtag/drivers/ti_icdi_usb.c
@@ -31,7 +31,7 @@
 
 #include <target/cortex_m.h>
 
-#include <libusb.h>
+#include "libusb_helper.h"
 
 #define ICDI_WRITE_ENDPOINT 0x02
 #define ICDI_READ_ENDPOINT 0x83
@@ -44,8 +44,7 @@
 #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;
@@ -657,10 +656,7 @@ static int icdi_usb_close(void *handle)
 		return ERROR_OK;
 
 	if (h->usb_dev)
-		libusb_close(h->usb_dev);
-
-	if (h->usb_ctx)
-		libusb_exit(h->usb_ctx);
+		jtag_libusb_close(h->usb_dev);
 
 	free(h->read_buffer);
 	free(h->write_buffer);
@@ -670,6 +666,7 @@ static int icdi_usb_close(void *handle)
 
 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;
 
@@ -682,19 +679,14 @@ static int icdi_usb_open(struct hl_interface_param_s *param, void **fd)
 		return ERROR_FAIL;
 	}
 
-	LOG_DEBUG("transport: %d vid: 0x%04x pid: 0x%04x", param->transport,
-		  param->vid[0], param->pid[0]);
-
-	/* TODO: convert libusb_ calls to jtag_libusb_ */
-	if (param->vid[1])
-		LOG_WARNING("Bad configuration: 'hla_vid_pid' command does not accept more than one VID PID pair on ti-icdi!");
+	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[0], param->pid[0]);
 	if (!h->usb_dev) {
 		LOG_ERROR("open failed");
 		goto error_open;

-----------------------------------------------------------------------

Summary of changes:
 src/jtag/drivers/ti_icdi_usb.c | 28 ++++++++++------------------
 tcl/interface/ti-icdi.cfg      |  5 +++++
 2 files changed, 15 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository