correctly calculate device_info_size, as all struct members are known now

[usb-driver] / usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index 3bf37e9cb33e5379649cdee7f0f85883d804dec2..f15910f6d994c5e839dd41058cf7343f688dce81 100644 (file)
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -18,214 +18,394 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <stdio.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <stdio.h>

+#include <usb.h>

 #include "xilinx.h"
 
 #include "xilinx.h"
 

-#define SNIFFLEN 4096
-static unsigned char lastbuf[4096];
+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 unsigned long card_type;
+
+#define NO_WINDRVR 1

 
 void hexdump(unsigned char *buf, int len);
 void diff(unsigned char *buf1, unsigned char *buf2, int len);
 
 
 void hexdump(unsigned char *buf, int len);
 void diff(unsigned char *buf1, unsigned char *buf2, int len);
 

-void parse_wdioctlreq(unsigned char *wdioctl, unsigned int request) {
+int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {

        struct header_struct* wdheader = (struct header_struct*)wdioctl;
        struct header_struct* wdheader = (struct header_struct*)wdioctl;

+       struct version_struct *version;
+       int ret = 0;

 
        if (wdheader->magic != MAGIC) {
 
        if (wdheader->magic != MAGIC) {

-               fprintf(stderr,"!!!ERROR: Header does not match!!!\n");
-               return;
+               fprintf(stderr,"!!!ERROR: magic header does not match!!!\n");
+               return (*ioctl_func) (fd, request, wdioctl);

        }
 
        }
 

-       fprintf(stderr, "Request: ");

        switch(request) {
                case VERSION:
        switch(request) {
                case VERSION:

-                       fprintf(stderr,"VERSION");
+                       version = (struct version_struct*)(wdheader->data);
+                       strcpy(version->version, "WinDriver no more");
+                       version->versionul = 999;
+                       fprintf(stderr,"faking VERSION\n");

                        break;
                        break;

+

                case LICENSE:
                case LICENSE:

-                       fprintf(stderr,"LICENSE");
-                       fprintf(stderr," \"%s\" (XX,XX)", ((struct license_struct*)(wdheader->data))->cLicense);
+                       fprintf(stderr,"faking LICENSE\n");

                        break;
                        break;

-               case TRANSFER:
-                       fprintf(stderr,"TRANSFER");
+
+               case CARD_REGISTER:
+                       {
+                               //struct card_register* cr = (struct card_register*)(wdheader->data);
+                               /* Todo: LPT-Port already in use */
+                       }
+                       fprintf(stderr,"faking CARD_REGISTER\n");

                        break;
                        break;

+

                case USB_TRANSFER:
                case USB_TRANSFER:

-                       fprintf(stderr,"USB_TRANSFER");
-               #if 0
+                       fprintf(stderr,"in USB_TRANSFER");

                        {
                                struct usb_transfer *ut = (struct usb_transfer*)(wdheader->data);
 
                        {
                                struct usb_transfer *ut = (struct usb_transfer*)(wdheader->data);
 

-                               fprintf(stderr," unique: %d, pipe: %d, read: %d, options: %x, size: %d, timeout: %x\n", ut->dwUniqueID, ut->dwPipeNum, ut->fRead, ut->dwOptions, ut->dwBufferSize, ut->dwTimeout);
-                               memcpy(lastbuf, ut->pBuffer, ut->dwBufferSize);
-                               hexdump(ut->pBuffer, ut->dwBufferSize);
+                               fprintf(stderr," unique: %lu, pipe: %lu, read: %lu, options: %lx, size: %lu, timeout: %lx\n", ut->dwUniqueID, ut->dwPipeNum, ut->fRead, ut->dwOptions, ut->dwBufferSize, ut->dwTimeout);
+                               fprintf(stderr,"setup packet: ");
+                               hexdump(ut->SetupPacket, 8);

                                fprintf(stderr,"\n");
                                fprintf(stderr,"\n");

-                       }
-                       fprintf(stderr,"\n");
+                               if (!ut->fRead && ut->dwBufferSize)
+                               {
+                                       hexdump(ut->pBuffer, ut->dwBufferSize);
+                                       fprintf(stderr,"\n");
+                               }
+
+#ifndef NO_WINDRVR
+                               ret = (*ioctl_func) (fd, request, wdioctl);

 #endif
 #endif

+
+                               fprintf(stderr,"Transferred: %lu (%s)\n",ut->dwBytesTransferred, (ut->fRead?"read":"write"));
+                               if (ut->fRead && ut->dwBytesTransferred)
+                               {
+                                       fprintf(stderr,"Read: ");
+                                       hexdump(ut->pBuffer, ut->dwBytesTransferred);
+                               }
+                               fprintf(stderr,"\n");
+                       }

                        break;
                        break;

-               case EVENT_UNREGISTER:
-                       fprintf(stderr,"EVENT_UNREGISTER");
-                       break;
-               case INT_DISABLE:
-                       fprintf(stderr,"INT_DISABLE");
-                       break;
-               case INT_WAIT:
-                       fprintf(stderr,"INT_WAIT");
-                       break;
-               case CARD_UNREGISTER:
-                       fprintf(stderr,"CARD_UNREGISTER");
-                       break;
-               case USB_GET_DEVICE_DATA:
-                       fprintf(stderr,"USB_GET_DEVICE_DATA");
-                       break;
+

                case INT_ENABLE:
                case INT_ENABLE:

-                       fprintf(stderr,"INT_ENABLE");
+                       fprintf(stderr,"faking INT_ENABLE");
+                       {
+                               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;
+                               //ret = (*ioctl_func) (fd, request, wdioctl);
+                       }
+

                        break;
                        break;

-               case EVENT_PULL:
-                       fprintf(stderr,"EVENT_PULL");
+                       
+               case INT_DISABLE:
+                       fprintf(stderr,"INT_DISABLE\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);
+#ifndef NO_WINDRVR
+                               ret = (*ioctl_func) (fd, request, wdioctl);
+#else
+                               it->dwCounter = 0;
+                               it->fStopped = 1;
+#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);
+                       }

                        break;
                        break;

+

                case USB_SET_INTERFACE:
                case USB_SET_INTERFACE:

-                       fprintf(stderr,"USB_SET_INTERFACE");
-                       break;
-               case EVENT_REGISTER:
+                       fprintf(stderr,"USB_SET_INTERFACE\n");

                        {
                        {

-                               struct event *e = (struct event*)(wdheader->data);
-                               fprintf(stderr,"%x:%x ", e->u.Usb.deviceId.dwVendorId, e->u.Usb.deviceId.dwProductId);
-                               fprintf(stderr,"match: %04x:%04x\n", e->matchTables[0].VendorId, e->matchTables[0].ProductId);
+                               struct usb_set_interface *usi = (struct usb_set_interface*)(wdheader->data);
+
+                               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);
+#endif

                        }
                        }

-                       memcpy(lastbuf, wdheader->data, wdheader->size);
-                       fprintf(stderr,"EVENT_REGISTER");

                        break;
                        break;

-               case CARD_REGISTER:
-                       break;
-               default:
-                       memcpy(lastbuf, wdheader->data, wdheader->size);
-                       fprintf(stderr,"\n");
-                       hexdump(wdheader->data, wdheader->size);
-                       fprintf(stderr,"\n");
-                       fprintf(stderr,"Unknown(%x)",request);
-       }

 
 

-       fprintf(stderr, ", size: %d\n", wdheader->size);
-}
+               case USB_GET_DEVICE_DATA:
+                       fprintf(stderr,"USB_GET_DEVICE_DATA\n");
+                       {
+                               struct usb_get_device_data *ugdd = (struct usb_get_device_data*)(wdheader->data);
+                               int pSize;

 
 

-void parse_wdioctlans(unsigned char *wdioctl, unsigned int request, int result) {
-       struct header_struct* wdheader = (struct header_struct*)wdioctl;
+                               fprintf(stderr, "unique: %lu, bytes: %lu, options: %lx\n", ugdd->dwUniqueID, ugdd->dwBytes, ugdd->dwOptions);
+                               pSize = ugdd->dwBytes;
+                               if (pSize) {
+                                       hexdump(ugdd->pBuf, pSize);
+                               }
+#ifndef NO_WINDRVR
+                               ret = (*ioctl_func) (fd, request, wdioctl);
+#else
+                               if (!ugdd->dwBytes) {
+                                       if (usb_cable) {
+                                               int i,j,k;
+                                               ugdd->dwBytes = sizeof(struct usb_device_info);
+
+                                               for (i=0; i<usb_cable->descriptor.bNumConfigurations; i++)
+                                               {
+                                                       struct usb_config_descriptor *conf_desc = &usb_cable->config[i];
+                                                       ugdd->dwBytes+=sizeof(WDU_CONFIGURATION);
+                                                       ugdd->dwBytes+=sizeof(WDU_INTERFACE) * conf_desc->bNumInterfaces;
+
+                                                       for (j=0; j<conf_desc->bNumInterfaces; j++)
+                                                       {
+                                                               struct usb_interface *interface = &usb_cable->config[i].interface[j];
+                                                               for(k=0; k<interface->num_altsetting; k++)
+                                                               {
+                                                                       unsigned char bNumEndpoints;
+                                                                       bNumEndpoints = interface->altsetting[k].bNumEndpoints;
+                                                                       ugdd->dwBytes+=sizeof(WDU_ALTERNATE_SETTING);
+                                                                       ugdd->dwBytes+=(sizeof(WDU_ENDPOINT_DESCRIPTOR)+sizeof(WDU_PIPE_INFO))*bNumEndpoints;
+                                                               }
+                                                       }
+                                               }
+
+                                               
+                                       }
+                               } else {
+                                       struct usb_device_info_get *udi = (struct usb_device_info_get*)ugdd->pBuf;
+                                       struct usb_endpoint_descriptor *ep;
+unsigned char dings[] = {0x12, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x40, 0xfd, 0x03, 0x08, 0x00, 0x00, 0x00, 0x01, 0x02,
+0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x45, 0x21, 0x08, 0x38, 0x45, 0x21, 0x08,
+0x4c, 0x45, 0x21, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x02, 0x20, 0x00, 0x01, 0x02, 0x00, 0x80,
+0x8c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x4c, 0x45, 0x21, 0x08, 0x58, 0x45, 0x21, 0x08,
+0x01, 0x00, 0x00, 0x00, 0x58, 0x45, 0x21, 0x08, 0x09, 0x04, 0x00, 0x00, 0x02, 0xff, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x6c, 0x45, 0x21, 0x08, 0x7c, 0x45, 0x21, 0x08, 0x07, 0x05, 0x02, 0x02,
+0x00, 0x02, 0x00, 0x00, 0x07, 0x05, 0x86, 0x02, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x86, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00};
+
+//unique: 94, bytes: 276, options: 0
+//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 00 00 00 00 00 00 00 00
+//03 00 00 00 00 00 00 00 38 45 21 08 38 45 21 08                              00 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
+//00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+//00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+//00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+//00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+//00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+//00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00                              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 00 00 00 00 00 00 00 00
+//8c 00 00 00 01 00 00 00 4c 45 21 08 58 45 21 08                              00 00 00 00 00 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                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 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 00 00 00 00
+//00 02 00 00 07 05 86 02 00 02 00 00 02 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+//00 02 00 00 02 00 00 00 02 00 00 00 00 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+//86 00 00 00 00 02 00 00 02 00 00 00 01 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+//00 00 00 00                                                                  00 00 00 00
+
+                                       bzero(udi, ugdd->dwBytes);
+                                       //memcpy(udi, dings, 276);
+                                       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;
+
+                                       ep = usb_cable->config->interface->altsetting[0].endpoint;
+
+                                       udi->Pipe0.dwNumber = 0x00;
+                                       udi->Pipe0.dwMaximumPacketSize = usb_cable->descriptor.bMaxPacketSize0;
+                                       udi->Pipe0.type = 0;
+                                       udi->Pipe0.direction = 3;
+                                       udi->Pipe0.dwInterval = 0;
+
+                                       udi->cfg.Descriptor.bLength = usb_cable->config->bLength;
+                                       udi->cfg.Descriptor.bDescriptorType = usb_cable->config->bDescriptorType;
+                                       udi->cfg.Descriptor.wTotalLength = usb_cable->config->wTotalLength;
+                                       udi->cfg.Descriptor.bNumInterfaces = usb_cable->config->bNumInterfaces;
+                                       udi->cfg.Descriptor.bConfigurationValue = usb_cable->config->bConfigurationValue;
+                                       udi->cfg.Descriptor.iConfiguration = usb_cable->config->iConfiguration;
+                                       udi->cfg.Descriptor.bmAttributes = usb_cable->config->bmAttributes;
+                                       udi->cfg.Descriptor.MaxPower = usb_cable->config->MaxPower;
+
+                                       // ab offset 168 config desc
+                               }
+#endif
+                               if (pSize) {
+                                       struct usb_device_info *udi = (struct usb_device_info*)ugdd->pBuf;

 
 

-       if (wdheader->magic != MAGIC) {
-               fprintf(stderr,"!!!ERROR: Header does not match!!!\n");
-               return;
-       }
+                                       fprintf(stderr, "Vendor: %x\n", udi->Descriptor.idVendor);

 
 

-       fprintf(stderr, "Answer: %d ", result);
-       switch(request) {
-               case VERSION:
-                       fprintf(stderr,"\"%s\" (%d)", ((struct version_struct*)(wdheader->data))->version, ((struct version_struct*)(wdheader->data))->versionul);
-                       break;
-               case LICENSE:
-                       fprintf(stderr,"\"%s\" (XX,XX)", ((struct license_struct*)(wdheader->data))->cLicense);
-                       break;
-               case TRANSFER:
-               case EVENT_UNREGISTER:
-               case INT_DISABLE:
-               case INT_WAIT:
-               case CARD_UNREGISTER:
-               case USB_GET_DEVICE_DATA:
-               case INT_ENABLE:
-               case EVENT_PULL:
-               case USB_SET_INTERFACE:
-               case CARD_REGISTER:
+                                       hexdump(ugdd->pBuf, pSize);
+                                       fprintf(stderr, "\n");
+                               }
+                       }

                        break;
                        break;

+

                case EVENT_REGISTER:
                case EVENT_REGISTER:

-                       fprintf(stderr,"\n");
-                       diff(lastbuf, wdheader->data, wdheader->size);
-                       break;
-               case USB_TRANSFER:
+                       fprintf(stderr,"EVENT_REGISTER\n");

                        {
                        {

-                               struct usb_transfer *ut = (struct usb_transfer*)(wdheader->data);
-
-                               fprintf(stderr,"\nTransferred: %d (%s)",ut->dwBytesTransferred, (ut->fRead?"read":"write"));
-                               if (ut->fRead && ut->dwBytesTransferred)
-                               {
-                                       fprintf(stderr,"\nRead: ");
-                                       hexdump(ut->pBuffer, ut->dwBytesTransferred);
+                               struct event *e = (struct event*)(wdheader->data);
+                               struct usb_bus *bus;
+                               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);
+                               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 (bus = busses; bus; bus = bus->next) {
+                                               struct usb_device *dev;
+
+                                               for (dev = bus->devices; dev; dev = dev->next) {
+                                                       struct usb_device_descriptor *desc = &(dev->descriptor);
+
+                                                       if((desc->idVendor == e->matchTables[i].VendorId) &&
+                                                          (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;
+                                                                       }
+                                                               }
+                                                       }
+                                               }
+                                       }

                                }
                                }

-                               #if 0
-                               hexdump(ut->pBuffer, ut->dwBufferSize);
-                               fprintf(stderr,"\n");
-                               diff(lastbuf, ut->pBuffer, ut->dwBufferSize);
-                               #endif
+
+#ifndef NO_WINDRVR
+                               ret = (*ioctl_func) (fd, request, wdioctl);
+#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);
+                               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;

-               default:
-                       fprintf(stderr,"\n");
-                       hexdump(wdheader->data, wdheader->size);
-                       fprintf(stderr,"\n");
-                       diff(lastbuf, wdheader->data, wdheader->size);
-                       break;
-       }
-       fprintf(stderr, "\n", wdheader->size);
-}
-
-int do_wdioctl(unsigned int request, unsigned char *wdioctl) {
-       struct header_struct* wdheader = (struct header_struct*)wdioctl;
-       struct version_struct *version;

 
 

-       if (wdheader->magic != MAGIC) {
-               fprintf(stderr,"!!!ERROR: Header does not match!!!\n");
-               return;
-       }
+               case TRANSFER:
+                       fprintf(stderr,"TRANSFER\n");
+#ifndef NO_WINDRVR
+                       ret = (*ioctl_func) (fd, request, wdioctl);
+#endif
+                       break;

 
 

-       switch(request) {
-               case VERSION:
-                       version = (struct version_struct*)(wdheader->data);
-                       strcpy(version->version, "WinDriver no more");
-                       version->versionul = 999;
-                       fprintf(stderr,"faking VERSION\n");
+               case EVENT_UNREGISTER:
+                       fprintf(stderr,"EVENT_UNREGISTER\n");
+#ifndef NO_WINDRVR
+                       ret = (*ioctl_func) (fd, request, wdioctl);
+#endif

                        break;
                        break;

-               case CARD_REGISTER:
+
+               case INT_WAIT:
+                       fprintf(stderr,"INT_WAIT\n");

                        {
                        {

-                               struct card_register* cr = (struct card_register*)(wdheader->data);
-                               /* Todo: LPT-Port already in use */
+                               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);
+
+#ifndef NO_WINDRVR
+                               ret = (*ioctl_func) (fd, request, wdioctl);
+#else
+                               if (usb_cable)
+                                       it->dwCounter++;
+#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,"faking CARD_REGISTER\n");

                        break;
                        break;

-               case USB_TRANSFER:
-                       fprintf(stderr,"in USB_TRANSFER");
+
+               case CARD_UNREGISTER:
+                       fprintf(stderr,"CARD_UNREGISTER\n");
+#ifndef NO_WINDRVR
+                       ret = (*ioctl_func) (fd, request, wdioctl);
+#endif
+                       break;
+
+               case EVENT_PULL:
+                       fprintf(stderr,"EVENT_PULL\n");

                        {
                        {

-                               struct usb_transfer *ut = (struct usb_transfer*)(wdheader->data);
+                               struct event *e = (struct event*)(wdheader->data);
+                               int i;

 
 

-                               fprintf(stderr," unique: %d, pipe: %d, read: %d, options: %x, size: %d, timeout: %x\n", ut->dwUniqueID, ut->dwPipeNum, ut->fRead, ut->dwOptions, ut->dwBufferSize, ut->dwTimeout);
-                               fprintf(stderr,"setup packet: ");
-                               hexdump(ut->SetupPacket, 8);
-                               if (!ut->fRead && ut->dwBufferSize)
-                               {
-                                       hexdump(ut->pBuffer, ut->dwBufferSize);
-                                       fprintf(stderr,"\n");
+                               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);
+                               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);
+
+#ifndef NO_WINDRVR
+                               ret = (*ioctl_func) (fd, request, wdioctl);
+#else
+//EVENT_PULL
+//handle: 1, action: 0, status: 0, eventid: 0, cardtype: 0, kplug: 0, options: 0, dev: 0:0, unique: 0, ver: 1, nummatch: 1
+//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;
+
+                                       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->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);
+                               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);

                        }
                        }

-               case LICENSE:
-               case TRANSFER:
-               case EVENT_UNREGISTER:
-               case INT_DISABLE:
-               case INT_WAIT:
-               case CARD_UNREGISTER:
-               case USB_GET_DEVICE_DATA:
-               case INT_ENABLE:
-               case EVENT_PULL:
-               case USB_SET_INTERFACE:
-               case EVENT_REGISTER:
+                       break;
+

                default:
                default:

-                       return -1;
+                       fprintf(stderr,"!!!Unsupported IOCTL: %x!!!\n", request);
+#ifndef NO_WINDRVR
+                       ret = (*ioctl_func) (fd, request, wdioctl);
+#endif
+                       break;

        }
 
        }
 

-       return 0;
+       return ret;

 }
 
 
 typedef int (*open_funcptr_t) (const char *, int, mode_t);
 
 }
 
 
 typedef int (*open_funcptr_t) (const char *, int, mode_t);
 

-static windrvrfd = 0;
-static void* mmapped = NULL;
-static size_t mmapplen = 0;
-

 int open (const char *pathname, int flags, ...)
 {
        static open_funcptr_t func = NULL;
 int open (const char *pathname, int flags, ...)
 {
        static open_funcptr_t func = NULL;


@@ -242,11 +422,22 @@ int open (const char *pathname, int flags, ...)
                va_end(args);
        }
 
                va_end(args);
        }
 

-       fd = (*func) (pathname, flags, mode);
-

        if (!strcmp (pathname, "/dev/windrvr6")) {
                fprintf(stderr,"opening windrvr6\n");
        if (!strcmp (pathname, "/dev/windrvr6")) {
                fprintf(stderr,"opening windrvr6\n");

-               windrvrfd = fd;
+#ifdef NO_WINDRVR
+               windrvrfd = fd = (*func) ("/dev/null", flags, mode);
+#else
+               windrvrfd = fd = (*func) (pathname, flags, mode);
+#endif
+               if (!busses) {
+                       usb_init();
+                       usb_find_busses();
+                       usb_find_devices();
+
+                       busses = usb_get_busses();
+               }
+       } else {
+               fd = (*func) (pathname, flags, mode);

        }
 
        return fd;
        }
 
        return fd;


@@ -274,30 +465,22 @@ void hexdump(unsigned char *buf, int len) {
 
 int ioctl(int fd, int request, ...)
 {
 
 int ioctl(int fd, int request, ...)
 {

-       static int (*func) (int, int, void *) = NULL;

        va_list args;
        void *argp;
        int ret;
 
        va_list args;
        void *argp;
        int ret;
 

-       if (!func)                                                                    
-               func = (int (*) (int, int, void *)) dlsym (REAL_LIBC, "ioctl");             
+       if (!ioctl_func)                                                                    
+               ioctl_func = (int (*) (int, int, void *)) dlsym (REAL_LIBC, "ioctl");             

 
        va_start (args, request);
        argp = va_arg (args, void *);
        va_end (args);
 
 
        va_start (args, request);
        argp = va_arg (args, void *);
        va_end (args);
 

-       if (fd == windrvrfd) {
-               parse_wdioctlreq(argp, request);
+       if (fd == windrvrfd)
+               ret = do_wdioctl(fd, request, argp);
+       else
+               ret = (*ioctl_func) (fd, request, argp);

 
 

-               if ((ret = do_wdioctl(request, argp)))
-                       ret = (*func) (fd, request, argp);
-       } else {
-               ret = (*func) (fd, request, argp);
-       }
-
-       if (fd == windrvrfd) {
-               parse_wdioctlans(argp, request, ret);
-       }

        return ret;
 }
 
        return ret;
 }