X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/a270f1e37a49ae072740de471bfe98658dea3b5e..5e3d963bcb6112d798f674b876b167c633ff6b59:/jtagkey.c

diff --git a/jtagkey.c b/jtagkey.c
index bf1cded..dec0b81 100644
--- a/jtagkey.c
+++ b/jtagkey.c
@@ -1,14 +1,17 @@
 #include <stdio.h>
 #include <ftdi.h>
+#include <unistd.h>
 #include "usb-driver.h"
+#include "config.h"
 #include "jtagkey.h"
 
 #define USBBUFSIZE 4096
 
 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;
 
@@ -56,6 +59,8 @@ int jtagkey_init(unsigned short vid, unsigned short pid) {
 		return ret;
 	}
 
+	bitbang_mode = BITMODE_BITBANG;
+
 	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 +69,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 +157,7 @@ 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);
 
+		jtagkey_set_bbmode(BITMODE_BITBANG);
 		while (pos < writepos) {
 			len = writepos-pos;
 
@@ -125,7 +169,6 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
 			pos += len;
 		}
 
-		DPRINTF("read %d/%d bytes\n", i, writepos-writebuf);
 		writepos = writebuf;
 	}
 
@@ -207,11 +250,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++) {
-			ftdi_write_data(&ftdic, writebuf+i, 1);
 
-			if (i > 0 && tr[i].cmdTrans == PP_WRITE && tr[i-1].cmdTrans == PP_READ)
-				ftdi_read_pins(&ftdic, readbuf+i);
+		*writepos = last_data;
+		writepos++;
+
+		jtagkey_set_bbmode(BITMODE_SYNCBB);
+		ftdi_write_data(&ftdic, writebuf, writepos-writebuf);
+
+		i = 0;
+		while (i < writepos-writebuf) {
+			i += ftdi_read_data(&ftdic, readbuf, sizeof(readbuf));
 		}
 
 #ifdef DEBUG
@@ -246,6 +294,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);