much faster programming via FTDI2232 now.

programs a xc3s200 in 22 seconds

diff --git a/jtagkey.c b/jtagkey.c
index f8e715826893e4b378142e592341dc4d5d3ce1eb..42669591ecfd76a9a06098e34380367ce4df8aa6 100644 (file)
--- a/jtagkey.c
+++ b/jtagkey.c
@@ -3,10 +3,13 @@
 #include "usb-driver.h"
 #include "jtagkey.h"
 
+#define USBBUFSIZE 384
+
 static struct ftdi_context ftdic;
 
 int jtagkey_init(unsigned short vid, unsigned short pid) {
        int ret = 0;
+       unsigned char c;
 
        if ((ret = ftdi_init(&ftdic)) != 0) {
                fprintf(stderr, "unable to initialise libftdi: %d (%s)\n", ret, ftdi_get_error_string(&ftdic));
@@ -29,7 +32,7 @@ int jtagkey_init(unsigned short vid, unsigned short pid) {
        }
 
 #if 0
-       if ((ret = ftdi_write_data_set_chunksize(&ftdic, 3))  != 0) {
+       if ((ret = ftdi_write_data_set_chunksize(&ftdic, 1))  != 0) {
                fprintf(stderr, "unable to set write chunksize: %d (%s)\n", ret, ftdi_get_error_string(&ftdic));
                return ret;
        }
@@ -40,11 +43,14 @@ int jtagkey_init(unsigned short vid, unsigned short pid) {
                return ret;
        }
 
-       if ((ret = ftdi_set_baudrate(&ftdic, 1000000))  != 0) {
+       if ((ret = ftdi_set_baudrate(&ftdic, 500000))  != 0) {
                fprintf(stderr, "unable to set baudrate: %d (%s)\n", ret, ftdi_get_error_string(&ftdic));
                return ret;
        }
 
+       c = 0x00;
+       ftdi_write_data(&ftdic, &c, 1);
+
        if ((ret = ftdi_set_bitmode(&ftdic, JTAGKEY_TCK|JTAGKEY_TDI|JTAGKEY_TMS|JTAGKEY_OEn, BITMODE_SYNCBB))  != 0) {
                fprintf(stderr, "unable to enable bitbang mode: %d (%s)\n", ret, ftdi_get_error_string(&ftdic));
                return ret;
@@ -88,13 +94,34 @@ void jtagkey_state(unsigned char data) {
 int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase, int ecpbase, int num) {
        int ret = 0;
        int i;
+       int nread = 0;
        unsigned long port;
        unsigned char val;
-       static unsigned char last_write = 0, last_data = 0;
+       static unsigned char last_data = 0;
+       static unsigned char writebuf[USBBUFSIZE], *writepos = writebuf;
+       static unsigned char readbuf[USBBUFSIZE], *readpos;
        unsigned char data;
-       unsigned char writebuf[4096], readbuf[4096], *pos;
+       static unsigned char last_write = 0x00;
+
+       /* Count writes */
+       for (i = 0; i < num; i++)
+               if (tr[i].cmdTrans == 10)
+                       nread++;
+
+       /* Write combining */
+       if ((writepos-writebuf > sizeof(writebuf)-num) || (nread && writepos-writebuf)) {
+               DPRINTF("writing %d bytes due to %d following reads in %d chunks or full buffer\n", writepos-writebuf, nread, num);
+
+               ftdi_write_data(&ftdic, writebuf, writepos-writebuf);
+
+               i = 0;
+               while (i < writepos-writebuf) {
+                       i += ftdi_read_data(&ftdic, readbuf, sizeof(readbuf));
+               };
+               DPRINTF("read %d/%d bytes\n", i, writepos-writebuf);
+               writepos = writebuf;
+       }
 
-       pos = writebuf;
        for (i = 0; i < num; i++) {
                DPRINTF("dwPort: 0x%lx, cmdTrans: %lu, dwbytes: %ld, fautoinc: %ld, dwoptions: %ld\n",
                                (unsigned long)tr[i].dwPort, tr[i].cmdTrans, tr[i].dwBytes,
@@ -109,10 +136,7 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
 #endif
 
                /* Pad writebuf for read-commands in stream */
-               if (tr[i].cmdTrans == 10) {
-                       *pos = last_data;
-                       pos++;
-               }
+               *writepos = last_data;
 
                if (port == ppbase + PP_DATA) {
                        DPRINTF("data port\n");
@@ -143,16 +167,22 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
                                                DPRINTF("!TMS\n");
                                        }
                                        if (val & PP_CTRL) {
-                                               data |= JTAGKEY_OEn;
+                                               data = JTAGKEY_OEn;
                                                DPRINTF("CTRL\n");
                                        } else {
                                                DPRINTF("!CTRL\n");
                                        }
-                                       *pos = data;
-                                       pos++;
 
-                                       last_write = val;
+                                       if (val & PP_PROG) {
+                                               DPRINTF("PROG\n");
+                                       } else {
+                                               DPRINTF("!PROG\n");
+                                       }
+
+                                       *writepos = data;
+
                                        last_data = data;
+                                       last_write = val;
                                        break;
 
                                default:
@@ -161,27 +191,35 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
                                        break;
                        }
                }
+               writepos++;
        }
 
-       ftdi_usb_purge_buffers(&ftdic);
-       ftdi_write_data(&ftdic, writebuf, pos-writebuf);
+       if (nread)
+       {
+               DPRINTF("writing %d bytes\n", writepos-writebuf);
+               ftdi_write_data(&ftdic, writebuf, writepos-writebuf);
+               DPRINTF("reading %d bytes\n", writepos-writebuf);
 
-       i = 0;
-       do {
-#if 0
-               ftdi_write_data(&ftdic, &last_data, 1);
-#endif
-               i += ftdi_read_data(&ftdic, readbuf, sizeof(readbuf));
-       } while (i < pos-writebuf);
+               i = 0;
+               while (i < writepos-writebuf) {
+                       i += ftdi_read_data(&ftdic, readbuf, sizeof(readbuf));
+               }
+               DPRINTF("read %d bytes\n", i);
 
 #ifdef DEBUG
-       DPRINTF("write: ");
-       hexdump(writebuf, pos-writebuf);
-       DPRINTF("read: ");
-       hexdump(readbuf, i);
+               DPRINTF("write: ");
+               hexdump(writebuf, writepos-writebuf);
+               DPRINTF("read: ");
+               hexdump(readbuf, i);
 #endif
 
-       pos = readbuf;
+               writepos = writebuf;
+       } else {
+               return ret;
+       }
+
+       readpos = readbuf;
+       readpos += 0;
 
        for (i = 0; i < num; i++) {
                DPRINTF("dwPort: 0x%lx, cmdTrans: %lu, dwbytes: %ld, fautoinc: %ld, dwoptions: %ld\n",
@@ -190,22 +228,29 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
 
                port = (unsigned long)tr[i].dwPort;
                val = tr[i].Data.Byte;
-               pos++;
+               readpos++;
 
-               if (port == ppbase + PP_STATUS) {
-                       DPRINTF("status port (last write: %d)\n", last_write);
+               if (port == ppbase + PP_DATA) {
+                       if (tr[i].cmdTrans == PP_WRITE) {
+                               last_write = val;
+                       }
+               } else if (port == ppbase + PP_STATUS) {
+                       DPRINTF("status port (last write: 0x%x)\n", last_write);
                        switch(tr[i].cmdTrans) {
                                case PP_READ:
-                                       data = *pos;
+                                       data = *readpos;
 #ifdef DEBUG
                                        DPRINTF("READ: 0x%x\n", data);
                                        jtagkey_state(data);
 #endif
 
                                        val = 0x00;
-                                       if (data & JTAGKEY_TDO)
+                                       if ((data & JTAGKEY_TDO) && (last_write & PP_PROG))
                                                val |= PP_TDO;
 
+                                       if (!(last_write & PP_PROG))
+                                               val |= 0x08;
+
                                        if (last_write & 0x40)
                                                val |= 0x20;
                                        else

diff --git a/usb-driver.c b/usb-driver.c
index 6b1fb87b36ce8979d3bd2085f2da0a4badb93911..9599200fce5c73f4e71f09bc93f59384472a3e6b 100644 (file)
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -349,7 +349,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
        switch(request & ~(0xc0000000)) {
                case VERSION:
                        version = (struct version_struct*)(wdheader->data);
-                       strcpy(version->version, "libusb-driver.so $Revision: 1.64 $");
+                       strcpy(version->version, "libusb-driver.so $Revision: 1.65 $");
                        version->versionul = 802;
                        DPRINTF("VERSION\n");
                        break;
@@ -800,6 +800,11 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
+#ifdef JTAGKEY
+                               if (cr->hCard == 0xff)
+                                       jtagkey_close();
+#endif
+
                                if (parportfd == cr->hCard && parportfd >= 0) {
                                        ioctl(parportfd, PPRELEASE);
                                        close(parportfd);

diff --git a/usb-driver.h b/usb-driver.h
index 282a5f8c03298cf12322444719cc4a202a84d2e1..baddf4a56208fec525db31d373f98036e6a47483 100644 (file)
--- a/usb-driver.h
+++ b/usb-driver.h
@@ -33,6 +33,7 @@
 
 #define PP_TDI                 0x01
 #define PP_TDO                 0x10
+#define PP_PROG                        0x10
 #define PP_TCK                 0x02
 #define PP_TMS                 0x04
 #define PP_CTRL                        0x08