fix prototype for _Z14isModuleLoadedPci

[usb-driver] / usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index 26ce16b4d526d3eda709a5e63ae07350ccb4aac5..6a7df90d44f052210d5c54b970131867b92d29c5 100644 (file)
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -39,6 +39,8 @@
 #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"
@@ -557,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;
@@ -624,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*);
@@ -641,3 +672,14 @@ int uname (struct utsname *__name) {
        return ret;
 }
 #endif
+
+/*
+ * Ugly hack for ISE 12. They don't seem to open /proc/modules with
+ * open() anymore...
+ * echo '_Z14isModuleLoadedPci' | c++filt
+ */
+int _Z14isModuleLoadedPci(char *module_name, int i) {
+       DPRINTF("_Z14isModuleLoadedPci: Checking for module %s (%d)\n", module_name, i);
+
+       return 1;
+}