We need to be able to differentiate between USB devices with the
same PID/VID, so add a way to set the desc field.
---
urjtag/src/tap/cable/dirtyjtag.c | 2 +-
urjtag/src/tap/cable/ft2232.c | 42 +++++++++++++-------------
urjtag/src/tap/cable/generic_usbconn.h | 4 +--
urjtag/src/tap/cable/ice100.c | 4 +--
urjtag/src/tap/cable/jlink.c | 2 +-
urjtag/src/tap/cable/usbblaster.c | 8 ++---
urjtag/src/tap/cable/vsllink.c | 2 +-
urjtag/src/tap/cable/xpc.c | 4 +--
urjtag/src/tap/usbconn/libftdx.h | 14 ++++-----
9 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/urjtag/src/tap/cable/dirtyjtag.c b/urjtag/src/tap/cable/dirtyjtag.c
index e93b44fa..94473e09 100644
--- a/urjtag/src/tap/cable/dirtyjtag.c
+++ b/urjtag/src/tap/cable/dirtyjtag.c
@@ -338,4 +338,4 @@ const urj_cable_driver_t urj_tap_cable_dirtyjtag_driver = {
urj_tap_cable_generic_flush_using_transfer,
urj_tap_cable_generic_usbconn_help
};
-URJ_DECLARE_USBCONN_CABLE(0x1209, 0xC0CA, "libusb", "dirtyjtag", dirtyjtag)
+URJ_DECLARE_USBCONN_CABLE(0x1209, 0xC0CA, "libusb", "dirtyjtag", dirtyjtag,
NULL)
diff --git a/urjtag/src/tap/cable/ft2232.c b/urjtag/src/tap/cable/ft2232.c
index 5e24090c..0540dbaa 100644
--- a/urjtag/src/tap/cable/ft2232.c
+++ b/urjtag/src/tap/cable/ft2232.c
@@ -2589,7 +2589,7 @@ const urj_cable_driver_t urj_tap_cable_ft2232_driver = {
ft2232_flush,
ftdx_usbcable_help
};
-URJ_DECLARE_FTDX_CABLE(0x0000, 0x0000, "-mpsse", "FT2232", ft2232)
+URJ_DECLARE_FTDX_CABLE(0x0000, 0x0000, "-mpsse", "FT2232", ft2232, NULL)
const urj_cable_driver_t urj_tap_cable_ft2232_armusbocd_driver = {
"ARM-USB-OCD",
@@ -2609,8 +2609,8 @@ const urj_cable_driver_t
urj_tap_cable_ft2232_armusbocd_driver = {
ft2232_flush,
ftdx_usbcable_help
};
-URJ_DECLARE_FTDX_CABLE(0x15BA, 0x0003, "-mpsse", "ARM-USB-OCD", armusbocd)
-URJ_DECLARE_FTDX_CABLE(0x15BA, 0x0004, "-mpsse", "ARM-USB-OCD", armusbocdtiny)
+URJ_DECLARE_FTDX_CABLE(0x15BA, 0x0003, "-mpsse", "ARM-USB-OCD", armusbocd,
NULL)
+URJ_DECLARE_FTDX_CABLE(0x15BA, 0x0004, "-mpsse", "ARM-USB-OCD", armusbocdtiny,
NULL)
const urj_cable_driver_t urj_tap_cable_ft2232_armusbtiny_h_driver = {
"ARM-USB-OCD-H",
@@ -2630,8 +2630,8 @@ const urj_cable_driver_t
urj_tap_cable_ft2232_armusbtiny_h_driver = {
ft2232_flush,
ftdx_usbcable_help
};
-URJ_DECLARE_FTDX_CABLE(0x15BA, 0x002A, "-mpsse", "ARM-USB-TINY-H",
armusbtiny_h)
-URJ_DECLARE_FTDX_CABLE(0x15BA, 0x002B, "-mpsse", "ARM-USB-OCD-H", armusbocd_h)
+URJ_DECLARE_FTDX_CABLE(0x15BA, 0x002A, "-mpsse", "ARM-USB-TINY-H",
armusbtiny_h, NULL)
+URJ_DECLARE_FTDX_CABLE(0x15BA, 0x002B, "-mpsse", "ARM-USB-OCD-H", armusbocd_h,
NULL)
const urj_cable_driver_t urj_tap_cable_ft2232_gnice_driver = {
"gnICE",
@@ -2651,7 +2651,7 @@ const urj_cable_driver_t
urj_tap_cable_ft2232_gnice_driver = {
ft2232_flush,
ftdx_usbcable_help
};
-URJ_DECLARE_FTDX_CABLE(0x0456, 0xF000, "-mpsse", "gnICE", gnice)
+URJ_DECLARE_FTDX_CABLE(0x0456, 0xF000, "-mpsse", "gnICE", gnice, NULL)
const urj_cable_driver_t urj_tap_cable_ft2232_gniceplus_driver = {
"gnICE+",
@@ -2671,7 +2671,7 @@ const urj_cable_driver_t
urj_tap_cable_ft2232_gniceplus_driver = {
ft2232_flush,
ftdx_usbcable_help
};
-URJ_DECLARE_FTDX_CABLE(0x0456, 0xF001, "-mpsse", "gnICE+", gniceplus)
+URJ_DECLARE_FTDX_CABLE(0x0456, 0xF001, "-mpsse", "gnICE+", gniceplus, NULL)
const urj_cable_driver_t urj_tap_cable_ft2232_jtagkey_driver = {
"JTAGkey",
@@ -2691,7 +2691,7 @@ const urj_cable_driver_t
urj_tap_cable_ft2232_jtagkey_driver = {
ft2232_flush,
ftdx_usbcable_help
};
-URJ_DECLARE_FTDX_CABLE(0x0403, 0xCFF8, "-mpsse", "JTAGkey", jtagkey)
+URJ_DECLARE_FTDX_CABLE(0x0403, 0xCFF8, "-mpsse", "JTAGkey", jtagkey, NULL)
const urj_cable_driver_t urj_tap_cable_ft2232_oocdlinks_driver = {
"OOCDLink-s",
@@ -2711,7 +2711,7 @@ const urj_cable_driver_t
urj_tap_cable_ft2232_oocdlinks_driver = {
ft2232_flush,
ftdx_usbcable_help
};
-URJ_DECLARE_FTDX_CABLE(0x0403, 0xbaf8, "-mpsse", "OOCDLink-s", oocdlinks)
+URJ_DECLARE_FTDX_CABLE(0x0403, 0xbaf8, "-mpsse", "OOCDLink-s", oocdlinks, NULL)
const urj_cable_driver_t urj_tap_cable_ft2232_turtelizer2_driver = {
"Turtelizer2",
@@ -2731,7 +2731,7 @@ const urj_cable_driver_t
urj_tap_cable_ft2232_turtelizer2_driver = {
ft2232_flush,
ftdx_usbcable_help
};
-URJ_DECLARE_FTDX_CABLE(0x0403, 0xBDC8, "-mpsse", "Turtelizer2", turtelizer2)
+URJ_DECLARE_FTDX_CABLE(0x0403, 0xBDC8, "-mpsse", "Turtelizer2", turtelizer2,
NULL)
const urj_cable_driver_t urj_tap_cable_ft2232_usbjtagrs232_driver = {
"USB-JTAG-RS232",
@@ -2751,7 +2751,7 @@ const urj_cable_driver_t
urj_tap_cable_ft2232_usbjtagrs232_driver = {
ft2232_flush,
ftdx_usbcable_help
};
-URJ_DECLARE_FTDX_CABLE(0x1457, 0x5118, "-mpsse", "USB-JTAG-RS232",
usbjtagrs232)
+URJ_DECLARE_FTDX_CABLE(0x1457, 0x5118, "-mpsse", "USB-JTAG-RS232",
usbjtagrs232, NULL)
const urj_cable_driver_t urj_tap_cable_ft2232_usbtojtagif_driver = {
"USB-to-JTAG-IF",
@@ -2771,7 +2771,7 @@ const urj_cable_driver_t
urj_tap_cable_ft2232_usbtojtagif_driver = {
ft2232_flush,
ftdx_usbcable_help
};
-URJ_DECLARE_FTDX_CABLE(0x0000, 0x0000, "-mpsse", "USB-to-JTAG-IF", usbtojtagif)
+URJ_DECLARE_FTDX_CABLE(0x0000, 0x0000, "-mpsse", "USB-to-JTAG-IF",
usbtojtagif, NULL)
const urj_cable_driver_t urj_tap_cable_ft2232_signalyzer_driver = {
"Signalyzer",
@@ -2791,7 +2791,7 @@ const urj_cable_driver_t
urj_tap_cable_ft2232_signalyzer_driver = {
ft2232_flush,
ftdx_usbcable_help
};
-URJ_DECLARE_FTDX_CABLE(0x0403, 0xbca1, "-mpsse", "Signalyzer", signalyzer)
+URJ_DECLARE_FTDX_CABLE(0x0403, 0xbca1, "-mpsse", "Signalyzer", signalyzer,
NULL)
const urj_cable_driver_t urj_tap_cable_ft2232_flyswatter_driver = {
"Flyswatter",
@@ -2811,7 +2811,7 @@ const urj_cable_driver_t
urj_tap_cable_ft2232_flyswatter_driver = {
ft2232_flush,
ftdx_usbcable_help
};
-URJ_DECLARE_FTDX_CABLE(0x0403, 0x6010, "-mpsse", "Flyswatter", flyswatter)
+URJ_DECLARE_FTDX_CABLE(0x0403, 0x6010, "-mpsse", "Flyswatter", flyswatter,
NULL)
const urj_cable_driver_t urj_tap_cable_ft2232_usbscarab2_driver = {
"usbScarab2",
@@ -2831,7 +2831,7 @@ const urj_cable_driver_t
urj_tap_cable_ft2232_usbscarab2_driver = {
ft2232_flush,
ftdx_usbcable_help
};
-URJ_DECLARE_FTDX_CABLE(0x0403, 0xbbe0, "-mpsse", "usbScarab2", usbscarab2)
+URJ_DECLARE_FTDX_CABLE(0x0403, 0xbbe0, "-mpsse", "usbScarab2", usbscarab2,
NULL)
const urj_cable_driver_t urj_tap_cable_ft2232_ktlink_driver = {
"KT-LINK",
@@ -2851,7 +2851,7 @@ const urj_cable_driver_t
urj_tap_cable_ft2232_ktlink_driver = {
ft2232_flush,
ftdx_usbcable_help
};
-URJ_DECLARE_FTDX_CABLE(0x0403, 0xbbe2, "-mpsse", "KT-LINK", ktlink)
+URJ_DECLARE_FTDX_CABLE(0x0403, 0xbbe2, "-mpsse", "KT-LINK", ktlink, NULL)
const urj_cable_driver_t urj_tap_cable_ft2232_milkymist_driver = {
"milkymist",
@@ -2871,7 +2871,7 @@ const urj_cable_driver_t
urj_tap_cable_ft2232_milkymist_driver = {
ft2232_flush,
ftdx_usbcable_help
};
-URJ_DECLARE_FTDX_CABLE(0x20b7, 0x0713, "-mpsse", "milkymist", milkymist)
+URJ_DECLARE_FTDX_CABLE(0x20b7, 0x0713, "-mpsse", "milkymist", milkymist, NULL)
const urj_cable_driver_t urj_tap_cable_ft2232_digilenths1_driver = {
"DigilentHS1",
@@ -2891,7 +2891,7 @@ const urj_cable_driver_t
urj_tap_cable_ft2232_digilenths1_driver = {
ft2232_flush,
ftdx_usbcable_help
};
-URJ_DECLARE_FTDX_CABLE(0x0403, 0x6010, "-mpsse", "DigilentHS1", digilenths1)
+URJ_DECLARE_FTDX_CABLE(0x0403, 0x6010, "-mpsse", "DigilentHS1", digilenths1,
NULL)
const urj_cable_driver_t urj_tap_cable_ft2232_ft4232_driver = {
"FT4232",
@@ -2911,7 +2911,7 @@ const urj_cable_driver_t
urj_tap_cable_ft2232_ft4232_driver = {
ft2232_flush,
ftdx_usbcable_extended_help
};
-URJ_DECLARE_FTDX_CABLE(0x0403, 0x6011, "-mpsse", "FT4232", ft4232)
+URJ_DECLARE_FTDX_CABLE(0x0403, 0x6011, "-mpsse", "FT4232", ft4232, NULL)
const urj_cable_driver_t urj_tap_cable_ft2232_jtagv3_driver = {
"JTAGv3",
@@ -2931,7 +2931,7 @@ const urj_cable_driver_t
urj_tap_cable_ft2232_jtagv3_driver = {
ft2232_flush,
ftdx_usbcable_help
};
-URJ_DECLARE_FTDX_CABLE(0x0403, 0xa6d0, "-mpsse", "JTAGv3", jtagv3)
+URJ_DECLARE_FTDX_CABLE(0x0403, 0xa6d0, "-mpsse", "JTAGv3", jtagv3, NULL)
const urj_cable_driver_t urj_tap_cable_ft2232_jtagv5_driver = {
"JTAGv5",
@@ -2951,7 +2951,7 @@ const urj_cable_driver_t
urj_tap_cable_ft2232_jtagv5_driver = {
ft2232_flush,
ftdx_usbcable_help
};
-URJ_DECLARE_FTDX_CABLE(0x0403, 0xa6d0, "-mpsse", "JTAGv5", jtagv5)
+URJ_DECLARE_FTDX_CABLE(0x0403, 0xa6d0, "-mpsse", "JTAGv5", jtagv5, NULL)
/*
Local Variables:
diff --git a/urjtag/src/tap/cable/generic_usbconn.h
b/urjtag/src/tap/cable/generic_usbconn.h
index 90af79b7..dada04bd 100644
--- a/urjtag/src/tap/cable/generic_usbconn.h
+++ b/urjtag/src/tap/cable/generic_usbconn.h
@@ -51,7 +51,7 @@ void urj_tap_cable_generic_usbconn_help_ex (urj_log_level_t
ll, const char *cabl
"INTERFACE Interface to use (0=first, 1=second, etc).\n" \
"INDEX Number of matching device (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 };
+#define URJ_DECLARE_USBCONN_CABLE(vid, pid, driver, name, cable, desc) \
+const urj_usbconn_cable_t urj_tap_cable_usbconn_##cable = { name, desc,
driver, vid, pid };
#endif /* URJ_TAP_CABLE_GENERIC_H */
diff --git a/urjtag/src/tap/cable/ice100.c b/urjtag/src/tap/cable/ice100.c
index 5a94d1d5..81603d10 100644
--- a/urjtag/src/tap/cable/ice100.c
+++ b/urjtag/src/tap/cable/ice100.c
@@ -1901,8 +1901,8 @@ const urj_cable_driver_t urj_tap_cable_ice100B_driver = {
ice_cable_help,
URJ_CABLE_QUIRK_ONESHOT
};
-URJ_DECLARE_USBCONN_CABLE(0x064B, 0x1225, "libusb", "ICE-100B", ice100B)
-URJ_DECLARE_USBCONN_CABLE(0x064B, 0x0225, "libusb", "ICE-100B", ice100Bw)
+URJ_DECLARE_USBCONN_CABLE(0x064B, 0x1225, "libusb", "ICE-100B", ice100B, NULL)
+URJ_DECLARE_USBCONN_CABLE(0x064B, 0x0225, "libusb", "ICE-100B", ice100Bw, NULL)
/*
Local Variables:
diff --git a/urjtag/src/tap/cable/jlink.c b/urjtag/src/tap/cable/jlink.c
index 8af32b70..e637ed91 100644
--- a/urjtag/src/tap/cable/jlink.c
+++ b/urjtag/src/tap/cable/jlink.c
@@ -720,4 +720,4 @@ const urj_cable_driver_t urj_tap_cable_jlink_driver = {
urj_tap_cable_generic_flush_using_transfer,
urj_tap_cable_generic_usbconn_help
};
-URJ_DECLARE_USBCONN_CABLE(0x1366, 0x0101, "libusb", "jlink", jlink)
+URJ_DECLARE_USBCONN_CABLE(0x1366, 0x0101, "libusb", "jlink", jlink, NULL)
diff --git a/urjtag/src/tap/cable/usbblaster.c
b/urjtag/src/tap/cable/usbblaster.c
index 1e6f6bb0..bc686bf0 100644
--- a/urjtag/src/tap/cable/usbblaster.c
+++ b/urjtag/src/tap/cable/usbblaster.c
@@ -515,7 +515,7 @@ const urj_cable_driver_t urj_tap_cable_usbblaster_driver = {
usbblaster_flush,
ftdx_usbcable_help
};
-URJ_DECLARE_FTDX_CABLE(0x09FB, 0x6001, "", "UsbBlaster", usbblaster)
-URJ_DECLARE_FTDX_CABLE(0x09FB, 0x6002, "", "UsbBlaster", cubic_cyclonium)
-URJ_DECLARE_FTDX_CABLE(0x09FB, 0x6003, "", "UsbBlaster", nios_eval)
-URJ_DECLARE_FTDX_CABLE(0x16C0, 0x06AD, "", "UsbBlaster", usb_jtag)
+URJ_DECLARE_FTDX_CABLE(0x09FB, 0x6001, "", "UsbBlaster", usbblaster, NULL)
+URJ_DECLARE_FTDX_CABLE(0x09FB, 0x6002, "", "UsbBlaster", cubic_cyclonium, NULL)
+URJ_DECLARE_FTDX_CABLE(0x09FB, 0x6003, "", "UsbBlaster", nios_eval, NULL)
+URJ_DECLARE_FTDX_CABLE(0x16C0, 0x06AD, "", "UsbBlaster", usb_jtag, NULL)
diff --git a/urjtag/src/tap/cable/vsllink.c b/urjtag/src/tap/cable/vsllink.c
index 667229ac..91e2c9c4 100644
--- a/urjtag/src/tap/cable/vsllink.c
+++ b/urjtag/src/tap/cable/vsllink.c
@@ -575,4 +575,4 @@ const urj_cable_driver_t urj_tap_cable_vsllink_driver = {
urj_tap_cable_generic_flush_using_transfer,
urj_tap_cable_generic_usbconn_help
};
-URJ_DECLARE_USBCONN_CABLE (0x0483, 0x5740, "libusb", "vsllink", vsllink)
+URJ_DECLARE_USBCONN_CABLE (0x0483, 0x5740, "libusb", "vsllink", vsllink, NULL)
diff --git a/urjtag/src/tap/cable/xpc.c b/urjtag/src/tap/cable/xpc.c
index a46b0c4a..3d24cd10 100644
--- a/urjtag/src/tap/cable/xpc.c
+++ b/urjtag/src/tap/cable/xpc.c
@@ -704,7 +704,7 @@ const urj_cable_driver_t urj_tap_cable_xpc_int_driver = {
urj_tap_cable_generic_flush_using_transfer,
urj_tap_cable_generic_usbconn_help
};
-URJ_DECLARE_USBCONN_CABLE(0x03FD, 0x0008, "libusb", "xpc_int", xpc_int)
+URJ_DECLARE_USBCONN_CABLE(0x03FD, 0x0008, "libusb", "xpc_int", xpc_int, NULL)
const urj_cable_driver_t urj_tap_cable_xpc_ext_driver = {
"xpc_ext",
@@ -724,4 +724,4 @@ const urj_cable_driver_t urj_tap_cable_xpc_ext_driver = {
urj_tap_cable_generic_flush_using_transfer,
urj_tap_cable_generic_usbconn_help
};
-URJ_DECLARE_USBCONN_CABLE(0x03FD, 0x0008, "libusb", "xpc_ext", xpc_ext)
+URJ_DECLARE_USBCONN_CABLE(0x03FD, 0x0008, "libusb", "xpc_ext", xpc_ext, NULL)
diff --git a/urjtag/src/tap/usbconn/libftdx.h b/urjtag/src/tap/usbconn/libftdx.h
index 70b14cb2..ae7bfae8 100644
--- a/urjtag/src/tap/usbconn/libftdx.h
+++ b/urjtag/src/tap/usbconn/libftdx.h
@@ -42,19 +42,19 @@
* Helpers to avoid having to copy & paste ifdef's everywhere
*/
#ifdef ENABLE_LOWLEVEL_FTDI
-#define _URJ_DECLARE_FTDI_CABLE(v, p, d, n, c) URJ_DECLARE_USBCONN_CABLE(v, p,
d, n, c)
+#define _URJ_DECLARE_FTDI_CABLE(v, p, d, n, c, desc)
URJ_DECLARE_USBCONN_CABLE(v, p, d, n, c, desc)
#else
-#define _URJ_DECLARE_FTDI_CABLE(v, p, d, n, c)
+#define _URJ_DECLARE_FTDI_CABLE(v, p, d, n, c, desc)
#endif
#ifdef ENABLE_LOWLEVEL_FTD2XX
-#define _URJ_DECLARE_FTD2XX_CABLE(v, p, d, n, c) URJ_DECLARE_USBCONN_CABLE(v,
p, d, n, c)
+#define _URJ_DECLARE_FTD2XX_CABLE(v, p, d, n, c, desc)
URJ_DECLARE_USBCONN_CABLE(v, p, d, n, c, desc)
#else
-#define _URJ_DECLARE_FTD2XX_CABLE(v, p, d, n, c)
+#define _URJ_DECLARE_FTD2XX_CABLE(v, p, d, n, c, desc)
#endif
-#define URJ_DECLARE_FTDX_CABLE(v, p, d, n, c) \
- _URJ_DECLARE_FTDI_CABLE(v, p, "ftdi"d, n, c##_ftdi) \
- _URJ_DECLARE_FTD2XX_CABLE(v, p, "ftd2xx"d, n, c##_ftd2xx)
+#define URJ_DECLARE_FTDX_CABLE(v, p, d, n, c, desc) \
+ _URJ_DECLARE_FTDI_CABLE(v, p, "ftdi"d, n, c##_ftdi, desc) \
+ _URJ_DECLARE_FTD2XX_CABLE(v, p, "ftd2xx"d, n, c##_ftd2xx, desc)
void ftdx_usbcable_help (urj_log_level_t ll, const char *cablename);
void ftdx_usbcable_extended_help (urj_log_level_t ll, const char *cablename);
--
2.31.1
_______________________________________________
UrJTAG-development mailing list
UrJTAG-development@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/urjtag-development
