Overload XilCommNS::CPortResources::Instance

[usb-driver] / usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index 55a74637991af424a683168c3b29d1bef882fd6f..252e3279c07b5adab1ba68da5cde70990ceb73d8 100644 (file)
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -61,13 +61,15 @@ static int modules_read = 0;
 #define NO_WINDRVR 1
 
 void hexdump(unsigned char *buf, int len, char *prefix) {
-       int i;
+       int i = 0;
 
-       fprintf(stderr, "%s ", prefix);
-       for(i=0; i<len; i++) {
+       fprintf(stderr, "%s %03x: ", prefix, i);
+       for(i = 0; i<len; i++) {
                fprintf(stderr,"%02x ", buf[i]);
-               if ((i % 16) == 15)
-                       fprintf(stderr,"\n%s ", prefix);
+               if ((i % 16) == 7)
+                       fprintf(stderr," ");
+               if (((i % 16) == 15) && ((i+1) < len))
+                       fprintf(stderr,"\n%s %03x: ", prefix, i+1);
        }
        fprintf(stderr,"\n");
 }
@@ -115,6 +117,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)
@@ -658,8 +661,10 @@ int semop (int __semid, struct sembuf *__sops, size_t __nsops) {
 #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
  */
 long int _Z14isModuleLoadedPci(char *module_name, int i) {
@@ -668,16 +673,66 @@ long int _Z14isModuleLoadedPci(char *module_name, int i) {
        return 1;
 }
 
+/* XilCommNS::CPortResources::Instance() */
+void* _ZN9XilCommNS14CPortResources8InstanceEv() {
+       static void* (*func) (void) = NULL;
+       void *ret;
+
+       if (!func)
+               func = (void* (*) (void)) dlsym(RTLD_NEXT, "_ZN9XilCommNS14CPortResources8InstanceEv");
+
+       DPRINTF("-> XilCommNS::CPortResources::Instance()\n");
+
+       ret = func();
+
+#ifdef DEBUG
+       hexdump(ret, 0x29, "<-");
+       #if 0
+       {
+               void *portinfo;
+               portinfo = ((unsigned char**)ret+0x00);
+               hexdump(portinfo, 256, "PI");
+               hexdump(portinfo+0x50, 4, "BS");
+               hexdump(portinfo+0x54, 4, "BE");
+               hexdump(portinfo+0x58, 4, "ES");
+               hexdump(portinfo+0x5c, 4, "EE");
+       }
+       #endif
+#endif
+
+       DPRINTF("<- XilCommNS::CPortResources::Instance()\n");
+
+       return ret;
+}
+
 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;
+       {
+               struct utsname un;
+               int ret;
 
-       ret = uname(&un);
+               ret = uname(&un);
 
-       if (ret == 0 && (!strcmp(un.machine, "x86_64"))) {
-               DPRINTF("setting 32bit personality\n");
-               (long)syscall(SYS_personality, PER_LINUX32);
+               if (ret == 0 && (!strcmp(un.machine, "x86_64"))) {
+                       DPRINTF("setting 32bit personality\n");
+                       (long)syscall(SYS_personality, PER_LINUX32);
+               }
        }
        #endif
 }