X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/9bfaca620d7dca45f8c5b71c2dcc4e1329db7ffd..80a14787b97779d86558f414d23f7058b8654c94:/usb-driver.c?ds=sidebyside

diff --git a/usb-driver.c b/usb-driver.c
index ddb2570..55a7463 100644
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -39,6 +39,10 @@
 #include <sys/ioctl.h>
 #include <sys/utsname.h>
 #include <bits/wordsize.h>
+#include <sys/ipc.h>
+#include <sys/sem.h>
+#include <syscall.h>
+#include <linux/personality.h>
 #include "usb-driver.h"
 #include "config.h"
 #include "xpcu.h"
@@ -56,13 +60,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");
 }
@@ -142,13 +147,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
 
@@ -162,8 +167,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
 			}
@@ -557,6 +561,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;
@@ -624,20 +634,50 @@ int access(const char *pathname, int mode) {
 	}
 }
 
-#if __WORDSIZE == 32
-int uname (struct utsname *__name) {
-	static int (*func) (struct utsname*);
-	int ret;
+#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 (*) (struct utsname*)) dlsym(RTLD_NEXT, "uname");
+		func = (int (*) (int, struct sembuf*, size_t)) dlsym(RTLD_NEXT, "semop");
 	
-	ret = (*func)(__name);
-
-	if (ret == 0 && (!strcmp(__name->machine, "x86_64"))) {
-		strcpy(__name->machine, "i686");
+	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 ret;
+
+	return (*func)(__semid, __sops, __nsops);
 }
 #endif
+
+/*
+ * Ugly hack for ISE 12. They don't seem to open /proc/modules with
+ * open() anymore...
+ * echo '_Z14isModuleLoadedPci' | c++filt
+ */
+long int _Z14isModuleLoadedPci(char *module_name, int i) {
+	DPRINTF("_Z14isModuleLoadedPci: Checking for module %s (%d)\n", module_name, i);
+
+	return 1;
+}
+
+static void __attribute__ ((constructor)) libusbdriver_init(void) {
+	#if __WORDSIZE == 32
+	struct utsname un;
+	int ret;
+
+	ret = uname(&un);
+
+	if (ret == 0 && (!strcmp(un.machine, "x86_64"))) {
+		DPRINTF("setting 32bit personality\n");
+		(long)syscall(SYS_personality, PER_LINUX32);
+	}
+	#endif
+}