fix ISE 12 support on 64bit

[usb-driver] / usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index 2f61e2bb3bc6f1068ef087e4798996d2c7b45ea5..55a74637991af424a683168c3b29d1bef882fd6f 100644 (file)
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -33,40 +33,41 @@
 #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 <signal.h>
 #include <signal.h>

-#include <pthread.h>

 #include <errno.h>
 #include <inttypes.h>
 #include <sys/ioctl.h>
 #include <sys/utsname.h>
 #include <bits/wordsize.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <sys/ioctl.h>
 #include <sys/utsname.h>
 #include <bits/wordsize.h>

+#include <sys/ipc.h>
+#include <sys/sem.h>
+#include <syscall.h>
+#include <linux/personality.h>

 #include "usb-driver.h"
 #include "config.h"
 #include "xpcu.h"
 
 static int (*ioctl_func) (int, int, void *) = NULL;
 #include "usb-driver.h"
 #include "config.h"
 #include "xpcu.h"
 
 static int (*ioctl_func) (int, int, void *) = NULL;

-static int windrvrfd = -1;
+static int *windrvrfds = NULL;
+static int windrvrfds_count = 0;

 static unsigned long ppbase = 0;
 static unsigned long ecpbase = 0;
 static struct parport_config *pport = NULL;
 static unsigned long ppbase = 0;
 static unsigned long ecpbase = 0;
 static struct parport_config *pport = NULL;

-static struct xpcu_s *xpcu = NULL;

 static FILE *modulesfp = NULL;
 static FILE *baseaddrfp = NULL;
 static int baseaddrnum = 0;
 static int modules_read = 0;
 static FILE *modulesfp = NULL;
 static FILE *baseaddrfp = NULL;
 static int baseaddrnum = 0;
 static int modules_read = 0;

-static int ints_enabled = 0;
-static pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER;

 
 #define NO_WINDRVR 1
 
 
 #define NO_WINDRVR 1
 

-void hexdump(unsigned char *buf, int len) {
+void hexdump(unsigned char *buf, int len, char *prefix) {

        int i;
 
        int i;
 

+       fprintf(stderr, "%s ", prefix);

        for(i=0; i<len; i++) {
                fprintf(stderr,"%02x ", buf[i]);
                if ((i % 16) == 15)
        for(i=0; i<len; i++) {
                fprintf(stderr,"%02x ", buf[i]);
                if ((i % 16) == 15)

-                       fprintf(stderr,"\n");
+                       fprintf(stderr,"\n%s ", prefix);

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


@@ -100,13 +101,13 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        {
                                struct card_register* cr = (struct card_register*)(wdheader->data);
 
                        {
                                struct card_register* cr = (struct card_register*)(wdheader->data);
 

-                               DPRINTF("Items: %lu, Addr: 0x%lx, bytes: %lu, bar: %lu\n",
+                               DPRINTF("-> Items: %lu, Addr: 0x%lx, bytes: %lu, bar: %lu\n",

                                cr->Card.dwItems,
                                (unsigned long)cr->Card.Item[0].I.IO.dwAddr,
                                cr->Card.Item[0].I.IO.dwBytes,
                                cr->Card.Item[0].I.IO.dwBar);
                                
                                cr->Card.dwItems,
                                (unsigned long)cr->Card.Item[0].I.IO.dwAddr,
                                cr->Card.Item[0].I.IO.dwBytes,
                                cr->Card.Item[0].I.IO.dwBar);
                                

-                               DPRINTF("Items: %lu, Addr: 0x%lx, bytes: %lu, bar: %lu\n",
+                               DPRINTF("-> Items: %lu, Addr: 0x%lx, bytes: %lu, bar: %lu\n",

                                cr->Card.dwItems,
                                (unsigned long)cr->Card.Item[1].I.IO.dwAddr,
                                cr->Card.Item[1].I.IO.dwBytes,
                                cr->Card.dwItems,
                                (unsigned long)cr->Card.Item[1].I.IO.dwAddr,
                                cr->Card.Item[1].I.IO.dwBytes,


@@ -132,42 +133,41 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                        cr->hCard = 0;
                                }
 #endif
                                        cr->hCard = 0;
                                }
 #endif

-                               DPRINTF("hCard: %lu\n", cr->hCard);
+                               DPRINTF("<-hCard: %lu\n", cr->hCard);

                        }
                        break;
 
                case USB_TRANSFER:
                        }
                        break;
 
                case USB_TRANSFER:

-                       DPRINTF("in USB_TRANSFER");
+                       DPRINTF("USB_TRANSFER\n");

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

-                               DPRINTF(" unique: 0x%lx, pipe: %lu, read: %lu, options: %lx, size: %lu, timeout: %lx\n",
+                               DPRINTF("-> unique: 0x%lx, pipe: %lu, read: %lu, options: %lx, size: %lu, timeout: %lx\n",

                                ut->dwUniqueID, ut->dwPipeNum, ut->fRead,
                                ut->dwOptions, ut->dwBufferSize, ut->dwTimeout);
                                if (ut->dwPipeNum == 0) {
                                ut->dwUniqueID, ut->dwPipeNum, ut->fRead,
                                ut->dwOptions, ut->dwBufferSize, ut->dwTimeout);
                                if (ut->dwPipeNum == 0) {

-                                       DPRINTF("setup packet: ");
-                                       hexdump(ut->SetupPacket, 8);
+                                       DPRINTF("-> setup packet:");
+                                       hexdump(ut->SetupPacket, 8, "");

                                }
 
                                if (!ut->fRead && ut->dwBufferSize)
                                {
                                }
 
                                if (!ut->fRead && ut->dwBufferSize)
                                {

-                                       hexdump(ut->pBuffer, ut->dwBufferSize);
+                                       hexdump(ut->pBuffer, ut->dwBufferSize, "->");

                                }
 #endif
 
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
                                }
 #endif
 
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else

-                               xpcu_transfer(xpcu, ut);
+                               ret = xpcu_transfer(ut);

 #endif
 
 #ifdef DEBUG
                                DPRINTF("Transferred: %lu (%s)\n",ut->dwBytesTransferred, (ut->fRead?"read":"write"));
                                if (ut->fRead && ut->dwBytesTransferred)
                                {
 #endif
 
 #ifdef DEBUG
                                DPRINTF("Transferred: %lu (%s)\n",ut->dwBytesTransferred, (ut->fRead?"read":"write"));
                                if (ut->fRead && ut->dwBytesTransferred)
                                {

-                                       DPRINTF("Read: ");
-                                       hexdump(ut->pBuffer, ut->dwBytesTransferred);
+                                       hexdump(ut->pBuffer, ut->dwBytesTransferred, "<-");

                                }
 #endif
                        }
                                }
 #endif
                        }


@@ -179,15 +179,21 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        {
                                struct interrupt *it = (struct interrupt*)(wdheader->data);
 
                        {
                                struct interrupt *it = (struct interrupt*)(wdheader->data);
 

-                               DPRINTF("Handle: 0x%lx, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
+                               DPRINTF("-> Handle: 0x%lx, 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->hInterrupt, it->dwOptions,
                                it->dwCmds, it->fEnableOk, it->dwCounter,
                                it->dwLost, it->fStopped);
 

-                               it->fEnableOk = 1;
-                               it->fStopped = 0;
-                               ints_enabled = 1;
-                               pthread_mutex_trylock(&int_wait);
+#ifndef NO_WINDRVR
+                               ret = (*ioctl_func) (fd, request, wdioctl);
+#else
+                               ret = xpcu_int_state(it, ENABLE_INTERRUPT);
+#endif
+
+                               DPRINTF("<- Handle: 0x%lx, 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;


@@ -197,20 +203,16 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        {
                                struct interrupt *it = (struct interrupt*)(wdheader->data);
 
                        {
                                struct interrupt *it = (struct interrupt*)(wdheader->data);
 

-                               DPRINTF("Handle: 0x%lx, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
+                               DPRINTF("-> Handle: 0x%lx, 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->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;
-                               ints_enabled = 0;
-                               if (pthread_mutex_trylock(&int_wait) == EBUSY)
-                                       pthread_mutex_unlock(&int_wait);
+                               ret = xpcu_int_state(it, DISABLE_INTERRUPT);

 #endif
 #endif

-                               DPRINTF("Handle: 0x%lx, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
+                               DPRINTF("<- Handle: 0x%lx, 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->hInterrupt, it->dwOptions,
                                it->dwCmds, it->fEnableOk, it->dwCounter,
                                it->dwLost, it->fStopped);


@@ -222,15 +224,15 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        {
                                struct usb_set_interface *usi = (struct usb_set_interface*)(wdheader->data);
 
                        {
                                struct usb_set_interface *usi = (struct usb_set_interface*)(wdheader->data);
 

-                               DPRINTF("unique: 0x%lx, interfacenum: %lu, alternatesetting: %lu, options: %lx\n",
+                               DPRINTF("-> unique: 0x%lx, 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
                                usi->dwUniqueID, usi->dwInterfaceNum,
                                usi->dwAlternateSetting, usi->dwOptions);
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else

-                               xpcu_set_interface(xpcu, usi);
+                               ret = xpcu_set_interface(usi);

 #endif
 #endif

-                               DPRINTF("unique: 0x%lx, interfacenum: %lu, alternatesetting: %lu, options: %lx\n",
+                               DPRINTF("<- unique: 0x%lx, interfacenum: %lu, alternatesetting: %lu, options: %lx\n",

                                usi->dwUniqueID, usi->dwInterfaceNum,
                                usi->dwAlternateSetting, usi->dwOptions);
                        }
                                usi->dwUniqueID, usi->dwInterfaceNum,
                                usi->dwAlternateSetting, usi->dwOptions);
                        }


@@ -242,11 +244,11 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        {
                                struct usb_get_device_data *ugdd = (struct usb_get_device_data*)(wdheader->data);
 
                        {
                                struct usb_get_device_data *ugdd = (struct usb_get_device_data*)(wdheader->data);
 

-                               DPRINTF("unique: 0x%lx, bytes: %lu, options: %lx\n",
+                               DPRINTF("-> unique: 0x%lx, bytes: %lu, options: %lx\n",

                                ugdd->dwUniqueID, ugdd->dwBytes,
                                ugdd->dwOptions);
 
                                ugdd->dwUniqueID, ugdd->dwBytes,
                                ugdd->dwOptions);
 

-                               ugdd->dwBytes = xpcu_deviceinfo(xpcu, ugdd);
+                               ret = xpcu_deviceinfo(ugdd);

 
                        }
                        break;
 
                        }
                        break;


@@ -260,7 +262,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                int i;
 #endif
 
                                int i;
 #endif
 

-                               DPRINTF("handle: 0x%lx, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: 0x%lx, ver: %lu, nummatch: %lu\n",
+                               DPRINTF("-> handle: 0x%lx, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: 0x%lx, ver: %lu, nummatch: %lu\n",

                                e->handle, e->dwAction,
                                e->dwStatus, e->dwEventId, e->dwCardType,
                                e->hKernelPlugIn, e->dwOptions,
                                e->handle, e->dwAction,
                                e->dwStatus, e->dwEventId, e->dwCardType,
                                e->hKernelPlugIn, e->dwOptions,


@@ -269,15 +271,14 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                e->u.Usb.dwUniqueID, e->dwEventVer,
                                e->dwNumMatchTables);
 
                                e->u.Usb.dwUniqueID, e->dwEventVer,
                                e->dwNumMatchTables);
 

-                               xpcu = xpcu_find(e);

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

-                               e->handle = (unsigned long)xpcu;
+                               ret = xpcu_find(e);

 #endif
 
 #ifdef DEBUG
 #endif
 
 #ifdef DEBUG

-                               DPRINTF("handle: 0x%lx, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: 0x%lx, ver: %lu, nummatch: %lu\n",
+                               DPRINTF("<- handle: 0x%lx, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: 0x%lx, ver: %lu, nummatch: %lu\n",

                                e->handle, e->dwAction,
                                e->dwStatus, e->dwEventId, e->dwCardType,
                                e->hKernelPlugIn, e->dwOptions,
                                e->handle, e->dwAction,
                                e->dwStatus, e->dwEventId, e->dwCardType,
                                e->hKernelPlugIn, e->dwOptions,


@@ -335,7 +336,7 @@ static 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

-                               xpcu_close(xpcu, e);
+                               ret = xpcu_close(e);

 #endif
                        }
                        break;
 #endif
                        }
                        break;


@@ -345,7 +346,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        {
                                struct interrupt *it = (struct interrupt*)(wdheader->data);
 
                        {
                                struct interrupt *it = (struct interrupt*)(wdheader->data);
 

-                               DPRINTF("Handle: 0x%lx, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
+                               DPRINTF("-> Handle: 0x%lx, 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->hInterrupt, it->dwOptions,
                                it->dwCmds, it->fEnableOk, it->dwCounter,
                                it->dwLost, it->fStopped);


@@ -353,20 +354,10 @@ static 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 (xpcu) {
-                                       if (it->dwCounter == 0) {
-                                               it->dwCounter = 1;
-                                       } else {
-                                               pthread_mutex_lock(&int_wait);
-                                               pthread_mutex_unlock(&int_wait);
-                                       }
-                               } else {
-                                       pthread_mutex_lock(&int_wait);
-                                       pthread_mutex_unlock(&int_wait);
-                               }
+                               ret = xpcu_int_wait(it);

 #endif
 
 #endif
 

-                               DPRINTF("INT_WAIT_RETURN: Handle: 0x%lx, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
+                               DPRINTF("<- INT_WAIT_RETURN: Handle: 0x%lx, 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->hInterrupt, it->dwOptions, it->dwCmds,
                                it->fEnableOk, it->dwCounter, it->dwLost,
                                it->fStopped);


@@ -378,12 +369,12 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        {
                                struct card_register* cr = (struct card_register*)(wdheader->data);
 
                        {
                                struct card_register* cr = (struct card_register*)(wdheader->data);
 

-                               DPRINTF("Addr: 0x%lx, bytes: %lu, bar: %lu\n",
+                               DPRINTF("-> Addr: 0x%lx, bytes: %lu, bar: %lu\n",

                                (unsigned long)cr->Card.Item[0].I.IO.dwAddr,
                                cr->Card.Item[0].I.IO.dwBytes,
                                cr->Card.Item[0].I.IO.dwBar);
 
                                (unsigned long)cr->Card.Item[0].I.IO.dwAddr,
                                cr->Card.Item[0].I.IO.dwBytes,
                                cr->Card.Item[0].I.IO.dwBar);
 

-                               DPRINTF("hCard: %lu\n", cr->hCard);
+                               DPRINTF("-> hCard: %lu\n", cr->hCard);

 
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);


@@ -403,7 +394,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #ifdef DEBUG
                                int i;
 
 #ifdef DEBUG
                                int i;
 

-                               DPRINTF("handle: 0x%lx, action: %lu, status: %lu, eventid: %lu, cardtype: %lx, kplug: %lu, options: %lu, dev: %lx:%lx, unique: 0x%lx, ver: %lu, nummatch: %lu\n",
+                               DPRINTF("-> handle: 0x%lx, action: %lu, status: %lu, eventid: %lu, cardtype: %lx, kplug: %lu, options: %lu, dev: %lx:%lx, unique: 0x%lx, 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->handle, e->dwAction, e->dwStatus,
                                e->dwEventId, e->dwCardType, e->hKernelPlugIn,
                                e->dwOptions, e->u.Usb.deviceId.dwVendorId,


@@ -412,7 +403,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                e->dwNumMatchTables);
 
                                for (i = 0; i < e->dwNumMatchTables; i++)
                                e->dwNumMatchTables);
 
                                for (i = 0; i < e->dwNumMatchTables; i++)

-                                       DPRINTF("match: dev: %04x:%04x, class: %x, subclass: %x, intclass: %x, intsubclass: %x, intproto: %x\n",
+                                       DPRINTF("-> 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].VendorId,
                                        e->matchTables[i].ProductId,
                                        e->matchTables[i].bDeviceClass,


@@ -425,11 +416,11 @@ static 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

-                               xpcu_found(xpcu, e);
+                               ret = xpcu_found(e);

 #endif
 
 #ifdef DEBUG
 #endif
 
 #ifdef DEBUG

-                               DPRINTF("handle: 0x%lx, action: %lu, status: %lu, eventid: %lu, cardtype: %lx, kplug: %lu, options: %lu, dev: %lx:%lx, unique: 0x%lx, ver: %lu, nummatch: %lu\n",
+                               DPRINTF("<- handle: 0x%lx, action: %lu, status: %lu, eventid: %lu, cardtype: %lx, kplug: %lu, options: %lu, dev: %lx:%lx, unique: 0x%lx, 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->handle, e->dwAction, e->dwStatus,
                                e->dwEventId, e->dwCardType, e->hKernelPlugIn,
                                e->dwOptions, e->u.Usb.deviceId.dwVendorId,


@@ -438,7 +429,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                e->dwNumMatchTables);
 
                                for (i = 0; i < e->dwNumMatchTables; i++)
                                e->dwNumMatchTables);
 
                                for (i = 0; i < e->dwNumMatchTables; i++)

-                                       DPRINTF("match: dev: %04x:%04x, class: %x, subclass: %x, intclass: %x, intsubclass: %x, intproto: %x\n",
+                                       DPRINTF("<- 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].VendorId,
                                        e->matchTables[i].ProductId,
                                        e->matchTables[i].bDeviceClass,


@@ -465,7 +456,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 int ioctl(int fd, unsigned long int request, ...) {
        va_list args;
        void *argp;
 int ioctl(int fd, unsigned long int request, ...) {
        va_list args;
        void *argp;

-       int ret;
+       int i;

 
        if (!ioctl_func)                                                                    
                ioctl_func = (int (*) (int, int, void *)) dlsym (RTLD_NEXT, "ioctl");             
 
        if (!ioctl_func)                                                                    
                ioctl_func = (int (*) (int, int, void *)) dlsym (RTLD_NEXT, "ioctl");             


@@ -474,12 +465,12 @@ int ioctl(int fd, unsigned long int request, ...) {
        argp = va_arg (args, void *);
        va_end (args);
 
        argp = va_arg (args, void *);
        va_end (args);
 

-       if (fd == windrvrfd)
-               ret = do_wdioctl(fd, request, argp);
-       else
-               ret = (*ioctl_func) (fd, request, argp);
+       for (i = 0; i < windrvrfds_count; i++) {
+               if (fd == windrvrfds[i])
+                       return do_wdioctl(fd, request, argp);
+       }

 
 

-       return ret;
+       return (*ioctl_func) (fd, request, argp);

 }
 
 int open (const char *pathname, int flags, ...) {
 }
 
 int open (const char *pathname, int flags, ...) {


@@ -498,11 +489,15 @@ int open (const char *pathname, int flags, ...) {
        }
 
        if (!strcmp (pathname, "/dev/windrvr6")) {
        }
 
        if (!strcmp (pathname, "/dev/windrvr6")) {

-               DPRINTF("opening windrvr6\n");
+               DPRINTF("opening windrvr6 (%d)\n", windrvrfds_count);
+               windrvrfds = realloc(windrvrfds, sizeof(int) * (++windrvrfds_count));
+               if (!windrvrfds)
+                       return -ENOMEM;
+

 #ifdef NO_WINDRVR
 #ifdef NO_WINDRVR

-               windrvrfd = fd = (*func) ("/dev/null", flags, mode);
+               windrvrfds[windrvrfds_count-1] = fd = (*func) ("/dev/null", flags, mode);

 #else
 #else

-               windrvrfd = fd = (*func) (pathname, flags, mode);
+               windrvrfds[windrvrfds_count-1] = fd = (*func) (pathname, flags, mode);

 #endif
 
                return fd;
 #endif
 
                return fd;


@@ -513,15 +508,22 @@ int open (const char *pathname, int flags, ...) {
 
 int close(int fd) {
        static int (*func) (int) = NULL;
 
 int close(int fd) {
        static int (*func) (int) = NULL;

+       int i;

 
        if (!func)
                func = (int (*) (int)) dlsym(RTLD_NEXT, "close");
        
 
        if (!func)
                func = (int (*) (int)) dlsym(RTLD_NEXT, "close");
        

-       if (fd == windrvrfd && windrvrfd >= 0) {
-               DPRINTF("close windrvrfd\n");
-
-               xpcu = NULL;
-               windrvrfd = -1;
+       for (i = 0; i < windrvrfds_count; i++) {
+               if (fd == windrvrfds[i] && windrvrfds[i] >= 0) {
+                       int remaining = windrvrfds_count - (i + 1);
+                       DPRINTF("close windrvr6 (%d)\n", i);
+                       if (remaining)
+                               memmove(&(windrvrfds[i]), &(windrvrfds[i+1]), remaining * sizeof(int));
+                       windrvrfds = realloc(windrvrfds, sizeof(int) * --windrvrfds_count);
+                       if (!windrvrfds_count)
+                               windrvrfds = NULL;
+                       break;
+               }

        }
 
        return (*func) (fd);
        }
 
        return (*func) (fd);


@@ -559,6 +561,12 @@ FILE *fopen(const char *path, const char *mode) {
 
        if (!strcmp(path, "/proc/modules")) {
                DPRINTF("opening /proc/modules\n");
 
        if (!strcmp(path, "/proc/modules")) {
                DPRINTF("opening /proc/modules\n");

+               if (!ret && errno == ENOENT) {
+                       /* Hmm.. there appears to be no /proc/modules file
+                        * fake it then */
+                       ret = (*func)("/dev/null", mode);
+                       DPRINTF("No /proc/modules -- faking\n");
+               }

 #ifdef NO_WINDRVR
                modulesfp = ret;
                modules_read = 0;
 #ifdef NO_WINDRVR
                modulesfp = ret;
                modules_read = 0;


@@ -626,20 +634,50 @@ int access(const char *pathname, int mode) {
        }
 }
 
        }
 }
 

-#if __WORDSIZE == 32
-int uname (struct utsname *__name) {
-       static int (*func) (struct utsname*);
-       int ret;
+#if 0
+/* USB cable sharing needs to overload semop, TODO! */
+int semop (int __semid, struct sembuf *__sops, size_t __nsops) {
+       static int (*func) (int, struct sembuf*, size_t) = NULL;
+       int i;

 
        if (!func)
 
        if (!func)

-               func = (int (*) (struct utsname*)) dlsym(RTLD_NEXT, "uname");
+               func = (int (*) (int, struct sembuf*, size_t)) dlsym(RTLD_NEXT, "semop");

        
        

-       ret = (*func)(__name);
-
-       if (ret == 0 && (!strcmp(__name->machine, "x86_64"))) {
-               strcpy(__name->machine, "i686");
+       fprintf(stderr,"semop: semid: 0x%X, elements: %d\n", __semid, __nsops);
+       for (i = 0; i < __nsops; i++) {
+               fprintf(stderr, " num: %u, op: %d, flg: %d\n", __sops[i].sem_num, __sops[i].sem_op, __sops[i].sem_flg);
+               if (__sops[i].sem_op < 0) {
+                       fprintf(stderr, "SEMAPHORE LOCK\n");
+               } else {
+                       fprintf(stderr, "SEMAPHORE UNLOCK\n");
+               }

        }
        }

-       
-       return ret;
+
+       return (*func)(__semid, __sops, __nsops);

 }
 #endif
 }
 #endif

+
+/*
+ * Ugly hack for ISE 12. They don't seem to open /proc/modules with
+ * open() anymore...
+ * echo '_Z14isModuleLoadedPci' | c++filt
+ */
+long int _Z14isModuleLoadedPci(char *module_name, int i) {
+       DPRINTF("_Z14isModuleLoadedPci: Checking for module %s (%d)\n", module_name, i);
+
+       return 1;
+}
+
+static void __attribute__ ((constructor)) libusbdriver_init(void) {
+       #if __WORDSIZE == 32
+       struct utsname un;
+       int ret;
+
+       ret = uname(&un);
+
+       if (ret == 0 && (!strcmp(un.machine, "x86_64"))) {
+               DPRINTF("setting 32bit personality\n");
+               (long)syscall(SYS_personality, PER_LINUX32);
+       }
+       #endif
+}