Halleluja

[usb-driver] / usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index 21ec2396e9d7938b4c00c496fc5f8c7ab467c6d6..109f01d9c37de5ce265dd6e97160c59196695e9d 100644 (file)
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -19,13 +19,16 @@
 #include <sys/time.h>
 #include <stdio.h>
 #include <usb.h>
 #include <sys/time.h>
 #include <stdio.h>
 #include <usb.h>

+#include <signal.h>

 #include "xilinx.h"
 
 static int (*ioctl_func) (int, int, void *) = NULL;
 static int windrvrfd = 0;
 static struct usb_bus *busses = NULL;
 #include "xilinx.h"
 
 static int (*ioctl_func) (int, int, void *) = NULL;
 static int windrvrfd = 0;
 static struct usb_bus *busses = NULL;

-static struct usb_device *usb_cable;
+static struct usb_device *usbdevice;
+static usb_dev_handle *usb_devhandle = NULL;

 static unsigned long card_type;
 static unsigned long card_type;

+static int ints_enabled = 0;

 
 #define NO_WINDRVR 1
 
 
 #define NO_WINDRVR 1
 


@@ -36,8 +39,8 @@ void diff(unsigned char *buf1, unsigned char *buf2, int len);
 //Vendor: 3fd
 //12 01 00 02 00 00 00 40 fd 03 08 00 00 00 01 02                              12 01 00 02 00 00 00 40 fd 03 08 00 00 00 01 02
 //00 01 00 00 00 00 00 00 40 00 00 00 00 00 00 00                              00 01 00 00 00 00 00 00 40 00 00 00 00 00 00 00
 //Vendor: 3fd
 //12 01 00 02 00 00 00 40 fd 03 08 00 00 00 01 02                              12 01 00 02 00 00 00 40 fd 03 08 00 00 00 01 02
 //00 01 00 00 00 00 00 00 40 00 00 00 00 00 00 00                              00 01 00 00 00 00 00 00 40 00 00 00 00 00 00 00

-//03 00 00 00 00 00 00 00 38 45 21 08 38 45 21 08                              03 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-//4c 45 21 08 00 00 00 00 00 00 00 00 00 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+//03 00 00 00 00 00 00 00 38 45 21 08 38 45 21 08                              03 00 00 00 00 00 00 00 38 45 21 08 38 45 21 08
+//4c 45 21 08 00 00 00 00 00 00 00 00 00 00 00 00                              4c 45 21 08 00 00 00 00 00 00 00 00 00 00 00 00

 //00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 //00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 //00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 //00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 //00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 //00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00


@@ -45,9 +48,9 @@ void diff(unsigned char *buf1, unsigned char *buf2, int len);
 //00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 //00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 //00 00 00 00 00 00 00 00 09 02 20 00 01 02 00 80                              00 00 00 00 00 00 00 00 09 02 20 00 01 02 00 80
 //00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 //00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 //00 00 00 00 00 00 00 00 09 02 20 00 01 02 00 80                              00 00 00 00 00 00 00 00 09 02 20 00 01 02 00 80

-//8c 00 00 00 01 00 00 00 4c 45 21 08 58 45 21 08                              8c 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00
-//01 00 00 00 58 45 21 08 09 04 00 00 02 ff 00 00                              01 00 00 00 00 00 00 00 09 04 00 00 02 ff 00 00
-//00 00 00 00 6c 45 21 08 7c 45 21 08 07 05 02 02                              00 00 00 00 00 00 00 00 00 00 00 00 07 05 02 02
+//8c 00 00 00 01 00 00 00 4c 45 21 08 58 45 21 08                              8c 00 00 00 01 00 00 00 4c 45 21 08 58 45 21 08
+//01 00 00 00 58 45 21 08 09 04 00 00 02 ff 00 00                              01 00 00 00 58 45 21 08 09 04 00 00 02 ff 00 00
+//00 00 00 00 6c 45 21 08 7c 45 21 08 07 05 02 02                              00 00 00 00 6c 45 21 08 7c 45 21 08 07 05 02 02

 //00 02 00 00 07 05 86 02 00 02 00 00 02 00 00 00                              00 02 00 00 07 05 86 02 00 02 00 00 02 00 00 00
 //00 02 00 00 02 00 00 00 02 00 00 00 00 00 00 00                              00 02 00 00 02 00 00 00 02 00 00 00 00 00 00 00
 //86 00 00 00 00 02 00 00 02 00 00 00 01 00 00 00                              86 00 00 00 00 02 00 00 02 00 00 00 01 00 00 00
 //00 02 00 00 07 05 86 02 00 02 00 00 02 00 00 00                              00 02 00 00 07 05 86 02 00 02 00 00 02 00 00 00
 //00 02 00 00 02 00 00 00 02 00 00 00 00 00 00 00                              00 02 00 00 02 00 00 00 02 00 00 00 00 00 00 00
 //86 00 00 00 00 02 00 00 02 00 00 00 01 00 00 00                              86 00 00 00 00 02 00 00 02 00 00 00 01 00 00 00


@@ -55,41 +58,54 @@ void diff(unsigned char *buf1, unsigned char *buf2, int len);
 int usb_deviceinfo(unsigned char *buf) {
        int i,j,k,l;
        int len = 0;
 int usb_deviceinfo(unsigned char *buf) {
        int i,j,k,l;
        int len = 0;

+       WDU_CONFIGURATION **pConfigs, **pActiveConfig;
+       WDU_INTERFACE **pActiveInterface;

 
        if (buf) {
                struct usb_device_info *udi = (struct usb_device_info*)(buf+len);
 
                udi->Descriptor.bLength = sizeof(WDU_DEVICE_DESCRIPTOR);
 
        if (buf) {
                struct usb_device_info *udi = (struct usb_device_info*)(buf+len);
 
                udi->Descriptor.bLength = sizeof(WDU_DEVICE_DESCRIPTOR);

-               udi->Descriptor.bDescriptorType = usb_cable->descriptor.bDescriptorType;
-               udi->Descriptor.bcdUSB = usb_cable->descriptor.bcdUSB;
-               udi->Descriptor.bDeviceClass = usb_cable->descriptor.bDeviceClass;
-               udi->Descriptor.bDeviceSubClass = usb_cable->descriptor.bDeviceSubClass;
-               udi->Descriptor.bDeviceProtocol = usb_cable->descriptor.bDeviceProtocol;
-               udi->Descriptor.bMaxPacketSize0 = usb_cable->descriptor.bMaxPacketSize0;
-               udi->Descriptor.idVendor = usb_cable->descriptor.idVendor;
-               udi->Descriptor.idProduct = usb_cable->descriptor.idProduct;
-               udi->Descriptor.bcdDevice = usb_cable->descriptor.bcdDevice;
-               udi->Descriptor.iManufacturer = usb_cable->descriptor.iManufacturer;
-               udi->Descriptor.iProduct = usb_cable->descriptor.iProduct;
-               udi->Descriptor.iSerialNumber = usb_cable->descriptor.iSerialNumber;
-               udi->Descriptor.bNumConfigurations = usb_cable->descriptor.bNumConfigurations;
+               udi->Descriptor.bDescriptorType = usbdevice->descriptor.bDescriptorType;
+               udi->Descriptor.bcdUSB = usbdevice->descriptor.bcdUSB;
+               udi->Descriptor.bDeviceClass = usbdevice->descriptor.bDeviceClass;
+               udi->Descriptor.bDeviceSubClass = usbdevice->descriptor.bDeviceSubClass;
+               udi->Descriptor.bDeviceProtocol = usbdevice->descriptor.bDeviceProtocol;
+               udi->Descriptor.bMaxPacketSize0 = usbdevice->descriptor.bMaxPacketSize0;
+               udi->Descriptor.idVendor = usbdevice->descriptor.idVendor;
+               udi->Descriptor.idProduct = usbdevice->descriptor.idProduct;
+               udi->Descriptor.bcdDevice = usbdevice->descriptor.bcdDevice;
+               udi->Descriptor.iManufacturer = usbdevice->descriptor.iManufacturer;
+               udi->Descriptor.iProduct = usbdevice->descriptor.iProduct;
+               udi->Descriptor.iSerialNumber = usbdevice->descriptor.iSerialNumber;
+               udi->Descriptor.bNumConfigurations = usbdevice->descriptor.bNumConfigurations;

 
                /* TODO: Fix Pipe0! */
                udi->Pipe0.dwNumber = 0x00;
 
                /* TODO: Fix Pipe0! */
                udi->Pipe0.dwNumber = 0x00;

-               udi->Pipe0.dwMaximumPacketSize = usb_cable->descriptor.bMaxPacketSize0;
+               udi->Pipe0.dwMaximumPacketSize = usbdevice->descriptor.bMaxPacketSize0;

                udi->Pipe0.type = 0;
                udi->Pipe0.direction = 3;
                udi->Pipe0.dwInterval = 0;
                udi->Pipe0.type = 0;
                udi->Pipe0.direction = 3;
                udi->Pipe0.dwInterval = 0;

+
+               pConfigs = &(udi->pConfigs);
+               pActiveConfig = &(udi->pActiveConfig);
+               pActiveInterface = &(udi->pActiveInterface[0]);

        }
 
        len = sizeof(struct usb_device_info);
 
        }
 
        len = sizeof(struct usb_device_info);
 

-       for (i=0; i<usb_cable->descriptor.bNumConfigurations; i++)
+       for (i=0; i<usbdevice->descriptor.bNumConfigurations; i++)

        {
        {

-               struct usb_config_descriptor *conf_desc = &usb_cable->config[i];
+               struct usb_config_descriptor *conf_desc = &usbdevice->config[i];
+               WDU_INTERFACE **pInterfaces;
+               WDU_ALTERNATE_SETTING **pAlternateSettings[conf_desc->bNumInterfaces];
+               WDU_ALTERNATE_SETTING **pActiveAltSetting[conf_desc->bNumInterfaces];
+

                if (buf) {
                        WDU_CONFIGURATION *cfg = (WDU_CONFIGURATION*)(buf+len);
 
                if (buf) {
                        WDU_CONFIGURATION *cfg = (WDU_CONFIGURATION*)(buf+len);
 

+                       *pConfigs = cfg;
+                       *pActiveConfig = cfg;
+

                        cfg->Descriptor.bLength = conf_desc->bLength;
                        cfg->Descriptor.bDescriptorType = conf_desc->bDescriptorType;
                        cfg->Descriptor.wTotalLength = conf_desc->wTotalLength;
                        cfg->Descriptor.bLength = conf_desc->bLength;
                        cfg->Descriptor.bDescriptorType = conf_desc->bDescriptorType;
                        cfg->Descriptor.wTotalLength = conf_desc->wTotalLength;


@@ -100,12 +116,21 @@ int usb_deviceinfo(unsigned char *buf) {
                        cfg->Descriptor.MaxPower = conf_desc->MaxPower;
 
                        cfg->dwNumInterfaces = conf_desc->bNumInterfaces;
                        cfg->Descriptor.MaxPower = conf_desc->MaxPower;
 
                        cfg->dwNumInterfaces = conf_desc->bNumInterfaces;

+
+                       pInterfaces = &(cfg->pInterfaces);

                }
                len += sizeof(WDU_CONFIGURATION);
                }
                len += sizeof(WDU_CONFIGURATION);

+

                if (buf) {
                if (buf) {

+                       *pInterfaces = (WDU_INTERFACE*)(buf+len);

                        for (j=0; j<conf_desc->bNumInterfaces; j++) {
                                WDU_INTERFACE *iface = (WDU_INTERFACE*)(buf+len);
                        for (j=0; j<conf_desc->bNumInterfaces; j++) {
                                WDU_INTERFACE *iface = (WDU_INTERFACE*)(buf+len);

-                               iface->dwNumAltSettings = usb_cable->config[i].interface[j].num_altsetting;
+
+                               pActiveInterface[j] = iface;
+
+                               pAlternateSettings[j] = &(iface->pAlternateSettings);
+                               iface->dwNumAltSettings = usbdevice->config[i].interface[j].num_altsetting;
+                               pActiveAltSetting[j] = &(iface->pActiveAltSetting);

 
                                len += sizeof(WDU_INTERFACE);
                        }
 
                                len += sizeof(WDU_INTERFACE);
                        }


@@ -115,11 +140,20 @@ int usb_deviceinfo(unsigned char *buf) {
 
                for (j=0; j<conf_desc->bNumInterfaces; j++)
                {
 
                for (j=0; j<conf_desc->bNumInterfaces; j++)
                {

-                       struct usb_interface *interface = &usb_cable->config[i].interface[j];
+                       struct usb_interface *interface = &usbdevice->config[i].interface[j];
+
+                       if (buf) {
+                               *pAlternateSettings[j] = (WDU_ALTERNATE_SETTING*)(buf+len);
+                               /* FIXME: */
+                               *pActiveAltSetting[j] = (WDU_ALTERNATE_SETTING*)(buf+len);
+                       }
+

                        for(k=0; k<interface->num_altsetting; k++)
                        {
                        for(k=0; k<interface->num_altsetting; k++)
                        {

-                               unsigned char bNumEndpoints;
-                               bNumEndpoints = interface->altsetting[k].bNumEndpoints;
+                               unsigned char bNumEndpoints = interface->altsetting[k].bNumEndpoints;
+                               WDU_ENDPOINT_DESCRIPTOR **pEndpointDescriptors;
+                               WDU_PIPE_INFO **pPipes;
+

                                if (buf) {
                                        WDU_ALTERNATE_SETTING *altset = (WDU_ALTERNATE_SETTING*)(buf+len);
 
                                if (buf) {
                                        WDU_ALTERNATE_SETTING *altset = (WDU_ALTERNATE_SETTING*)(buf+len);
 


@@ -132,11 +166,14 @@ int usb_deviceinfo(unsigned char *buf) {
                                        altset->Descriptor.bInterfaceSubClass = interface->altsetting[k].bInterfaceSubClass;
                                        altset->Descriptor.bInterfaceProtocol = interface->altsetting[k].bInterfaceProtocol;
                                        altset->Descriptor.iInterface = interface->altsetting[k].iInterface;
                                        altset->Descriptor.bInterfaceSubClass = interface->altsetting[k].bInterfaceSubClass;
                                        altset->Descriptor.bInterfaceProtocol = interface->altsetting[k].bInterfaceProtocol;
                                        altset->Descriptor.iInterface = interface->altsetting[k].iInterface;

+                                       pEndpointDescriptors = &(altset->pEndpointDescriptors);
+                                       pPipes = &(altset->pPipes);

 
                                }
                                len +=sizeof(WDU_ALTERNATE_SETTING);
 
                                if (buf) {
 
                                }
                                len +=sizeof(WDU_ALTERNATE_SETTING);
 
                                if (buf) {

+                                       *pEndpointDescriptors = (WDU_ENDPOINT_DESCRIPTOR*)(buf+len);

                                        for (l = 0; l < bNumEndpoints; l++) {
                                                WDU_ENDPOINT_DESCRIPTOR *ed = (WDU_ENDPOINT_DESCRIPTOR*)(buf+len);
 
                                        for (l = 0; l < bNumEndpoints; l++) {
                                                WDU_ENDPOINT_DESCRIPTOR *ed = (WDU_ENDPOINT_DESCRIPTOR*)(buf+len);
 


@@ -150,6 +187,7 @@ int usb_deviceinfo(unsigned char *buf) {
                                                len += sizeof(WDU_ENDPOINT_DESCRIPTOR);
                                        }
                                                
                                                len += sizeof(WDU_ENDPOINT_DESCRIPTOR);
                                        }
                                                

+                                       *pPipes = (WDU_PIPE_INFO*)(buf+len);

                                        for (l = 0; l < bNumEndpoints; l++) {
                                                WDU_PIPE_INFO *pi = (WDU_PIPE_INFO*)(buf+len);
 
                                        for (l = 0; l < bNumEndpoints; l++) {
                                                WDU_PIPE_INFO *pi = (WDU_PIPE_INFO*)(buf+len);
 


@@ -231,19 +269,20 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                {
                                        fprintf(stderr,"Read: ");
                                        hexdump(ut->pBuffer, ut->dwBytesTransferred);
                                {
                                        fprintf(stderr,"Read: ");
                                        hexdump(ut->pBuffer, ut->dwBytesTransferred);

+                                       fprintf(stderr,"\n");

                                }
                                }

-                               fprintf(stderr,"\n");

                        }
                        break;
 
                case INT_ENABLE:
                        }
                        break;
 
                case INT_ENABLE:

-                       fprintf(stderr,"faking INT_ENABLE");
+                       fprintf(stderr,"INT_ENABLE\n");

                        {
                                struct interrupt *it = (struct interrupt*)(wdheader->data);
 
                                fprintf(stderr,"Handle: %lu, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n", it->hInterrupt, it->dwOptions, it->dwCmds, it->fEnableOk, it->dwCounter, it->dwLost, it->fStopped);
 
                                it->fEnableOk = 1;
                        {
                                struct interrupt *it = (struct interrupt*)(wdheader->data);
 
                                fprintf(stderr,"Handle: %lu, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n", it->hInterrupt, it->dwOptions, it->dwCmds, it->fEnableOk, it->dwCounter, it->dwLost, it->fStopped);
 
                                it->fEnableOk = 1;

+                               ints_enabled = 1;

                                //ret = (*ioctl_func) (fd, request, wdioctl);
                        }
 
                                //ret = (*ioctl_func) (fd, request, wdioctl);
                        }
 


@@ -260,6 +299,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #else
                                it->dwCounter = 0;
                                it->fStopped = 1;
 #else
                                it->dwCounter = 0;
                                it->fStopped = 1;

+                               ints_enabled = 0;

 #endif
                                fprintf(stderr,"Handle: %lu, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n", it->hInterrupt, it->dwOptions, it->dwCmds, it->fEnableOk, it->dwCounter, it->dwLost, it->fStopped);
                        }
 #endif
                                fprintf(stderr,"Handle: %lu, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n", it->hInterrupt, it->dwOptions, it->dwCmds, it->fEnableOk, it->dwCounter, it->dwLost, it->fStopped);
                        }


@@ -273,36 +313,47 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                fprintf(stderr,"unique: %lu, interfacenum: %lu, alternatesetting: %lu, options: %lx\n", usi->dwUniqueID, usi->dwInterfaceNum, usi->dwAlternateSetting, usi->dwOptions);
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
                                fprintf(stderr,"unique: %lu, interfacenum: %lu, alternatesetting: %lu, options: %lx\n", usi->dwUniqueID, usi->dwInterfaceNum, usi->dwAlternateSetting, usi->dwOptions);
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);

+#else
+                               if (usbdevice) {
+                                       if (!usb_devhandle)
+                                               usb_devhandle = usb_open(usbdevice);
+
+                                       /* FIXME: Select right interface! */
+                                       ret = usb_claim_interface(usb_devhandle, usbdevice->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber);
+                                       if (!ret) {
+                                               ret = usb_set_altinterface(usb_devhandle, usi->dwAlternateSetting);
+                                               if (ret)
+                                                       fprintf(stderr, "usb_set_altinterface: %d\n", ret);
+                                       } else {
+                                               fprintf(stderr, "usb_claim_interface: %d -> %d (%s)\n", usbdevice->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber, ret, usb_strerror());
+                                       }
+                               }

 #endif
 #endif

+                               fprintf(stderr,"unique: %lu, interfacenum: %lu, alternatesetting: %lu, options: %lx\n", usi->dwUniqueID, usi->dwInterfaceNum, usi->dwAlternateSetting, usi->dwOptions);

                        }
                        break;
 
                case USB_GET_DEVICE_DATA:
                        }
                        break;
 
                case USB_GET_DEVICE_DATA:

-                       fprintf(stderr,"USB_GET_DEVICE_DATA\n");
+                       fprintf(stderr,"faking USB_GET_DEVICE_DATA\n");

                        {
                                struct usb_get_device_data *ugdd = (struct usb_get_device_data*)(wdheader->data);
                                int pSize;
 
                                fprintf(stderr, "unique: %lu, bytes: %lu, options: %lx\n", ugdd->dwUniqueID, ugdd->dwBytes, ugdd->dwOptions);
                                pSize = ugdd->dwBytes;
                        {
                                struct usb_get_device_data *ugdd = (struct usb_get_device_data*)(wdheader->data);
                                int pSize;
 
                                fprintf(stderr, "unique: %lu, bytes: %lu, options: %lx\n", ugdd->dwUniqueID, ugdd->dwBytes, ugdd->dwOptions);
                                pSize = ugdd->dwBytes;

-#ifndef NO_WINDRVR
-                               ret = (*ioctl_func) (fd, request, wdioctl);
-#else
+                               //ret = (*ioctl_func) (fd, request, wdioctl);

                                if (!ugdd->dwBytes) {
                                if (!ugdd->dwBytes) {

-                                       if (usb_cable) {
+                                       if (usbdevice) {

                                                ugdd->dwBytes = usb_deviceinfo(NULL);
                                        }
                                } else {
                                        usb_deviceinfo((unsigned char*)ugdd->pBuf);
                                }
                                                ugdd->dwBytes = usb_deviceinfo(NULL);
                                        }
                                } else {
                                        usb_deviceinfo((unsigned char*)ugdd->pBuf);
                                }

-#endif
+

                                if (pSize) {
                                        struct usb_device_info *udi = (struct usb_device_info*)ugdd->pBuf;
 
                                        fprintf(stderr, "Vendor: %x\n", udi->Descriptor.idVendor);
                                if (pSize) {
                                        struct usb_device_info *udi = (struct usb_device_info*)ugdd->pBuf;
 
                                        fprintf(stderr, "Vendor: %x\n", udi->Descriptor.idVendor);

-
-                                       hexdump(ugdd->pBuf, pSize);
-                                       fprintf(stderr, "\n");

                                }
                        }
                        break;
                                }
                        }
                        break;


@@ -328,19 +379,22 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                                           (desc->idProduct == e->matchTables[i].ProductId) &&
                                                           (desc->bDeviceClass == e->matchTables[i].bDeviceClass) &&
                                                           (desc->bDeviceSubClass == e->matchTables[i].bDeviceSubClass)) {
                                                           (desc->idProduct == e->matchTables[i].ProductId) &&
                                                           (desc->bDeviceClass == e->matchTables[i].bDeviceClass) &&
                                                           (desc->bDeviceSubClass == e->matchTables[i].bDeviceSubClass)) {

-                                                               struct usb_interface *interface = dev->config->interface;
-                                                               int ai;
-                                                               
-                                                               for (ai = 0; ai < interface->num_altsetting; ai++) {
-                                                                       fprintf(stderr, "intclass: %x, intsubclass: %x, intproto: %x\n", interface->altsetting[i].bInterfaceClass, interface->altsetting[i].bInterfaceSubClass, interface->altsetting[i].bInterfaceProtocol);
-                                                                       if ((interface->altsetting[i].bInterfaceSubClass == e->matchTables[i].bInterfaceSubClass) &&
-                                                                           (interface->altsetting[i].bInterfaceProtocol == e->matchTables[i].bInterfaceProtocol)){
-                                                                               /* TODO: check interfaceClass! */
-                                                                               fprintf(stderr,"!!!FOUND DEVICE WITH LIBUSB!!!\n");
-                                                                               usb_cable = dev;
-                                                                               card_type = e->dwCardType;
-                                                                       }
-                                                               }
+                                                                  int ac;
+                                                                  for (ac = 0; ac < desc->bNumConfigurations; ac++) {
+                                                                          struct usb_interface *interface = dev->config[ac].interface;
+                                                                          int ai;
+
+                                                                          for (ai = 0; ai < interface->num_altsetting; ai++) {
+                                                                                  fprintf(stderr, "intclass: %x, intsubclass: %x, intproto: %x\n", interface->altsetting[i].bInterfaceClass, interface->altsetting[i].bInterfaceSubClass, interface->altsetting[i].bInterfaceProtocol);
+                                                                                  if ((interface->altsetting[ai].bInterfaceSubClass == e->matchTables[i].bInterfaceSubClass) &&
+                                                                                                  (interface->altsetting[ai].bInterfaceProtocol == e->matchTables[i].bInterfaceProtocol)){
+                                                                                          /* TODO: check interfaceClass! */
+                                                                                          fprintf(stderr,"!!!FOUND DEVICE WITH LIBUSB!!!\n");
+                                                                                          usbdevice = dev;
+                                                                                          card_type = e->dwCardType;
+                                                                                  }
+                                                                          }
+                                                                  }

                                                        }
                                                }
                                        }
                                                        }
                                                }
                                        }


@@ -348,6 +402,10 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);

+#else
+//handle: 0, action: 16371, status: 0, eventid: 0, cardtype: 4294967294, kplug: 0, options: 0, dev: 0:0, unique: 0, ver: 1, nummatch: 2
+//handle: 1, action: 16371, status: 0, eventid: 0, cardtype: 4294967294, kplug: 0, options: 0, dev: 0:0, unique: 0, ver: 1, nummatch: 2
+                               e->handle++;

 #endif
 
                                fprintf(stderr,"handle: %lu, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: %lu, ver: %lu, nummatch: %lu\n", e->handle, e->dwAction, e->dwStatus, e->dwEventId, e->dwCardType, e->hKernelPlugIn, e->dwOptions, e->u.Usb.deviceId.dwVendorId, e->u.Usb.deviceId.dwProductId, e->u.Usb.dwUniqueID, e->dwEventVer, e->dwNumMatchTables);
 #endif
 
                                fprintf(stderr,"handle: %lu, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: %lu, ver: %lu, nummatch: %lu\n", e->handle, e->dwAction, e->dwStatus, e->dwEventId, e->dwCardType, e->hKernelPlugIn, e->dwOptions, e->u.Usb.deviceId.dwVendorId, e->u.Usb.deviceId.dwProductId, e->u.Usb.dwUniqueID, e->dwEventVer, e->dwNumMatchTables);


@@ -380,11 +438,19 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else

-                               if (usb_cable)
-                                       it->dwCounter++;
+                               if (usbdevice) {
+                                       if (it->dwCounter == 0) {
+                                               it->dwCounter = 1;
+                                       } else {
+                                               //FIXME: signal durch FUTEX, overload futex!
+                                               while(ints_enabled) {sleep(1);}
+                                       }
+                               } else {
+                                       while(ints_enabled) {sleep(1);}
+                               }

 #endif
 
 #endif
 

-                               fprintf(stderr,"Handle: %lu, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n", it->hInterrupt, it->dwOptions, it->dwCmds, it->fEnableOk, it->dwCounter, it->dwLost, it->fStopped);
+                               fprintf(stderr,"INT_WAIT_RETURN: Handle: %lu, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n", it->hInterrupt, it->dwOptions, it->dwCmds, it->fEnableOk, it->dwCounter, it->dwLost, it->fStopped);

                        }
                        break;
 
                        }
                        break;
 


@@ -401,7 +467,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                struct event *e = (struct event*)(wdheader->data);
                                int i;
 
                                struct event *e = (struct event*)(wdheader->data);
                                int i;
 

-                               fprintf(stderr,"handle: %lu, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: %lu, ver: %lu, nummatch: %lu\n", e->handle, e->dwAction, e->dwStatus, e->dwEventId, e->dwCardType, e->hKernelPlugIn, e->dwOptions, e->u.Usb.deviceId.dwVendorId, e->u.Usb.deviceId.dwProductId, e->u.Usb.dwUniqueID, e->dwEventVer, e->dwNumMatchTables);
+                               fprintf(stderr,"handle: %lu, action: %lu, status: %lu, eventid: %lu, cardtype: %lx, kplug: %lu, options: %lu, dev: %lx:%lx, unique: %lu, ver: %lu, nummatch: %lu\n", e->handle, e->dwAction, e->dwStatus, e->dwEventId, e->dwCardType, e->hKernelPlugIn, e->dwOptions, e->u.Usb.deviceId.dwVendorId, e->u.Usb.deviceId.dwProductId, e->u.Usb.dwUniqueID, e->dwEventVer, e->dwNumMatchTables);

                                for (i = 0; i < e->dwNumMatchTables; i++)
                                        fprintf(stderr,"match: dev: %04x:%04x, class: %x, subclass: %x, intclass: %x, intsubclass: %x, intproto: %x\n", e->matchTables[i].VendorId, e->matchTables[i].ProductId, e->matchTables[i].bDeviceClass, e->matchTables[i].bDeviceSubClass, e->matchTables[i].bInterfaceClass, e->matchTables[i].bInterfaceSubClass, e->matchTables[i].bInterfaceProtocol);
 
                                for (i = 0; i < e->dwNumMatchTables; i++)
                                        fprintf(stderr,"match: dev: %04x:%04x, class: %x, subclass: %x, intclass: %x, intsubclass: %x, intproto: %x\n", e->matchTables[i].VendorId, e->matchTables[i].ProductId, e->matchTables[i].bDeviceClass, e->matchTables[i].bDeviceSubClass, e->matchTables[i].bInterfaceClass, e->matchTables[i].bInterfaceSubClass, e->matchTables[i].bInterfaceProtocol);
 


@@ -413,26 +479,27 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 //match: dev: 0:0, class: 0, subclass: 0, intclass: 0, intsubclass: 0, intproto: 0
 //handle: 1, action: 1, status: 0, eventid: 109, cardtype: 4294967294, kplug: 0, options: 0, dev: 0:0, unique: 90, ver: 1, nummatch: 1
 //match: dev: 3fd:8, class: 0, subclass: 0, intclass: ff, intsubclass: 0, intproto: 0
 //match: dev: 0:0, class: 0, subclass: 0, intclass: 0, intsubclass: 0, intproto: 0
 //handle: 1, action: 1, status: 0, eventid: 109, cardtype: 4294967294, kplug: 0, options: 0, dev: 0:0, unique: 90, ver: 1, nummatch: 1
 //match: dev: 3fd:8, class: 0, subclass: 0, intclass: ff, intsubclass: 0, intproto: 0

-                               if (usb_cable) {
-                                       struct usb_interface *interface = usb_cable->config->interface;
+                               if (usbdevice) {
+                                       struct usb_interface *interface = usbdevice->config->interface;

 
                                        e->dwCardType = card_type;
                                        e->dwAction = 1;
                                        e->dwEventId = 109;
 
                                        e->dwCardType = card_type;
                                        e->dwAction = 1;
                                        e->dwEventId = 109;

-                                       e->u.Usb.dwUniqueID = 4711;
-                                       e->matchTables[0].VendorId = usb_cable->descriptor.idVendor;
-                                       e->matchTables[0].ProductId = usb_cable->descriptor.idProduct;
-                                       e->matchTables[0].bDeviceClass = usb_cable->descriptor.bDeviceClass;
-                                       e->matchTables[0].bDeviceSubClass = usb_cable->descriptor.bDeviceSubClass;
+                                       e->u.Usb.dwUniqueID = 110;
+                                       e->matchTables[0].VendorId = usbdevice->descriptor.idVendor;
+                                       e->matchTables[0].ProductId = usbdevice->descriptor.idProduct;
+                                       e->matchTables[0].bDeviceClass = usbdevice->descriptor.bDeviceClass;
+                                       e->matchTables[0].bDeviceSubClass = usbdevice->descriptor.bDeviceSubClass;

                                        e->matchTables[0].bInterfaceClass = interface->altsetting[0].bInterfaceClass;
                                        e->matchTables[0].bInterfaceSubClass = interface->altsetting[0].bInterfaceSubClass;
                                        e->matchTables[0].bInterfaceProtocol = interface->altsetting[0].bInterfaceProtocol;
                                }
 #endif
 
                                        e->matchTables[0].bInterfaceClass = interface->altsetting[0].bInterfaceClass;
                                        e->matchTables[0].bInterfaceSubClass = interface->altsetting[0].bInterfaceSubClass;
                                        e->matchTables[0].bInterfaceProtocol = interface->altsetting[0].bInterfaceProtocol;
                                }
 #endif
 

-                               fprintf(stderr,"handle: %lu, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: %lu, ver: %lu, nummatch: %lu\n", e->handle, e->dwAction, e->dwStatus, e->dwEventId, e->dwCardType, e->hKernelPlugIn, e->dwOptions, e->u.Usb.deviceId.dwVendorId, e->u.Usb.deviceId.dwProductId, e->u.Usb.dwUniqueID, e->dwEventVer, e->dwNumMatchTables);
+                               fprintf(stderr,"handle: %lu, action: %lu, status: %lu, eventid: %lu, cardtype: %lx, kplug: %lu, options: %lu, dev: %lx:%lx, unique: %lu, ver: %lu, nummatch: %lu\n", e->handle, e->dwAction, e->dwStatus, e->dwEventId, e->dwCardType, e->hKernelPlugIn, e->dwOptions, e->u.Usb.deviceId.dwVendorId, e->u.Usb.deviceId.dwProductId, e->u.Usb.dwUniqueID, e->dwEventVer, e->dwNumMatchTables);

                                for (i = 0; i < e->dwNumMatchTables; i++)
                                        fprintf(stderr,"match: dev: %04x:%04x, class: %x, subclass: %x, intclass: %x, intsubclass: %x, intproto: %x\n", e->matchTables[i].VendorId, e->matchTables[i].ProductId, e->matchTables[i].bDeviceClass, e->matchTables[i].bDeviceSubClass, e->matchTables[i].bInterfaceClass, e->matchTables[i].bInterfaceSubClass, e->matchTables[i].bInterfaceProtocol);
                                for (i = 0; i < e->dwNumMatchTables; i++)
                                        fprintf(stderr,"match: dev: %04x:%04x, class: %x, subclass: %x, intclass: %x, intsubclass: %x, intproto: %x\n", e->matchTables[i].VendorId, e->matchTables[i].ProductId, e->matchTables[i].bDeviceClass, e->matchTables[i].bDeviceSubClass, e->matchTables[i].bInterfaceClass, e->matchTables[i].bInterfaceSubClass, e->matchTables[i].bInterfaceProtocol);

+

                        }
                        break;
 
                        }
                        break;
 


@@ -528,6 +595,20 @@ int ioctl(int fd, int request, ...)
        return ret;
 }
 
        return ret;
 }
 

+int futex(int *uaddr, int op, int val, const struct timespec *timeout, int *uaddr2, int val3) {
+       static int (*func) (int*, int, int, const struct timespec*, int*, int) = NULL;
+       int ret;
+
+       if (!func)
+               func = (int (*) (int*, int, int, const struct timespec*, int*, int)) dlsym(REAL_LIBC, "futex");
+
+       fprintf(stderr,"FUTEX: %x\n", (unsigned int)uaddr);
+       ret = (*func) (uaddr, op, val, timeout, uaddr2, val3);
+
+       return ret;
+}
+
+

 #if 0
 void *mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset)
 {
 #if 0
 void *mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset)
 {