impact requests ECP addresses, even when ECP is not available. Ignore

[usb-driver] / usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index d38da3e4dfdc2bf8a5a4321beec0e7cff41b14c5..7523c1360eeba5c0f94212faa2d93b321f5968ad 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,21 +37,29 @@
 #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 <linux/parport.h>
+#include <linux/ppdev.h>

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

-static int windrvrfd = 0;
-FILE *modulesfp;
+static int windrvrfd = -1;
+static int parportfd = -1;
+static int parportnum = 0;
+static unsigned long ppbase = 0;
+static unsigned long ecpbase = 0;
+FILE *modulesfp = 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 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)
 
 #ifdef DEBUG
 #define DPRINTF(format, args...) fprintf(stderr, format, ##args)


@@ -229,6 +237,70 @@ int usb_deviceinfo(unsigned char *buf) {
        return len;
 }
 
        return len;
 }
 

+int pp_transfer(WD_TRANSFER *tr, int fd, unsigned int request, unsigned char *wdioctl) {
+       int ret = 0;
+       unsigned char val;
+
+       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
+
+#ifndef NO_WINDRVR
+       ret = (*ioctl_func) (fd, request, wdioctl);
+#else
+       if (parportfd < 0)
+               return ret;
+
+       switch(tr->cmdTrans) {
+               case 10: /* Read Byte */
+                       if ((unsigned long)tr->dwPort == ppbase) { /* Data Port */
+                               ret = 0; /* We don't support reading of the data port */
+                       } else if ((unsigned long)tr->dwPort == ppbase + 1) { /* Status Port */
+                               DPRINTF("status port\n");
+                               ret = ioctl(parportfd, PPRSTATUS, &val);
+                       } else if ((unsigned long)tr->dwPort == ppbase + 2) { /* Control Port */
+                               DPRINTF("control port\n");
+                               ret = ioctl(parportfd, PPRCONTROL, &val);
+                       }
+                       break;
+               case 13: /* Write Byte */
+                       if ((unsigned long)tr->dwPort == ppbase) { /* Data Port */
+                               DPRINTF("data port\n");
+                               ret = ioctl(parportfd, PPWDATA, &val);
+                       } else if ((unsigned long)tr->dwPort == ppbase + 1) { /* Status Port */
+                               ret = 0; /* Status Port is readonly */
+                       } else if ((unsigned long)tr->dwPort == ppbase + 2) { /* Control Port */
+                               DPRINTF("control port\n");
+                               ret = ioctl(parportfd, PPWCONTROL, &val);
+                       }
+                       break;
+               default:
+                       fprintf(stderr,"!!!Unsupported TRANSFER command: %lu!!!\n", tr->cmdTrans);
+                       ret = -1;
+                       break;
+       }
+
+       tr->Data.Byte = val;
+#endif
+
+       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;
        struct version_struct *version;
 int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
        struct header_struct* wdheader = (struct header_struct*)wdioctl;
        struct version_struct *version;


@@ -239,7 +311,7 @@ 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);
                        strcpy(version->version, "WinDriver no more");
                case VERSION:
                        version = (struct version_struct*)(wdheader->data);
                        strcpy(version->version, "WinDriver no more");


@@ -251,14 +323,68 @@ 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);

-                       }
+                               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
+                               if (parportfd < 0) {
+                                       snprintf(ppdev, sizeof(ppdev), "/dev/parport%d", parportnum);
+                                       DPRINTF("opening %s\n", ppdev);
+                                       parportfd = open(ppdev, O_RDWR|O_EXCL);
+                                       parportnum++;
+
+                                       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;
+
+                                       pmode = IEEE1284_MODE_COMPAT;
+                                       if (ioctl(parportfd, PPNEGOT, &pmode) == -1)
+                                               return ret;
+                                       
+                                       if (cr->Card.dwItems > 1 && cr->Card.Item[1].I.IO.dwBytes) {
+                                               DPRINTF("ECP mode requested\n");
+                                               ecpbase = cr->Card.Item[1].I.IO.dwBytes;
+                                               /* TODO: Implement ECP mode */
+#if 0
+                                               pmode = IEEE1284_MODE_ECP;
+
+                                               if (ioctl(parportfd, PPNEGOT, &pmode) == -1) {
+                                                       pmode = IEEE1284_MODE_COMPAT;
+                                                       if (ioctl(parportfd, PPNEGOT, &pmode) == -1)
+                                                               return ret;
+                                               }

 #endif
 #endif

-                       DPRINTF("CARD_REGISTER\n");
+                                       }
+
+                                       cr->hCard = parportfd;
+                                       ppbase = (unsigned long)cr->Card.Item[0].I.IO.dwAddr;
+                               }
+#endif
+                               DPRINTF("hCard: %lu\n", cr->hCard);
+                       }

                        break;
 
                case USB_TRANSFER:
                        break;
 
                case USB_TRANSFER:


@@ -320,6 +446,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 +509,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 +529,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,6 +551,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        }
                        break;
 
                        }
                        break;
 

+               case EVENT_REGISTER_OLD:

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


@@ -514,11 +644,41 @@ 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);
+
+                               ret = pp_transfer(tr, fd, request, wdioctl);
+                       }
+                       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;
+
+
+                               for (i = 0; i < num; i++) {
+                                       DPRINTF("Transfer %d:\n", i+1);

 #ifndef NO_WINDRVR
 #ifndef NO_WINDRVR

-                       ret = (*ioctl_func) (fd, request, wdioctl);
+                                       wdheader->size = sizeof(WD_TRANSFER);
+                                       request = TRANSFER;
+                                       wdheader->data = tr + i;

 #endif
 #endif

+                                       ret = pp_transfer(tr + i, fd, request, wdioctl);
+                               }
+
+#ifndef NO_WINDRVR
+                               wdheader->data = tr;
+#endif
+
+                               return ret;
+                       }

                        break;
 
                case EVENT_UNREGISTER:
                        break;
 
                case EVENT_UNREGISTER:


@@ -563,9 +723,27 @@ 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 (parportfd == cr->hCard && parportfd >= 0) {
+                                       ioctl(parportfd, PPRELEASE);
+                                       close(parportfd);
+                                       parportfd = -1;
+                                       parportnum--;
+                               }

 #endif
 #endif

+                       }

                        break;
 
                case EVENT_PULL:
                        break;
 
                case EVENT_PULL:


@@ -648,7 +826,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;


@@ -660,7 +838,7 @@ int ioctl(int fd, int request, ...) {
        argp = va_arg (args, void *);
        va_end (args);
 
        argp = va_arg (args, void *);
        va_end (args);
 

-       if (windrvrfd && (fd == windrvrfd))
+       if (fd == windrvrfd)

                ret = do_wdioctl(fd, request, argp);
        else
                ret = (*ioctl_func) (fd, request, argp);
                ret = do_wdioctl(fd, request, argp);
        else
                ret = (*ioctl_func) (fd, request, argp);


@@ -710,9 +888,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);


@@ -748,7 +934,7 @@ 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++;