From 920e4cab1e2ea0251f8f3f401b807b96ffcfcc1f Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 28 Jun 2010 21:14:25 +0000 Subject: [PATCH] need to update cable lists too for usbblaster libusb conversion git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@1804 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- urjtag/ChangeLog | 4 +++- urjtag/src/tap/cable/generic_usbconn_list.h | 16 ++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/urjtag/ChangeLog b/urjtag/ChangeLog index 7893513d..8008c6dc 100644 --- a/urjtag/ChangeLog +++ b/urjtag/ChangeLog @@ -1,7 +1,9 @@ 2010-06-28 Mike Frysinger * configure.ac (usbblaster): Move from libftdi to libusb requirement. - * src/tap/cable/usbblaster.c: Convert from FTDX helpers to libusb helpers. + * src/tap/cable/generic_usbconn_list.h: Drop ftdx usbblaster cables and add + libusb usbblaser cables. + * src/tap/cable/usbblaster.c: Convert from libftdx helpers to libusb helpers. 2010-06-24 Mike Frysinger diff --git a/urjtag/src/tap/cable/generic_usbconn_list.h b/urjtag/src/tap/cable/generic_usbconn_list.h index 57891773..ab862847 100644 --- a/urjtag/src/tap/cable/generic_usbconn_list.h +++ b/urjtag/src/tap/cable/generic_usbconn_list.h @@ -62,18 +62,10 @@ _URJ_USB(usbscarab2_ftdi) #endif #endif #ifdef ENABLE_CABLE_USBBLASTER -#ifdef ENABLE_LOWLEVEL_FTD2XX -_URJ_USB(usbblaster_ftd2xx) -_URJ_USB(cubic_cyclonium_ftd2xx) -_URJ_USB(nios_eval_ftd2xx) -_URJ_USB(usb_jtag_ftd2xx) -#endif -#ifdef ENABLE_LOWLEVEL_FTDI -_URJ_USB(usbblaster_ftdi) -_URJ_USB(cubic_cyclonium_ftdi) -_URJ_USB(nios_eval_ftdi) -_URJ_USB(usb_jtag_ftdi) -#endif +_URJ_USB(usbblaster) +_URJ_USB(cubic_cyclonium) +_URJ_USB(nios_eval) +_URJ_USB(usb_jtag) #endif #ifdef ENABLE_CABLE_ICE100 _URJ_USB(ice100B)