Fix 32-bit ISE 10.1 on 64-bit platform.

[usb-driver] / usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index b39c4fc506264e8ed5564f25e0e1bb1f7e2466fb..def52dbf587cf7115f6ed679aab59d5a6cb03280 100644 (file)
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -39,22 +39,19 @@
 #include <errno.h>
 #include <inttypes.h>
 #include <sys/ioctl.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <sys/ioctl.h>

-#include <linux/parport.h>
-#include <linux/ppdev.h>
+#include <sys/utsname.h>
+#include <bits/wordsize.h>

 #include "usb-driver.h"
 #include "config.h"
 #include "usb-driver.h"
 #include "config.h"

-#ifdef JTAGKEY
-#include "jtagkey.h"
-#endif

 
 static int (*ioctl_func) (int, int, void *) = NULL;
 static int windrvrfd = -1;
 
 static int (*ioctl_func) (int, int, void *) = NULL;
 static int windrvrfd = -1;

-static int parportfd = -1;

 static unsigned long ppbase = 0;
 static unsigned long ecpbase = 0;
 static unsigned long ppbase = 0;
 static unsigned long ecpbase = 0;

-FILE *modulesfp = NULL;
-FILE *baseaddrfp = NULL;
-int baseaddrnum = 0;
+static struct parport_config *pport = NULL;
+static FILE *modulesfp = NULL;
+static FILE *baseaddrfp = NULL;
+static int baseaddrnum = 0;

 static int modules_read = 0;
 static struct usb_bus *busses = NULL;
 static struct usb_device *usbdevice;
 static int modules_read = 0;
 static struct usb_bus *busses = NULL;
 static struct usb_device *usbdevice;


@@ -77,7 +74,7 @@ void hexdump(unsigned char *buf, int len) {
        fprintf(stderr,"\n");
 }
 
        fprintf(stderr,"\n");
 }
 

-int usb_deviceinfo(unsigned char *buf) {
+static int usb_deviceinfo(unsigned char *buf) {

        int i,j,k,l;
        int len = 0;
        WDU_CONFIGURATION **pConfigs, **pActiveConfig;
        int i,j,k,l;
        int len = 0;
        WDU_CONFIGURATION **pConfigs, **pActiveConfig;


@@ -237,107 +234,7 @@ int usb_deviceinfo(unsigned char *buf) {
        return len;
 }
 
        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) {
+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;


@@ -350,7 +247,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
        switch(request & ~(0xc0000000)) {
                case VERSION:
                        version = (struct version_struct*)(wdheader->data);
        switch(request & ~(0xc0000000)) {
                case VERSION:
                        version = (struct version_struct*)(wdheader->data);

-                       strcpy(version->version, "libusb-driver.so $Revision: 1.66 $");
+                       strcpy(version->version, "libusb-driver.so version: " USB_DRIVER_VERSION);

                        version->versionul = 802;
                        DPRINTF("VERSION\n");
                        break;
                        version->versionul = 802;
                        DPRINTF("VERSION\n");
                        break;


@@ -364,7 +261,6 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        DPRINTF("CARD_REGISTER\n");
                        {
                                struct card_register* cr = (struct card_register*)(wdheader->data);
                        DPRINTF("CARD_REGISTER\n");
                        {
                                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,
 
                                DPRINTF("Items: %lu, Addr: 0x%lx, bytes: %lu, bar: %lu\n",
                                cr->Card.dwItems,


@@ -380,64 +276,23 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else

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

 
 

+                               pport = config_get((unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10);
+                               if (!pport)

                                        break;
                                        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);
+                               ret = pport->open((unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10);

 
 

-                                       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
-                                       }
+                               ppbase = (unsigned long)cr->Card.Item[0].I.IO.dwAddr;

 
 

-                                       cr->hCard = parportfd;
-                               }
+                               if (cr->Card.dwItems > 1 && cr->Card.Item[1].I.IO.dwAddr)
+                                       ecpbase = (unsigned long)cr->Card.Item[1].I.IO.dwAddr;

 
 

-                               ppbase = (unsigned long)cr->Card.Item[0].I.IO.dwAddr;
-                               if (ret < 0)
+                               if (ret >= 0) {
+                                       cr->hCard = ret;
+                               } else {

                                        cr->hCard = 0;
                                        cr->hCard = 0;

+                               }

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


@@ -613,6 +468,8 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        {
                                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;
 
                                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",
                                int i;
 
                                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",


@@ -624,6 +481,37 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                e->u.Usb.dwUniqueID, e->dwEventVer,
                                e->dwNumMatchTables);
 
                                e->u.Usb.dwUniqueID, e->dwEventVer,
                                e->dwNumMatchTables);
 

+                               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++) {
 
                                        DPRINTF("match: dev: %04x:%04x, class: %x, subclass: %x, intclass: %x, intsubclass: %x, intproto: %x\n",
                                for (i = 0; i < e->dwNumMatchTables; i++) {
 
                                        DPRINTF("match: dev: %04x:%04x, class: %x, subclass: %x, intclass: %x, intsubclass: %x, intproto: %x\n",


@@ -638,13 +526,17 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                        for (bus = busses; bus; bus = bus->next) {
                                                struct usb_device *dev;
 
                                        for (bus = busses; bus; bus = bus->next) {
                                                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 ac;
                                                                   for (ac = 0; ac < desc->bNumConfigurations; ac++) {
                                                                           struct usb_interface *interface = dev->config[ac].interface;


@@ -709,14 +601,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else

-
-#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);
+                               ret = pport->transfer(tr, fd, request, ppbase, ecpbase, 1);

 #endif
                        }
                        break;
 #endif
                        }
                        break;


@@ -727,22 +612,10 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        {
                                WD_TRANSFER *tr = (WD_TRANSFER*)(wdheader->data);
                                unsigned long num = wdheader->size/sizeof(WD_TRANSFER);
                        {
                                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
 #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);
-                               }
+                               ret = pport->transfer(tr, fd, request, ppbase, ecpbase, num);

 #endif
                        }
                        break;
 #endif
                        }
                        break;


@@ -802,16 +675,10 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else

-#ifdef JTAGKEY
-                               if (cr->hCard == 0xff)
-                                       jtagkey_close();
-#endif
+                               if (pport)
+                                       pport->close(cr->hCard);

 
 

-                               if (parportfd == cr->hCard && parportfd >= 0) {
-                                       ioctl(parportfd, PPRELEASE);
-                                       close(parportfd);
-                                       parportfd = -1;
-                               }
+                               pport = NULL;

 #endif
                        }
                        break;
 #endif
                        }
                        break;


@@ -1065,10 +932,28 @@ int access(const char *pathname, int mode) {
 
        if (!func)
                func = (int (*) (const char*, int)) dlsym(RTLD_NEXT, "access");
 
        if (!func)
                func = (int (*) (const char*, int)) dlsym(RTLD_NEXT, "access");

-       
-       if (!strcmp(pathname, "/dev/windrvr6")) {
+
+       if (pathname && !strcmp(pathname, "/dev/windrvr6")) {

                return 0;
        } else {
                return (*func)(pathname, mode);
        }
 }
                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