X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/9bfaca620d7dca45f8c5b71c2dcc4e1329db7ffd..HEAD:/usb-driver.c diff --git a/usb-driver.c b/usb-driver.c index ddb2570..3b8b51d 100644 --- a/usb-driver.c +++ b/usb-driver.c @@ -39,6 +39,11 @@ #include #include #include +#include +#include +#include +#include +#include #include "usb-driver.h" #include "config.h" #include "xpcu.h" @@ -56,13 +61,16 @@ static int modules_read = 0; #define NO_WINDRVR 1 -void hexdump(unsigned char *buf, int len) { - int i; +void hexdump(unsigned char *buf, int len, char *prefix) { + int i = 0; - for(i=0; ihCard = 0; pport = config_get((unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10); if (!pport) @@ -142,13 +151,13 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { ut->dwUniqueID, ut->dwPipeNum, ut->fRead, ut->dwOptions, ut->dwBufferSize, ut->dwTimeout); if (ut->dwPipeNum == 0) { - DPRINTF("-> setup packet: "); - hexdump(ut->SetupPacket, 8); + DPRINTF("-> setup packet:"); + hexdump(ut->SetupPacket, 8, ""); } if (!ut->fRead && ut->dwBufferSize) { - hexdump(ut->pBuffer, ut->dwBufferSize); + hexdump(ut->pBuffer, ut->dwBufferSize, "->"); } #endif @@ -162,8 +171,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { DPRINTF("Transferred: %lu (%s)\n",ut->dwBytesTransferred, (ut->fRead?"read":"write")); if (ut->fRead && ut->dwBytesTransferred) { - DPRINTF("<- Read: "); - hexdump(ut->pBuffer, ut->dwBytesTransferred); + hexdump(ut->pBuffer, ut->dwBytesTransferred, "<-"); } #endif } @@ -557,6 +565,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,20 +638,158 @@ int access(const char *pathname, int mode) { } } -#if __WORDSIZE == 32 -int uname (struct utsname *__name) { - static int (*func) (struct utsname*); - int ret; +#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 (*) (struct utsname*)) dlsym(RTLD_NEXT, "uname"); + func = (int (*) (int, struct sembuf*, size_t)) dlsym(RTLD_NEXT, "semop"); - ret = (*func)(__name); + 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 + +/* + * 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) { + DPRINTF("_Z14isModuleLoadedPci: Checking for module %s (%d)\n", module_name, i); + + return 1; +} + +void cpr_segv_handler(int sig, siginfo_t *info, void *context) { + void *newmem; - if (ret == 0 && (!strcmp(__name->machine, "x86_64"))) { - strcpy(__name->machine, "i686"); + DPRINTF("SEGV at %p, mapping memory\n", info->si_addr); + errno = 0; + newmem = mmap(info->si_addr, 1, PROT_READ, MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED, -1, 0); + if (newmem != info->si_addr) { + perror("libusb-driver.so: Can't map memory, crashing now"); + exit(EXIT_FAILURE); } - +} + +/* XilCommNS::CPortResources::Instance() */ +void* _ZN9XilCommNS14CPortResources8InstanceEv() { + static void* (*func) (void) = NULL; + char *filename = NULL; + void *ret; + int i; + + if (!func) { + struct sigaction act, oldact; + int sighand_installed = 0; + + func = (void* (*) (void)) dlsym(RTLD_NEXT, "_ZN9XilCommNS14CPortResources8InstanceEv"); + + DPRINTF("Installing signal-handler for SIGSEGV\n"); + bzero(&act, sizeof(struct sigaction)); + act.sa_sigaction = cpr_segv_handler; + act.sa_flags = SA_SIGINFO; + if (sigaction(SIGSEGV, &act, &oldact) == 0) { + sighand_installed = 1; + } + + DPRINTF("Searching for filename starting at %p\n", func); + for(i = 0; i < 32768; i++) { + if (!strcmp(((char*)func)+i, "/proc/sys/dev/parport/%s/base-addr")) { + filename = ((char*)func)+i; + DPRINTF("Filename found at offset %p\n", (void*)(filename - ((char*)func))); + break; + } + } + if (sighand_installed) { + DPRINTF("Restoring signal-handler for SIGSEGV\n"); + sigaction(SIGSEGV, &oldact, NULL); + } + if (!filename) + fprintf(stderr, "libusb-driver.so: Can't find memory to patch, parallel cables will probably not work!\n"); + } + + if (filename) { + long pagesize; + size_t protectlen; + void *start; + int len = strlen(filename) + 1; + int ret; + + pagesize = sysconf(_SC_PAGE_SIZE); + DPRINTF("You have %lu bytes sized pages!\n", pagesize); + + start = (void*)((long)filename & (~(pagesize-1))); + + protectlen = pagesize; + if ((long)(filename + len) > (long)(start + protectlen)) + protectlen += pagesize; + + DPRINTF("Unprotecting %zd bytes starting at %p\n", protectlen, start); + ret = mprotect(start, protectlen, PROT_READ|PROT_WRITE); + if (ret == -1) + perror("mprotect"); + + DPRINTF("Replacing %s with /dev/zero\n", filename); + strcpy(filename, "/dev/zero"); + + DPRINTF("Reprotecting %zd bytes starting at %p\n", protectlen, start); + ret = mprotect(start, protectlen, PROT_READ|PROT_EXEC); + if (ret == -1) + perror("mprotect"); + } + + DPRINTF("-> XilCommNS::CPortResources::Instance()\n"); + + ret = func(); + + DPRINTF("<- XilCommNS::CPortResources::Instance()\n"); + return ret; } -#endif + +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 +}