X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/d0e2002d3acb644380d6250cc73927ce1d698f76..4af4753dc42ce756e91d803da1824478e11695f0:/jtagkey.c

diff --git a/jtagkey.c b/jtagkey.c
index 4266959..2be1954 100644
--- a/jtagkey.c
+++ b/jtagkey.c
@@ -3,9 +3,10 @@
 #include "usb-driver.h"
 #include "jtagkey.h"
 
-#define USBBUFSIZE 384
+#define USBBUFSIZE 4096
 
 static struct ftdi_context ftdic;
+static unsigned int usb_maxlen = 0;
 
 int jtagkey_init(unsigned short vid, unsigned short pid) {
 	int ret = 0;
@@ -31,12 +32,11 @@ int jtagkey_init(unsigned short vid, unsigned short pid) {
 		return ret;
 	}
 
-#if 0
-	if ((ret = ftdi_write_data_set_chunksize(&ftdic, 1))  != 0) {
-		fprintf(stderr, "unable to set write chunksize: %d (%s)\n", ret, ftdi_get_error_string(&ftdic));
+
+	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,7 +51,7 @@ 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_SYNCBB))  != 0) {
+	if ((ret = ftdi_set_bitmode(&ftdic, JTAGKEY_TCK|JTAGKEY_TDI|JTAGKEY_TMS|JTAGKEY_OEn, BITMODE_BITBANG))  != 0) {
 		fprintf(stderr, "unable to enable bitbang mode: %d (%s)\n", ret, ftdi_get_error_string(&ftdic));
 		return ret;
 	}
@@ -98,26 +98,33 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
 	unsigned long port;
 	unsigned char val;
 	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;
-	static unsigned char last_write = 0x00;
+	unsigned char data, prev_data;
 
-	/* Count writes */
+	/* Count reads */
 	for (i = 0; i < num; i++)
-		if (tr[i].cmdTrans == 10)
+		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);
 
-		ftdi_write_data(&ftdic, writebuf, writepos-writebuf);
+		len = writepos-pos;
+
+		while (pos < writepos) {
+			if (len > usb_maxlen)
+				len = usb_maxlen;
+
+			DPRINTF("combined write of %d/%d\n",len,writepos-pos);
+			ftdi_write_data(&ftdic, pos, len);
+			pos += len;
+		}
 
-		i = 0;
-		while (i < writepos-writebuf) {
-			i += ftdi_read_data(&ftdic, readbuf, sizeof(readbuf));
-		};
 		DPRINTF("read %d/%d bytes\n", i, writepos-writebuf);
 		writepos = writebuf;
 	}
@@ -137,6 +144,7 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
 
 		/* Pad writebuf for read-commands in stream */
 		*writepos = last_data;
+		prev_data = last_data;
 
 		if (port == ppbase + PP_DATA) {
 			DPRINTF("data port\n");
@@ -191,20 +199,18 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
 					break;
 			}
 		}
-		writepos++;
+
+		if (nread || (*writepos != prev_data))
+			writepos++;
 	}
 
 	if (nread)
 	{
 		DPRINTF("writing %d bytes\n", writepos-writebuf);
-		ftdi_write_data(&ftdic, writebuf, writepos-writebuf);
-		DPRINTF("reading %d bytes\n", writepos-writebuf);
-
-		i = 0;
-		while (i < writepos-writebuf) {
-			i += ftdi_read_data(&ftdic, readbuf, sizeof(readbuf));
+		for (i=0; i<writepos-writebuf; i++) {
+			ftdi_write_data(&ftdic, writebuf+i, 1);
+			ftdi_read_pins(&ftdic, readbuf+i);
 		}
-		DPRINTF("read %d bytes\n", i);
 
 #ifdef DEBUG
 		DPRINTF("write: ");