From 785c3f17e42920a36ca91055806b1cc17bf33c67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnim=20L=C3=A4uger?= Date: Sat, 1 Mar 2008 23:04:04 +0000 Subject: [PATCH] rework init sequence [ 1904970 ] git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@1109 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- jtag/ChangeLog | 7 +++ jtag/src/tap/parport/ftd2xx.c | 13 ++++-- jtag/src/tap/parport/ftdi.c | 83 ++++++++++++++++++++++++++++++----- 3 files changed, 88 insertions(+), 15 deletions(-) diff --git a/jtag/ChangeLog b/jtag/ChangeLog index e6fea8a9..c5a64400 100644 --- a/jtag/ChangeLog +++ b/jtag/ChangeLog @@ -1,3 +1,10 @@ +2008-03-01 Arnim + + * src/tap/parport/ftdi.c (ftdi_mpsse_open): rework sequence to fix + a system that shows similar hangs as reported in + [ 1904970 ] JTAG operations hang with libftdi + * src/tap/parport/ftd2xx.c (ftd2xx_mpsse_open): align with ftdi.c + 2008-03-01 Kolja Waschk * src/tap/cable/xpc.c: Implemented much faster access method using GPIF diff --git a/jtag/src/tap/parport/ftd2xx.c b/jtag/src/tap/parport/ftd2xx.c index 7a400d12..f14478f5 100644 --- a/jtag/src/tap/parport/ftd2xx.c +++ b/jtag/src/tap/parport/ftd2xx.c @@ -289,12 +289,17 @@ ftd2xx_mpsse_open( parport_t *parport ) FT_Close(fc); return -1; } - if ((status = FT_Purge(fc, FT_PURGE_RX | FT_PURGE_TX)) != FT_OK) { + if ((status = FT_Purge(fc, FT_PURGE_RX)) != FT_OK) { fprintf(stderr, "Can't purge buffers: %li\n", status); FT_Close(fc); return -1; } - /* set a reasonnable latency timer value + if ((status = FT_SetChars(fc, 7, 1, 6, 1)) != FT_OK) { + fprintf(stderr, "Can't set special characters: %li\n", status); + FT_Close(fc); + return -1; + } + /* set a reasonable latency timer value if this value is too low then the chip will send intermediate result data in short packets (suboptimal performance) */ if ((status = FT_SetLatencyTimer(fc, 16)) != FT_OK) { @@ -317,7 +322,7 @@ ftd2xx_mpsse_open( parport_t *parport ) FT_Close(fc); return -1; } - if ((status = FT_Purge(fc, FT_PURGE_RX | FT_PURGE_TX)) != FT_OK) { + if ((status = FT_Purge(fc, FT_PURGE_RX)) != FT_OK) { fprintf(stderr, "Can't purge buffers: %li\n", status); FT_Close(fc); return -1; @@ -337,7 +342,7 @@ ftd2xx_mpsse_open( parport_t *parport ) FT_Close(fc); return -1; } - if ((status = FT_Purge(fc, FT_PURGE_RX | FT_PURGE_TX)) != FT_OK) { + if ((status = FT_Purge(fc, FT_PURGE_RX)) != FT_OK) { fprintf(stderr, "Can't purge buffers: %li\n", status); FT_Close(fc); return -1; diff --git a/jtag/src/tap/parport/ftdi.c b/jtag/src/tap/parport/ftdi.c index 677691f9..6ea6d4c1 100644 --- a/jtag/src/tap/parport/ftdi.c +++ b/jtag/src/tap/parport/ftdi.c @@ -293,6 +293,57 @@ ftdi_std_open( parport_t *parport ) } +#undef LIBFTDI_UNIMPLEMENTED + +static int +seq_purge( struct ftdi_context *fc, int purge_rx, int purge_tx ) +{ + int result = 0; + unsigned char buf; + +#ifndef LIBFTDI_UNIMPLEMENTED + result = ftdi_usb_purge_buffers( fc ); + if (result == 0) + result = ftdi_read_data( fc, &buf, 1 ); +#else /* not yet available */ + { + int rx_loop; + + if (purge_rx) + for (rx_loop = 0; (rx_loop < 6) && (result == 0); rx_loop++) + result = ftdi_usb_purge_rx_buffer( fc ); + + if (purge_tx) + if (result == 0) + result = ftdi_usb_purge_tx_buffer( fc ); + if (result == 0) + ftdi_read_data( fc, &buf, 1 ); + } +#endif + + return result; +} + + +static int +seq_reset( struct ftdi_context *fc ) +{ + int result = 0; + +#ifdef LIBFTDI_UNIMPLEMENTED /* not yet available */ + { + unsigned short status; + if ((result = ftdi_poll_status( fc, &status )) < 0) + return result; + } +#endif + if ((result = ftdi_usb_reset( fc)) < 0) + return result; + + return seq_purge( fc, 1, 1 ); +} + + static int ftdi_mpsse_open( parport_t *parport ) { @@ -308,7 +359,7 @@ ftdi_mpsse_open( parport_t *parport ) However, it's built after the description of JTAG_InitDevice Ref. FTCJTAGPG10.pdf Intermittent problems will occur when certain steps are skipped. */ - if (ftdi_usb_reset(fc) < 0) + if (seq_reset(fc) < 0) { fprintf (stderr, "Can't reset USB: %s\n", ftdi_get_error_string (fc)); @@ -316,17 +367,27 @@ ftdi_mpsse_open( parport_t *parport ) ftdi_deinit(fc); return -1; } - if (ftdi_usb_purge_buffers(fc) < 0) + if (seq_purge(fc, 1, 0) < 0) { - fprintf (stderr, "Can't purge USB buffers: %s\n", + fprintf (stderr, "Can't purge USB RX buffer: %s\n", ftdi_get_error_string (fc)); ftdi_usb_close(fc); ftdi_deinit(fc); return -1; } - /* set a reasonnable latency timer value - if this value is too low then the chip will send intermediate result data - in short packets (suboptimal performance) */ +#ifdef LIBFTDI_UNIMPLEMENTED /* not yet available */ + if (ftdi_set_chars(fc, 0, 0, 0, 0) < 0) + { + fprintf (stderr, "Can't set special characters: %s\n", + ftdi_get_error_string (fc)); + ftdi_usb_close(fc); + ftdi_deinit(fc); + return -1; + } +#endif + /* set a reasonable latency timer value + if this value is too low then the chip will send intermediate result data + in short packets (suboptimal performance) */ if(ftdi_set_latency_timer(fc, 16) < 0) { fprintf (stderr, "Can't set target latency: %s\n", @@ -336,7 +397,7 @@ ftdi_mpsse_open( parport_t *parport ) return -1; } - if (ftdi_set_bitmode(fc, 0x0b, BITMODE_RESET) < 0) + if (ftdi_disable_bitbang(fc) < 0) { fprintf (stderr, "Can't reset bitmode: %s\n", ftdi_get_error_string (fc)); @@ -361,9 +422,9 @@ ftdi_mpsse_open( parport_t *parport ) ftdi_deinit(fc); return -1; } - if (ftdi_usb_purge_buffers(fc) < 0) + if (seq_purge(fc, 1, 0) < 0) { - fprintf (stderr, "Can't purge USB buffers: %s\n", + fprintf (stderr, "Can't purge USB RX buffer: %s\n", ftdi_get_error_string (fc)); ftdi_usb_close(fc); ftdi_deinit(fc); @@ -387,9 +448,9 @@ ftdi_mpsse_open( parport_t *parport ) ftdi_deinit(fc); return -1; } - if (ftdi_usb_purge_buffers(fc) < 0) + if (seq_purge(fc, 1, 0) < 0) { - fprintf (stderr, "Can't purge USB buffers: %s\n", + fprintf (stderr, "Can't purge USB RX buffer: %s\n", ftdi_get_error_string (fc)); ftdi_usb_close(fc); ftdi_deinit(fc);