]> cvs.zerfleddert.de Git - usb-driver/blobdiff - usb-driver.c
Let usb-driver work with a no-module kernel by Gyorgy 'nog' Jeney
[usb-driver] / usb-driver.c
index 2f61e2bb3bc6f1068ef087e4798996d2c7b45ea5..264366bac6bcb075a1574b9bc9a41bdfe4c24aa1 100644 (file)
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <stdio.h>
-#include <usb.h>
 #include <signal.h>
-#include <pthread.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <sys/ioctl.h>
 #include <sys/utsname.h>
 #include <bits/wordsize.h>
+#include <sys/ipc.h>
+#include <sys/sem.h>
 #include "usb-driver.h"
 #include "config.h"
 #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;
 static int modules_read = 0;
-static int ints_enabled = 0;
-static pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER;
 
 #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");
 }
@@ -100,13 +99,13 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        {
                                struct card_register* cr = (struct card_register*)(wdheader->data);
 
-                               DPRINTF("Items: %lu, Addr: 0x%lx, bytes: %lu, bar: %lu\n",
+                               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",
+                               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,
@@ -132,42 +131,41 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                        cr->hCard = 0;
                                }
 #endif
-                               DPRINTF("hCard: %lu\n", cr->hCard);
+                               DPRINTF("<-hCard: %lu\n", cr->hCard);
                        }
                        break;
 
                case USB_TRANSFER:
-                       DPRINTF("in USB_TRANSFER");
+                       DPRINTF("USB_TRANSFER\n");
                        {
                                struct usb_transfer *ut = (struct usb_transfer*)(wdheader->data);
 
 #ifdef DEBUG
-                               DPRINTF(" unique: 0x%lx, pipe: %lu, read: %lu, options: %lx, size: %lu, timeout: %lx\n",
+                               DPRINTF("-> unique: 0x%lx, pipe: %lu, read: %lu, options: %lx, size: %lu, timeout: %lx\n",
                                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
                        }
@@ -179,15 +177,21 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        {
                                struct interrupt *it = (struct interrupt*)(wdheader->data);
 
-                               DPRINTF("Handle: 0x%lx, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
+                               DPRINTF("-> Handle: 0x%lx, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
                                it->hInterrupt, it->dwOptions,
                                it->dwCmds, it->fEnableOk, it->dwCounter,
                                it->dwLost, it->fStopped);
 
-                               it->fEnableOk = 1;
-                               it->fStopped = 0;
-                               ints_enabled = 1;
-                               pthread_mutex_trylock(&int_wait);
+#ifndef NO_WINDRVR
+                               ret = (*ioctl_func) (fd, request, wdioctl);
+#else
+                               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",
+                               it->hInterrupt, it->dwOptions,
+                               it->dwCmds, it->fEnableOk, it->dwCounter,
+                               it->dwLost, it->fStopped);
                        }
 
                        break;
@@ -197,20 +201,16 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        {
                                struct interrupt *it = (struct interrupt*)(wdheader->data);
 
-                               DPRINTF("Handle: 0x%lx, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
+                               DPRINTF("-> Handle: 0x%lx, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
                                it->hInterrupt, it->dwOptions,
                                it->dwCmds, it->fEnableOk, it->dwCounter,
                                it->dwLost, it->fStopped);
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
-                               it->dwCounter = 0;
-                               it->fStopped = 1;
-                               ints_enabled = 0;
-                               if (pthread_mutex_trylock(&int_wait) == EBUSY)
-                                       pthread_mutex_unlock(&int_wait);
+                               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",
+                               DPRINTF("<- Handle: 0x%lx, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
                                it->hInterrupt, it->dwOptions,
                                it->dwCmds, it->fEnableOk, it->dwCounter,
                                it->dwLost, it->fStopped);
@@ -222,15 +222,15 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        {
                                struct usb_set_interface *usi = (struct usb_set_interface*)(wdheader->data);
 
-                               DPRINTF("unique: 0x%lx, interfacenum: %lu, alternatesetting: %lu, options: %lx\n",
+                               DPRINTF("-> unique: 0x%lx, interfacenum: %lu, alternatesetting: %lu, options: %lx\n",
                                usi->dwUniqueID, usi->dwInterfaceNum,
                                usi->dwAlternateSetting, usi->dwOptions);
 #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",
+                               DPRINTF("<- unique: 0x%lx, interfacenum: %lu, alternatesetting: %lu, options: %lx\n",
                                usi->dwUniqueID, usi->dwInterfaceNum,
                                usi->dwAlternateSetting, usi->dwOptions);
                        }
@@ -242,11 +242,11 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        {
                                struct usb_get_device_data *ugdd = (struct usb_get_device_data*)(wdheader->data);
 
-                               DPRINTF("unique: 0x%lx, bytes: %lu, options: %lx\n",
+                               DPRINTF("-> unique: 0x%lx, bytes: %lu, options: %lx\n",
                                ugdd->dwUniqueID, ugdd->dwBytes,
                                ugdd->dwOptions);
 
-                               ugdd->dwBytes = xpcu_deviceinfo(xpcu, ugdd);
+                               ret = xpcu_deviceinfo(ugdd);
 
                        }
                        break;
@@ -260,7 +260,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                int i;
 #endif
 
-                               DPRINTF("handle: 0x%lx, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: 0x%lx, ver: %lu, nummatch: %lu\n",
+                               DPRINTF("-> handle: 0x%lx, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: 0x%lx, ver: %lu, nummatch: %lu\n",
                                e->handle, e->dwAction,
                                e->dwStatus, e->dwEventId, e->dwCardType,
                                e->hKernelPlugIn, e->dwOptions,
@@ -269,15 +269,14 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                e->u.Usb.dwUniqueID, e->dwEventVer,
                                e->dwNumMatchTables);
 
-                               xpcu = xpcu_find(e);
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
-                               e->handle = (unsigned long)xpcu;
+                               ret = xpcu_find(e);
 #endif
 
 #ifdef DEBUG
-                               DPRINTF("handle: 0x%lx, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: 0x%lx, ver: %lu, nummatch: %lu\n",
+                               DPRINTF("<- handle: 0x%lx, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: 0x%lx, ver: %lu, nummatch: %lu\n",
                                e->handle, e->dwAction,
                                e->dwStatus, e->dwEventId, e->dwCardType,
                                e->hKernelPlugIn, e->dwOptions,
@@ -335,7 +334,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;
@@ -345,7 +344,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        {
                                struct interrupt *it = (struct interrupt*)(wdheader->data);
 
-                               DPRINTF("Handle: 0x%lx, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
+                               DPRINTF("-> Handle: 0x%lx, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
                                it->hInterrupt, it->dwOptions,
                                it->dwCmds, it->fEnableOk, it->dwCounter,
                                it->dwLost, it->fStopped);
@@ -353,20 +352,10 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
-                               if (xpcu) {
-                                       if (it->dwCounter == 0) {
-                                               it->dwCounter = 1;
-                                       } else {
-                                               pthread_mutex_lock(&int_wait);
-                                               pthread_mutex_unlock(&int_wait);
-                                       }
-                               } else {
-                                       pthread_mutex_lock(&int_wait);
-                                       pthread_mutex_unlock(&int_wait);
-                               }
+                               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",
+                               DPRINTF("<- INT_WAIT_RETURN: Handle: 0x%lx, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n",
                                it->hInterrupt, it->dwOptions, it->dwCmds,
                                it->fEnableOk, it->dwCounter, it->dwLost,
                                it->fStopped);
@@ -378,12 +367,12 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        {
                                struct card_register* cr = (struct card_register*)(wdheader->data);
 
-                               DPRINTF("Addr: 0x%lx, bytes: %lu, bar: %lu\n",
+                               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);
+                               DPRINTF("-> hCard: %lu\n", cr->hCard);
 
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
@@ -403,7 +392,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #ifdef DEBUG
                                int i;
 
-                               DPRINTF("handle: 0x%lx, action: %lu, status: %lu, eventid: %lu, cardtype: %lx, kplug: %lu, options: %lu, dev: %lx:%lx, unique: 0x%lx, ver: %lu, nummatch: %lu\n",
+                               DPRINTF("-> handle: 0x%lx, action: %lu, status: %lu, eventid: %lu, cardtype: %lx, kplug: %lu, options: %lu, dev: %lx:%lx, unique: 0x%lx, ver: %lu, nummatch: %lu\n",
                                e->handle, e->dwAction, e->dwStatus,
                                e->dwEventId, e->dwCardType, e->hKernelPlugIn,
                                e->dwOptions, e->u.Usb.deviceId.dwVendorId,
@@ -412,7 +401,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                e->dwNumMatchTables);
 
                                for (i = 0; i < e->dwNumMatchTables; i++)
-                                       DPRINTF("match: dev: %04x:%04x, class: %x, subclass: %x, intclass: %x, intsubclass: %x, intproto: %x\n",
+                                       DPRINTF("-> match: dev: %04x:%04x, class: %x, subclass: %x, intclass: %x, intsubclass: %x, intproto: %x\n",
                                        e->matchTables[i].VendorId,
                                        e->matchTables[i].ProductId,
                                        e->matchTables[i].bDeviceClass,
@@ -425,11 +414,11 @@ 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
-                               DPRINTF("handle: 0x%lx, action: %lu, status: %lu, eventid: %lu, cardtype: %lx, kplug: %lu, options: %lu, dev: %lx:%lx, unique: 0x%lx, ver: %lu, nummatch: %lu\n",
+                               DPRINTF("<- handle: 0x%lx, action: %lu, status: %lu, eventid: %lu, cardtype: %lx, kplug: %lu, options: %lu, dev: %lx:%lx, unique: 0x%lx, ver: %lu, nummatch: %lu\n",
                                e->handle, e->dwAction, e->dwStatus,
                                e->dwEventId, e->dwCardType, e->hKernelPlugIn,
                                e->dwOptions, e->u.Usb.deviceId.dwVendorId,
@@ -438,7 +427,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                e->dwNumMatchTables);
 
                                for (i = 0; i < e->dwNumMatchTables; i++)
-                                       DPRINTF("match: dev: %04x:%04x, class: %x, subclass: %x, intclass: %x, intsubclass: %x, intproto: %x\n",
+                                       DPRINTF("<- match: dev: %04x:%04x, class: %x, subclass: %x, intclass: %x, intsubclass: %x, intproto: %x\n",
                                        e->matchTables[i].VendorId,
                                        e->matchTables[i].ProductId,
                                        e->matchTables[i].bDeviceClass,
@@ -465,7 +454,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");             
@@ -474,12 +463,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, ...) {
@@ -498,11 +487,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;
@@ -513,15 +506,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);
@@ -559,6 +559,12 @@ FILE *fopen(const char *path, const char *mode) {
 
        if (!strcmp(path, "/proc/modules")) {
                DPRINTF("opening /proc/modules\n");
+               if (!ret && errno == ENOENT) {
+                       /* Hmm.. there appears to be no /proc/modules file
+                        * fake it then */
+                       ret = (*func)("/dev/null", mode);
+                       DPRINTF("No /proc/modules -- faking\n");
+               }
 #ifdef NO_WINDRVR
                modulesfp = ret;
                modules_read = 0;
@@ -626,6 +632,29 @@ int access(const char *pathname, int mode) {
        }
 }
 
+#if 0
+/* USB cable sharing needs to overload semop, TODO! */
+int semop (int __semid, struct sembuf *__sops, size_t __nsops) {
+       static int (*func) (int, struct sembuf*, size_t) = NULL;
+       int i;
+
+       if (!func)
+               func = (int (*) (int, struct sembuf*, size_t)) dlsym(RTLD_NEXT, "semop");
+       
+       fprintf(stderr,"semop: semid: 0x%X, elements: %d\n", __semid, __nsops);
+       for (i = 0; i < __nsops; i++) {
+               fprintf(stderr, " num: %u, op: %d, flg: %d\n", __sops[i].sem_num, __sops[i].sem_op, __sops[i].sem_flg);
+               if (__sops[i].sem_op < 0) {
+                       fprintf(stderr, "SEMAPHORE LOCK\n");
+               } else {
+                       fprintf(stderr, "SEMAPHORE UNLOCK\n");
+               }
+       }
+
+       return (*func)(__semid, __sops, __nsops);
+}
+#endif
+
 #if __WORDSIZE == 32
 int uname (struct utsname *__name) {
        static int (*func) (struct utsname*);
Impressum, Datenschutz