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

[usb-driver] / jtagkey.c

diff --git a/jtagkey.c b/jtagkey.c
index 7707ae042d1112a574d13f21aea8ebb79424e952..41f0fd60723df3d2e472ada46b1a2cd8da1d0690 100644 (file)
--- a/jtagkey.c
+++ b/jtagkey.c
@@ -2,15 +2,17 @@
 #include <ftdi.h>
 #include <unistd.h>
 #include "usb-driver.h"
+#include "config.h"
 #include "jtagkey.h"
 
 #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;
 
@@ -35,10 +37,14 @@ int jtagkey_init(unsigned short vid, unsigned short pid) {
        }
 
 
+#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
 
        if ((ret = ftdi_set_latency_timer(&ftdic, 1))  != 0) {
                fprintf(stderr, "unable to set latency timer: %d (%s)\n", ret, ftdi_get_error_string(&ftdic));
@@ -53,12 +59,12 @@ int jtagkey_init(unsigned short vid, unsigned short pid) {
        c = 0x00;
        ftdi_write_data(&ftdic, &c, 1);
 
-       if ((ret = ftdi_set_bitmode(&ftdic, JTAGKEY_TCK|JTAGKEY_TDI|JTAGKEY_TMS|JTAGKEY_OEn, BITMODE_BITBANG))  != 0) {
+       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;
        }
 
-       bitbang_mode = BITMODE_BITBANG;
+       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));
@@ -68,10 +74,23 @@ 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) {
@@ -143,7 +162,9 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
                int len;
                DPRINTF("writing %d bytes due to %d following reads in %d chunks or full buffer\n", writepos-writebuf, nread, num);
 
+#ifndef SLOW_AND_SAFE
                jtagkey_set_bbmode(BITMODE_BITBANG);
+#endif
                while (pos < writepos) {
                        len = writepos-pos;
 
@@ -152,10 +173,15 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
 
                        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;
        }