]> git.zerfleddert.de Git - usb-driver/blobdiff - jtagkey.c
XILINX platform cable USB DLC9 works, too (reported by Johannes Hanika)
[usb-driver] / jtagkey.c
index f8e715826893e4b378142e592341dc4d5d3ce1eb..d23c60d244a06e6e04e368b1e701b777875d725d 100644 (file)
--- a/jtagkey.c
+++ b/jtagkey.c
@@ -1,12 +1,40 @@
 #include <stdio.h>
 #include <ftdi.h>
 #include <stdio.h>
 #include <ftdi.h>
+#include <unistd.h>
+#include <pthread.h>
+#include <inttypes.h>
 #include "usb-driver.h"
 #include "usb-driver.h"
+#include "config.h"
 #include "jtagkey.h"
 #include "jtagkey.h"
+#include "jtagmon.h"
+
+#define USBBUFSIZE 1048576
+#define JTAG_SPEED 100000
+#define BULK_LATENCY 2
+#define OTHER_LATENCY 1
 
 static struct ftdi_context ftdic;
 
 
 static struct ftdi_context ftdic;
 
-int jtagkey_init(unsigned short vid, unsigned short pid) {
+static int jtagkey_latency(int latency) {
+       static int current = 0;
+       int ret;
+
+       if (current != latency) {
+               DPRINTF("switching latency\n");
+               if ((ret = ftdi_set_latency_timer(&ftdic, latency))  != 0) {
+                       fprintf(stderr, "unable to set latency timer: %d (%s)\n", ret, ftdi_get_error_string(&ftdic));
+                       return ret;
+               }
+               
+               current = latency;
+       }
+
+       return ret;
+}
+
+static int jtagkey_init(unsigned short vid, unsigned short pid) {
        int ret = 0;
        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));
 
        if ((ret = ftdi_init(&ftdic)) != 0) {
                fprintf(stderr, "unable to initialise libftdi: %d (%s)\n", ret, ftdi_get_error_string(&ftdic));
@@ -28,28 +56,32 @@ int jtagkey_init(unsigned short vid, unsigned short pid) {
                return ret;
        }
 
                return ret;
        }
 
-#if 0
-       if ((ret = ftdi_write_data_set_chunksize(&ftdic, 3))  != 0) {
+       if ((ret = ftdi_write_data_set_chunksize(&ftdic, USBBUFSIZE))  != 0) {
                fprintf(stderr, "unable to set write chunksize: %d (%s)\n", ret, ftdi_get_error_string(&ftdic));
                return ret;
        }
                fprintf(stderr, "unable to set 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));
+       if ((ret = ftdi_read_data_set_chunksize(&ftdic, USBBUFSIZE))  != 0) {
+               fprintf(stderr, "unable to set read chunksize: %d (%s)\n", ret, ftdi_get_error_string(&ftdic));
                return ret;
        }
 
                return ret;
        }
 
-       if ((ret = ftdi_set_baudrate(&ftdic, 1000000))  != 0) {
-               fprintf(stderr, "unable to set baudrate: %d (%s)\n", ret, ftdi_get_error_string(&ftdic));
+       if ((ret = jtagkey_latency(OTHER_LATENCY)) != 0)
                return ret;
                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;
        }
 
 
        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;
        }
 
+       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;
+       }
+
        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;
        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;
@@ -58,10 +90,23 @@ int jtagkey_init(unsigned short vid, unsigned short pid) {
        return ret;
 }
 
        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);
+       }
 }
 
 void jtagkey_state(unsigned char data) {
 }
 
 void jtagkey_state(unsigned char data) {
@@ -85,16 +130,73 @@ void jtagkey_state(unsigned char data) {
        fprintf(stderr,"\n");
 }
 
        fprintf(stderr,"\n");
 }
 
+struct jtagkey_reader_arg {
+       int             num;
+       unsigned char   *buf;
+};
+
+static void *jtagkey_reader(void *thread_arg) {
+       struct jtagkey_reader_arg *arg = (struct jtagkey_reader_arg*)thread_arg;
+       int i;
+
+       i = 0;
+       DPRINTF("reader for %d bytes\n", arg->num);
+       while (i < arg->num) {
+               i += ftdi_read_data(&ftdic, arg->buf + i, arg->num - i);
+       }
+       
+       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;
 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;
        unsigned long port;
        unsigned char val;
-       static unsigned char last_write = 0, last_data = 0;
-       unsigned char data;
-       unsigned char writebuf[4096], readbuf[4096], *pos;
+       static unsigned char last_data = 0;
+       static unsigned char last_write = 0x00;
+       static unsigned char writebuf[USBBUFSIZE], *writepos = writebuf;
+       static unsigned char readbuf[USBBUFSIZE], *readpos;
+       unsigned char data, prev_data, last_cyc_write;
+       struct jtagkey_reader_arg targ;
+       pthread_t reader_thread;
+
+       /* Count reads */
+       for (i = 0; i < num; i++)
+               if (tr[i].cmdTrans == PP_READ)
+                       nread++;
+
+       /* 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);
+               jtagkey_latency(BULK_LATENCY);
+
+               targ.num = writepos-pos;
+               targ.buf = readbuf;
+               pthread_create(&reader_thread, NULL, &jtagkey_reader, &targ);
+
+               while (pos < writepos) {
+                       len = writepos-pos;
+
+                       if (len > USBBUFSIZE)
+                               len = USBBUFSIZE;
+
+                       DPRINTF("combined write of %d/%d\n",len,writepos-pos);
+                       ftdi_write_data(&ftdic, pos, len);
+                       pos += len;
+               }
+               pthread_join(reader_thread, NULL);
+
+               writepos = writebuf;
+       }
+
+       last_cyc_write = last_write;
 
 
-       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,
        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,
@@ -106,13 +208,14 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
 #ifdef DEBUG
                if (tr[i].cmdTrans == 13)
                        DPRINTF("write byte: %d\n", val);
 #ifdef DEBUG
                if (tr[i].cmdTrans == 13)
                        DPRINTF("write byte: %d\n", val);
+
+               if (tr[i].cmdTrans == 13)
+                       jtagmon(val & PP_TCK, val & PP_TMS, val & PP_TDI);
 #endif
 
                /* Pad writebuf for read-commands in stream */
 #endif
 
                /* Pad writebuf for read-commands in stream */
-               if (tr[i].cmdTrans == 10) {
-                       *pos = last_data;
-                       pos++;
-               }
+               *writepos = last_data;
+               prev_data = last_data;
 
                if (port == ppbase + PP_DATA) {
                        DPRINTF("data port\n");
 
                if (port == ppbase + PP_DATA) {
                        DPRINTF("data port\n");
@@ -143,16 +246,22 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
                                                DPRINTF("!TMS\n");
                                        }
                                        if (val & PP_CTRL) {
                                                DPRINTF("!TMS\n");
                                        }
                                        if (val & PP_CTRL) {
-                                               data |= JTAGKEY_OEn;
+                                               data = JTAGKEY_OEn;
                                                DPRINTF("CTRL\n");
                                        } else {
                                                DPRINTF("!CTRL\n");
                                        }
                                                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_data = data;
+                                       last_write = val;
                                        break;
 
                                default:
                                        break;
 
                                default:
@@ -161,27 +270,40 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
                                        break;
                        }
                }
                                        break;
                        }
                }
+
+               if ((tr[i].cmdTrans == PP_READ) || (*writepos != prev_data) || (i == num-1))
+                       writepos++;
        }
 
        }
 
-       ftdi_usb_purge_buffers(&ftdic);
-       ftdi_write_data(&ftdic, writebuf, pos-writebuf);
+       if (nread)
+       {
+               DPRINTF("writing %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);
+               *writepos = last_data;
+               writepos++;
+
+               jtagkey_latency(OTHER_LATENCY);
+
+               targ.num = writepos-writebuf;
+               targ.buf = readbuf;
+               pthread_create(&reader_thread, NULL, &jtagkey_reader, &targ);
+               ftdi_write_data(&ftdic, writebuf, writepos-writebuf);
+               pthread_join(reader_thread, NULL);
 
 #ifdef DEBUG
 
 #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
 
 #endif
 
-       pos = readbuf;
+               writepos = writebuf;
+       } else {
+               return ret;
+       }
+
+       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",
 
        for (i = 0; i < num; i++) {
                DPRINTF("dwPort: 0x%lx, cmdTrans: %lu, dwbytes: %ld, fautoinc: %ld, dwoptions: %ld\n",
@@ -190,22 +312,34 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
 
                port = (unsigned long)tr[i].dwPort;
                val = tr[i].Data.Byte;
 
                port = (unsigned long)tr[i].dwPort;
                val = tr[i].Data.Byte;
-               pos++;
 
 
-               if (port == ppbase + PP_STATUS) {
-                       DPRINTF("status port (last write: %d)\n", last_write);
+               if ((tr[i].cmdTrans != PP_READ) && (val == last_write) && (i != num-1))
+                       continue;
+
+               readpos++;
+
+               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:
                        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;
 #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;
 
                                                val |= PP_TDO;
 
+                                       if (~last_write & PP_PROG)
+                                               val |= 0x08;
+
                                        if (last_write & 0x40)
                                                val |= 0x20;
                                        else
                                        if (last_write & 0x40)
                                                val |= 0x20;
                                        else
Impressum, Datenschutz