#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"
#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)
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;
}
#endif
-#if __WORDSIZE == 32
-int uname (struct utsname *__name) {
- static int (*func) (struct utsname*);
+/*
+ * 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;
- if (!func)
- func = (int (*) (struct utsname*)) dlsym(RTLD_NEXT, "uname");
-
- ret = (*func)(__name);
+ ret = uname(&un);
- if (ret == 0 && (!strcmp(__name->machine, "x86_64"))) {
- strcpy(__name->machine, "i686");
+ if (ret == 0 && (!strcmp(un.machine, "x86_64"))) {
+ DPRINTF("setting 32bit personality\n");
+ (long)syscall(SYS_personality, PER_LINUX32);
}
-
- return ret;
+ #endif
}
-#endif