From ebfeb9ea8cd2b6039f0f72e7e7578f2d31990e63 Mon Sep 17 00:00:00 2001 From: Kolja Waschk Date: Sat, 16 Feb 2008 14:26:37 +0000 Subject: [PATCH] Drivers for ftdi-based cables weren't included if only FTD2XX was there (but no libftdi) git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@1029 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- jtag/ChangeLog | 5 ++++- jtag/src/tap/cable.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/jtag/ChangeLog b/jtag/ChangeLog index f5764e0e..ff702faa 100644 --- a/jtag/ChangeLog +++ b/jtag/ChangeLog @@ -2,8 +2,11 @@ * THANKS: to the original SVF and BSDL parser programmers -2008-02-15 Kolja Waschk +2008-02-16 Kolja Waschk + * doc/UrJTAG.txt: Updated doc about building with FTD2XX in Cygwin + * src/tap/cable.c: Include ftdi-based cable drivers if either libftdi or + FTDI's FTD2XX (CDM) drivers are present (--with-ftd2xx) * src/flash/Makefile.am, src/flash/jedec_exp.c, src/flash/detectflash.c, configure.ac: Experimental new code for flash detection, to be enabled during configuration with --enable-jedec-exp (disabled by default) diff --git a/jtag/src/tap/cable.c b/jtag/src/tap/cable.c index f546cde5..f5c920a2 100644 --- a/jtag/src/tap/cable.c +++ b/jtag/src/tap/cable.c @@ -44,7 +44,7 @@ extern cable_driver_t arcom_cable_driver; extern cable_driver_t byteblaster_cable_driver; -#ifdef HAVE_LIBFTDI +#if defined(HAVE_LIBFTDI) || defined(HAVE_LIBFTD2XX) extern cable_driver_t usbblaster_cable_driver; extern cable_driver_t ft2232_cable_driver; extern cable_driver_t ft2232_jtagkey_cable_driver; @@ -75,7 +75,7 @@ extern cable_driver_t ep9307_cable_driver; cable_driver_t *cable_drivers[] = { &arcom_cable_driver, &byteblaster_cable_driver, -#ifdef HAVE_LIBFTDI +#if defined(HAVE_LIBFTDI) || defined(HAVE_LIBFTD2XX) &usbblaster_cable_driver, &ft2232_cable_driver, &ft2232_jtagkey_cable_driver,