X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/3f5287b7f725b0e90b8a29b4ed3e16cfdc8d6fbe..75417531f327bd77dcbe6607f3fb373ecb6bf79d:/jtagkey.c

diff --git a/jtagkey.c b/jtagkey.c
index 04cfb4c..41f0fd6 100644
--- a/jtagkey.c
+++ b/jtagkey.c
@@ -1,14 +1,18 @@
 #include <stdio.h>
 #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;
 
@@ -33,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));
@@ -51,11 +59,13 @@ 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_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) {
@@ -114,6 +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;
 
@@ -122,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;
 	}
 
@@ -207,36 +263,16 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
 	if (nread)
 	{
 		DPRINTF("writing %d bytes\n", writepos-writebuf);
-		for (i=0; i<writepos-writebuf; i++) {
-#if 1
-			int combine = i;
-			
-			do {
-				if (combine > 0 &&
-					tr[combine-1].cmdTrans == PP_READ) {
-					break;
-				} else {
-					combine++;
-				}
-			} while (combine < writepos-writebuf);
 
-			DPRINTF("combined writes before read: %d\n", combine);
-
-			if ((combine-i)-1 > 0) {
-				ftdi_write_data(&ftdic, writebuf+i, (combine-i)-1);
-				i = combine-1;
-			}
-#endif
-
-			ftdi_write_data(&ftdic, writebuf+i, 1);
+		*writepos = last_data;
+		writepos++;
 
-			if (i > 0 && tr[i].cmdTrans == PP_WRITE && tr[i-1].cmdTrans == PP_READ)
-				ftdi_read_pins(&ftdic, readbuf+i);
+		jtagkey_set_bbmode(BITMODE_SYNCBB);
+		ftdi_write_data(&ftdic, writebuf, writepos-writebuf);
 
-			if (i == (writepos-writebuf)-1 && tr[i].cmdTrans == PP_READ) {
-				ftdi_write_data(&ftdic, writebuf+i, 1);
-				ftdi_read_pins(&ftdic, readbuf+i+1);
-			}
+		i = 0;
+		while (i < writepos-writebuf) {
+			i += ftdi_read_data(&ftdic, readbuf, sizeof(readbuf));
 		}
 
 #ifdef DEBUG
@@ -271,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);