declare variables at the beginning of the scope

[usb-driver] / usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index 44a280b1e94704f48a30f7e1eb34e64e9a5fdf8e..1e1f026bbdb342c4eadae64988bf4754df35aed1 100644 (file)
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -115,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)
@@ -658,26 +659,46 @@ 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
  */
-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;
+       {
+               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
 }