X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/98b8ef391f9f508131d222080a79b3b3e72a4b22..HEAD:/jtagkey.c

diff --git a/jtagkey.c b/jtagkey.c
index a3cb8eb..04bd0cd 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;
 
@@ -41,6 +41,11 @@ static int jtagkey_init(unsigned short vid, unsigned short pid) {
 		return ret;
 	}
 	
+	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;
+	}
+
 	if ((ret = ftdi_usb_open(&ftdic, vid, pid)) != 0) {
 		fprintf(stderr, "unable to open ftdi device: %d (%s)\n", ret, ftdi_get_error_string(&ftdic));
 		return ret;
@@ -51,11 +56,6 @@ static int jtagkey_init(unsigned short vid, unsigned short pid) {
 		return ret;
 	}
 
-	if ((ret = ftdi_set_interface(&ftdic, INTERFACE_A)) != 0) {
-		fprintf(stderr, "unable to set interface: %d (%s)\n", ret, ftdi_get_error_string(&ftdic));
-		return ret;
-	}
-
 	if ((ret = ftdi_write_data_set_chunksize(&ftdic, USBBUFSIZE))  != 0) {
 		fprintf(stderr, "unable to set write chunksize: %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;