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

diff --git a/jtagkey.c b/jtagkey.c
index 249e9d9..dec0b81 100644
--- a/jtagkey.c
+++ b/jtagkey.c
@@ -2,6 +2,7 @@
 #include <ftdi.h>
 #include <unistd.h>
 #include "usb-driver.h"
+#include "config.h"
 #include "jtagkey.h"
 
 #define USBBUFSIZE 4096
@@ -10,7 +11,7 @@ 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;
 
@@ -68,10 +69,23 @@ 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) {
@@ -79,6 +93,7 @@ static int jtagkey_set_bbmode(unsigned char mode) {
 
 	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) {
@@ -154,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;
 	}
 
@@ -236,6 +250,10 @@ int jtagkey_transfer(WD_TRANSFER *tr, int fd, unsigned int request, int ppbase,
 	if (nread)
 	{
 		DPRINTF("writing %d bytes\n", writepos-writebuf);
+
+		*writepos = last_data;
+		writepos++;
+
 		jtagkey_set_bbmode(BITMODE_SYNCBB);
 		ftdi_write_data(&ftdic, writebuf, writepos-writebuf);
 
@@ -276,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);