X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/9f78065e213deae9b29c035ac6ea6dc767139aca..ad0f0d12f7625db09928da09e6417f4010b60eae:/usb-driver.c?ds=inline

diff --git a/usb-driver.c b/usb-driver.c
index 6a7df90..1e1f026 100644
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -41,6 +41,8 @@
 #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"
@@ -113,6 +115,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #ifndef NO_WINDRVR
 				ret = (*ioctl_func) (fd, request, wdioctl);
 #else
+				cr->hCard = 0;
 
 				pport = config_get((unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10);
 				if (!pport)
@@ -655,31 +658,47 @@ int semop (int __semid, struct sembuf *__sops, size_t __nsops) {
 }
 #endif
 
-#if __WORDSIZE == 32
-int uname (struct utsname *__name) {
-	static int (*func) (struct utsname*);
-	int ret;
-
-	if (!func)
-		func = (int (*) (struct utsname*)) dlsym(RTLD_NEXT, "uname");
-	
-	ret = (*func)(__name);
-
-	if (ret == 0 && (!strcmp(__name->machine, "x86_64"))) {
-		strcpy(__name->machine, "i686");
-	}
-	
-	return ret;
-}
-#endif
-
 /*
- * Ugly hack for ISE 12. They don't seem to open /proc/modules with
- * open() anymore...
+ * Ugly hack for ISE 12. Preload doesn't seem to work correctly for
+ * libImpactComm.so. Even though the file is still read with fopen(),
+ * the version from libc is used and not the one from this file.
+ * Replace the function calling fopen() instead...
  * echo '_Z14isModuleLoadedPci' | c++filt
  */
-int _Z14isModuleLoadedPci(char *module_name, int i) {
+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) {
+	int i;
+	char buf[256];
+	char buf2[256];
+
+	for (i = 0; i < 4; i++) {
+		snprintf(buf, sizeof(buf), "XIL_IMPACT_ENV_LPT%d_BASE_ADDRESS", i+1);
+		snprintf(buf2, sizeof(buf2), "%x", 0x10*i);
+		setenv(buf, buf2, 1);
+		snprintf(buf, sizeof(buf), "XIL_IMPACT_ENV_LPT%d_ECP_ADDRESS", i+1);
+		snprintf(buf2, sizeof(buf2), "%x", (0x10*i)+0x400);
+		setenv(buf, buf2, 1);
+	}
+
+	setenv("XIL_IMPACT_USE_LIBUSB", "0", 1);
+	setenv("XIL_IMPACT_USE_WINDRIVER", "1", 1);
+
+	#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
+}