remove old debug message

[usb-driver] / usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index f15910f6d994c5e839dd41058cf7343f688dce81..b39c4fc506264e8ed5564f25e0e1bb1f7e2466fb 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>


@@ -19,18 +34,308 @@
 #include <sys/time.h>
 #include <stdio.h>
 #include <usb.h>
 #include <sys/time.h>
 #include <stdio.h>
 #include <usb.h>

-#include "xilinx.h"
+#include <signal.h>
+#include <pthread.h>
+#include <errno.h>
+#include <inttypes.h>
+#include <sys/ioctl.h>
+#include <linux/parport.h>
+#include <linux/ppdev.h>
+#include "usb-driver.h"
+#include "config.h"
+#ifdef JTAGKEY
+#include "jtagkey.h"
+#endif

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

-static int windrvrfd = 0;
+static int windrvrfd = -1;
+static int parportfd = -1;
+static unsigned long ppbase = 0;
+static unsigned long ecpbase = 0;
+FILE *modulesfp = NULL;
+FILE *baseaddrfp = NULL;
+int baseaddrnum = 0;
+static int modules_read = 0;

 static struct usb_bus *busses = NULL;
 static struct usb_bus *busses = NULL;

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

 static unsigned long card_type;
 static unsigned long card_type;

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

 
 #define NO_WINDRVR 1
 
 
 #define NO_WINDRVR 1
 

-void hexdump(unsigned char *buf, int len);
-void diff(unsigned char *buf1, unsigned char *buf2, int len);
+void hexdump(unsigned char *buf, int len) {
+       int i;
+
+       for(i=0; i<len; i++) {
+               fprintf(stderr,"%02x ", buf[i]);
+               if ((i % 16) == 15)
+                       fprintf(stderr,"\n");
+       }
+       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 = WDU_DIR_IN_OUT;
+               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 pp_transfer(WD_TRANSFER *tr, int fd, unsigned int request) {
+       int ret = 0;
+       unsigned long port = (unsigned long)tr->dwPort;
+       unsigned char val;
+       static unsigned char last_pp_write = 0;
+
+       DPRINTF("dwPort: 0x%lx, cmdTrans: %lu, dwbytes: %ld, fautoinc: %ld, dwoptions: %ld\n",
+                       (unsigned long)tr->dwPort, tr->cmdTrans, tr->dwBytes,
+                       tr->fAutoinc, tr->dwOptions);
+
+       val = tr->Data.Byte;
+       
+#ifdef DEBUG
+       if (tr->cmdTrans == 13)
+               DPRINTF("write byte: %d\n", val);
+#endif
+
+       if (parportfd < 0)
+               return ret;
+
+       if (port == ppbase + PP_DATA) {
+               DPRINTF("data port\n");
+               switch(tr->cmdTrans) {
+                       case PP_READ:
+                               ret = 0; /* We don't support reading of the data port */
+                               break;
+
+                       case PP_WRITE:
+                               ret = ioctl(parportfd, PPWDATA, &val);
+                               last_pp_write = val;
+                               break;
+
+                       default:
+                               fprintf(stderr,"!!!Unsupported TRANSFER command: %lu!!!\n", tr->cmdTrans);
+                               ret = -1;
+                               break;
+               }
+       } else if (port == ppbase + PP_STATUS) {
+               DPRINTF("status port (last write: %d)\n", last_pp_write);
+               switch(tr->cmdTrans) {
+                       case PP_READ:
+                               ret = ioctl(parportfd, PPRSTATUS, &val);
+#ifdef FORCE_PC3_IDENT
+                               val &= 0x5f;
+                               if (last_pp_write & 0x40)
+                                       val |= 0x20;
+                               else
+                                       val |= 0x80;
+#endif
+                               break;
+
+                       case PP_WRITE:
+                               ret = 0; /* Status Port is readonly */
+                               break;
+
+                       default:
+                               fprintf(stderr,"!!!Unsupported TRANSFER command: %lu!!!\n", tr->cmdTrans);
+                               ret = -1;
+                               break;
+               }
+       } else if (port == ppbase + PP_CONTROL) {
+               DPRINTF("control port\n");
+               switch(tr->cmdTrans) {
+                       case PP_READ:
+                               ret = ioctl(parportfd, PPRCONTROL, &val);
+                               break;
+
+                       case PP_WRITE:
+                               ret = ioctl(parportfd, PPWCONTROL, &val);
+                               break;
+
+                       default:
+                               fprintf(stderr,"!!!Unsupported TRANSFER command: %lu!!!\n", tr->cmdTrans);
+                               ret = -1;
+                               break;
+               }
+       } else if ((port == ecpbase + PP_ECP_CFGA) && ecpbase) {
+               DPRINTF("ECP_CFGA port\n");
+       } else if ((port == ecpbase + PP_ECP_CFGB) && ecpbase) {
+               DPRINTF("ECP_CFGB port\n");
+       } else if ((port == ecpbase + PP_ECP_ECR) && ecpbase) {
+               DPRINTF("ECP_ECR port\n");
+       } else {
+               DPRINTF("access to unsupported address range!\n");
+               ret = 0;
+       }
+
+       tr->Data.Byte = val;
+
+       DPRINTF("dwPortReturn: 0x%lx, cmdTrans: %lu, dwbytes: %ld, fautoinc: %ld, dwoptions: %ld\n",
+                       (unsigned long)tr->dwPort, tr->cmdTrans, tr->dwBytes,
+                       tr->fAutoinc, tr->dwOptions);
+#ifdef DEBUG
+       if (tr->cmdTrans == 10)
+               DPRINTF("read byte: %d\n", tr->Data.Byte);
+#endif
+
+       return ret;
+}

 
 int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
        struct header_struct* wdheader = (struct header_struct*)wdioctl;
 
 int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
        struct header_struct* wdheader = (struct header_struct*)wdioctl;


@@ -42,237 +347,293 @@ 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;
-                       fprintf(stderr,"faking VERSION\n");
+                       strcpy(version->version, "libusb-driver.so $Revision: 1.66 $");
+                       version->versionul = 802;
+                       DPRINTF("VERSION\n");

                        break;
 
                case LICENSE:
                        break;
 
                case LICENSE:

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

                        break;
 
                        break;
 

+               case CARD_REGISTER_OLD:

                case CARD_REGISTER:
                case CARD_REGISTER:

+                       DPRINTF("CARD_REGISTER\n");

                        {
                        {

-                               //struct card_register* cr = (struct card_register*)(wdheader->data);
-                               /* Todo: LPT-Port already in use */
+                               struct card_register* cr = (struct card_register*)(wdheader->data);
+                               char ppdev[32];
+
+                               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
+                               
+#ifdef JTAGKEY
+                               if (!config_is_real_pport((unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10)) {
+                                       int num = (unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10;
+
+                                       ret=jtagkey_init(config_usb_vid(num), config_usb_pid(num));
+                                       cr->hCard = 0xff;
+                                       ppbase = (unsigned long)cr->Card.Item[0].I.IO.dwAddr;
+                                       if (ret < 0)
+                                               cr->hCard = 0;
+
+                                       break;
+                               }
+#endif
+
+                               if (parportfd < 0) {
+                                       snprintf(ppdev, sizeof(ppdev), "/dev/parport%lu",
+                                                       (unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10);
+                                       DPRINTF("opening %s\n", ppdev);
+                                       parportfd = open(ppdev, O_RDWR|O_EXCL);
+
+                                       if (parportfd < 0)
+                                               fprintf(stderr,"Can't open %s: %s\n", ppdev, strerror(errno));
+                               }
+
+                               if (parportfd >= 0) {
+                                       int pmode;
+
+                                       if (ioctl(parportfd, PPCLAIM) == -1)
+                                               return ret;
+
+                                       ecpbase = 0;
+                                       pmode = IEEE1284_MODE_COMPAT;
+                                       if (ioctl(parportfd, PPNEGOT, &pmode) == -1)
+                                               return ret;
+
+                                       if (cr->Card.dwItems > 1 && cr->Card.Item[1].I.IO.dwAddr) {
+                                               DPRINTF("ECP mode requested\n");
+                                               ecpbase = (unsigned long)cr->Card.Item[1].I.IO.dwAddr;
+                                               /* TODO: Implement ECP mode */
+#if 0
+                                               pmode = IEEE1284_MODE_ECP;
+
+                                               if (ioctl(parportfd, PPNEGOT, &pmode) == -1) {
+                                                       ecpbase = 0;
+                                                       pmode = IEEE1284_MODE_COMPAT;
+                                                       if (ioctl(parportfd, PPNEGOT, &pmode) == -1)
+                                                               return ret;
+                                               }
+#endif
+                                       }
+
+                                       cr->hCard = parportfd;
+                               }
+
+                               ppbase = (unsigned long)cr->Card.Item[0].I.IO.dwAddr;
+                               if (ret < 0)
+                                       cr->hCard = 0;
+#endif
+                               DPRINTF("hCard: %lu\n", cr->hCard);

                        }
                        }

-                       fprintf(stderr,"faking CARD_REGISTER\n");

                        break;
 
                case USB_TRANSFER:
                        break;
 
                case USB_TRANSFER:

-                       fprintf(stderr,"in USB_TRANSFER");
+                       DPRINTF("in USB_TRANSFER");

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

-                               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: ");
+#ifdef DEBUG
+                               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);
+                               DPRINTF("setup packet: ");

                                hexdump(ut->SetupPacket, 8);
                                hexdump(ut->SetupPacket, 8);

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

                                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);
 
 #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);
+                                       DPRINTF("requesttype: %x, request: %x, value: %u, index: %u, size: %u\n", requesttype, request, value, index, size);
+                                       ret = usb_control_msg(usb_devhandle, requesttype, request, value, index, ut->pBuffer, size, ut->dwTimeout);
+                               } 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;
+                               }

 #endif
 
 #endif
 

-                               fprintf(stderr,"Transferred: %lu (%s)\n",ut->dwBytesTransferred, (ut->fRead?"read":"write"));
+#ifdef DEBUG
+                               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;
 
                        }
                        break;
 

+               case INT_ENABLE_OLD:

                case INT_ENABLE:
                case INT_ENABLE:

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

                        {
                                struct interrupt *it = (struct interrupt*)(wdheader->data);
 
                        {
                                struct interrupt *it = (struct interrupt*)(wdheader->data);
 

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

-                               //ret = (*ioctl_func) (fd, request, wdioctl);
+                               it->fStopped = 0;
+                               ints_enabled = 1;
+                               pthread_mutex_trylock(&int_wait);

                        }
 
                        break;
                        
                case INT_DISABLE:
                        }
 
                        break;
                        
                case INT_DISABLE:

-                       fprintf(stderr,"INT_DISABLE\n");
+                       DPRINTF("INT_DISABLE\n");

                        {
                                struct interrupt *it = (struct interrupt*)(wdheader->data);
 
                        {
                                struct interrupt *it = (struct interrupt*)(wdheader->data);
 

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

 #endif
 #endif

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

-                       fprintf(stderr,"USB_SET_INTERFACE\n");
+                       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);
 

-                               fprintf(stderr,"unique: %lu, interfacenum: %lu, alternatesetting: %lu, options: %lx\n", usi->dwUniqueID, usi->dwInterfaceNum, usi->dwAlternateSetting, usi->dwOptions);
+                               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);
 #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) {
+                                                       usbinterface = usbdevice->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber;
+                                                       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
 #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:

-                       fprintf(stderr,"USB_GET_DEVICE_DATA\n");
+                       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;
 

-                               fprintf(stderr, "unique: %lu, bytes: %lu, options: %lx\n", ugdd->dwUniqueID, ugdd->dwBytes, ugdd->dwOptions);
+                               DPRINTF("unique: %lu, bytes: %lu, options: %lx\n",
+                               ugdd->dwUniqueID, ugdd->dwBytes,
+                               ugdd->dwOptions);
+

                                pSize = ugdd->dwBytes;
                                pSize = ugdd->dwBytes;

-                               if (pSize) {
-                                       hexdump(ugdd->pBuf, pSize);
-                               }
-#ifndef NO_WINDRVR
-                               ret = (*ioctl_func) (fd, request, wdioctl);
-#else

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

-                                       if (usb_cable) {
-                                               int i,j,k;
-                                               ugdd->dwBytes = sizeof(struct usb_device_info);
-
-                                               for (i=0; i<usb_cable->descriptor.bNumConfigurations; i++)
-                                               {
-                                                       struct usb_config_descriptor *conf_desc = &usb_cable->config[i];
-                                                       ugdd->dwBytes+=sizeof(WDU_CONFIGURATION);
-                                                       ugdd->dwBytes+=sizeof(WDU_INTERFACE) * conf_desc->bNumInterfaces;
-
-                                                       for (j=0; j<conf_desc->bNumInterfaces; j++)
-                                                       {
-                                                               struct usb_interface *interface = &usb_cable->config[i].interface[j];
-                                                               for(k=0; k<interface->num_altsetting; k++)
-                                                               {
-                                                                       unsigned char bNumEndpoints;
-                                                                       bNumEndpoints = interface->altsetting[k].bNumEndpoints;
-                                                                       ugdd->dwBytes+=sizeof(WDU_ALTERNATE_SETTING);
-                                                                       ugdd->dwBytes+=(sizeof(WDU_ENDPOINT_DESCRIPTOR)+sizeof(WDU_PIPE_INFO))*bNumEndpoints;
-                                                               }
-                                                       }
-                                               }
-
-                                               
+                                       if (usbdevice) {
+                                               ugdd->dwBytes = usb_deviceinfo(NULL);

                                        }
                                } else {
                                        }
                                } else {

-                                       struct usb_device_info_get *udi = (struct usb_device_info_get*)ugdd->pBuf;
-                                       struct usb_endpoint_descriptor *ep;
-unsigned char dings[] = {0x12, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x40, 0xfd, 0x03, 0x08, 0x00, 0x00, 0x00, 0x01, 0x02,
-0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x45, 0x21, 0x08, 0x38, 0x45, 0x21, 0x08,
-0x4c, 0x45, 0x21, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x02, 0x20, 0x00, 0x01, 0x02, 0x00, 0x80,
-0x8c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x4c, 0x45, 0x21, 0x08, 0x58, 0x45, 0x21, 0x08,
-0x01, 0x00, 0x00, 0x00, 0x58, 0x45, 0x21, 0x08, 0x09, 0x04, 0x00, 0x00, 0x02, 0xff, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x6c, 0x45, 0x21, 0x08, 0x7c, 0x45, 0x21, 0x08, 0x07, 0x05, 0x02, 0x02,
-0x00, 0x02, 0x00, 0x00, 0x07, 0x05, 0x86, 0x02, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x86, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00};
-
-//unique: 94, bytes: 276, options: 0
-//Vendor: 3fd
-//12 01 00 02 00 00 00 40 fd 03 08 00 00 00 01 02                              12 01 00 02 00 00 00 40 fd 03 08 00 00 00 01 02
-//00 01 00 00 00 00 00 00 40 00 00 00 00 00 00 00                              00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-//03 00 00 00 00 00 00 00 38 45 21 08 38 45 21 08                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-//4c 45 21 08 00 00 00 00 00 00 00 00 00 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-//00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-//00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-//00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-//00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-//00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-//00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-//00 00 00 00 00 00 00 00 09 02 20 00 01 02 00 80                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-//8c 00 00 00 01 00 00 00 4c 45 21 08 58 45 21 08                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-//01 00 00 00 58 45 21 08 09 04 00 00 02 ff 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-//00 00 00 00 6c 45 21 08 7c 45 21 08 07 05 02 02                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-//00 02 00 00 07 05 86 02 00 02 00 00 02 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-//00 02 00 00 02 00 00 00 02 00 00 00 00 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-//86 00 00 00 00 02 00 00 02 00 00 00 01 00 00 00                              00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-//00 00 00 00                                                                  00 00 00 00
-
-                                       bzero(udi, ugdd->dwBytes);
-                                       //memcpy(udi, dings, 276);
-                                       udi->Descriptor.bLength = sizeof(WDU_DEVICE_DESCRIPTOR);
-                                       udi->Descriptor.bDescriptorType = usb_cable->descriptor.bDescriptorType;
-                                       udi->Descriptor.bcdUSB = usb_cable->descriptor.bcdUSB;
-                                       udi->Descriptor.bDeviceClass = usb_cable->descriptor.bDeviceClass;
-                                       udi->Descriptor.bDeviceSubClass = usb_cable->descriptor.bDeviceSubClass;
-                                       udi->Descriptor.bDeviceProtocol = usb_cable->descriptor.bDeviceProtocol;
-                                       udi->Descriptor.bMaxPacketSize0 = usb_cable->descriptor.bMaxPacketSize0;
-                                       udi->Descriptor.idVendor = usb_cable->descriptor.idVendor;
-                                       udi->Descriptor.idProduct = usb_cable->descriptor.idProduct;
-                                       udi->Descriptor.bcdDevice = usb_cable->descriptor.bcdDevice;
-                                       udi->Descriptor.iManufacturer = usb_cable->descriptor.iManufacturer;
-                                       udi->Descriptor.iProduct = usb_cable->descriptor.iProduct;
-                                       udi->Descriptor.iSerialNumber = usb_cable->descriptor.iSerialNumber;
-                                       udi->Descriptor.bNumConfigurations = usb_cable->descriptor.bNumConfigurations;
-
-                                       ep = usb_cable->config->interface->altsetting[0].endpoint;
-
-                                       udi->Pipe0.dwNumber = 0x00;
-                                       udi->Pipe0.dwMaximumPacketSize = usb_cable->descriptor.bMaxPacketSize0;
-                                       udi->Pipe0.type = 0;
-                                       udi->Pipe0.direction = 3;
-                                       udi->Pipe0.dwInterval = 0;
-
-                                       udi->cfg.Descriptor.bLength = usb_cable->config->bLength;
-                                       udi->cfg.Descriptor.bDescriptorType = usb_cable->config->bDescriptorType;
-                                       udi->cfg.Descriptor.wTotalLength = usb_cable->config->wTotalLength;
-                                       udi->cfg.Descriptor.bNumInterfaces = usb_cable->config->bNumInterfaces;
-                                       udi->cfg.Descriptor.bConfigurationValue = usb_cable->config->bConfigurationValue;
-                                       udi->cfg.Descriptor.iConfiguration = usb_cable->config->iConfiguration;
-                                       udi->cfg.Descriptor.bmAttributes = usb_cable->config->bmAttributes;
-                                       udi->cfg.Descriptor.MaxPower = usb_cable->config->MaxPower;
-
-                                       // ab offset 168 config desc
-                               }
-#endif
-                               if (pSize) {
-                                       struct usb_device_info *udi = (struct usb_device_info*)ugdd->pBuf;
-
-                                       fprintf(stderr, "Vendor: %x\n", udi->Descriptor.idVendor);
-
-                                       hexdump(ugdd->pBuf, pSize);
-                                       fprintf(stderr, "\n");
+                                       usb_deviceinfo((unsigned char*)ugdd->pBuf);

                                }
                        }
                        break;
 
                                }
                        }
                        break;
 

+               case EVENT_REGISTER_OLD:

                case EVENT_REGISTER:
                case EVENT_REGISTER:

-                       fprintf(stderr,"EVENT_REGISTER\n");
+                       DPRINTF("EVENT_REGISTER\n");

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

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

 
                                        for (bus = busses; bus; bus = bus->next) {
                                                struct usb_device *dev;
 
                                        for (bus = busses; bus; bus = bus->next) {
                                                struct usb_device *dev;


@@ -284,19 +645,27 @@ unsigned char dings[] = {0x12, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x40, 0xfd, 0
                                                           (desc->idProduct == e->matchTables[i].ProductId) &&
                                                           (desc->bDeviceClass == e->matchTables[i].bDeviceClass) &&
                                                           (desc->bDeviceSubClass == e->matchTables[i].bDeviceSubClass)) {
                                                           (desc->idProduct == e->matchTables[i].ProductId) &&
                                                           (desc->bDeviceClass == e->matchTables[i].bDeviceClass) &&
                                                           (desc->bDeviceSubClass == e->matchTables[i].bDeviceSubClass)) {

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

                                                        }
                                                }
                                        }
                                                        }
                                                }
                                        }


@@ -304,91 +673,215 @@ unsigned char dings[] = {0x12, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x40, 0xfd, 0
 
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);

+#else
+                               e->handle++;

 #endif
 
 #endif
 

-                               fprintf(stderr,"handle: %lu, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: %lu, ver: %lu, nummatch: %lu\n", e->handle, e->dwAction, e->dwStatus, e->dwEventId, e->dwCardType, e->hKernelPlugIn, e->dwOptions, e->u.Usb.deviceId.dwVendorId, e->u.Usb.deviceId.dwProductId, e->u.Usb.dwUniqueID, e->dwEventVer, e->dwNumMatchTables);
+#ifdef DEBUG
+                               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;
 
                        }
                        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
+
+#ifdef JTAGKEY
+                               if (!config_is_real_pport(ppbase / 0x10)) {
+                                       ret = jtagkey_transfer(tr, fd, request, ppbase, ecpbase, 1);
+                                       break;
+                               }
+#endif /* JTAGKEY */
+                               ret = pp_transfer(tr, fd, request);

 #endif
 #endif

+                       }
+                       break;
+
+               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);
+                               int i;
+#ifndef NO_WINDRVR
+                               ret = (*ioctl_func) (fd, request, wdioctl);
+#else
+
+#ifdef JTAGKEY
+                               if (!config_is_real_pport(ppbase / 0x10)) {
+                                       ret = jtagkey_transfer(tr, fd, request, ppbase, ecpbase, num);
+                                       break;
+                               }
+#endif /* JTAGKEY */
+
+                               for (i = 0; i < num; i++) {
+                                       DPRINTF("Transfer %d:\n", i+1);
+                                       ret = pp_transfer(tr + i, fd, request);
+                               }
+#endif
+                       }

                        break;
 
                case EVENT_UNREGISTER:
                        break;
 
                case EVENT_UNREGISTER:

-                       fprintf(stderr,"EVENT_UNREGISTER\n");
+                       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:

-                       fprintf(stderr,"INT_WAIT\n");
+                       DPRINTF("INT_WAIT\n");

                        {
                                struct interrupt *it = (struct interrupt*)(wdheader->data);
 
                        {
                                struct interrupt *it = (struct interrupt*)(wdheader->data);
 

-                               fprintf(stderr,"Handle: %lu, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n", it->hInterrupt, it->dwOptions, it->dwCmds, it->fEnableOk, it->dwCounter, it->dwLost, it->fStopped);
+                               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 (usb_cable)
-                                       it->dwCounter++;
+                               if (usbdevice) {
+                                       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);
+                               }

 #endif
 
 #endif
 

-                               fprintf(stderr,"Handle: %lu, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n", it->hInterrupt, it->dwOptions, it->dwCmds, it->fEnableOk, it->dwCounter, it->dwLost, it->fStopped);
+                               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
+#ifdef JTAGKEY
+                               if (cr->hCard == 0xff)
+                                       jtagkey_close();
+#endif
+
+                               if (parportfd == cr->hCard && parportfd >= 0) {
+                                       ioctl(parportfd, PPRELEASE);
+                                       close(parportfd);
+                                       parportfd = -1;
+                               }

 #endif
 #endif

+                       }

                        break;
 
                case EVENT_PULL:
                        break;
 
                case EVENT_PULL:

-                       fprintf(stderr,"EVENT_PULL\n");
+                       DPRINTF("EVENT_PULL\n");

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

+#ifdef DEBUG

                                int i;
 
                                int i;
 

-                               fprintf(stderr,"handle: %lu, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: %lu, ver: %lu, nummatch: %lu\n", e->handle, e->dwAction, e->dwStatus, e->dwEventId, e->dwCardType, e->hKernelPlugIn, e->dwOptions, e->u.Usb.deviceId.dwVendorId, e->u.Usb.deviceId.dwProductId, e->u.Usb.dwUniqueID, e->dwEventVer, e->dwNumMatchTables);
+                               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
 
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else

-//EVENT_PULL
-//handle: 1, action: 0, status: 0, eventid: 0, cardtype: 0, kplug: 0, options: 0, dev: 0:0, unique: 0, ver: 1, nummatch: 1
-//match: dev: 0:0, class: 0, subclass: 0, intclass: 0, intsubclass: 0, intproto: 0
-//handle: 1, action: 1, status: 0, eventid: 109, cardtype: 4294967294, kplug: 0, options: 0, dev: 0:0, unique: 90, ver: 1, nummatch: 1
-//match: dev: 3fd:8, class: 0, subclass: 0, intclass: ff, intsubclass: 0, intproto: 0
-                               if (usb_cable) {
-                                       struct usb_interface *interface = usb_cable->config->interface;
+                               if (usbdevice) {
+                                       struct usb_interface *interface = usbdevice->config->interface;

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

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

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

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

                        }
                        break;
 
                        }
                        break;
 


@@ -403,18 +896,34 @@ unsigned char dings[] = {0x12, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x40, 0xfd, 0
        return ret;
 }
 
        return ret;
 }
 

+int ioctl(int fd, unsigned long int request, ...) {
+       va_list args;
+       void *argp;
+       int ret;
+
+       if (!ioctl_func)                                                                    
+               ioctl_func = (int (*) (int, int, void *)) dlsym (RTLD_NEXT, "ioctl");             
+
+       va_start (args, request);
+       argp = va_arg (args, void *);
+       va_end (args);

 
 

-typedef int (*open_funcptr_t) (const char *, int, mode_t);
+       if (fd == windrvrfd)
+               ret = do_wdioctl(fd, request, argp);
+       else
+               ret = (*ioctl_func) (fd, request, argp);
+
+       return ret;
+}

 
 

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

        mode_t mode = 0;
        va_list args;
        int fd;
 
        if (!func)
        mode_t mode = 0;
        va_list args;
        int fd;
 
        if (!func)

-               func = (open_funcptr_t) dlsym (REAL_LIBC, "open");
+               func = (int (*) (const char *, int, mode_t)) dlsym (RTLD_NEXT, "open");

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


@@ -423,7 +932,7 @@ int open (const char *pathname, int flags, ...)
        }
 
        if (!strcmp (pathname, "/dev/windrvr6")) {
        }
 
        if (!strcmp (pathname, "/dev/windrvr6")) {

-               fprintf(stderr,"opening windrvr6\n");
+               DPRINTF("opening windrvr6\n");

 #ifdef NO_WINDRVR
                windrvrfd = fd = (*func) ("/dev/null", flags, mode);
 #else
 #ifdef NO_WINDRVR
                windrvrfd = fd = (*func) ("/dev/null", flags, mode);
 #else


@@ -436,118 +945,130 @@ int open (const char *pathname, int flags, ...)
 
                        busses = usb_get_busses();
                }
 
                        busses = usb_get_busses();
                }

-       } else {
-               fd = (*func) (pathname, flags, mode);
+
+               return fd;

        }
 
        }
 

-       return fd;
+       return (*func) (pathname, flags, mode);

 }
 
 }
 

-void diff(unsigned char *buf1, unsigned char *buf2, int len) {
-       int i;
+int close(int fd) {
+       static int (*func) (int) = NULL;

 
 

-       for(i=0; i<len; i++) {
-               if (buf1[i] != buf2[i]) {
-                       fprintf(stderr,"Diff at %d: %02x(%c)->%02x(%c)\n", i, buf1[i], ((buf1[i] >= 31 && buf1[i] <= 126)?buf1[i]:'.'), buf2[i], ((buf2[i] >= 31 && buf2[i] <= 126)?buf2[i]:'.'));
-               }
-       }
-}
+       if (!func)
+               func = (int (*) (int)) dlsym(RTLD_NEXT, "close");
+       
+       if (fd == windrvrfd && windrvrfd >= 0) {
+               DPRINTF("close windrvrfd\n");
+               if (usbinterface >= 0)
+                       usb_release_interface(usb_devhandle, usbinterface);

 
 

-void hexdump(unsigned char *buf, int len) {
-       int i;
+               if (usb_devhandle)
+                       usb_close(usb_devhandle);

 
 

-       for(i=0; i<len; i++) {
-               fprintf(stderr,"%02x ", buf[i]);
-               if ((i % 16) == 15)
-                       fprintf(stderr,"\n");
+               usb_devhandle = NULL;
+               usbinterface = -1;
+               windrvrfd = -1;

        }
        }

-}

 
 

-int ioctl(int fd, int request, ...)
-{
-       va_list args;
-       void *argp;
-       int ret;
-
-       if (!ioctl_func)                                                                    
-               ioctl_func = (int (*) (int, int, void *)) dlsym (REAL_LIBC, "ioctl");             
+       return (*func) (fd);
+}

 
 

-       va_start (args, request);
-       argp = va_arg (args, void *);
-       va_end (args);
+FILE *fopen(const char *path, const char *mode) {
+       FILE *ret;
+       static FILE* (*func) (const char*, const char*) = NULL;
+       char buf[256];
+       int i;

 
 

-       if (fd == windrvrfd)
-               ret = do_wdioctl(fd, request, argp);
-       else
-               ret = (*ioctl_func) (fd, request, argp);
+       if (!func)
+               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);
+                       }

 
 

-       return ret;
-}
+                       if (ret) {
+                               baseaddrfp = ret;
+                               baseaddrnum = i;
+                       }

 
 

-#if 0
-void *mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset)
-{
-       static void* (*func) (void *, size_t, int, int, int, off_t) = NULL;
-       void *ret;
+                       return ret;
+               }
+       }

 
 

-       if (!func)
-               func = (void* (*) (void *, size_t, int, int, int, off_t)) dlsym (REAL_LIBC, "mmap");
+       ret = (*func) (path, mode);

 
 

-       ret = (*func) (start, length, prot, flags, fd, offset);
-       fprintf(stderr,"MMAP: %x, %d, %d, %d, %d, %d -> %x\n", (unsigned int)start, length, prot, flags, fd, offset, (unsigned int)ret);
-       mmapped = ret;
-       mmapplen = length;
+       if (!strcmp(path, "/proc/modules")) {
+               DPRINTF("opening /proc/modules\n");
+#ifdef NO_WINDRVR
+               modulesfp = ret;
+               modules_read = 0;
+#endif
+       }

 
        return ret;
 }
 
 
        return ret;
 }
 

-void *mmap64(void *start, size_t length, int prot, int flags, int fd, off64_t offset)
-{
-       static void* (*func) (void *, size_t, int, int, int, off64_t) = NULL;
-       void *ret;
+char *fgets(char *s, int size, FILE *stream) {
+        static char* (*func) (char*, int, FILE*) = NULL;
+       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)
-               func = (void* (*) (void *, size_t, int, int, int, off64_t)) dlsym (REAL_LIBC, "mmap64");

 
 

-       ret = (*func) (start, length, prot, flags, fd, offset);
-       fprintf(stderr,"MMAP64: %x, %d, %d, %d, %d, %lld -> %x\n", (unsigned int)start, length, prot, flags, fd, offset, (unsigned int)ret);
-       mmapped = ret;
-       mmapplen = length;
+       if (!func)
+               func = (char* (*) (char*, int, FILE*)) dlsym(RTLD_NEXT, "fgets");
+       
+       if (modulesfp == stream) {
+               if (modules_read < sizeof(modules) / sizeof(modules[0])) {
+                       strcpy(s, modules[modules_read]);
+                       ret = s;
+                       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);
+       }

 
        return ret;
 }
 
 
        return ret;
 }
 

-void *mmap2(void *start, size_t length, int prot, int flags, int fd, off_t pgoffset)
-{
-       static void* (*func) (void *, size_t, int, int, int, off_t) = NULL;
-       void *ret;
+int fclose(FILE *fp) {
+       static int (*func) (FILE*) = NULL;

 
        if (!func)
 
        if (!func)

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

 
 

-       ret = (*func) (start, length, prot, flags, fd, pgoffset);
-       fprintf(stderr,"MMAP2: %x, %d, %d, %d, %d, %d -> %x\n", (unsigned int)start, length, prot, flags, fd, pgoffset, (unsigned int)ret);
-       mmapped = ret;
-       mmapplen = length;
+       if (fp == modulesfp) {
+               modulesfp = NULL;
+       }

 
 

-       return ret;
+       if (fp == baseaddrfp) {
+               baseaddrfp = NULL;
+       }
+       
+       return (*func)(fp);

 }
 
 }
 

-void *malloc(size_t size)
-{
-       static void* (*func) (size_t) = NULL;
-       void *ret;
+int access(const char *pathname, int mode) {
+       static int (*func) (const char*, int);

 
        if (!func)
 
        if (!func)

-               func = (void* (*) (size_t)) dlsym(REAL_LIBC, "malloc");
+               func = (int (*) (const char*, int)) dlsym(RTLD_NEXT, "access");

        
        

-       ret = (*func) (size);
-       
-       //fprintf(stderr,"MALLOC: %d -> %x\n", size, (unsigned int) ret);
-
-       return ret;
+       if (!strcmp(pathname, "/dev/windrvr6")) {
+               return 0;
+       } else {
+               return (*func)(pathname, mode);
+       }

 }
 }

-#endif
-
-
-#endif