X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/19acdb82e419d2075cc277a273941fb1e9a51ba0..7b219d308d74d4ab41643207b0ee37fb2dbbe632:/usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index 0cc74bf..264366b 100644
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -39,12 +39,15 @@
 #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;
@@ -55,13 +58,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");
 }
@@ -141,13 +145,13 @@ 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
 
@@ -161,8 +165,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 				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
 			}
@@ -451,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");             
@@ -460,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, ...) {
@@ -484,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;
@@ -499,13 +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");
-		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);
@@ -543,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;
@@ -610,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*);