add another ioctl-stub

[usb-driver] / usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index f5df8455653ed1ec77b2a21f3aa3ec0baaeddcf2..853c38ccdffad5bd23413dd52c0db518fb74b37d 100644 (file)
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -47,12 +47,12 @@ static int modules_read = 0;
 static struct usb_bus *busses = NULL;
 static struct usb_device *usbdevice;
 static usb_dev_handle *usb_devhandle = NULL;
-static uint32_t card_type;
+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)
@@ -240,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");
@@ -252,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");
@@ -321,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");
                        {
@@ -383,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);
@@ -402,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");
                        {
@@ -423,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");
                        {
@@ -515,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
@@ -522,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
@@ -713,6 +729,14 @@ int close(int fd) {
        
        if (fd == windrvrfd && windrvrfd >= 0) {
                DPRINTF("close windrvrfd\n");
+               if (usbinterface >= 0)
+                       usb_release_interface(usb_devhandle, usbinterface);
+
+               if (usb_devhandle)
+                       usb_close(usb_devhandle);
+
+               usb_devhandle = NULL;
+               usbinterface = -1;
                windrvrfd = -1;
        }