fix prom readback, but this slows everything down again...

[usb-driver] / jtagkey.c

diff --git a/jtagkey.c b/jtagkey.c
index 9891f4b70302d77a43283db5dbbcf16de3c2454d..41f0fd60723df3d2e472ada46b1a2cd8da1d0690 100644 (file)
--- a/jtagkey.c
+++ b/jtagkey.c
@@ -1,13 +1,18 @@
 #include <stdio.h>
 #include <ftdi.h>
+#include <unistd.h>
 #include "usb-driver.h"
+#include "config.h"
 #include "jtagkey.h"
 
-#define USBBUFSIZE 384
+#define USBBUFSIZE 4096
+#define SLOW_AND_SAFE 1
 
 static struct ftdi_context ftdic;
+static unsigned int usb_maxlen = 0;
+static unsigned char bitbang_mode;
 
-int jtagkey_init(unsigned short vid, unsigned short pid) {
+static int jtagkey_init(unsigned short vid, unsigned short pid) {
        int ret = 0;
        unsigned char c;
 
@@ -31,9 +36,12 @@ int jtagkey_init(unsigned short vid, unsigned short pid) {
                return ret;
        }
 
-#if 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));
+
+#ifdef SLOW_AND_SAFE
+       usb_maxlen = 384;
+#else
+       if ((ret = ftdi_write_data_get_chunksize(&ftdic, &usb_maxlen))  != 0) {
+               fprintf(stderr, "unable to get write chunksize: %d (%s)\n", ret, ftdi_get_error_string(&ftdic));
                return ret;
        }
 #endif
@@ -56,6 +64,8 @@ int jtagkey_init(unsigned short vid, unsigned short pid) {
                return ret;
        }
 
+       bitbang_mode = BITMODE_SYNCBB;
+
        if ((ret = ftdi_usb_purge_buffers(&ftdic))  != 0) {
                fprintf(stderr, "unable to purge buffers: %d (%s)\n", ret, ftdi_get_error_string(&ftdic));
                return ret;
@@ -64,10 +74,48 @@ int jtagkey_init(unsigned short vid, unsigned short pid) {
        return ret;
 }
 
-void jtagkey_close() {
-       ftdi_disable_bitbang(&ftdic);
-       ftdi_usb_close(&ftdic);
-       ftdi_deinit(&ftdic);
+int jtagkey_open(int num) {
+       int ret;
+
+       ret = jtagkey_init(config_usb_vid(num), config_usb_pid(num));
+
+       if (ret >= 0)
+               ret = 0xff;
+
+       return ret;
+}
+
+void jtagkey_close(int handle) {
+       if (handle == 0xff) {
+               ftdi_disable_bitbang(&ftdic);
+               ftdi_usb_close(&ftdic);
+               ftdi_deinit(&ftdic);
+       }
+}
+
+static int jtagkey_set_bbmode(unsigned char mode) {
+       int ret = 0;
+
+       if (bitbang_mode != mode) {
+               DPRINTF("switching bitbang-mode!\n");
+
+               /* Wait for the latency-timer to kick in */
+               usleep(2);
+               if ((ret = ftdi_set_bitmode(&ftdic, JTAGKEY_TCK|JTAGKEY_TDI|JTAGKEY_TMS|JTAGKEY_OEn, mode))  != 0) {
+                       fprintf(stderr, "unable to enable bitbang mode: %d (%s)\n", ret, ftdi_get_error_string(&ftdic));
+                       return ret;
+               }
+               if ((ret = ftdi_usb_purge_buffers(&ftdic))  != 0) {
+                       fprintf(stderr, "unable to purge buffers: %d (%s)\n", ret, ftdi_get_error_string(&ftdic));
+                       return ret;
+               }
+               /* Wait for the FTDI2232 to settle */
+               usleep(2);
+
+               bitbang_mode = mode;
+       }
+
+       return ret;
 }
 
 void jtagkey_state(unsigned char data) {
@@ -110,15 +158,30 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
 
        /* Write combining */
        if ((writepos-writebuf > sizeof(writebuf)-num) || (nread && writepos-writebuf)) {
+               unsigned char *pos = writebuf;
+               int len;
                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));
+#ifndef SLOW_AND_SAFE
+               jtagkey_set_bbmode(BITMODE_BITBANG);
+#endif
+               while (pos < writepos) {
+                       len = writepos-pos;
+
+                       if (len > usb_maxlen)
+                               len = usb_maxlen;
+
+                       DPRINTF("combined write of %d/%d\n",len,writepos-pos);
+                       ftdi_write_data(&ftdic, pos, len);
+#ifdef SLOW_AND_SAFE
+                       i = 0;
+                       while (i < len) {
+                               i += ftdi_read_data(&ftdic, readbuf, sizeof(readbuf));
+                       }
+#endif
+                       pos += len;
                }
-               DPRINTF("read %d/%d bytes\n", i, writepos-writebuf);
+
                writepos = writebuf;
        }
 
@@ -200,14 +263,17 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
        if (nread)
        {
                DPRINTF("writing %d bytes\n", writepos-writebuf);
+
+               *writepos = last_data;
+               writepos++;
+
+               jtagkey_set_bbmode(BITMODE_SYNCBB);
                ftdi_write_data(&ftdic, writebuf, writepos-writebuf);
-               DPRINTF("reading %d bytes\n", writepos-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: ");
@@ -222,7 +288,6 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
        }
 
        readpos = readbuf;
-       readpos += 0;
 
        for (i = 0; i < num; i++) {
                DPRINTF("dwPort: 0x%lx, cmdTrans: %lu, dwbytes: %ld, fautoinc: %ld, dwoptions: %ld\n",
@@ -242,6 +307,7 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
                        switch(tr[i].cmdTrans) {
                                case PP_READ:
                                        data = *readpos;
+
 #ifdef DEBUG
                                        DPRINTF("READ: 0x%x\n", data);
                                        jtagkey_state(data);