[UrJTAG-dev] [PATCH 2/4] Differentiate between Flyswatter and Digilent devices

[Anton Blanchard]

Flyswatter and Digilent use the same PID/VID, so we need to look at
the description.

Unfortunately Digilent use a different description for the Nexys Video,
so we need to match against two strings. This means creating a copy of
the urj_cable_driver_t data structure.
---
 urjtag/src/tap/cable/ft2232.c               | 24 +++++++++++++++++++--
 urjtag/src/tap/cable/generic_usbconn_list.h |  1 +
 urjtag/src/tap/cable_list.h                 |  1 +
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/urjtag/src/tap/cable/ft2232.c b/urjtag/src/tap/cable/ft2232.c
index 0540dbaa..3d029f39 100644
--- a/urjtag/src/tap/cable/ft2232.c
+++ b/urjtag/src/tap/cable/ft2232.c
@@ -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, 
NULL)
+URJ_DECLARE_FTDX_CABLE(0x0403, 0x6010, "-mpsse", "Flyswatter", flyswatter, 
"Flyswatter")
 
 const urj_cable_driver_t urj_tap_cable_ft2232_usbscarab2_driver = {
     "usbScarab2",
@@ -2891,7 +2891,27 @@ 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, 
NULL)
+URJ_DECLARE_FTDX_CABLE(0x0403, 0x6010, "-mpsse", "DigilentHS1", digilenths1, 
"Digilent Adept USB Device")
+
+const urj_cable_driver_t urj_tap_cable_ft2232_digilentnexysvideo_driver = {
+    "DigilentNexysVideo",
+    N_("Digilent Nexys Video Adapter"),
+    URJ_CABLE_DEVICE_USB,
+    { .usb = ft2232_connect, },
+    urj_tap_cable_generic_disconnect,
+    ft2232_cable_free,
+    ft2232_digilenths1_init,
+    ft2232_generic_done,
+    ft2232_set_frequency,
+    ft2232_clock,
+    ft2232_get_tdo,
+    ft2232_transfer,
+    ft2232_set_signal,
+    urj_tap_cable_generic_get_signal,
+    ft2232_flush,
+    ftdx_usbcable_help
+};
+URJ_DECLARE_FTDX_CABLE(0x0403, 0x6010, "-mpsse", "DigilentNexysVideo", 
digilentnexysvideo, "Digilent USB Device")
 
 const urj_cable_driver_t urj_tap_cable_ft2232_ft4232_driver = {
     "FT4232",
diff --git a/urjtag/src/tap/cable/generic_usbconn_list.h 
b/urjtag/src/tap/cable/generic_usbconn_list.h
index 9c3cc9a8..82f5a453 100644
--- a/urjtag/src/tap/cable/generic_usbconn_list.h
+++ b/urjtag/src/tap/cable/generic_usbconn_list.h
@@ -64,6 +64,7 @@ _URJ_USB_FTDX(usbjtagrs232)
 _URJ_USB_FTDX(usbscarab2)
 _URJ_USB_FTDX(usbtojtagif)
 _URJ_USB_FTDX(digilenths1)
+_URJ_USB_FTDX(digilentnexysvideo)
 _URJ_USB_FTDX(ft4232)
 #endif
 #ifdef ENABLE_CABLE_USBBLASTER
diff --git a/urjtag/src/tap/cable_list.h b/urjtag/src/tap/cable_list.h
index b321901c..d6a365af 100644
--- a/urjtag/src/tap/cable_list.h
+++ b/urjtag/src/tap/cable_list.h
@@ -64,6 +64,7 @@ _URJ_CABLE(ft2232_usbjtagrs232)
 _URJ_CABLE(ft2232_usbscarab2)
 _URJ_CABLE(ft2232_usbtojtagif)
 _URJ_CABLE(ft2232_digilenths1)
+_URJ_CABLE(ft2232_digilentnexysvideo)
 _URJ_CABLE(ft2232_ft4232)
 #endif
 #ifdef ENABLE_CABLE_GPIO
-- 
2.31.1



_______________________________________________
UrJTAG-development mailing list
UrJTAG-development@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/urjtag-development