]> cvs.zerfleddert.de Git - usb-driver/blobdiff - usb-driver.c
projects / usb-driver / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
replace a magic value by its name
[usb-driver] / usb-driver.c
diff --git a/usb-driver.c b/usb-driver.c
index e92467f95b2ebbea50967bbb7cfa5b86ecbb4e4c..264da44c0eaec66203ddda05a4c5c474dd07e79b 100644 (file)
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -20,41 +20,35 @@
 #include <stdio.h>
 #include <usb.h>
 #include <signal.h>
 #include <stdio.h>
 #include <usb.h>
 #include <signal.h>
-#include "xilinx.h"
+#include <pthread.h>
+#include "usb-driver.h"
 
 static int (*ioctl_func) (int, int, void *) = NULL;
 static int windrvrfd = 0;
 
 static int (*ioctl_func) (int, int, void *) = NULL;
 static int windrvrfd = 0;
+FILE *modulesfp;
+static int modules_read = 0;
 static struct usb_bus *busses = NULL;
 static struct usb_device *usbdevice;
 static usb_dev_handle *usb_devhandle = NULL;
 static unsigned long card_type;
 static int ints_enabled = 0;
 static struct usb_bus *busses = NULL;
 static struct usb_device *usbdevice;
 static usb_dev_handle *usb_devhandle = NULL;
 static unsigned long card_type;
 static int ints_enabled = 0;
+static pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER;
 
 #define NO_WINDRVR 1
 
 #define NO_WINDRVR 1
+#undef DEBUG
+
+#ifdef DEBUG
+void hexdump(unsigned char *buf, int len) {
+       int i;
+
+       for(i=0; i<len; i++) {
+               fprintf(stderr,"%02x ", buf[i]);
+               if ((i % 16) == 15)
+                       fprintf(stderr,"\n");
+       }
+}
+#endif
 
 
-void hexdump(unsigned char *buf, int len);
-void diff(unsigned char *buf1, unsigned char *buf2, int len);
-
-//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 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 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
-//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 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 00 00 00                                                                  00 00 00 00
 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;
@@ -83,7 +77,7 @@ int usb_deviceinfo(unsigned char *buf) {
                udi->Pipe0.dwNumber = 0x00;
                udi->Pipe0.dwMaximumPacketSize = usbdevice->descriptor.bMaxPacketSize0;
                udi->Pipe0.type = 0;
                udi->Pipe0.dwNumber = 0x00;
                udi->Pipe0.dwMaximumPacketSize = usbdevice->descriptor.bMaxPacketSize0;
                udi->Pipe0.type = 0;
-               udi->Pipe0.direction = 3;
+               udi->Pipe0.direction = WDU_DIR_IN_OUT;
                udi->Pipe0.dwInterval = 0;
 
                pConfigs = &(udi->pConfigs);
                udi->Pipe0.dwInterval = 0;
 
                pConfigs = &(udi->pConfigs);
@@ -230,57 +224,82 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        version = (struct version_struct*)(wdheader->data);
                        strcpy(version->version, "WinDriver no more");
                        version->versionul = 999;
                        version = (struct version_struct*)(wdheader->data);
                        strcpy(version->version, "WinDriver no more");
                        version->versionul = 999;
+#ifdef DEBUG
                        fprintf(stderr,"faking VERSION\n");
                        fprintf(stderr,"faking VERSION\n");
+#endif
                        break;
 
                case LICENSE:
                        break;
 
                case LICENSE:
+#ifdef DEBUG
                        fprintf(stderr,"faking LICENSE\n");
                        fprintf(stderr,"faking LICENSE\n");
+#endif
                        break;
 
                case CARD_REGISTER:
                        break;
 
                case CARD_REGISTER:
+                       /* TODO: Implement for LPT-support */
+#if 0
                        {
                        {
-                               //struct card_register* cr = (struct card_register*)(wdheader->data);
-                               /* Todo: LPT-Port already in use */
+                               struct card_register* cr = (struct card_register*)(wdheader->data);
                        }
                        }
+#endif
+#ifdef DEBUG
                        fprintf(stderr,"faking CARD_REGISTER\n");
                        fprintf(stderr,"faking CARD_REGISTER\n");
+#endif
                        break;
 
                case USB_TRANSFER:
                        break;
 
                case USB_TRANSFER:
+#ifdef DEBUG
                        fprintf(stderr,"in USB_TRANSFER");
                        fprintf(stderr,"in USB_TRANSFER");
+#endif
                        {
                                struct usb_transfer *ut = (struct usb_transfer*)(wdheader->data);
                        {
                                struct usb_transfer *ut = (struct usb_transfer*)(wdheader->data);
-                               int requesttype, request, value, index, size;
 
 
+#ifdef DEBUG
                                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," 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");
+
                                if (!ut->fRead && ut->dwBufferSize)
                                {
                                        hexdump(ut->pBuffer, ut->dwBufferSize);
                                        fprintf(stderr,"\n");
                                }
                                if (!ut->fRead && ut->dwBufferSize)
                                {
                                        hexdump(ut->pBuffer, ut->dwBufferSize);
                                        fprintf(stderr,"\n");
                                }
+#endif
 
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
                                /* http://www.jungo.com/support/documentation/windriver/802/wdusb_man_mhtml/node55.html#SECTION001213000000000000000 */
 
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
                                /* http://www.jungo.com/support/documentation/windriver/802/wdusb_man_mhtml/node55.html#SECTION001213000000000000000 */
-                               requesttype = ut->SetupPacket[0];
-                               request = ut->SetupPacket[1];
-                               value = ut->SetupPacket[2] | (ut->SetupPacket[3] << 8);
-                               index = ut->SetupPacket[4] | (ut->SetupPacket[5] << 8);
-                               size = ut->SetupPacket[6] | (ut->SetupPacket[7] << 8);
-                               fprintf(stderr, "requesttype: %x, request: %x, value: %u, index: %u, size: %u\n", requesttype, request, value, index, size);
-                               ret = usb_control_msg(usb_devhandle, requesttype, request, value, index, ut->pBuffer, size, ut->dwTimeout);
+                               if (ut->dwPipeNum == 0) { /* control pipe */
+                                       int requesttype, request, value, index, size;
+                                       requesttype = ut->SetupPacket[0];
+                                       request = ut->SetupPacket[1];
+                                       value = ut->SetupPacket[2] | (ut->SetupPacket[3] << 8);
+                                       index = ut->SetupPacket[4] | (ut->SetupPacket[5] << 8);
+                                       size = ut->SetupPacket[6] | (ut->SetupPacket[7] << 8);
+#ifdef DEBUG
+                                       fprintf(stderr, "requesttype: %x, request: %x, value: %u, index: %u, size: %u\n", requesttype, request, value, index, size);
+#endif
+                                       ret = usb_control_msg(usb_devhandle, requesttype, request, value, index, ut->pBuffer, size, ut->dwTimeout);
+                               } else {
+                                       if (ut->fRead) {
+                                               ret = usb_bulk_read(usb_devhandle, ut->dwPipeNum, ut->pBuffer, ut->dwBufferSize, ut->dwTimeout);
+
+                                       } else {
+                                               ret = usb_bulk_write(usb_devhandle, ut->dwPipeNum, ut->pBuffer, ut->dwBufferSize, ut->dwTimeout);
+                                       }
+                               }
+
                                if (ret < 0) {
                                if (ret < 0) {
-                                       fprintf(stderr, "usb_control_msg: %d\n", ret);
+                                       fprintf(stderr, "usb_transfer: %d (%s)\n", ret, usb_strerror());
                                } else {
                                        ut->dwBytesTransferred = ret;
                                        ret = 0;
                                }
                                } else {
                                        ut->dwBytesTransferred = ret;
                                        ret = 0;
                                }
-                                       
 #endif
 
 #endif
 
+#ifdef DEBUG
                                fprintf(stderr,"Transferred: %lu (%s)\n",ut->dwBytesTransferred, (ut->fRead?"read":"write"));
                                if (ut->fRead && ut->dwBytesTransferred)
                                {
                                fprintf(stderr,"Transferred: %lu (%s)\n",ut->dwBytesTransferred, (ut->fRead?"read":"write"));
                                if (ut->fRead && ut->dwBytesTransferred)
                                {
@@ -288,46 +307,62 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                        hexdump(ut->pBuffer, ut->dwBytesTransferred);
                                        fprintf(stderr,"\n");
                                }
                                        hexdump(ut->pBuffer, ut->dwBytesTransferred);
                                        fprintf(stderr,"\n");
                                }
+#endif
                        }
                        break;
 
                case INT_ENABLE:
                        }
                        break;
 
                case INT_ENABLE:
+#ifdef DEBUG
                        fprintf(stderr,"INT_ENABLE\n");
                        fprintf(stderr,"INT_ENABLE\n");
+#endif
                        {
                                struct interrupt *it = (struct interrupt*)(wdheader->data);
 
                        {
                                struct interrupt *it = (struct interrupt*)(wdheader->data);
 
+#ifdef DEBUG
                                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,"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
 
                                it->fEnableOk = 1;
                                ints_enabled = 1;
 
                                it->fEnableOk = 1;
                                ints_enabled = 1;
-                               //ret = (*ioctl_func) (fd, request, wdioctl);
+                               pthread_mutex_trylock(&int_wait);
                        }
 
                        break;
                        
                case INT_DISABLE:
                        }
 
                        break;
                        
                case INT_DISABLE:
+#ifdef DEBUG
                        fprintf(stderr,"INT_DISABLE\n");
                        fprintf(stderr,"INT_DISABLE\n");
+#endif
                        {
                                struct interrupt *it = (struct interrupt*)(wdheader->data);
 
                        {
                                struct interrupt *it = (struct interrupt*)(wdheader->data);
 
+#ifdef DEBUG
                                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,"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
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
                                it->dwCounter = 0;
                                it->fStopped = 1;
                                ints_enabled = 0;
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
                                it->dwCounter = 0;
                                it->fStopped = 1;
                                ints_enabled = 0;
+                               pthread_mutex_unlock(&int_wait);
 #endif
 #endif
+#ifdef DEBUG
                                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,"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
                        }
                        break;
 
                case USB_SET_INTERFACE:
                        }
                        break;
 
                case USB_SET_INTERFACE:
+#ifdef DEBUG
                        fprintf(stderr,"USB_SET_INTERFACE\n");
                        fprintf(stderr,"USB_SET_INTERFACE\n");
+#endif
                        {
                                struct usb_set_interface *usi = (struct usb_set_interface*)(wdheader->data);
 
                        {
                                struct usb_set_interface *usi = (struct usb_set_interface*)(wdheader->data);
 
+#ifdef DEBUG
                                fprintf(stderr,"unique: %lu, interfacenum: %lu, alternatesetting: %lu, options: %lx\n", usi->dwUniqueID, usi->dwInterfaceNum, usi->dwAlternateSetting, usi->dwOptions);
                                fprintf(stderr,"unique: %lu, interfacenum: %lu, alternatesetting: %lu, options: %lx\n", usi->dwUniqueID, usi->dwInterfaceNum, usi->dwAlternateSetting, usi->dwOptions);
+#endif
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
@@ -338,7 +373,6 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                        /* FIXME: Select right interface! */
                                        ret = usb_claim_interface(usb_devhandle, usbdevice->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber);
                                        if (!ret) {
                                        /* 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_configuration(usb_devhandle, usbdevice->config[0].bConfigurationValue);
                                                if(!ret) {
                                                        ret = usb_set_altinterface(usb_devhandle, usi->dwAlternateSetting);
                                                        if (ret)
                                                if(!ret) {
                                                        ret = usb_set_altinterface(usb_devhandle, usi->dwAlternateSetting);
                                                        if (ret)
@@ -351,19 +385,24 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                        }
                                }
 #endif
                                        }
                                }
 #endif
+#ifdef DEBUG
                                fprintf(stderr,"unique: %lu, interfacenum: %lu, alternatesetting: %lu, options: %lx\n", usi->dwUniqueID, usi->dwInterfaceNum, usi->dwAlternateSetting, usi->dwOptions);
                                fprintf(stderr,"unique: %lu, interfacenum: %lu, alternatesetting: %lu, options: %lx\n", usi->dwUniqueID, usi->dwInterfaceNum, usi->dwAlternateSetting, usi->dwOptions);
+#endif
                        }
                        break;
 
                case USB_GET_DEVICE_DATA:
                        }
                        break;
 
                case USB_GET_DEVICE_DATA:
+#ifdef DEBUG
                        fprintf(stderr,"faking USB_GET_DEVICE_DATA\n");
                        fprintf(stderr,"faking USB_GET_DEVICE_DATA\n");
+#endif
                        {
                                struct usb_get_device_data *ugdd = (struct usb_get_device_data*)(wdheader->data);
                                int pSize;
 
                        {
                                struct usb_get_device_data *ugdd = (struct usb_get_device_data*)(wdheader->data);
                                int pSize;
 
+#ifdef DEBUG
                                fprintf(stderr, "unique: %lu, bytes: %lu, options: %lx\n", ugdd->dwUniqueID, ugdd->dwBytes, ugdd->dwOptions);
                                fprintf(stderr, "unique: %lu, bytes: %lu, options: %lx\n", ugdd->dwUniqueID, ugdd->dwBytes, ugdd->dwOptions);
+#endif
                                pSize = ugdd->dwBytes;
                                pSize = ugdd->dwBytes;
-                               //ret = (*ioctl_func) (fd, request, wdioctl);
                                if (!ugdd->dwBytes) {
                                        if (usbdevice) {
                                                ugdd->dwBytes = usb_deviceinfo(NULL);
                                if (!ugdd->dwBytes) {
                                        if (usbdevice) {
                                                ugdd->dwBytes = usb_deviceinfo(NULL);
@@ -371,25 +410,25 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                } else {
                                        usb_deviceinfo((unsigned char*)ugdd->pBuf);
                                }
                                } else {
                                        usb_deviceinfo((unsigned char*)ugdd->pBuf);
                                }
-
-                               if (pSize) {
-                                       struct usb_device_info *udi = (struct usb_device_info*)ugdd->pBuf;
-
-                                       fprintf(stderr, "Vendor: %x\n", udi->Descriptor.idVendor);
-                               }
                        }
                        break;
 
                case EVENT_REGISTER:
                        }
                        break;
 
                case EVENT_REGISTER:
+#ifdef DEBUG
                        fprintf(stderr,"EVENT_REGISTER\n");
                        fprintf(stderr,"EVENT_REGISTER\n");
+#endif
                        {
                                struct event *e = (struct event*)(wdheader->data);
                                struct usb_bus *bus;
                                int i;
 
                        {
                                struct event *e = (struct event*)(wdheader->data);
                                struct usb_bus *bus;
                                int i;
 
+#ifdef DEBUG
                                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: %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
                                for (i = 0; i < e->dwNumMatchTables; i++) {
                                for (i = 0; i < e->dwNumMatchTables; i++) {
+#ifdef DEBUG
                                        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);
                                        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);
+#endif
 
                                        for (bus = busses; bus; bus = bus->next) {
                                                struct usb_device *dev;
 
                                        for (bus = busses; bus; bus = bus->next) {
                                                struct usb_device *dev;
@@ -407,11 +446,15 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                                                           int ai;
 
                                                                           for (ai = 0; ai < interface->num_altsetting; ai++) {
                                                                           int ai;
 
                                                                           for (ai = 0; ai < interface->num_altsetting; ai++) {
+#ifdef DEBUG
                                                                                   fprintf(stderr, "intclass: %x, intsubclass: %x, intproto: %x\n", interface->altsetting[i].bInterfaceClass, interface->altsetting[i].bInterfaceSubClass, interface->altsetting[i].bInterfaceProtocol);
                                                                                   fprintf(stderr, "intclass: %x, intsubclass: %x, intproto: %x\n", interface->altsetting[i].bInterfaceClass, interface->altsetting[i].bInterfaceSubClass, interface->altsetting[i].bInterfaceProtocol);
+#endif
                                                                                   if ((interface->altsetting[ai].bInterfaceSubClass == e->matchTables[i].bInterfaceSubClass) &&
                                                                                                   (interface->altsetting[ai].bInterfaceProtocol == e->matchTables[i].bInterfaceProtocol)){
                                                                                           /* TODO: check interfaceClass! */
                                                                                   if ((interface->altsetting[ai].bInterfaceSubClass == e->matchTables[i].bInterfaceSubClass) &&
                                                                                                   (interface->altsetting[ai].bInterfaceProtocol == e->matchTables[i].bInterfaceProtocol)){
                                                                                           /* TODO: check interfaceClass! */
+#ifdef DEBUG
                                                                                           fprintf(stderr,"!!!FOUND DEVICE WITH LIBUSB!!!\n");
                                                                                           fprintf(stderr,"!!!FOUND DEVICE WITH LIBUSB!!!\n");
+#endif
                                                                                           usbdevice = dev;
                                                                                           card_type = e->dwCardType;
                                                                                   }
                                                                                           usbdevice = dev;
                                                                                           card_type = e->dwCardType;
                                                                                   }
@@ -425,14 +468,14 @@ 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
-//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
 
                                e->handle++;
 #endif
 
+#ifdef DEBUG
                                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);
                                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);
+#endif
                        }
                        break;
 
                        }
                        break;
 
@@ -444,18 +487,24 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        break;
 
                case EVENT_UNREGISTER:
                        break;
 
                case EVENT_UNREGISTER:
+#ifdef DEBUG
                        fprintf(stderr,"EVENT_UNREGISTER\n");
                        fprintf(stderr,"EVENT_UNREGISTER\n");
+#endif
 #ifndef NO_WINDRVR
                        ret = (*ioctl_func) (fd, request, wdioctl);
 #endif
                        break;
 
                case INT_WAIT:
 #ifndef NO_WINDRVR
                        ret = (*ioctl_func) (fd, request, wdioctl);
 #endif
                        break;
 
                case INT_WAIT:
+#ifdef DEBUG
                        fprintf(stderr,"INT_WAIT\n");
                        fprintf(stderr,"INT_WAIT\n");
+#endif
                        {
                                struct interrupt *it = (struct interrupt*)(wdheader->data);
 
                        {
                                struct interrupt *it = (struct interrupt*)(wdheader->data);
 
+#ifdef DEBUG
                                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,"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
 
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
@@ -464,15 +513,18 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                        if (it->dwCounter == 0) {
                                                it->dwCounter = 1;
                                        } else {
                                        if (it->dwCounter == 0) {
                                                it->dwCounter = 1;
                                        } else {
-                                               //FIXME: signal durch FUTEX, overload futex!
-                                               while(ints_enabled) {sleep(1);}
+                                               pthread_mutex_lock(&int_wait);
+                                               pthread_mutex_unlock(&int_wait);
                                        }
                                } else {
                                        }
                                } else {
-                                       while(ints_enabled) {sleep(1);}
+                                       pthread_mutex_lock(&int_wait);
+                                       pthread_mutex_unlock(&int_wait);
                                }
 #endif
 
                                }
 #endif
 
+#ifdef DEBUG
                                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);
                                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);
+#endif
                        }
                        break;
 
                        }
                        break;
 
@@ -484,23 +536,22 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        break;
 
                case EVENT_PULL:
                        break;
 
                case EVENT_PULL:
+#ifdef DEBUG
                        fprintf(stderr,"EVENT_PULL\n");
                        fprintf(stderr,"EVENT_PULL\n");
+#endif
                        {
                                struct event *e = (struct event*)(wdheader->data);
                        {
                                struct event *e = (struct event*)(wdheader->data);
+#ifdef DEBUG
                                int i;
 
                                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);
                                int i;
 
                                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);
+#endif
 
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
 
 #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 (usbdevice) {
                                        struct usb_interface *interface = usbdevice->config->interface;
 
                                if (usbdevice) {
                                        struct usb_interface *interface = usbdevice->config->interface;
 
@@ -518,9 +569,11 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                }
 #endif
 
                                }
 #endif
 
+#ifdef DEBUG
                                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);
                                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);
+#endif
 
                        }
                        break;
 
                        }
                        break;
@@ -536,18 +589,34 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
        return ret;
 }
 
        return ret;
 }
 
+int ioctl(int fd, int request, ...) {
+       va_list args;
+       void *argp;
+       int ret;
 
 
-typedef int (*open_funcptr_t) (const char *, int, mode_t);
+       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);
+
+       if (fd == windrvrfd)
+               ret = do_wdioctl(fd, request, argp);
+       else
+               ret = (*ioctl_func) (fd, request, argp);
+
+       return ret;
+}
 
 
-int open (const char *pathname, int flags, ...)
-{
-       static open_funcptr_t func = NULL;
+int open (const char *pathname, int flags, ...) {
+       static int (*func) (const char *, int, mode_t) = NULL;
        mode_t mode = 0;
        va_list args;
        int fd;
 
        if (!func)
        mode_t mode = 0;
        va_list args;
        int fd;
 
        if (!func)
-               func = (open_funcptr_t) dlsym (REAL_LIBC, "open");
+               func = (int (*) (const char *, int, mode_t)) dlsym (REAL_LIBC, "open");
 
        if (flags & O_CREAT) {
                va_start(args, flags);
 
        if (flags & O_CREAT) {
                va_start(args, flags);
@@ -556,7 +625,9 @@ int open (const char *pathname, int flags, ...)
        }
 
        if (!strcmp (pathname, "/dev/windrvr6")) {
        }
 
        if (!strcmp (pathname, "/dev/windrvr6")) {
+#ifdef DEBUG
                fprintf(stderr,"opening windrvr6\n");
                fprintf(stderr,"opening windrvr6\n");
+#endif
 #ifdef NO_WINDRVR
                windrvrfd = fd = (*func) ("/dev/null", flags, mode);
 #else
 #ifdef NO_WINDRVR
                windrvrfd = fd = (*func) ("/dev/null", flags, mode);
 #else
@@ -569,132 +640,83 @@ int open (const char *pathname, int flags, ...)
 
                        busses = usb_get_busses();
                }
 
                        busses = usb_get_busses();
                }
-       } else {
-               fd = (*func) (pathname, flags, mode);
-       }
-
-       return fd;
-}
 
 
-void diff(unsigned char *buf1, unsigned char *buf2, int len) {
-       int i;
-
-       for(i=0; i<len; i++) {
-               if (buf1[i] != buf2[i]) {
-                       fprintf(stderr,"Diff at %d: %02x(%c)->%02x(%c)\n", i, buf1[i], ((buf1[i] >= 31 && buf1[i] <= 126)?buf1[i]:'.'), buf2[i], ((buf2[i] >= 31 && buf2[i] <= 126)?buf2[i]:'.'));
-               }
+               return fd;
        }
        }
-}
 
 
-void hexdump(unsigned char *buf, int len) {
-       int i;
-
-       for(i=0; i<len; i++) {
-               fprintf(stderr,"%02x ", buf[i]);
-               if ((i % 16) == 15)
-                       fprintf(stderr,"\n");
-       }
+       return (*func) (pathname, flags, mode);
 }
 
 }
 
-int ioctl(int fd, int request, ...)
-{
-       va_list args;
-       void *argp;
-       int ret;
-
-       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);
-
-       if (fd == windrvrfd)
-               ret = do_wdioctl(fd, request, argp);
-       else
-               ret = (*ioctl_func) (fd, request, argp);
-
-       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;
+int close(int fd) {
+       static int (*func) (int) = NULL;
 
        if (!func)
 
        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);
+               func = (int (*) (int)) dlsym(REAL_LIBC, "close");
+       
+       if (fd == windrvrfd) {
+#ifdef DEBUG
+               fprintf(stderr,"close windrvrfd\n");
+#endif
+               windrvrfd = 0;
+       }
 
 
-       return ret;
+       return (*func) (fd);
 }
 
 }
 
-
-#if 0
-void *mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset)
-{
-       static void* (*func) (void *, size_t, int, int, int, off_t) = NULL;
-       void *ret;
+FILE *fopen(const char *path, const char *mode) {
+       FILE *ret;
+       static FILE* (*func) (const char*, const char*) = NULL;
 
        if (!func)
 
        if (!func)
-               func = (void* (*) (void *, size_t, int, int, int, off_t)) dlsym (REAL_LIBC, "mmap");
-
-       ret = (*func) (start, length, prot, flags, fd, offset);
-       fprintf(stderr,"MMAP: %x, %d, %d, %d, %d, %d -> %x\n", (unsigned int)start, length, prot, flags, fd, offset, (unsigned int)ret);
-       mmapped = ret;
-       mmapplen = length;
-
-       return ret;
-}
-
-void *mmap64(void *start, size_t length, int prot, int flags, int fd, off64_t offset)
-{
-       static void* (*func) (void *, size_t, int, int, int, off64_t) = NULL;
-       void *ret;
+               func = (FILE* (*) (const char*, const char*)) dlsym(REAL_LIBC, "fopen");
 
 
-       if (!func)
-               func = (void* (*) (void *, size_t, int, int, int, off64_t)) dlsym (REAL_LIBC, "mmap64");
+       ret = (*func) (path, mode);
 
 
-       ret = (*func) (start, length, prot, flags, fd, offset);
-       fprintf(stderr,"MMAP64: %x, %d, %d, %d, %d, %lld -> %x\n", (unsigned int)start, length, prot, flags, fd, offset, (unsigned int)ret);
-       mmapped = ret;
-       mmapplen = length;
+       if (!strcmp (path, "/proc/modules")) {
+#ifdef DEBUG
+               fprintf(stderr,"opening /proc/modules\n");
+#endif
+#ifdef NO_WINDRVR
+               modulesfp = ret;
+               modules_read = 0;
+#endif
+       }
 
        return ret;
 }
 
 
        return ret;
 }
 
-void *mmap2(void *start, size_t length, int prot, int flags, int fd, off_t pgoffset)
-{
-       static void* (*func) (void *, size_t, int, int, int, off_t) = NULL;
-       void *ret;
+char *fgets(char *s, int size, FILE *stream) {
+        static char* (*func) (char*, int, FILE*) = NULL;
+       const char modules[] = "windrvr6 160960 0 - Live 0xf98b0000\n";
+       char *ret = NULL;
 
 
-       if (!func)
-               func = (void* (*) (void *, size_t, int, int, int, off_t)) dlsym (REAL_LIBC, "mmap2");
 
 
-       ret = (*func) (start, length, prot, flags, fd, pgoffset);
-       fprintf(stderr,"MMAP2: %x, %d, %d, %d, %d, %d -> %x\n", (unsigned int)start, length, prot, flags, fd, pgoffset, (unsigned int)ret);
-       mmapped = ret;
-       mmapplen = length;
+       if (!func)
+               func = (char* (*) (char*, int, FILE*)) dlsym(REAL_LIBC, "fgets");
+       
+       if (modulesfp == stream) {
+               if (!modules_read) {
+                       strcpy(s, modules);
+                       ret = s;
+                       modules_read = 1;
+               }
+       } else {
+               ret = (*func)(s,size,stream);
+       }
 
        return ret;
 }
 
 
        return ret;
 }
 
-void *malloc(size_t size)
-{
-       static void* (*func) (size_t) = NULL;
-       void *ret;
+int fclose(FILE *fp) {
+       static int (*func) (FILE*) = NULL;
 
        if (!func)
 
        if (!func)
-               func = (void* (*) (size_t)) dlsym(REAL_LIBC, "malloc");
-       
-       ret = (*func) (size);
-       
-       //fprintf(stderr,"MALLOC: %d -> %x\n", size, (unsigned int) ret);
+               func = (int (*) (FILE*)) dlsym(REAL_LIBC, "fclose");
 
 
-       return ret;
+       if (fp == modulesfp) {
+               modulesfp = NULL;
+       }
+       
+       return (*func)(fp);
 }
 #endif
 }
 #endif
-
-
-#endif
libusb/ppdev-connector for XILINX jtag tools (like impact)
Impressum, Datenschutz