X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/f0bfb2db7dd53c2ac7c8376805ad596d080bddc8..576995a8663c7f9da1d65e05cb35dbf86cdb66e9:/usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index d38da3e..853c38c 100644
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -37,21 +37,22 @@
 #include <signal.h>
 #include <pthread.h>
 #include <errno.h>
+#include <inttypes.h>
 #include "usb-driver.h"
 
 static int (*ioctl_func) (int, int, void *) = NULL;
-static int windrvrfd = 0;
-FILE *modulesfp;
+static int windrvrfd = -1;
+FILE *modulesfp = NULL;
 static int modules_read = 0;
 static struct usb_bus *busses = NULL;
 static struct usb_device *usbdevice;
 static usb_dev_handle *usb_devhandle = NULL;
+static int usbinterface = -1;
 static unsigned long card_type;
 static int ints_enabled = 0;
 static pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER;
 
 #define NO_WINDRVR 1
-#undef DEBUG
 
 #ifdef DEBUG
 #define DPRINTF(format, args...) fprintf(stderr, format, ##args)
@@ -239,7 +240,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 		return (*ioctl_func) (fd, request, wdioctl);
 	}
 
-	switch(request) {
+	switch(request & ~(0xc0000000)) {
 		case VERSION:
 			version = (struct version_struct*)(wdheader->data);
 			strcpy(version->version, "WinDriver no more");
@@ -251,11 +252,15 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 			DPRINTF("LICENSE\n");
 			break;
 
+		case CARD_REGISTER_OLD:
 		case CARD_REGISTER:
 			/* TODO: Implement for LPT-support */
 #if 0
 			{
 				struct card_register* cr = (struct card_register*)(wdheader->data);
+#ifndef NO_WINDRVR
+				ret = (*ioctl_func) (fd, request, wdioctl);
+#endif
 			}
 #endif
 			DPRINTF("CARD_REGISTER\n");
@@ -320,6 +325,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 			}
 			break;
 
+		case INT_ENABLE_OLD:
 		case INT_ENABLE:
 			DPRINTF("INT_ENABLE\n");
 			{
@@ -382,6 +388,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 					ret = usb_claim_interface(usb_devhandle, usbdevice->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber);
 					if (!ret) {
 						if(!ret) {
+							usbinterface = usbdevice->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber;
 							ret = usb_set_altinterface(usb_devhandle, usi->dwAlternateSetting);
 							if (ret)
 								fprintf(stderr, "usb_set_altinterface: %d\n", ret);
@@ -401,6 +408,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 			}
 			break;
 
+		case USB_GET_DEVICE_DATA_OLD:
 		case USB_GET_DEVICE_DATA:
 			DPRINTF("USB_GET_DEVICE_DATA\n");
 			{
@@ -422,6 +430,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 			}
 			break;
 
+		case EVENT_REGISTER_OLD:
 		case EVENT_REGISTER:
 			DPRINTF("EVENT_REGISTER\n");
 			{
@@ -514,6 +523,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 			}
 			break;
 
+		case TRANSFER_OLD:
 		case TRANSFER:
 			DPRINTF("TRANSFER\n");
 #ifndef NO_WINDRVR
@@ -521,6 +531,13 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #endif
 			break;
 
+		case MULTI_TRANSFER:
+			DPRINTF("MULTI_TRANSFER\n");
+#ifndef NO_WINDRVR
+			ret = (*ioctl_func) (fd, request, wdioctl);
+#endif
+			break;
+
 		case EVENT_UNREGISTER:
 			DPRINTF("EVENT_UNREGISTER\n");
 #ifndef NO_WINDRVR
@@ -660,7 +677,7 @@ int ioctl(int fd, int request, ...) {
 	argp = va_arg (args, void *);
 	va_end (args);
 
-	if (windrvrfd && (fd == windrvrfd))
+	if (fd == windrvrfd)
 		ret = do_wdioctl(fd, request, argp);
 	else
 		ret = (*ioctl_func) (fd, request, argp);
@@ -710,9 +727,17 @@ int close(int fd) {
 	if (!func)
 		func = (int (*) (int)) dlsym(RTLD_NEXT, "close");
 	
-	if (fd == windrvrfd) {
+	if (fd == windrvrfd && windrvrfd >= 0) {
 		DPRINTF("close windrvrfd\n");
-		windrvrfd = 0;
+		if (usbinterface >= 0)
+			usb_release_interface(usb_devhandle, usbinterface);
+
+		if (usb_devhandle)
+			usb_close(usb_devhandle);
+
+		usb_devhandle = NULL;
+		usbinterface = -1;
+		windrvrfd = -1;
 	}
 
 	return (*func) (fd);