XILINX platform cable USB DLC9 works, too (reported by Johannes Hanika)

[usb-driver] / usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index be08eff4236fec1f5d5de7194225f2926a92d874..27a9580a4ade4c06b27d5049edb98ef5ea773692 100644 (file)
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -1,4 +1,4 @@
-/* libusb connector for XILINX impact
+/* libusb/ppdev connector for XILINX impact

  *
  * Copyright (c) 2007 Michael Gernoth <michael@gernoth.net>
  *
  *
  * Copyright (c) 2007 Michael Gernoth <michael@gernoth.net>
  *


@@ -37,24 +37,30 @@
 #include <signal.h>
 #include <pthread.h>
 #include <errno.h>
 #include <signal.h>
 #include <pthread.h>
 #include <errno.h>

+#include <inttypes.h>
+#include <sys/ioctl.h>

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

+#include "config.h"

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

-static int windrvrfd = 0;
-FILE *modulesfp;
+static int windrvrfd = -1;
+static unsigned long ppbase = 0;
+static unsigned long ecpbase = 0;
+static struct parport_config *pport = NULL;
+FILE *modulesfp = NULL;
+FILE *baseaddrfp = NULL;
+int baseaddrnum = 0;

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

+static int usbinterface = -1;

 static unsigned long card_type;
 static int ints_enabled = 0;
 static pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER;
 
 #define NO_WINDRVR 1
 static unsigned long card_type;
 static int ints_enabled = 0;
 static pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER;
 
 #define NO_WINDRVR 1

-#undef DEBUG

 
 

-#ifdef DEBUG
-#define DPRINTF(format, args...) fprintf(stderr, format, ##args)

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


@@ -65,9 +71,6 @@ void hexdump(unsigned char *buf, int len) {
        }
        fprintf(stderr,"\n");
 }
        }
        fprintf(stderr,"\n");
 }

-#else
-#define DPRINTF(format, args...)
-#endif

 
 int usb_deviceinfo(unsigned char *buf) {
        int i,j,k,l;
 
 int usb_deviceinfo(unsigned char *buf) {
        int i,j,k,l;


@@ -239,10 +242,10 @@ 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");
+                       strcpy(version->version, "libusb-driver.so version: " USB_DRIVER_VERSION);

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


@@ -251,14 +254,46 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        DPRINTF("LICENSE\n");
                        break;
 
                        DPRINTF("LICENSE\n");
                        break;
 

+               case CARD_REGISTER_OLD:

                case CARD_REGISTER:
                case CARD_REGISTER:

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

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

-                       }
+
+                               DPRINTF("Items: %lu, Addr: 0x%lx, bytes: %lu, bar: %lu\n",
+                               cr->Card.dwItems,
+                               (unsigned long)cr->Card.Item[0].I.IO.dwAddr,
+                               cr->Card.Item[0].I.IO.dwBytes,
+                               cr->Card.Item[0].I.IO.dwBar);
+                               
+                               DPRINTF("Items: %lu, Addr: 0x%lx, bytes: %lu, bar: %lu\n",
+                               cr->Card.dwItems,
+                               (unsigned long)cr->Card.Item[1].I.IO.dwAddr,
+                               cr->Card.Item[1].I.IO.dwBytes,
+                               cr->Card.Item[1].I.IO.dwBar);
+#ifndef NO_WINDRVR
+                               ret = (*ioctl_func) (fd, request, wdioctl);
+#else
+
+                               pport = config_get((unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10);
+                               if (!pport)
+                                       break;
+
+                               ret = pport->open((unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10);
+
+                               ppbase = (unsigned long)cr->Card.Item[0].I.IO.dwAddr;
+
+                               if (cr->Card.dwItems > 1 && cr->Card.Item[1].I.IO.dwAddr)
+                                       ecpbase = (unsigned long)cr->Card.Item[1].I.IO.dwAddr;
+
+                               if (ret >= 0) {
+                                       cr->hCard = ret;
+                               } else {
+                                       cr->hCard = 0;
+                               }

 #endif
 #endif

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

                        break;
 
                case USB_TRANSFER:
                        break;
 
                case USB_TRANSFER:


@@ -320,6 +355,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        }
                        break;
 
                        }
                        break;
 

+               case INT_ENABLE_OLD:

                case INT_ENABLE:
                        DPRINTF("INT_ENABLE\n");
                        {
                case INT_ENABLE:
                        DPRINTF("INT_ENABLE\n");
                        {


@@ -382,6 +418,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                        ret = usb_claim_interface(usb_devhandle, usbdevice->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber);
                                        if (!ret) {
                                                if(!ret) {
                                        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);
                                                        ret = usb_set_altinterface(usb_devhandle, usi->dwAlternateSetting);
                                                        if (ret)
                                                                fprintf(stderr, "usb_set_altinterface: %d\n", ret);


@@ -401,6 +438,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        }
                        break;
 
                        }
                        break;
 

+               case USB_GET_DEVICE_DATA_OLD:

                case USB_GET_DEVICE_DATA:
                        DPRINTF("USB_GET_DEVICE_DATA\n");
                        {
                case USB_GET_DEVICE_DATA:
                        DPRINTF("USB_GET_DEVICE_DATA\n");
                        {


@@ -422,11 +460,14 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        }
                        break;
 
                        }
                        break;
 

+               case EVENT_REGISTER_OLD:

                case EVENT_REGISTER:
                        DPRINTF("EVENT_REGISTER\n");
                        {
                                struct event *e = (struct event*)(wdheader->data);
                                struct usb_bus *bus;
                case EVENT_REGISTER:
                        DPRINTF("EVENT_REGISTER\n");
                        {
                                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",


@@ -438,6 +479,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",


@@ -452,13 +524,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;


@@ -514,11 +590,32 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        }
                        break;
 
                        }
                        break;
 

+               case TRANSFER_OLD:

                case TRANSFER:
                        DPRINTF("TRANSFER\n");
                case TRANSFER:
                        DPRINTF("TRANSFER\n");

+                       {
+                               WD_TRANSFER *tr = (WD_TRANSFER*)(wdheader->data);
+

 #ifndef NO_WINDRVR
 #ifndef NO_WINDRVR

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

 #endif
 #endif

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

                        break;
 
                case EVENT_UNREGISTER:
                        break;
 
                case EVENT_UNREGISTER:


@@ -563,9 +660,25 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 
                case CARD_UNREGISTER:
                        DPRINTF("CARD_UNREGISTER\n");
 
                case CARD_UNREGISTER:
                        DPRINTF("CARD_UNREGISTER\n");

+                       {
+                               struct card_register* cr = (struct card_register*)(wdheader->data);
+
+                               DPRINTF("Addr: 0x%lx, bytes: %lu, bar: %lu\n",
+                               (unsigned long)cr->Card.Item[0].I.IO.dwAddr,
+                               cr->Card.Item[0].I.IO.dwBytes,
+                               cr->Card.Item[0].I.IO.dwBar);
+
+                               DPRINTF("hCard: %lu\n", cr->hCard);
+

 #ifndef NO_WINDRVR
 #ifndef NO_WINDRVR

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

 #endif
 #endif

+                       }

                        break;
 
                case EVENT_PULL:
                        break;
 
                case EVENT_PULL:


@@ -648,7 +761,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
        return ret;
 }
 
        return ret;
 }
 

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

        va_list args;
        void *argp;
        int ret;
        va_list args;
        void *argp;
        int ret;


@@ -710,9 +823,17 @@ int close(int fd) {
        if (!func)
                func = (int (*) (int)) dlsym(RTLD_NEXT, "close");
        
        if (!func)
                func = (int (*) (int)) dlsym(RTLD_NEXT, "close");
        

-       if (fd == windrvrfd) {
+       if (fd == windrvrfd && windrvrfd >= 0) {

                DPRINTF("close windrvrfd\n");
                DPRINTF("close windrvrfd\n");

-               windrvrfd = 0;
+               if (usbinterface >= 0)
+                       usb_release_interface(usb_devhandle, usbinterface);
+
+               if (usb_devhandle)
+                       usb_close(usb_devhandle);
+
+               usb_devhandle = NULL;
+               usbinterface = -1;
+               windrvrfd = -1;

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


@@ -721,13 +842,34 @@ int close(int fd) {
 FILE *fopen(const char *path, const char *mode) {
        FILE *ret;
        static FILE* (*func) (const char*, const char*) = NULL;
 FILE *fopen(const char *path, const char *mode) {
        FILE *ret;
        static FILE* (*func) (const char*, const char*) = NULL;

+       char buf[256];
+       int i;

 
        if (!func)
                func = (FILE* (*) (const char*, const char*)) dlsym(RTLD_NEXT, "fopen");
 
 
        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);
+                       }
+
+                       if (ret) {
+                               baseaddrfp = ret;
+                               baseaddrnum = i;
+                       }
+
+                       return ret;
+               }
+       }
+

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

-       if (!strcmp (path, "/proc/modules")) {
+       if (!strcmp(path, "/proc/modules")) {

                DPRINTF("opening /proc/modules\n");
 #ifdef NO_WINDRVR
                modulesfp = ret;
                DPRINTF("opening /proc/modules\n");
 #ifdef NO_WINDRVR
                modulesfp = ret;


@@ -741,6 +883,7 @@ FILE *fopen(const char *path, const char *mode) {
 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 *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;
 
 
        char *ret = NULL;
 
 


@@ -748,11 +891,16 @@ char *fgets(char *s, int size, FILE *stream) {
                func = (char* (*) (char*, int, FILE*)) dlsym(RTLD_NEXT, "fgets");
        
        if (modulesfp == stream) {
                func = (char* (*) (char*, int, FILE*)) dlsym(RTLD_NEXT, "fgets");
        
        if (modulesfp == stream) {

-               if (modules_read < sizeof(modules)) {
+               if (modules_read < sizeof(modules) / sizeof(modules[0])) {

                        strcpy(s, modules[modules_read]);
                        ret = s;
                        modules_read++;
                }
                        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);
        }
        } else {
                ret = (*func)(s,size,stream);
        }


@@ -769,6 +917,10 @@ int fclose(FILE *fp) {
        if (fp == modulesfp) {
                modulesfp = NULL;
        }
        if (fp == modulesfp) {
                modulesfp = NULL;
        }

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

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


@@ -778,8 +930,8 @@ 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);