From 82d5ff71748981dd05c5fe92aec9a8513fcd3f67 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 10 May 2011 23:03:32 +0000 Subject: [PATCH] usbconn: add interface option to usage git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@1906 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- urjtag/ChangeLog | 3 +++ urjtag/src/tap/cable/generic_usbconn.h | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/urjtag/ChangeLog b/urjtag/ChangeLog index 171fc50f..da9e47bb 100644 --- a/urjtag/ChangeLog +++ b/urjtag/ChangeLog @@ -3,6 +3,9 @@ * src/tap/usbconn/libftdi.c (usbconn_ftdi_common_open): Use the new interface option and call ftdi_set_interface with it. Patch by Michael Walle. + * src/tap/cable/generic_usbconn.h: Add new "interface" option to usage. + Patch by Michael Walle. + 2011-04-30 Mike Frysinger * configure.ac: Force recent versions of autotools (at least ones released diff --git a/urjtag/src/tap/cable/generic_usbconn.h b/urjtag/src/tap/cable/generic_usbconn.h index b4cbeb56..f0b87ba9 100644 --- a/urjtag/src/tap/cable/generic_usbconn.h +++ b/urjtag/src/tap/cable/generic_usbconn.h @@ -43,11 +43,12 @@ void urj_tap_cable_generic_usbconn_help (urj_log_level_t ll, const char *cablena void urj_tap_cable_generic_usbconn_help_ex (urj_log_level_t ll, const char *cablename, const char *ex_short, const char *ex_desc); #define URJ_TAP_CABLE_GENERIC_USBCONN_HELP_SHORT \ - "[vid=VID] [pid=PID] [desc=DESC]" + "[vid=VID] [pid=PID] [desc=DESC] [interface=INTERFACE]" #define URJ_TAP_CABLE_GENERIC_USBCONN_HELP_DESC \ "VID USB Device Vendor ID (hex, e.g. 0abc)\n" \ "PID USB Device Product ID (hex, e.g. 0abc)\n" \ - "DESC Some string to match in description or serial no.\n" + "DESC Some string to match in description or serial no.\n" \ + "INTERFACE Interface to use (0=first, 1=second, etc).\n" #define URJ_DECLARE_USBCONN_CABLE(vid, pid, driver, name, cable) \ const urj_usbconn_cable_t urj_tap_cable_usbconn_##cable = { name, NULL, driver, vid, pid };