From: Michal Demin <michaldemin@gmail.com>
Date: Mon, 10 Jan 2011 13:54:10 +0000 (+0100)
Subject: Add support for different interfaces on FTDI chips.
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/commitdiff_plain/6615630635379e2768f9cbc69b3efeb742195b32

Add support for different interfaces on FTDI chips.

Signed-off-by: Michal Demin <michaldemin@gmail.com>
---

diff --git a/config.c b/config.c
index a39902e..2963129 100644
--- a/config.c
+++ b/config.c
@@ -23,6 +23,7 @@ static void read_config() {
 #ifdef JTAGKEY
 	char *pbuf;
 	unsigned short vid, pid;
+	unsigned short iface;
 	int line, len, num;
 #endif
 
@@ -152,7 +153,7 @@ static void read_config() {
 				pbuf = buf + i;
 
 				for (; i < len; i++) {
-					if (buf[i] == ' ' || buf[i] == '\t')
+					if (buf[i] == ' ' || buf[i] == '\t' || buf[i] == ':')
 						break;
 				}
 
@@ -163,9 +164,16 @@ static void read_config() {
 					continue;
 				}
 
+				iface = 0;
+				pbuf = buf + i;
+				if (pbuf[0] == ':') {
+					iface = atoi(pbuf + 1);
+				}
+
 				pp_config[num].real = 0;
 				pp_config[num].usb_vid = vid;
 				pp_config[num].usb_pid = pid;
+				pp_config[num].usb_iface = iface;
 				pp_config[num].open = jtagkey_open;
 				pp_config[num].close = jtagkey_close;
 				pp_config[num].transfer = jtagkey_transfer;
@@ -243,3 +251,20 @@ unsigned short config_usb_pid(int num) {
 
 	return ret;
 }
+
+unsigned short config_usb_iface(int num) {
+	unsigned short ret = 0x00;
+	int i;
+	
+	read_config();
+	
+	for (i=0; i<sizeof(pp_config)/sizeof(struct parport_config); i++) {
+		if (pp_config[i].num == num) {
+			ret = pp_config[i].usb_iface;
+			break;
+		}
+	}
+
+	return ret;
+}
+
diff --git a/config.h b/config.h
index f800587..0c8097b 100644
--- a/config.h
+++ b/config.h
@@ -4,6 +4,7 @@ struct parport_config {
 	unsigned char real;
 	unsigned short usb_vid;
 	unsigned short usb_pid;
+	unsigned short usb_iface;
 	int (*open) (int num);
 	void (*close) (int handle);
 	int (*transfer) (WD_TRANSFER *tr, int fd, unsigned int request, int ppbase, int ecpbase, int num);
@@ -13,3 +14,4 @@ struct parport_config __attribute__ ((visibility ("hidden"))) *config_get(int nu
 unsigned char __attribute__ ((visibility ("hidden"))) config_is_real_pport(int num);
 unsigned short __attribute__ ((visibility ("hidden"))) config_usb_vid(int num);
 unsigned short __attribute__ ((visibility ("hidden"))) config_usb_pid(int num);
+unsigned short __attribute__ ((visibility ("hidden"))) config_usb_iface(int num);
diff --git a/jtagkey.c b/jtagkey.c
index a3cb8eb..c4f2bee 100644
--- a/jtagkey.c
+++ b/jtagkey.c
@@ -32,7 +32,7 @@ static int jtagkey_latency(int latency) {
 	return ret;
 }
 
-static int jtagkey_init(unsigned short vid, unsigned short pid) {
+static int jtagkey_init(unsigned short vid, unsigned short pid, unsigned short iface) {
 	int ret = 0;
 	unsigned char c;
 
@@ -51,7 +51,7 @@ static int jtagkey_init(unsigned short vid, unsigned short pid) {
 		return ret;
 	}
 
-	if ((ret = ftdi_set_interface(&ftdic, INTERFACE_A)) != 0) {
+	if ((ret = ftdi_set_interface(&ftdic, iface)) != 0) {
 		fprintf(stderr, "unable to set interface: %d (%s)\n", ret, ftdi_get_error_string(&ftdic));
 		return ret;
 	}
@@ -93,7 +93,7 @@ static int jtagkey_init(unsigned short vid, unsigned short pid) {
 int jtagkey_open(int num) {
 	int ret;
 
-	ret = jtagkey_init(config_usb_vid(num), config_usb_pid(num));
+	ret = jtagkey_init(config_usb_vid(num), config_usb_pid(num), config_usb_iface(num));
 
 	if (ret >= 0)
 		ret = 0xff;
diff --git a/libusb-driverrc b/libusb-driverrc
index 98d0e31..9cf8230 100644
--- a/libusb-driverrc
+++ b/libusb-driverrc
@@ -4,3 +4,6 @@
 
 # Amontec Jtagkey
 LPT2 = FTDI:0403:cff8
+# Dangerous Prototypes Bus Blaster v2
+LPT3 = FTDI:0403:6010:2
+