move card_type into xpcu_s

[usb-driver] / usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index 2eece1e76344b45ed0ce229c71f97ba7563bc93d..9ed0c353bf1f5ca4756eb0b3d06ea4fdeec25071 100644 (file)
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -1,13 +1,28 @@
-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+/* libusb/ppdev connector for XILINX impact
+ *
+ * Copyright (c) 2007 Michael Gernoth <michael@gernoth.net>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */

 
 #define _GNU_SOURCE 1
 
 
 #define _GNU_SOURCE 1
 

-#if defined(RTLD_NEXT)
-#define REAL_LIBC RTLD_NEXT
-#else
-#define REAL_LIBC ((void *) -1L)
-#endif
-

 #include <dlfcn.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <dlfcn.h>
 #include <stdarg.h>
 #include <stdlib.h>


@@ -21,21 +36,29 @@
 #include <usb.h>
 #include <signal.h>
 #include <pthread.h>
 #include <usb.h>
 #include <signal.h>
 #include <pthread.h>

-#include "xilinx.h"
+#include <errno.h>
+#include <inttypes.h>
+#include <sys/ioctl.h>
+#include <sys/utsname.h>
+#include <bits/wordsize.h>
+#include "usb-driver.h"
+#include "config.h"
+#include "xpcu.h"

 
 static int (*ioctl_func) (int, int, void *) = NULL;
 
 static int (*ioctl_func) (int, int, void *) = NULL;

-static int windrvrfd = 0;
-FILE *modulesfp;
+static int windrvrfd = -1;
+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 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 pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER;
 
 #define NO_WINDRVR 1
 static int ints_enabled = 0;
 static pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER;
 
 #define NO_WINDRVR 1

-#undef DEBUG

 
 void hexdump(unsigned char *buf, int len) {
        int i;
 
 void hexdump(unsigned char *buf, int len) {
        int i;


@@ -45,169 +68,11 @@ void hexdump(unsigned char *buf, int len) {
                if ((i % 16) == 15)
                        fprintf(stderr,"\n");
        }
                if ((i % 16) == 15)
                        fprintf(stderr,"\n");
        }

+       fprintf(stderr,"\n");

 }
 
 }
 

-int usb_deviceinfo(unsigned char *buf) {
-       int i,j,k,l;
-       int len = 0;
-       WDU_CONFIGURATION **pConfigs, **pActiveConfig;
-       WDU_INTERFACE **pActiveInterface;
-
-       if (buf) {
-               struct usb_device_info *udi = (struct usb_device_info*)(buf+len);
-
-               udi->Descriptor.bLength = sizeof(WDU_DEVICE_DESCRIPTOR);
-               udi->Descriptor.bDescriptorType = usbdevice->descriptor.bDescriptorType;
-               udi->Descriptor.bcdUSB = usbdevice->descriptor.bcdUSB;
-               udi->Descriptor.bDeviceClass = usbdevice->descriptor.bDeviceClass;
-               udi->Descriptor.bDeviceSubClass = usbdevice->descriptor.bDeviceSubClass;
-               udi->Descriptor.bDeviceProtocol = usbdevice->descriptor.bDeviceProtocol;
-               udi->Descriptor.bMaxPacketSize0 = usbdevice->descriptor.bMaxPacketSize0;
-               udi->Descriptor.idVendor = usbdevice->descriptor.idVendor;
-               udi->Descriptor.idProduct = usbdevice->descriptor.idProduct;
-               udi->Descriptor.bcdDevice = usbdevice->descriptor.bcdDevice;
-               udi->Descriptor.iManufacturer = usbdevice->descriptor.iManufacturer;
-               udi->Descriptor.iProduct = usbdevice->descriptor.iProduct;
-               udi->Descriptor.iSerialNumber = usbdevice->descriptor.iSerialNumber;
-               udi->Descriptor.bNumConfigurations = usbdevice->descriptor.bNumConfigurations;
-
-               /* TODO: Fix Pipe0! */
-               udi->Pipe0.dwNumber = 0x00;
-               udi->Pipe0.dwMaximumPacketSize = usbdevice->descriptor.bMaxPacketSize0;
-               udi->Pipe0.type = 0;
-               udi->Pipe0.direction = 3;
-               udi->Pipe0.dwInterval = 0;
-
-               pConfigs = &(udi->pConfigs);
-               pActiveConfig = &(udi->pActiveConfig);
-               pActiveInterface = &(udi->pActiveInterface[0]);
-       }
-
-       len = sizeof(struct usb_device_info);
-
-       for (i=0; i<usbdevice->descriptor.bNumConfigurations; i++)
-       {
-               struct usb_config_descriptor *conf_desc = &usbdevice->config[i];
-               WDU_INTERFACE **pInterfaces;
-               WDU_ALTERNATE_SETTING **pAlternateSettings[conf_desc->bNumInterfaces];
-               WDU_ALTERNATE_SETTING **pActiveAltSetting[conf_desc->bNumInterfaces];
-
-               if (buf) {
-                       WDU_CONFIGURATION *cfg = (WDU_CONFIGURATION*)(buf+len);
-
-                       *pConfigs = cfg;
-                       *pActiveConfig = cfg;
-
-                       cfg->Descriptor.bLength = conf_desc->bLength;
-                       cfg->Descriptor.bDescriptorType = conf_desc->bDescriptorType;
-                       cfg->Descriptor.wTotalLength = conf_desc->wTotalLength;
-                       cfg->Descriptor.bNumInterfaces = conf_desc->bNumInterfaces;
-                       cfg->Descriptor.bConfigurationValue = conf_desc->bConfigurationValue;
-                       cfg->Descriptor.iConfiguration = conf_desc->iConfiguration;
-                       cfg->Descriptor.bmAttributes = conf_desc->bmAttributes;
-                       cfg->Descriptor.MaxPower = conf_desc->MaxPower;
-
-                       cfg->dwNumInterfaces = conf_desc->bNumInterfaces;
-
-                       pInterfaces = &(cfg->pInterfaces);
-               }
-               len += sizeof(WDU_CONFIGURATION);
-
-               if (buf) {
-                       *pInterfaces = (WDU_INTERFACE*)(buf+len);
-                       for (j=0; j<conf_desc->bNumInterfaces; j++) {
-                               WDU_INTERFACE *iface = (WDU_INTERFACE*)(buf+len);
-
-                               pActiveInterface[j] = iface;
-
-                               pAlternateSettings[j] = &(iface->pAlternateSettings);
-                               iface->dwNumAltSettings = usbdevice->config[i].interface[j].num_altsetting;
-                               pActiveAltSetting[j] = &(iface->pActiveAltSetting);
-
-                               len += sizeof(WDU_INTERFACE);
-                       }
-               } else {
-                       len += sizeof(WDU_INTERFACE) * conf_desc->bNumInterfaces;
-               }
-
-               for (j=0; j<conf_desc->bNumInterfaces; j++)
-               {
-                       struct usb_interface *interface = &usbdevice->config[i].interface[j];
-
-                       if (buf) {
-                               *pAlternateSettings[j] = (WDU_ALTERNATE_SETTING*)(buf+len);
-                               /* FIXME: */
-                               *pActiveAltSetting[j] = (WDU_ALTERNATE_SETTING*)(buf+len);
-                       }
-
-                       for(k=0; k<interface->num_altsetting; k++)
-                       {
-                               unsigned char bNumEndpoints = interface->altsetting[k].bNumEndpoints;
-                               WDU_ENDPOINT_DESCRIPTOR **pEndpointDescriptors;
-                               WDU_PIPE_INFO **pPipes;
-
-                               if (buf) {
-                                       WDU_ALTERNATE_SETTING *altset = (WDU_ALTERNATE_SETTING*)(buf+len);
-
-                                       altset->Descriptor.bLength = interface->altsetting[k].bLength;
-                                       altset->Descriptor.bDescriptorType = interface->altsetting[k].bDescriptorType;
-                                       altset->Descriptor.bInterfaceNumber = interface->altsetting[k].bInterfaceNumber;
-                                       altset->Descriptor.bAlternateSetting = interface->altsetting[k].bAlternateSetting;
-                                       altset->Descriptor.bNumEndpoints = interface->altsetting[k].bNumEndpoints;
-                                       altset->Descriptor.bInterfaceClass = interface->altsetting[k].bInterfaceClass;
-                                       altset->Descriptor.bInterfaceSubClass = interface->altsetting[k].bInterfaceSubClass;
-                                       altset->Descriptor.bInterfaceProtocol = interface->altsetting[k].bInterfaceProtocol;
-                                       altset->Descriptor.iInterface = interface->altsetting[k].iInterface;
-                                       pEndpointDescriptors = &(altset->pEndpointDescriptors);
-                                       pPipes = &(altset->pPipes);
-
-                               }
-                               len +=sizeof(WDU_ALTERNATE_SETTING);

 
 

-                               if (buf) {
-                                       *pEndpointDescriptors = (WDU_ENDPOINT_DESCRIPTOR*)(buf+len);
-                                       for (l = 0; l < bNumEndpoints; l++) {
-                                               WDU_ENDPOINT_DESCRIPTOR *ed = (WDU_ENDPOINT_DESCRIPTOR*)(buf+len);
-
-                                               ed->bLength = interface->altsetting[k].endpoint[l].bLength;
-                                               ed->bDescriptorType = interface->altsetting[k].endpoint[l].bDescriptorType;
-                                               ed->bEndpointAddress = interface->altsetting[k].endpoint[l].bEndpointAddress;
-                                               ed->bmAttributes = interface->altsetting[k].endpoint[l].bmAttributes;
-                                               ed->wMaxPacketSize = interface->altsetting[k].endpoint[l].wMaxPacketSize;
-                                               ed->bInterval = interface->altsetting[k].endpoint[l].bInterval;
-
-                                               len += sizeof(WDU_ENDPOINT_DESCRIPTOR);
-                                       }
-                                               
-                                       *pPipes = (WDU_PIPE_INFO*)(buf+len);
-                                       for (l = 0; l < bNumEndpoints; l++) {
-                                               WDU_PIPE_INFO *pi = (WDU_PIPE_INFO*)(buf+len);
-
-                                               pi->dwNumber = interface->altsetting[k].endpoint[l].bEndpointAddress;
-                                               pi->dwMaximumPacketSize = WDU_GET_MAX_PACKET_SIZE(interface->altsetting[k].endpoint[l].wMaxPacketSize);
-                                               pi->type = interface->altsetting[k].endpoint[l].bmAttributes & USB_ENDPOINT_TYPE_MASK;
-                                               if (pi->type == PIPE_TYPE_CONTROL)
-                                                       pi->direction = WDU_DIR_IN_OUT;
-                                               else
-                                               {
-                                                       pi->direction = interface->altsetting[k].endpoint[l].bEndpointAddress & USB_ENDPOINT_DIR_MASK ?  WDU_DIR_IN : WDU_DIR_OUT;
-                                               }
-
-                                               pi->dwInterval = interface->altsetting[k].endpoint[l].bInterval;
-
-                                               len += sizeof(WDU_PIPE_INFO);
-                                       }
-                               } else {
-                                       len +=(sizeof(WDU_ENDPOINT_DESCRIPTOR)+sizeof(WDU_PIPE_INFO))*bNumEndpoints;
-                               }
-                       }
-               }
-       }
-
-       return len;
-}
-
-int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
+static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {

        struct header_struct* wdheader = (struct header_struct*)wdioctl;
        struct version_struct *version;
        int ret = 0;
        struct header_struct* wdheader = (struct header_struct*)wdioctl;
        struct version_struct *version;
        int ret = 0;


@@ -217,110 +82,110 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                return (*ioctl_func) (fd, request, wdioctl);
        }
 
                return (*ioctl_func) (fd, request, wdioctl);
        }
 

-       switch(request) {
+       switch(request & ~(0xc0000000)) {

                case VERSION:
                        version = (struct version_struct*)(wdheader->data);
                case VERSION:
                        version = (struct version_struct*)(wdheader->data);

-                       strcpy(version->version, "WinDriver no more");
-                       version->versionul = 999;
-#ifdef DEBUG
-                       fprintf(stderr,"faking VERSION\n");
-#endif
+                       strcpy(version->version, "libusb-driver.so version: " USB_DRIVER_VERSION);
+                       version->versionul = 802;
+                       DPRINTF("VERSION\n");

                        break;
 
                case LICENSE:
                        break;
 
                case LICENSE:

-#ifdef DEBUG
-                       fprintf(stderr,"faking LICENSE\n");
-#endif
+                       DPRINTF("LICENSE\n");

                        break;
 
                        break;
 

+               case CARD_REGISTER_OLD:

                case CARD_REGISTER:
                case CARD_REGISTER:

-                       /* TODO: Implement for LPT-support */
-#if 0
+                       DPRINTF("CARD_REGISTER\n");

                        {
                                struct card_register* cr = (struct card_register*)(wdheader->data);
                        {
                                struct card_register* cr = (struct card_register*)(wdheader->data);

-                       }
-#endif
-#ifdef DEBUG
-                       fprintf(stderr,"faking CARD_REGISTER\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);
+                               
+                               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.Item[1].I.IO.dwBar);
+#ifndef NO_WINDRVR
+                               ret = (*ioctl_func) (fd, request, wdioctl);
+#else
+
+                               pport = config_get((unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10);
+                               if (!pport)
+                                       break;
+
+                               ret = pport->open((unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10);
+
+                               ppbase = (unsigned long)cr->Card.Item[0].I.IO.dwAddr;
+
+                               if (cr->Card.dwItems > 1 && cr->Card.Item[1].I.IO.dwAddr)
+                                       ecpbase = (unsigned long)cr->Card.Item[1].I.IO.dwAddr;
+
+                               if (ret >= 0) {
+                                       cr->hCard = ret;
+                               } else {
+                                       cr->hCard = 0;
+                               }

 #endif
 #endif

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

                        break;
 
                case USB_TRANSFER:
                        break;
 
                case USB_TRANSFER:

-#ifdef DEBUG
-                       fprintf(stderr,"in USB_TRANSFER");
-#endif
+                       DPRINTF("in USB_TRANSFER");

                        {
                                struct usb_transfer *ut = (struct usb_transfer*)(wdheader->data);
 
 #ifdef DEBUG
                        {
                                struct usb_transfer *ut = (struct usb_transfer*)(wdheader->data);
 
 #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");
+                               DPRINTF(" 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);
+                               if (ut->dwPipeNum == 0) {
+                                       DPRINTF("setup packet: ");
+                                       hexdump(ut->SetupPacket, 8);
+                               }

 
                                if (!ut->fRead && ut->dwBufferSize)
                                {
                                        hexdump(ut->pBuffer, ut->dwBufferSize);
 
                                if (!ut->fRead && ut->dwBufferSize)
                                {
                                        hexdump(ut->pBuffer, ut->dwBufferSize);

-                                       fprintf(stderr,"\n");

                                }
 #endif
 
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
                                }
 #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 */
-                               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) {
-                                       fprintf(stderr, "usb_transfer: %d (%s)\n", ret, usb_strerror());
-                               } else {
-                                       ut->dwBytesTransferred = ret;
-                                       ret = 0;
-                               }
+                               xpcu_transfer(xpcu, ut);

 #endif
 
 #ifdef DEBUG
 #endif
 
 #ifdef DEBUG

-                               fprintf(stderr,"Transferred: %lu (%s)\n",ut->dwBytesTransferred, (ut->fRead?"read":"write"));
+                               DPRINTF("Transferred: %lu (%s)\n",ut->dwBytesTransferred, (ut->fRead?"read":"write"));

                                if (ut->fRead && ut->dwBytesTransferred)
                                {
                                if (ut->fRead && ut->dwBytesTransferred)
                                {

-                                       fprintf(stderr,"Read: ");
+                                       DPRINTF("Read: ");

                                        hexdump(ut->pBuffer, ut->dwBytesTransferred);
                                        hexdump(ut->pBuffer, ut->dwBytesTransferred);

-                                       fprintf(stderr,"\n");

                                }
 #endif
                        }
                        break;
 
                                }
 #endif
                        }
                        break;
 

+               case INT_ENABLE_OLD:

                case INT_ENABLE:
                case INT_ENABLE:

-#ifdef DEBUG
-                       fprintf(stderr,"INT_ENABLE\n");
-#endif
+                       DPRINTF("INT_ENABLE\n");

                        {
                                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);
-#endif
+                               DPRINTF("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;
 
                                it->fEnableOk = 1;

+                               it->fStopped = 0;

                                ints_enabled = 1;
                                pthread_mutex_trylock(&int_wait);
                        }
                                ints_enabled = 1;
                                pthread_mutex_trylock(&int_wait);
                        }


@@ -328,133 +193,164 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        break;
                        
                case INT_DISABLE:
                        break;
                        
                case INT_DISABLE:

-#ifdef DEBUG
-                       fprintf(stderr,"INT_DISABLE\n");
-#endif
+                       DPRINTF("INT_DISABLE\n");

                        {
                                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);
-#endif
+                               DPRINTF("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;
                                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
-#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);
+                               if (pthread_mutex_trylock(&int_wait) == EBUSY)
+                                       pthread_mutex_unlock(&int_wait);

 #endif
 #endif

+                               DPRINTF("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;
 
                case USB_SET_INTERFACE:
                        }
                        break;
 
                case USB_SET_INTERFACE:

-#ifdef DEBUG
-                       fprintf(stderr,"USB_SET_INTERFACE\n");
-#endif
+                       DPRINTF("USB_SET_INTERFACE\n");

                        {
                                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);
-#endif
+                               DPRINTF("unique: %lu, interfacenum: %lu, alternatesetting: %lu, options: %lx\n",
+                               usi->dwUniqueID, usi->dwInterfaceNum,
+                               usi->dwAlternateSetting, usi->dwOptions);

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

-                               if (usbdevice) {
-                                       if (!usb_devhandle)
-                                               usb_devhandle = usb_open(usbdevice);
-
-                                       /* FIXME: Select right interface! */
-                                       ret = usb_claim_interface(usb_devhandle, usbdevice->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber);
-                                       if (!ret) {
-                                               if(!ret) {
-                                                       ret = usb_set_altinterface(usb_devhandle, usi->dwAlternateSetting);
-                                                       if (ret)
-                                                               fprintf(stderr, "usb_set_altinterface: %d\n", ret);
-                                               } else {
-                                                       fprintf(stderr, "usb_set_configuration: %d (%s)\n", ret, usb_strerror());
-                                               }
-                                       } else {
-                                               fprintf(stderr, "usb_claim_interface: %d -> %d (%s)\n", usbdevice->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber, ret, usb_strerror());
-                                       }
-                               }
-#endif
-#ifdef DEBUG
-                               fprintf(stderr,"unique: %lu, interfacenum: %lu, alternatesetting: %lu, options: %lx\n", usi->dwUniqueID, usi->dwInterfaceNum, usi->dwAlternateSetting, usi->dwOptions);
+                               xpcu_set_interface(xpcu, usi);

 #endif
 #endif

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

                        }
                        break;
 
                        }
                        break;
 

+               case USB_GET_DEVICE_DATA_OLD:

                case USB_GET_DEVICE_DATA:
                case USB_GET_DEVICE_DATA:

-#ifdef DEBUG
-                       fprintf(stderr,"faking USB_GET_DEVICE_DATA\n");
-#endif
+                       DPRINTF("USB_GET_DEVICE_DATA\n");

                        {
                                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);
-#endif
+                               DPRINTF("unique: %lu, bytes: %lu, options: %lx\n",
+                               ugdd->dwUniqueID, ugdd->dwBytes,
+                               ugdd->dwOptions);
+

                                pSize = ugdd->dwBytes;
                                if (!ugdd->dwBytes) {
                                pSize = ugdd->dwBytes;
                                if (!ugdd->dwBytes) {

-                                       if (usbdevice) {
-                                               ugdd->dwBytes = usb_deviceinfo(NULL);
+                                       if (xpcu->dev) {
+                                               ugdd->dwBytes = xpcu_deviceinfo(xpcu, NULL);

                                        }
                                } else {
                                        }
                                } else {

-                                       usb_deviceinfo((unsigned char*)ugdd->pBuf);
+                                       xpcu_deviceinfo(xpcu, (unsigned char*)ugdd->pBuf);

                                }
                        }
                        break;
 
                                }
                        }
                        break;
 

+               case EVENT_REGISTER_OLD:

                case EVENT_REGISTER:
                case EVENT_REGISTER:

-#ifdef DEBUG
-                       fprintf(stderr,"EVENT_REGISTER\n");
-#endif
+                       DPRINTF("EVENT_REGISTER\n");

                        {
                                struct event *e = (struct event*)(wdheader->data);
                                struct usb_bus *bus;
                        {
                                struct event *e = (struct event*)(wdheader->data);
                                struct usb_bus *bus;

+                               char* devpos;
+                               int busnum = -1, devnum = -1;

                                int i;
 
                                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);
-#endif
+                               DPRINTF("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);
+
+                               devpos = getenv("XILINX_USB_DEV");
+                               if (devpos != NULL) {
+                                       int j;
+                                       char *devstr = NULL, *remainder;
+
+                                       DPRINTF("XILINX_USB_DEV=%s\n", devpos);
+
+                                       for (j = 0; j < strlen(devpos) && devpos[j] != 0; j++) {
+                                               if (devpos[j] == ':') {
+                                                       devpos[j] = 0;
+                                                       devstr = &(devpos[j+1]);
+                                               }
+                                       }
+
+                                       if (devstr && strlen(devstr) > 0) {
+                                               busnum = strtol(devpos, &remainder, 10);
+                                               if (devpos == remainder) {
+                                                       busnum = -1;
+                                               } else {
+                                                       devnum = strtol(devstr, &remainder, 10);
+                                                       if (devstr == remainder) {
+                                                               busnum = -1;
+                                                               devnum = -1;
+                                                       } else {
+                                                               fprintf(stderr,"Using XILINX platform cable USB at %03d:%03d\n",
+                                                               busnum, devnum);
+                                                       }
+                                               }
+                                       }
+                               }
+

                                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);
-#endif

 
 

-                                       for (bus = busses; bus; bus = bus->next) {
+                                       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].bDeviceSubClass,
+                                       e->matchTables[i].bInterfaceClass,
+                                       e->matchTables[i].bInterfaceSubClass,
+                                       e->matchTables[i].bInterfaceProtocol);
+
+                                       for (bus = xpcu->busses; bus; bus = bus->next) {

                                                struct usb_device *dev;
 
                                                struct usb_device *dev;
 

+                                               if ((devnum != -1) && (strtol(bus->dirname, NULL, 10) != busnum))
+                                                       continue;
+

                                                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) &&
                                                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)) {
+                                                          (desc->bDeviceSubClass == e->matchTables[i].bDeviceSubClass) &&
+                                                          ((devnum == -1) || (strtol(dev->filename, NULL, 10) == devnum)) ) {

                                                                   int ac;
                                                                   for (ac = 0; ac < desc->bNumConfigurations; ac++) {
                                                                           struct usb_interface *interface = dev->config[ac].interface;
                                                                           int ai;
 
                                                                           for (ai = 0; ai < interface->num_altsetting; ai++) {
                                                                   int ac;
                                                                   for (ac = 0; ac < desc->bNumConfigurations; ac++) {
                                                                           struct usb_interface *interface = dev->config[ac].interface;
                                                                           int ai;
 
                                                                           for (ai = 0; ai < interface->num_altsetting; ai++) {

-#ifdef DEBUG
-                                                                                  fprintf(stderr, "intclass: %x, intsubclass: %x, intproto: %x\n", interface->altsetting[i].bInterfaceClass, interface->altsetting[i].bInterfaceSubClass, interface->altsetting[i].bInterfaceProtocol);
-#endif
+
+                                                                                  DPRINTF("intclass: %x, intsubclass: %x, intproto: %x\n",
+                                                                                  interface->altsetting[i].bInterfaceClass,
+                                                                                  interface->altsetting[i].bInterfaceSubClass,
+                                                                                  interface->altsetting[i].bInterfaceProtocol);
+

                                                                                   if ((interface->altsetting[ai].bInterfaceSubClass == e->matchTables[i].bInterfaceSubClass) &&
                                                                                                   (interface->altsetting[ai].bInterfaceProtocol == e->matchTables[i].bInterfaceProtocol)){
                                                                                           /* TODO: check interfaceClass! */
                                                                                   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");
-#endif
-                                                                                          usbdevice = dev;
-                                                                                          card_type = e->dwCardType;
+                                                                                          DPRINTF("found device with libusb\n");
+                                                                                          xpcu->dev = dev;
+                                                                                          xpcu->card_type = e->dwCardType;

                                                                                   }
                                                                           }
                                                                   }
                                                                                   }
                                                                           }
                                                                   }


@@ -470,95 +366,159 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #endif
 
 #ifdef DEBUG
 #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);
+                               DPRINTF("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++)
                                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);
+                                       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].bDeviceSubClass,
+                                       e->matchTables[i].bInterfaceClass,
+                                       e->matchTables[i].bInterfaceSubClass,
+                                       e->matchTables[i].bInterfaceProtocol);

 #endif
                        }
                        break;
 
 #endif
                        }
                        break;
 

+               case TRANSFER_OLD:

                case TRANSFER:
                case TRANSFER:

-                       fprintf(stderr,"TRANSFER\n");
+                       DPRINTF("TRANSFER\n");
+                       {
+                               WD_TRANSFER *tr = (WD_TRANSFER*)(wdheader->data);
+

 #ifndef NO_WINDRVR
 #ifndef NO_WINDRVR

-                       ret = (*ioctl_func) (fd, request, wdioctl);
+                               ret = (*ioctl_func) (fd, request, wdioctl);
+#else
+                               ret = pport->transfer(tr, fd, request, ppbase, ecpbase, 1);

 #endif
 #endif

+                       }

                        break;
 
                        break;
 

-               case EVENT_UNREGISTER:
-#ifdef DEBUG
-                       fprintf(stderr,"EVENT_UNREGISTER\n");
+               case MULTI_TRANSFER_OLD:
+               case MULTI_TRANSFER:
+                       DPRINTF("MULTI_TRANSFER\n");
+                       {
+                               WD_TRANSFER *tr = (WD_TRANSFER*)(wdheader->data);
+                               unsigned long num = wdheader->size/sizeof(WD_TRANSFER);
+#ifndef NO_WINDRVR
+                               ret = (*ioctl_func) (fd, request, wdioctl);
+#else
+                               ret = pport->transfer(tr, fd, request, ppbase, ecpbase, num);

 #endif
 #endif

+                       }
+                       break;
+
+               case EVENT_UNREGISTER:
+                       DPRINTF("EVENT_UNREGISTER\n");

 #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");
-#endif
+                       DPRINTF("INT_WAIT\n");

                        {
                                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);
-#endif
+                               DPRINTF("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
 
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else

-                               if (usbdevice) {
+                               if (xpcu->dev) {

                                        if (it->dwCounter == 0) {
                                                it->dwCounter = 1;
                                        } else {
                                                pthread_mutex_lock(&int_wait);
                                        if (it->dwCounter == 0) {
                                                it->dwCounter = 1;
                                        } else {
                                                pthread_mutex_lock(&int_wait);

+                                               pthread_mutex_unlock(&int_wait);

                                        }
                                } else {
                                        pthread_mutex_lock(&int_wait);
                                        }
                                } else {
                                        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);
-#endif
+                               DPRINTF("INT_WAIT_RETURN: Handle: %lu, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
+                               it->hInterrupt, it->dwOptions, it->dwCmds,
+                               it->fEnableOk, it->dwCounter, it->dwLost,
+                               it->fStopped);

                        }
                        break;
 
                case CARD_UNREGISTER:
                        }
                        break;
 
                case CARD_UNREGISTER:

-                       fprintf(stderr,"CARD_UNREGISTER\n");
+                       DPRINTF("CARD_UNREGISTER\n");
+                       {
+                               struct card_register* cr = (struct card_register*)(wdheader->data);
+
+                               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);
+
+                               DPRINTF("hCard: %lu\n", cr->hCard);
+

 #ifndef NO_WINDRVR
 #ifndef NO_WINDRVR

-                       ret = (*ioctl_func) (fd, request, wdioctl);
+                               ret = (*ioctl_func) (fd, request, wdioctl);
+#else
+                               if (pport)
+                                       pport->close(cr->hCard);
+
+                               pport = NULL;

 #endif
 #endif

+                       }

                        break;
 
                case EVENT_PULL:
                        break;
 
                case EVENT_PULL:

-#ifdef DEBUG
-                       fprintf(stderr,"EVENT_PULL\n");
-#endif
+                       DPRINTF("EVENT_PULL\n");

                        {
                                struct event *e = (struct event*)(wdheader->data);
 #ifdef DEBUG
                                int i;
 
                        {
                                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);
+                               DPRINTF("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++)
                                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);
+                                       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].bDeviceSubClass,
+                                       e->matchTables[i].bInterfaceClass,
+                                       e->matchTables[i].bInterfaceSubClass,
+                                       e->matchTables[i].bInterfaceProtocol);

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

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

 
 

-                                       e->dwCardType = card_type;
+                                       e->dwCardType = xpcu->card_type;

                                        e->dwAction = 1;
                                        e->dwEventId = 109;
                                        e->u.Usb.dwUniqueID = 110;
                                        e->dwAction = 1;
                                        e->dwEventId = 109;
                                        e->u.Usb.dwUniqueID = 110;

-                                       e->matchTables[0].VendorId = usbdevice->descriptor.idVendor;
-                                       e->matchTables[0].ProductId = usbdevice->descriptor.idProduct;
-                                       e->matchTables[0].bDeviceClass = usbdevice->descriptor.bDeviceClass;
-                                       e->matchTables[0].bDeviceSubClass = usbdevice->descriptor.bDeviceSubClass;
+                                       e->matchTables[0].VendorId = xpcu->dev->descriptor.idVendor;
+                                       e->matchTables[0].ProductId = xpcu->dev->descriptor.idProduct;
+                                       e->matchTables[0].bDeviceClass = xpcu->dev->descriptor.bDeviceClass;
+                                       e->matchTables[0].bDeviceSubClass = xpcu->dev->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;
                                        e->matchTables[0].bInterfaceClass = interface->altsetting[0].bInterfaceClass;
                                        e->matchTables[0].bInterfaceSubClass = interface->altsetting[0].bInterfaceSubClass;
                                        e->matchTables[0].bInterfaceProtocol = interface->altsetting[0].bInterfaceProtocol;


@@ -566,9 +526,23 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #endif
 
 #ifdef DEBUG
 #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);
+                               DPRINTF("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++)
                                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);
+                                       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].bDeviceSubClass,
+                                       e->matchTables[i].bInterfaceClass,
+                                       e->matchTables[i].bInterfaceSubClass,
+                                       e->matchTables[i].bInterfaceProtocol);

 #endif
 
                        }
 #endif
 
                        }


@@ -585,14 +559,13 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
        return ret;
 }
 
        return ret;
 }
 

-int ioctl(int fd, int request, ...)
-{
+int ioctl(int fd, unsigned long int request, ...) {

        va_list args;
        void *argp;
        int ret;
 
        if (!ioctl_func)                                                                    
        va_list args;
        void *argp;
        int ret;
 
        if (!ioctl_func)                                                                    

-               ioctl_func = (int (*) (int, int, void *)) dlsym (REAL_LIBC, "ioctl");             
+               ioctl_func = (int (*) (int, int, void *)) dlsym (RTLD_NEXT, "ioctl");             

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


@@ -606,17 +579,14 @@ int ioctl(int fd, int request, ...)
        return ret;
 }
 
        return ret;
 }
 

-typedef int (*open_funcptr_t) (const char *, int, mode_t);
-
-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 (RTLD_NEXT, "open");

 
        if (flags & O_CREAT) {
                va_start(args, flags);
 
        if (flags & O_CREAT) {
                va_start(args, flags);


@@ -625,21 +595,14 @@ int open (const char *pathname, int flags, ...)
        }
 
        if (!strcmp (pathname, "/dev/windrvr6")) {
        }
 
        if (!strcmp (pathname, "/dev/windrvr6")) {

-#ifdef DEBUG
-               fprintf(stderr,"opening windrvr6\n");
-#endif
+               DPRINTF("opening windrvr6\n");

 #ifdef NO_WINDRVR
                windrvrfd = fd = (*func) ("/dev/null", flags, mode);
 #else
                windrvrfd = fd = (*func) (pathname, flags, mode);
 #endif
 #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();
-               }
+               if (!xpcu)
+                       xpcu = xpcu_open();

 
                return fd;
        }
 
                return fd;
        }


@@ -651,13 +614,16 @@ int close(int fd) {
        static int (*func) (int) = NULL;
 
        if (!func)
        static int (*func) (int) = NULL;
 
        if (!func)

-               func = (int (*) (int)) dlsym(REAL_LIBC, "close");
+               func = (int (*) (int)) dlsym(RTLD_NEXT, "close");

        
        

-       if (fd == windrvrfd) {
-#ifdef DEBUG
-               fprintf(stderr,"close windrvrfd\n");
-#endif
-               windrvrfd = 0;
+       if (fd == windrvrfd && windrvrfd >= 0) {
+               DPRINTF("close windrvrfd\n");
+
+               if (xpcu)
+                       xpcu_close(xpcu);
+
+               xpcu = NULL;
+               windrvrfd = -1;

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


@@ -666,16 +632,35 @@ int close(int fd) {
 FILE *fopen(const char *path, const char *mode) {
        FILE *ret;
        static FILE* (*func) (const char*, const char*) = NULL;
 FILE *fopen(const char *path, const char *mode) {
        FILE *ret;
        static FILE* (*func) (const char*, const char*) = NULL;

+       char buf[256];
+       int i;

 
        if (!func)
 
        if (!func)

-               func = (FILE* (*) (const char*, const char*)) dlsym(REAL_LIBC, "fopen");
+               func = (FILE* (*) (const char*, const char*)) dlsym(RTLD_NEXT, "fopen");
+
+       for (i = 0; i < 4; i++) {
+               snprintf(buf, sizeof(buf), "/proc/sys/dev/parport/parport%d/base-addr", i);
+               if (!strcmp(path, buf)) {
+                       DPRINTF("open base-addr of parport%d\n", i);
+                       if (config_is_real_pport(i)) {
+                               ret = (*func) (path, mode);
+                       } else {
+                               ret = (*func) ("/dev/null", mode);
+                       }
+
+                       if (ret) {
+                               baseaddrfp = ret;
+                               baseaddrnum = i;
+                       }
+
+                       return ret;
+               }
+       }

 
        ret = (*func) (path, mode);
 
 
        ret = (*func) (path, mode);
 

-       if (!strcmp (path, "/proc/modules")) {
-#ifdef DEBUG
-               fprintf(stderr,"opening /proc/modules\n");
-#endif
+       if (!strcmp(path, "/proc/modules")) {
+               DPRINTF("opening /proc/modules\n");

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


@@ -687,19 +672,25 @@ FILE *fopen(const char *path, const char *mode) {
 
 char *fgets(char *s, int size, FILE *stream) {
         static char* (*func) (char*, int, FILE*) = NULL;
 
 char *fgets(char *s, int size, FILE *stream) {
         static char* (*func) (char*, int, FILE*) = NULL;

-       const char modules[] = "windrvr6 160960 0 - Live 0xf98b0000\n";
+       const char modules[][256] = {"windrvr6 1 0 - Live 0xdeadbeef\n", "parport_pc 1 0 - Live 0xdeadbeef\n"};
+       char buf[256];

        char *ret = NULL;
 
 
        if (!func)
        char *ret = NULL;
 
 
        if (!func)

-               func = (char* (*) (char*, int, FILE*)) dlsym(REAL_LIBC, "fgets");
+               func = (char* (*) (char*, int, FILE*)) dlsym(RTLD_NEXT, "fgets");

        
        if (modulesfp == stream) {
        
        if (modulesfp == stream) {

-               if (!modules_read) {
-                       strcpy(s, modules);
+               if (modules_read < sizeof(modules) / sizeof(modules[0])) {
+                       strcpy(s, modules[modules_read]);

                        ret = s;
                        ret = s;

-                       modules_read = 1;
+                       modules_read++;

                }
                }

+       } else if (baseaddrfp == stream) {
+               snprintf(s, sizeof(buf), "%d\t%d\n",
+                       (baseaddrnum) * 0x10,
+                       ((baseaddrnum) * 0x10) + 0x400);
+               ret = s;

        } else {
                ret = (*func)(s,size,stream);
        }
        } else {
                ret = (*func)(s,size,stream);
        }


@@ -711,12 +702,46 @@ int fclose(FILE *fp) {
        static int (*func) (FILE*) = NULL;
 
        if (!func)
        static int (*func) (FILE*) = NULL;
 
        if (!func)

-               func = (int (*) (FILE*)) dlsym(REAL_LIBC, "fclose");
+               func = (int (*) (FILE*)) dlsym(RTLD_NEXT, "fclose");

 
        if (fp == modulesfp) {
                modulesfp = NULL;
        }
 
        if (fp == modulesfp) {
                modulesfp = NULL;
        }

+
+       if (fp == baseaddrfp) {
+               baseaddrfp = NULL;
+       }

        
        return (*func)(fp);
 }
        
        return (*func)(fp);
 }

+
+int access(const char *pathname, int mode) {
+       static int (*func) (const char*, int);
+
+       if (!func)
+               func = (int (*) (const char*, int)) dlsym(RTLD_NEXT, "access");
+
+       if (pathname && !strcmp(pathname, "/dev/windrvr6")) {
+               return 0;
+       } else {
+               return (*func)(pathname, mode);
+       }
+}
+
+#if __WORDSIZE == 32
+int uname (struct utsname *__name) {
+       static int (*func) (struct utsname*);
+       int ret;
+
+       if (!func)
+               func = (int (*) (struct utsname*)) dlsym(RTLD_NEXT, "uname");
+       
+       ret = (*func)(__name);
+
+       if (ret == 0 && (!strcmp(__name->machine, "x86_64"))) {
+               strcpy(__name->machine, "i686");
+       }
+       
+       return ret;
+}

 #endif
 #endif