X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/cbfa0ac6c885015f3ed37ec3931fba812194b0c0..98b8ef391f9f508131d222080a79b3b3e72a4b22:/usb-driver.c diff --git a/usb-driver.c b/usb-driver.c index 647a5bc..ed78932 100644 --- a/usb-driver.c +++ b/usb-driver.c @@ -33,41 +33,44 @@ #include #include #include -#include #include -#include #include #include #include #include #include +#include +#include +#include +#include +#include #include "usb-driver.h" #include "config.h" #include "xpcu.h" static int (*ioctl_func) (int, int, void *) = NULL; -static int windrvrfd = -1; +static int *windrvrfds = NULL; +static int windrvrfds_count = 0; static unsigned long ppbase = 0; static unsigned long ecpbase = 0; static struct parport_config *pport = NULL; -static struct xpcu_s *xpcu = NULL; static FILE *modulesfp = NULL; static FILE *baseaddrfp = NULL; static int baseaddrnum = 0; static int modules_read = 0; -static unsigned long card_type; -static int ints_enabled = 0; -static pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER; #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; idata); - DPRINTF("Items: %lu, Addr: 0x%lx, bytes: %lu, bar: %lu\n", + DPRINTF("-> Items: %lu, Addr: 0x%lx, bytes: %lu, bar: %lu\n", cr->Card.dwItems, (unsigned long)cr->Card.Item[0].I.IO.dwAddr, cr->Card.Item[0].I.IO.dwBytes, cr->Card.Item[0].I.IO.dwBar); - DPRINTF("Items: %lu, Addr: 0x%lx, bytes: %lu, bar: %lu\n", + DPRINTF("-> Items: %lu, Addr: 0x%lx, bytes: %lu, bar: %lu\n", cr->Card.dwItems, (unsigned long)cr->Card.Item[1].I.IO.dwAddr, cr->Card.Item[1].I.IO.dwBytes, @@ -115,6 +118,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) @@ -133,67 +137,41 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { cr->hCard = 0; } #endif - DPRINTF("hCard: %lu\n", cr->hCard); + DPRINTF("<-hCard: %lu\n", cr->hCard); } break; case USB_TRANSFER: - DPRINTF("in USB_TRANSFER"); + DPRINTF("USB_TRANSFER\n"); { struct usb_transfer *ut = (struct usb_transfer*)(wdheader->data); #ifdef DEBUG - DPRINTF(" unique: %lu, pipe: %lu, read: %lu, options: %lx, size: %lu, timeout: %lx\n", + DPRINTF("-> unique: 0x%lx, pipe: %lu, read: %lu, options: %lx, size: %lu, timeout: %lx\n", 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 #ifndef NO_WINDRVR ret = (*ioctl_func) (fd, request, wdioctl); #else - xpcu_claim(xpcu, XPCU_CLAIM); - /* http://www.jungo.com/support/documentation/windriver/802/wdusb_man_mhtml/node55.html#SECTION001213000000000000000 */ - if (ut->dwPipeNum == 0) { /* control pipe */ - int requesttype, request, value, index, size; - requesttype = ut->SetupPacket[0]; - request = ut->SetupPacket[1]; - value = ut->SetupPacket[2] | (ut->SetupPacket[3] << 8); - index = ut->SetupPacket[4] | (ut->SetupPacket[5] << 8); - size = ut->SetupPacket[6] | (ut->SetupPacket[7] << 8); - DPRINTF("requesttype: %x, request: %x, value: %u, index: %u, size: %u\n", requesttype, request, value, index, size); - ret = usb_control_msg(xpcu->handle, requesttype, request, value, index, ut->pBuffer, size, ut->dwTimeout); - } else { - if (ut->fRead) { - ret = usb_bulk_read(xpcu->handle, ut->dwPipeNum, ut->pBuffer, ut->dwBufferSize, ut->dwTimeout); - } else { - ret = usb_bulk_write(xpcu->handle, ut->dwPipeNum, ut->pBuffer, ut->dwBufferSize, ut->dwTimeout); - } - xpcu_claim(xpcu, XPCU_RELEASE); - } - - if (ret < 0) { - fprintf(stderr, "usb_transfer: %d (%s)\n", ret, usb_strerror()); - } else { - ut->dwBytesTransferred = ret; - ret = 0; - } + ret = xpcu_transfer(ut); #endif #ifdef DEBUG 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 } @@ -205,15 +183,21 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { { struct interrupt *it = (struct interrupt*)(wdheader->data); - DPRINTF("Handle: %lu, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n", + DPRINTF("-> Handle: 0x%lx, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n", it->hInterrupt, it->dwOptions, it->dwCmds, it->fEnableOk, it->dwCounter, it->dwLost, it->fStopped); - it->fEnableOk = 1; - it->fStopped = 0; - ints_enabled = 1; - pthread_mutex_trylock(&int_wait); +#ifndef NO_WINDRVR + ret = (*ioctl_func) (fd, request, wdioctl); +#else + ret = xpcu_int_state(it, ENABLE_INTERRUPT); +#endif + + DPRINTF("<- Handle: 0x%lx, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n", + it->hInterrupt, it->dwOptions, + it->dwCmds, it->fEnableOk, it->dwCounter, + it->dwLost, it->fStopped); } break; @@ -223,20 +207,16 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { { struct interrupt *it = (struct interrupt*)(wdheader->data); - DPRINTF("Handle: %lu, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n", + DPRINTF("-> Handle: 0x%lx, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n", it->hInterrupt, it->dwOptions, it->dwCmds, it->fEnableOk, it->dwCounter, it->dwLost, it->fStopped); #ifndef NO_WINDRVR ret = (*ioctl_func) (fd, request, wdioctl); #else - it->dwCounter = 0; - it->fStopped = 1; - ints_enabled = 0; - if (pthread_mutex_trylock(&int_wait) == EBUSY) - pthread_mutex_unlock(&int_wait); + ret = xpcu_int_state(it, DISABLE_INTERRUPT); #endif - DPRINTF("Handle: %lu, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n", + DPRINTF("<- Handle: 0x%lx, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n", it->hInterrupt, it->dwOptions, it->dwCmds, it->fEnableOk, it->dwCounter, it->dwLost, it->fStopped); @@ -248,28 +228,15 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { { struct usb_set_interface *usi = (struct usb_set_interface*)(wdheader->data); - DPRINTF("unique: %lu, interfacenum: %lu, alternatesetting: %lu, options: %lx\n", + DPRINTF("-> unique: 0x%lx, interfacenum: %lu, alternatesetting: %lu, options: %lx\n", usi->dwUniqueID, usi->dwInterfaceNum, usi->dwAlternateSetting, usi->dwOptions); #ifndef NO_WINDRVR ret = (*ioctl_func) (fd, request, wdioctl); #else - if (xpcu->dev) { - if (!xpcu->handle) { - xpcu->handle = usb_open(xpcu->dev); -#ifndef NO_USB_RESET - if (xpcu->handle) { - usb_reset(xpcu->handle); - xpcu->handle = usb_open(xpcu->dev); - } -#endif - } - - xpcu->interface = xpcu->dev->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber; - xpcu->alternate = usi->dwAlternateSetting; - } + ret = xpcu_set_interface(usi); #endif - DPRINTF("unique: %lu, interfacenum: %lu, alternatesetting: %lu, options: %lx\n", + DPRINTF("<- unique: 0x%lx, interfacenum: %lu, alternatesetting: %lu, options: %lx\n", usi->dwUniqueID, usi->dwInterfaceNum, usi->dwAlternateSetting, usi->dwOptions); } @@ -280,20 +247,13 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { DPRINTF("USB_GET_DEVICE_DATA\n"); { struct usb_get_device_data *ugdd = (struct usb_get_device_data*)(wdheader->data); - int pSize; - DPRINTF("unique: %lu, bytes: %lu, options: %lx\n", + DPRINTF("-> unique: 0x%lx, bytes: %lu, options: %lx\n", ugdd->dwUniqueID, ugdd->dwBytes, ugdd->dwOptions); - pSize = ugdd->dwBytes; - if (!ugdd->dwBytes) { - if (xpcu->dev) { - ugdd->dwBytes = xpcu_deviceinfo(xpcu, NULL); - } - } else { - xpcu_deviceinfo(xpcu, (unsigned char*)ugdd->pBuf); - } + ret = xpcu_deviceinfo(ugdd); + } break; @@ -302,12 +262,11 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { DPRINTF("EVENT_REGISTER\n"); { struct event *e = (struct event*)(wdheader->data); - struct usb_bus *bus; - char* devpos; - int busnum = -1, devnum = -1; +#ifdef DEBUG int i; +#endif - DPRINTF("handle: %lu, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: %lu, ver: %lu, nummatch: %lu\n", + DPRINTF("-> handle: 0x%lx, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: 0x%lx, ver: %lu, nummatch: %lu\n", e->handle, e->dwAction, e->dwStatus, e->dwEventId, e->dwCardType, e->hKernelPlugIn, e->dwOptions, @@ -316,96 +275,14 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { e->u.Usb.dwUniqueID, e->dwEventVer, e->dwNumMatchTables); - devpos = getenv("XILINX_USB_DEV"); - if (devpos != NULL) { - int j; - char *devstr = NULL, *remainder; - - DPRINTF("XILINX_USB_DEV=%s\n", devpos); - - for (j = 0; j < strlen(devpos) && devpos[j] != 0; j++) { - if (devpos[j] == ':') { - devpos[j] = 0; - devstr = &(devpos[j+1]); - } - } - - if (devstr && strlen(devstr) > 0) { - busnum = strtol(devpos, &remainder, 10); - if (devpos == remainder) { - busnum = -1; - } else { - devnum = strtol(devstr, &remainder, 10); - if (devstr == remainder) { - busnum = -1; - devnum = -1; - } else { - fprintf(stderr,"Using XILINX platform cable USB at %03d:%03d\n", - busnum, devnum); - } - } - } - } - - for (i = 0; i < e->dwNumMatchTables; i++) { - - DPRINTF("match: dev: %04x:%04x, class: %x, subclass: %x, intclass: %x, intsubclass: %x, intproto: %x\n", - e->matchTables[i].VendorId, - e->matchTables[i].ProductId, - e->matchTables[i].bDeviceClass, - e->matchTables[i].bDeviceSubClass, - e->matchTables[i].bInterfaceClass, - e->matchTables[i].bInterfaceSubClass, - e->matchTables[i].bInterfaceProtocol); - - for (bus = xpcu->busses; bus; bus = bus->next) { - struct usb_device *dev; - - if ((devnum != -1) && (strtol(bus->dirname, NULL, 10) != busnum)) - continue; - - for (dev = bus->devices; dev; dev = dev->next) { - struct usb_device_descriptor *desc = &(dev->descriptor); - - if((desc->idVendor == e->matchTables[i].VendorId) && - (desc->idProduct == e->matchTables[i].ProductId) && - (desc->bDeviceClass == e->matchTables[i].bDeviceClass) && - (desc->bDeviceSubClass == e->matchTables[i].bDeviceSubClass) && - ((devnum == -1) || (strtol(dev->filename, NULL, 10) == devnum)) ) { - int ac; - for (ac = 0; ac < desc->bNumConfigurations; ac++) { - struct usb_interface *interface = dev->config[ac].interface; - int ai; - - for (ai = 0; ai < interface->num_altsetting; ai++) { - - DPRINTF("intclass: %x, intsubclass: %x, intproto: %x\n", - interface->altsetting[i].bInterfaceClass, - interface->altsetting[i].bInterfaceSubClass, - interface->altsetting[i].bInterfaceProtocol); - - if ((interface->altsetting[ai].bInterfaceSubClass == e->matchTables[i].bInterfaceSubClass) && - (interface->altsetting[ai].bInterfaceProtocol == e->matchTables[i].bInterfaceProtocol)){ - /* TODO: check interfaceClass! */ - DPRINTF("found device with libusb\n"); - xpcu->dev = dev; - card_type = e->dwCardType; - } - } - } - } - } - } - } - #ifndef NO_WINDRVR ret = (*ioctl_func) (fd, request, wdioctl); #else - e->handle++; + ret = xpcu_find(e); #endif #ifdef DEBUG - DPRINTF("handle: %lu, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: %lu, ver: %lu, nummatch: %lu\n", + DPRINTF("<- handle: 0x%lx, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: 0x%lx, ver: %lu, nummatch: %lu\n", e->handle, e->dwAction, e->dwStatus, e->dwEventId, e->dwCardType, e->hKernelPlugIn, e->dwOptions, @@ -456,10 +333,16 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { break; case EVENT_UNREGISTER: - DPRINTF("EVENT_UNREGISTER\n"); + { + struct event *e = (struct event*)(wdheader->data); + + DPRINTF("EVENT_UNREGISTER\n"); #ifndef NO_WINDRVR - ret = (*ioctl_func) (fd, request, wdioctl); + ret = (*ioctl_func) (fd, request, wdioctl); +#else + ret = xpcu_close(e); #endif + } break; case INT_WAIT: @@ -467,7 +350,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { { struct interrupt *it = (struct interrupt*)(wdheader->data); - DPRINTF("Handle: %lu, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n", + DPRINTF("-> Handle: 0x%lx, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n", it->hInterrupt, it->dwOptions, it->dwCmds, it->fEnableOk, it->dwCounter, it->dwLost, it->fStopped); @@ -475,20 +358,10 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { #ifndef NO_WINDRVR ret = (*ioctl_func) (fd, request, wdioctl); #else - if (xpcu->dev) { - if (it->dwCounter == 0) { - it->dwCounter = 1; - } else { - pthread_mutex_lock(&int_wait); - pthread_mutex_unlock(&int_wait); - } - } else { - pthread_mutex_lock(&int_wait); - pthread_mutex_unlock(&int_wait); - } + ret = xpcu_int_wait(it); #endif - DPRINTF("INT_WAIT_RETURN: Handle: %lu, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n", + DPRINTF("<- INT_WAIT_RETURN: Handle: 0x%lx, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n", it->hInterrupt, it->dwOptions, it->dwCmds, it->fEnableOk, it->dwCounter, it->dwLost, it->fStopped); @@ -500,12 +373,12 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { { struct card_register* cr = (struct card_register*)(wdheader->data); - DPRINTF("Addr: 0x%lx, bytes: %lu, bar: %lu\n", + DPRINTF("-> Addr: 0x%lx, bytes: %lu, bar: %lu\n", (unsigned long)cr->Card.Item[0].I.IO.dwAddr, cr->Card.Item[0].I.IO.dwBytes, cr->Card.Item[0].I.IO.dwBar); - DPRINTF("hCard: %lu\n", cr->hCard); + DPRINTF("-> hCard: %lu\n", cr->hCard); #ifndef NO_WINDRVR ret = (*ioctl_func) (fd, request, wdioctl); @@ -525,7 +398,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { #ifdef DEBUG int i; - DPRINTF("handle: %lu, action: %lu, status: %lu, eventid: %lu, cardtype: %lx, kplug: %lu, options: %lu, dev: %lx:%lx, unique: %lu, ver: %lu, nummatch: %lu\n", + DPRINTF("-> handle: 0x%lx, action: %lu, status: %lu, eventid: %lu, cardtype: %lx, kplug: %lu, options: %lu, dev: %lx:%lx, unique: 0x%lx, ver: %lu, nummatch: %lu\n", e->handle, e->dwAction, e->dwStatus, e->dwEventId, e->dwCardType, e->hKernelPlugIn, e->dwOptions, e->u.Usb.deviceId.dwVendorId, @@ -534,7 +407,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { e->dwNumMatchTables); for (i = 0; i < e->dwNumMatchTables; i++) - DPRINTF("match: dev: %04x:%04x, class: %x, subclass: %x, intclass: %x, intsubclass: %x, intproto: %x\n", + DPRINTF("-> match: dev: %04x:%04x, class: %x, subclass: %x, intclass: %x, intsubclass: %x, intproto: %x\n", e->matchTables[i].VendorId, e->matchTables[i].ProductId, e->matchTables[i].bDeviceClass, @@ -547,25 +420,11 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { #ifndef NO_WINDRVR ret = (*ioctl_func) (fd, request, wdioctl); #else - if (xpcu->dev) { - struct usb_interface *interface = xpcu->dev->config->interface; - - e->dwCardType = card_type; - e->dwAction = 1; - e->dwEventId = 109; - e->u.Usb.dwUniqueID = 110; - e->matchTables[0].VendorId = xpcu->dev->descriptor.idVendor; - e->matchTables[0].ProductId = xpcu->dev->descriptor.idProduct; - e->matchTables[0].bDeviceClass = xpcu->dev->descriptor.bDeviceClass; - e->matchTables[0].bDeviceSubClass = xpcu->dev->descriptor.bDeviceSubClass; - e->matchTables[0].bInterfaceClass = interface->altsetting[0].bInterfaceClass; - e->matchTables[0].bInterfaceSubClass = interface->altsetting[0].bInterfaceSubClass; - e->matchTables[0].bInterfaceProtocol = interface->altsetting[0].bInterfaceProtocol; - } + ret = xpcu_found(e); #endif #ifdef DEBUG - DPRINTF("handle: %lu, action: %lu, status: %lu, eventid: %lu, cardtype: %lx, kplug: %lu, options: %lu, dev: %lx:%lx, unique: %lu, ver: %lu, nummatch: %lu\n", + DPRINTF("<- handle: 0x%lx, action: %lu, status: %lu, eventid: %lu, cardtype: %lx, kplug: %lu, options: %lu, dev: %lx:%lx, unique: 0x%lx, ver: %lu, nummatch: %lu\n", e->handle, e->dwAction, e->dwStatus, e->dwEventId, e->dwCardType, e->hKernelPlugIn, e->dwOptions, e->u.Usb.deviceId.dwVendorId, @@ -574,7 +433,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { e->dwNumMatchTables); for (i = 0; i < e->dwNumMatchTables; i++) - DPRINTF("match: dev: %04x:%04x, class: %x, subclass: %x, intclass: %x, intsubclass: %x, intproto: %x\n", + DPRINTF("<- match: dev: %04x:%04x, class: %x, subclass: %x, intclass: %x, intsubclass: %x, intproto: %x\n", e->matchTables[i].VendorId, e->matchTables[i].ProductId, e->matchTables[i].bDeviceClass, @@ -601,7 +460,7 @@ static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { int ioctl(int fd, unsigned long int request, ...) { va_list args; void *argp; - int ret; + int i; if (!ioctl_func) ioctl_func = (int (*) (int, int, void *)) dlsym (RTLD_NEXT, "ioctl"); @@ -610,12 +469,12 @@ int ioctl(int fd, unsigned long int request, ...) { argp = va_arg (args, void *); va_end (args); - if (fd == windrvrfd) - ret = do_wdioctl(fd, request, argp); - else - ret = (*ioctl_func) (fd, request, argp); + for (i = 0; i < windrvrfds_count; i++) { + if (fd == windrvrfds[i]) + return do_wdioctl(fd, request, argp); + } - return ret; + return (*ioctl_func) (fd, request, argp); } int open (const char *pathname, int flags, ...) { @@ -634,14 +493,16 @@ int open (const char *pathname, int flags, ...) { } if (!strcmp (pathname, "/dev/windrvr6")) { - DPRINTF("opening windrvr6\n"); + DPRINTF("opening windrvr6 (%d)\n", windrvrfds_count); + windrvrfds = realloc(windrvrfds, sizeof(int) * (++windrvrfds_count)); + if (!windrvrfds) + return -ENOMEM; + #ifdef NO_WINDRVR - windrvrfd = fd = (*func) ("/dev/null", flags, mode); + windrvrfds[windrvrfds_count-1] = fd = (*func) ("/dev/null", flags, mode); #else - windrvrfd = fd = (*func) (pathname, flags, mode); + windrvrfds[windrvrfds_count-1] = fd = (*func) (pathname, flags, mode); #endif - if (!xpcu) - xpcu = xpcu_open(); return fd; } @@ -651,22 +512,22 @@ int open (const char *pathname, int flags, ...) { int close(int fd) { static int (*func) (int) = NULL; + int i; if (!func) func = (int (*) (int)) dlsym(RTLD_NEXT, "close"); - if (fd == windrvrfd && windrvrfd >= 0) { - DPRINTF("close windrvrfd\n"); - - if (xpcu->handle) { - xpcu_claim(xpcu, XPCU_RELEASE); - usb_close(xpcu->handle); + for (i = 0; i < windrvrfds_count; i++) { + if (fd == windrvrfds[i] && windrvrfds[i] >= 0) { + int remaining = windrvrfds_count - (i + 1); + DPRINTF("close windrvr6 (%d)\n", i); + if (remaining) + memmove(&(windrvrfds[i]), &(windrvrfds[i+1]), remaining * sizeof(int)); + windrvrfds = realloc(windrvrfds, sizeof(int) * --windrvrfds_count); + if (!windrvrfds_count) + windrvrfds = NULL; + break; } - - xpcu->handle = NULL; - xpcu->interface = -1; - xpcu = NULL; - windrvrfd = -1; } return (*func) (fd); @@ -704,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; @@ -771,20 +638,129 @@ 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 - if (ret == 0 && (!strcmp(__name->machine, "x86_64"))) { - strcpy(__name->machine, "i686"); +/* + * 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; +} + +/* XilCommNS::CPortResources::Instance() */ +void* _ZN9XilCommNS14CPortResources8InstanceEv() { + static void* (*func) (void) = NULL; + char *filename = NULL; + void *ret; + int i; + + if (!func) { + func = (void* (*) (void)) dlsym(RTLD_NEXT, "_ZN9XilCommNS14CPortResources8InstanceEv"); + + DPRINTF("Searching for filename starting at %p\n", func); + for(i = 0; i < 16384; 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 (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 +}