]> git.zerfleddert.de Git - usb-driver/blobdiff - usb-driver.c
add short note about cleaning cable locks
[usb-driver] / usb-driver.c
index 33268f048c7523d7fb2569b4e4c761bceb6eee14..be3b94ffaded07ff9285328551126c1ea58c98f9 100644 (file)
 #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 "usb-driver.h"
 #include "usb-driver.h"
+#include "config.h"
 
 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 int parportnum = 0;
 static unsigned long ppbase = 0;
 static unsigned long ecpbase = 0;
 static unsigned long ppbase = 0;
 static unsigned long ecpbase = 0;
+static struct parport_config *pport = NULL;
 FILE *modulesfp = 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 int modules_read = 0;
 static struct usb_bus *busses = NULL;
 static struct usb_device *usbdevice;
@@ -61,8 +61,6 @@ static pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER;
 
 #define NO_WINDRVR 1
 
 
 #define NO_WINDRVR 1
 
-#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;
 
@@ -73,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;
@@ -237,95 +232,6 @@ 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 long port = (unsigned long)tr->dwPort;
-       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;
-
-       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);
-                               break;
-
-                       default:
-                               fprintf(stderr,"!!!Unsupported TRANSFER command: %lu!!!\n", tr->cmdTrans);
-                               ret = -1;
-                               break;
-               }
-       } else if (port == ppbase + PP_STATUS) {
-               DPRINTF("status port\n");
-               switch(tr->cmdTrans) {
-                       case PP_READ:
-                               ret = ioctl(parportfd, PPRSTATUS, &val);
-                               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 {
-               DPRINTF("access to unsupported address range (probably ECP)!\n");
-               ret = 0;
-       }
-
-       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;
@@ -339,7 +245,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, "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;
@@ -353,7 +259,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,
@@ -369,45 +274,22 @@ 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
-                               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;
-
-                                       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.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) {
-                                                       ecpbase = 0;
-                                                       pmode = IEEE1284_MODE_COMPAT;
-                                                       if (ioctl(parportfd, PPNEGOT, &pmode) == -1)
-                                                               return ret;
-                                               }
-#endif
-                                       }
+                               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);
 
 
-                                       cr->hCard = parportfd;
-                                       ppbase = (unsigned long)cr->Card.Item[0].I.IO.dwAddr;
+                               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
                                DPRINTF("hCard: %lu\n", cr->hCard);
                                }
 #endif
                                DPRINTF("hCard: %lu\n", cr->hCard);
@@ -677,7 +559,11 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        {
                                WD_TRANSFER *tr = (WD_TRANSFER*)(wdheader->data);
 
                        {
                                WD_TRANSFER *tr = (WD_TRANSFER*)(wdheader->data);
 
-                               ret = pp_transfer(tr, fd, request, wdioctl);
+#ifndef NO_WINDRVR
+                               ret = (*ioctl_func) (fd, request, wdioctl);
+#else
+                               ret = pport->transfer(tr, fd, request, ppbase, ecpbase, 1);
+#endif
                        }
                        break;
 
                        }
                        break;
 
@@ -687,24 +573,11 @@ 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;
-
-
-                               for (i = 0; i < num; i++) {
-                                       DPRINTF("Transfer %d:\n", i+1);
 #ifndef NO_WINDRVR
 #ifndef NO_WINDRVR
-                                       wdheader->size = sizeof(WD_TRANSFER);
-                                       request = TRANSFER;
-                                       wdheader->data = tr + i;
-#endif
-                                       ret = pp_transfer(tr + i, fd, request, wdioctl);
-                               }
-
-#ifndef NO_WINDRVR
-                               wdheader->data = tr;
+                               ret = (*ioctl_func) (fd, request, wdioctl);
+#else
+                               ret = pport->transfer(tr, fd, request, ppbase, ecpbase, num);
 #endif
 #endif
-
-                               return ret;
                        }
                        break;
 
                        }
                        break;
 
@@ -763,12 +636,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
-                               if (parportfd == cr->hCard && parportfd >= 0) {
-                                       ioctl(parportfd, PPRELEASE);
-                                       close(parportfd);
-                                       parportfd = -1;
-                                       parportnum--;
-                               }
+                               pport->close(cr->hCard);
 #endif
                        }
                        break;
 #endif
                        }
                        break;
@@ -934,13 +802,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;
@@ -954,6 +843,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;
 
 
@@ -966,6 +856,11 @@ char *fgets(char *s, int size, FILE *stream) {
                        ret = s;
                        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);
        }
@@ -982,6 +877,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);
 }
@@ -991,8 +890,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);
Impressum, Datenschutz