add one supported and one untested cable

[usb-driver] / usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index 0383d123d034d62188bc63fc6c09b86ca1a149f3..26ce16b4d526d3eda709a5e63ae07350ccb4aac5 100644 (file)
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -33,7 +33,6 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <stdio.h>
-#include <usb.h>
 #include <signal.h>
 #include <errno.h>
 #include <inttypes.h>
@@ -45,11 +44,11 @@
 #include "xpcu.h"
 
 static int (*ioctl_func) (int, int, void *) = NULL;
-static int windrvrfd = -1;
+static int *windrvrfds = NULL;
+static int windrvrfds_count = 0;
 static unsigned long ppbase = 0;
 static unsigned long ecpbase = 0;
 static struct parport_config *pport = NULL;
-static struct xpcu_s *xpcu = NULL;
 static FILE *modulesfp = NULL;
 static FILE *baseaddrfp = NULL;
 static int baseaddrnum = 0;
@@ -57,13 +56,14 @@ static int modules_read = 0;
 
 #define NO_WINDRVR 1
 
-void hexdump(unsigned char *buf, int len) {
+void hexdump(unsigned char *buf, int len, char *prefix) {
        int i;
 
+       fprintf(stderr, "%s ", prefix);
        for(i=0; i<len; i++) {
                fprintf(stderr,"%02x ", buf[i]);
                if ((i % 16) == 15)
-                       fprintf(stderr,"\n");
+                       fprintf(stderr,"\n%s ", prefix);
        }
        fprintf(stderr,"\n");
 }
@@ -143,28 +143,27 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                ut->dwUniqueID, ut->dwPipeNum, ut->fRead,
                                ut->dwOptions, ut->dwBufferSize, ut->dwTimeout);
                                if (ut->dwPipeNum == 0) {
-                                       DPRINTF("-> setup packet: ");
-                                       hexdump(ut->SetupPacket, 8);
+                                       DPRINTF("-> setup packet:");
+                                       hexdump(ut->SetupPacket, 8, "");
                                }
 
                                if (!ut->fRead && ut->dwBufferSize)
                                {
-                                       hexdump(ut->pBuffer, ut->dwBufferSize);
+                                       hexdump(ut->pBuffer, ut->dwBufferSize, "->");
                                }
 #endif
 
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
-                               xpcu_transfer(xpcu, ut);
+                               ret = xpcu_transfer(ut);
 #endif
 
 #ifdef DEBUG
                                DPRINTF("Transferred: %lu (%s)\n",ut->dwBytesTransferred, (ut->fRead?"read":"write"));
                                if (ut->fRead && ut->dwBytesTransferred)
                                {
-                                       DPRINTF("<- Read: ");
-                                       hexdump(ut->pBuffer, ut->dwBytesTransferred);
+                                       hexdump(ut->pBuffer, ut->dwBytesTransferred, "<-");
                                }
 #endif
                        }
@@ -184,7 +183,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
-                               xpcu_int_state(xpcu, it, ENABLE_INTERRUPT);
+                               ret = xpcu_int_state(it, ENABLE_INTERRUPT);
 #endif
 
                                DPRINTF("<- Handle: 0x%lx, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
@@ -207,7 +206,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
-                               xpcu_int_state(xpcu, it, DISABLE_INTERRUPT);
+                               ret = xpcu_int_state(it, DISABLE_INTERRUPT);
 #endif
                                DPRINTF("<- Handle: 0x%lx, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
                                it->hInterrupt, it->dwOptions,
@@ -227,7 +226,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
-                               xpcu_set_interface(xpcu, usi);
+                               ret = xpcu_set_interface(usi);
 #endif
                                DPRINTF("<- unique: 0x%lx, interfacenum: %lu, alternatesetting: %lu, options: %lx\n",
                                usi->dwUniqueID, usi->dwInterfaceNum,
@@ -245,7 +244,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                ugdd->dwUniqueID, ugdd->dwBytes,
                                ugdd->dwOptions);
 
-                               ugdd->dwBytes = xpcu_deviceinfo(xpcu, ugdd);
+                               ret = xpcu_deviceinfo(ugdd);
 
                        }
                        break;
@@ -271,7 +270,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
-                               xpcu = xpcu_find(e);
+                               ret = xpcu_find(e);
 #endif
 
 #ifdef DEBUG
@@ -333,7 +332,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
-                               xpcu_close(xpcu, e);
+                               ret = xpcu_close(e);
 #endif
                        }
                        break;
@@ -351,7 +350,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
-                               xpcu_int_wait(xpcu, it);
+                               ret = xpcu_int_wait(it);
 #endif
 
                                DPRINTF("<- INT_WAIT_RETURN: Handle: 0x%lx, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
@@ -413,7 +412,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
-                               xpcu_found(xpcu, e);
+                               ret = xpcu_found(e);
 #endif
 
 #ifdef DEBUG
@@ -453,7 +452,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 int ioctl(int fd, unsigned long int request, ...) {
        va_list args;
        void *argp;
-       int ret;
+       int i;
 
        if (!ioctl_func)                                                                    
                ioctl_func = (int (*) (int, int, void *)) dlsym (RTLD_NEXT, "ioctl");             
@@ -462,12 +461,12 @@ int ioctl(int fd, unsigned long int request, ...) {
        argp = va_arg (args, void *);
        va_end (args);
 
-       if (fd == windrvrfd)
-               ret = do_wdioctl(fd, request, argp);
-       else
-               ret = (*ioctl_func) (fd, request, argp);
+       for (i = 0; i < windrvrfds_count; i++) {
+               if (fd == windrvrfds[i])
+                       return do_wdioctl(fd, request, argp);
+       }
 
-       return ret;
+       return (*ioctl_func) (fd, request, argp);
 }
 
 int open (const char *pathname, int flags, ...) {
@@ -486,11 +485,15 @@ int open (const char *pathname, int flags, ...) {
        }
 
        if (!strcmp (pathname, "/dev/windrvr6")) {
-               DPRINTF("opening windrvr6\n");
+               DPRINTF("opening windrvr6 (%d)\n", windrvrfds_count);
+               windrvrfds = realloc(windrvrfds, sizeof(int) * (++windrvrfds_count));
+               if (!windrvrfds)
+                       return -ENOMEM;
+
 #ifdef NO_WINDRVR
-               windrvrfd = fd = (*func) ("/dev/null", flags, mode);
+               windrvrfds[windrvrfds_count-1] = fd = (*func) ("/dev/null", flags, mode);
 #else
-               windrvrfd = fd = (*func) (pathname, flags, mode);
+               windrvrfds[windrvrfds_count-1] = fd = (*func) (pathname, flags, mode);
 #endif
 
                return fd;
@@ -501,15 +504,22 @@ int open (const char *pathname, int flags, ...) {
 
 int close(int fd) {
        static int (*func) (int) = NULL;
+       int i;
 
        if (!func)
                func = (int (*) (int)) dlsym(RTLD_NEXT, "close");
        
-       if (fd == windrvrfd && windrvrfd >= 0) {
-               DPRINTF("close windrvrfd\n");
-
-               xpcu = NULL;
-               windrvrfd = -1;
+       for (i = 0; i < windrvrfds_count; i++) {
+               if (fd == windrvrfds[i] && windrvrfds[i] >= 0) {
+                       int remaining = windrvrfds_count - (i + 1);
+                       DPRINTF("close windrvr6 (%d)\n", i);
+                       if (remaining)
+                               memmove(&(windrvrfds[i]), &(windrvrfds[i+1]), remaining * sizeof(int));
+                       windrvrfds = realloc(windrvrfds, sizeof(int) * --windrvrfds_count);
+                       if (!windrvrfds_count)
+                               windrvrfds = NULL;
+                       break;
+               }
        }
 
        return (*func) (fd);