add documentation for FTDI2232 based devices

[usb-driver] / jtagkey.c

diff --git a/jtagkey.c b/jtagkey.c
index e17afc8895a71aa55da0bd7bb6bcd5c091a848f0..fc762d368d211604cb0cb53ec6cdd2fca5ac775a 100644 (file)
--- a/jtagkey.c
+++ b/jtagkey.c
@@ -7,6 +7,7 @@
 #include "jtagkey.h"
 
 #define USBBUFSIZE 1048576
+#define JTAG_SPEED 100000
 #define SLOW_AND_SAFE 1
 
 static struct ftdi_context ftdic;
@@ -51,11 +52,6 @@ static int jtagkey_init(unsigned short vid, unsigned short pid) {
                return ret;
        }
 
-       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);
 
@@ -64,6 +60,11 @@ static int jtagkey_init(unsigned short vid, unsigned short pid) {
                return ret;
        }
 
+       if ((ret = ftdi_set_baudrate(&ftdic, JTAG_SPEED))  != 0) {
+               fprintf(stderr, "unable to set baudrate: %d (%s)\n", ret, ftdi_get_error_string(&ftdic));
+               return ret;
+       }
+
        bitbang_mode = BITMODE_SYNCBB;
 
        if ((ret = ftdi_usb_purge_buffers(&ftdic))  != 0) {
@@ -160,6 +161,7 @@ static void *jtagkey_reader(void *thread_arg) {
        pthread_exit(NULL);
 }
 
+/* TODO: Interpret JTAG commands and transfer in MPSSE mode */
 int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase, int ecpbase, int num) {
        int ret = 0;
        int i;
@@ -170,7 +172,7 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
        static unsigned char last_write = 0x00;
        static unsigned char writebuf[USBBUFSIZE], *writepos = writebuf;
        static unsigned char readbuf[USBBUFSIZE], *readpos;
-       unsigned char data, prev_data;
+       unsigned char data, prev_data, last_cyc_write;
        struct jtagkey_reader_arg targ;
        pthread_t reader_thread;
 
@@ -211,6 +213,8 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
                writepos = writebuf;
        }
 
+       last_cyc_write = last_write;
+
        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,
@@ -282,7 +286,7 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
                        }
                }
 
-               if (nread || (*writepos != prev_data) || (i == num-1))
+               if ((tr[i].cmdTrans == PP_READ) || (*writepos != prev_data) || (i == num-1))
                        writepos++;
        }
 
@@ -315,6 +319,7 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
        }
 
        readpos = readbuf;
+       last_write = last_cyc_write;
 
        for (i = 0; i < num; i++) {
                DPRINTF("dwPort: 0x%lx, cmdTrans: %lu, dwbytes: %ld, fautoinc: %ld, dwoptions: %ld\n",
@@ -323,6 +328,10 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
 
                port = (unsigned long)tr[i].dwPort;
                val = tr[i].Data.Byte;
+
+               if ((tr[i].cmdTrans != PP_READ) && (val == last_write) && (i != num-1))
+                       continue;
+
                readpos++;
 
                if (port == ppbase + PP_DATA) {
@@ -344,7 +353,7 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
                                        if ((data & JTAGKEY_TDO) && (last_write & PP_PROG))
                                                val |= PP_TDO;
 
-                                       if (!(last_write & PP_PROG))
+                                       if (~last_write & PP_PROG)
                                                val |= 0x08;
 
                                        if (last_write & 0x40)