X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/1dac51954a4ae30f94b76422a292a348b02fe441..d0e2002d3acb644380d6250cc73927ce1d698f76:/usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index b3dd4d8..9599200 100644
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -65,7 +65,6 @@ static pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER;
 
 #define NO_WINDRVR 1
 
-#ifdef DEBUG
 void hexdump(unsigned char *buf, int len) {
 	int i;
 
@@ -76,7 +75,6 @@ void hexdump(unsigned char *buf, int len) {
 	}
 	fprintf(stderr,"\n");
 }
-#endif
 
 int usb_deviceinfo(unsigned char *buf) {
 	int i,j,k,l;
@@ -351,7 +349,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 	switch(request & ~(0xc0000000)) {
 		case VERSION:
 			version = (struct version_struct*)(wdheader->data);
-			strcpy(version->version, "libusb-driver.so $Revision: 1.63 $");
+			strcpy(version->version, "libusb-driver.so $Revision: 1.65 $");
 			version->versionul = 802;
 			DPRINTF("VERSION\n");
 			break;
@@ -802,6 +800,11 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #ifndef NO_WINDRVR
 				ret = (*ioctl_func) (fd, request, wdioctl);
 #else
+#ifdef JTAGKEY
+				if (cr->hCard == 0xff)
+					jtagkey_close();
+#endif
+
 				if (parportfd == cr->hCard && parportfd >= 0) {
 					ioctl(parportfd, PPRELEASE);
 					close(parportfd);