Fix autogen.sh invocation of libjaylink

[openocd.git] / src / jtag / drivers / ft2232.c

diff --git a/src/jtag/drivers/ft2232.c b/src/jtag/drivers/ft2232.c
index fed829856036d17c2eec0ef8f80a656b7dba1eb3..621da8e21807ee3b579ed7b0fbfbb287628063e1 100644 (file)
--- a/src/jtag/drivers/ft2232.c
+++ b/src/jtag/drivers/ft2232.c
@@ -22,9 +22,7 @@
 *   GNU General Public License for more details.                          *
 *                                                                         *
 *   You should have received a copy of the GNU General Public License     *
-*   along with this program; if not, write to the                         *
-*   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+*   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
 ***************************************************************************/
 
 /**
@@ -164,7 +162,7 @@ static uint16_t ft2232_vid[MAX_USB_IDS + 1] = { 0x0403, 0 };
 static uint16_t ft2232_pid[MAX_USB_IDS + 1] = { 0x6010, 0 };
 
 struct ft2232_layout {
-       char *name;
+       const char *name;
        int (*init)(void);
        void (*reset)(int trst, int srst);
        void (*blink)(void);
@@ -1511,7 +1509,8 @@ static void minimodule_reset(int trst, int srst)
 
 static void turtle_reset(int trst, int srst)
 {
-       trst = trst;
+       if (trst == 1)
+               LOG_ERROR("Can't assert TRST: the adapter lacks this signal");
 
        if (srst == 1)
                low_output |= nSRST;
@@ -2340,6 +2339,11 @@ static int ft2232_init(void)
        int retval;
        uint32_t bytes_written;
 
+       LOG_WARNING("Using DEPRECATED interface driver 'ft2232'");
+#if BUILD_FTDI
+       LOG_INFO("Consider using the 'ftdi' interface driver, with configuration files in interface/ftdi/...");
+#endif
+
        if (tap_get_tms_path_len(TAP_IRPAUSE, TAP_IRPAUSE) == 7)
                LOG_DEBUG("ft2232 interface using 7 step jtag state transitions");
        else
@@ -3141,9 +3145,8 @@ static void flossjtag_blink(void)
 static int ft2232_quit(void)
 {
 #if BUILD_FT2232_FTD2XX == 1
-       FT_STATUS status;
 
-       status = FT_Close(ftdih);
+       FT_Close(ftdih);
 #elif BUILD_FT2232_LIBFTDI == 1
        ftdi_usb_close(&ftdic);