X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/cdc711dc0a482c5cd0bc6dee34c930403c75cee1..740b45f5cad8371f2e43c37ab1f3fb9d4d64c3cc:/usb-driver.c diff --git a/usb-driver.c b/usb-driver.c index cae2ab1..264366b 100644 --- a/usb-driver.c +++ b/usb-driver.c @@ -1,13 +1,28 @@ -#if defined(__GNUC__) && !defined(__STRICT_ANSI__) +/* libusb/ppdev connector for XILINX impact + * + * Copyright (c) 2007 Michael Gernoth + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ #define _GNU_SOURCE 1 -#if defined(RTLD_NEXT) -#define REAL_LIBC RTLD_NEXT -#else -#define REAL_LIBC ((void *) -1L) -#endif - #include #include #include @@ -18,127 +33,452 @@ #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 *windrvrfds = NULL; +static int windrvrfds_count = 0; +static unsigned long ppbase = 0; +static unsigned long ecpbase = 0; +static struct parport_config *pport = NULL; +static FILE *modulesfp = NULL; +static FILE *baseaddrfp = NULL; +static int baseaddrnum = 0; +static int modules_read = 0; + +#define NO_WINDRVR 1 + +void hexdump(unsigned char *buf, int len, char *prefix) { + int i; -#define SNIFFLEN 4096 + fprintf(stderr, "%s ", prefix); + for(i=0; imagic != MAGIC) { + fprintf(stderr,"!!!ERROR: magic header does not match!!!\n"); + return (*ioctl_func) (fd, request, wdioctl); + } -struct license_struct { - char cLicense[128]; // Buffer with license string to put. - // If empty string then get current license setting - // into dwLicense. - unsigned long dwLicense; // Returns license settings: LICENSE_DEMO, LICENSE_WD - // etc..., or 0 for invalid license. - unsigned long dwLicense2; // Returns additional license settings, if dwLicense - // could not hold all the information. - // Then dwLicense will return 0. -}; + switch(request & ~(0xc0000000)) { + case VERSION: + version = (struct version_struct*)(wdheader->data); + strcpy(version->version, "libusb-driver.so version: " USB_DRIVER_VERSION); + version->versionul = 802; + DPRINTF("VERSION\n"); + break; -#define WD_IOCTL_HEADER_CODE 0xa410b413UL + case LICENSE: + DPRINTF("LICENSE\n"); + break; -void parse_wdioctlreq(unsigned char *wdioctl, unsigned int request) { - struct header_struct* wdheader = (struct header_struct*)wdioctl; + case CARD_REGISTER_OLD: + case CARD_REGISTER: + DPRINTF("CARD_REGISTER\n"); + { + struct card_register* cr = (struct card_register*)(wdheader->data); + + 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", + cr->Card.dwItems, + (unsigned long)cr->Card.Item[1].I.IO.dwAddr, + cr->Card.Item[1].I.IO.dwBytes, + cr->Card.Item[1].I.IO.dwBar); +#ifndef NO_WINDRVR + ret = (*ioctl_func) (fd, request, wdioctl); +#else - if (wdheader->dwHeader != WD_IOCTL_HEADER_CODE) { - fprintf(stderr,"!!!ERROR: Header does not match!!!\n"); - return; - } + pport = config_get((unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10); + if (!pport) + break; - fprintf(stderr, "Request: "); - switch(request) { - case 0x910: - fprintf(stderr,"IOCTL_WD_VERSION"); - //fprintf(stderr," %s(%d)", ((struct version_struct*)(wdheader->data))->version, ((struct version_struct*)(wdheader->data))->versionul); - break; - case 0x952: - fprintf(stderr,"IOCTL_WD_LICENSE"); + ret = pport->open((unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10); + + ppbase = (unsigned long)cr->Card.Item[0].I.IO.dwAddr; + + if (cr->Card.dwItems > 1 && cr->Card.Item[1].I.IO.dwAddr) + ecpbase = (unsigned long)cr->Card.Item[1].I.IO.dwAddr; + + if (ret >= 0) { + cr->hCard = ret; + } else { + cr->hCard = 0; + } +#endif + DPRINTF("<-hCard: %lu\n", cr->hCard); + } break; - case 0x98c: - fprintf(stderr,"IOCTL_WD_TRANSFER"); + + case USB_TRANSFER: + DPRINTF("USB_TRANSFER\n"); + { + struct usb_transfer *ut = (struct usb_transfer*)(wdheader->data); + +#ifdef DEBUG + 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, ""); + } + + if (!ut->fRead && ut->dwBufferSize) + { + hexdump(ut->pBuffer, ut->dwBufferSize, "->"); + } +#endif + +#ifndef NO_WINDRVR + ret = (*ioctl_func) (fd, request, wdioctl); +#else + ret = xpcu_transfer(ut); +#endif + +#ifdef DEBUG + DPRINTF("Transferred: %lu (%s)\n",ut->dwBytesTransferred, (ut->fRead?"read":"write")); + if (ut->fRead && ut->dwBytesTransferred) + { + hexdump(ut->pBuffer, ut->dwBytesTransferred, "<-"); + } +#endif + } break; - case 0x983: - fprintf(stderr,"IOCTL_WDU_TRANSFER"); + + case INT_ENABLE_OLD: + case INT_ENABLE: + DPRINTF("INT_ENABLE\n"); + { + struct interrupt *it = (struct interrupt*)(wdheader->data); + + 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 + 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; - case 0x987: - fprintf(stderr,"IOCTL_WD_EVENT_UNREGISTER"); + + case INT_DISABLE: + DPRINTF("INT_DISABLE\n"); + { + struct interrupt *it = (struct interrupt*)(wdheader->data); + + 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 + ret = xpcu_int_state(it, DISABLE_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; - case 0x91f: - fprintf(stderr,"IOCTL_WD_INT_DISABLE"); + + case USB_SET_INTERFACE: + DPRINTF("USB_SET_INTERFACE\n"); + { + struct usb_set_interface *usi = (struct usb_set_interface*)(wdheader->data); + + 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 + ret = xpcu_set_interface(usi); +#endif + DPRINTF("<- unique: 0x%lx, interfacenum: %lu, alternatesetting: %lu, options: %lx\n", + usi->dwUniqueID, usi->dwInterfaceNum, + usi->dwAlternateSetting, usi->dwOptions); + } break; - case 0x94b: - fprintf(stderr,"IOCTL_WD_INT_WAIT"); + + case USB_GET_DEVICE_DATA_OLD: + case USB_GET_DEVICE_DATA: + DPRINTF("USB_GET_DEVICE_DATA\n"); + { + struct usb_get_device_data *ugdd = (struct usb_get_device_data*)(wdheader->data); + + DPRINTF("-> unique: 0x%lx, bytes: %lu, options: %lx\n", + ugdd->dwUniqueID, ugdd->dwBytes, + ugdd->dwOptions); + + ret = xpcu_deviceinfo(ugdd); + + } break; - case 0x92b: - fprintf(stderr,"IOCTL_WD_CARD_UNREGISTER"); + + case EVENT_REGISTER_OLD: + case EVENT_REGISTER: + DPRINTF("EVENT_REGISTER\n"); + { + struct event *e = (struct event*)(wdheader->data); +#ifdef DEBUG + int i; +#endif + + 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, + e->u.Usb.deviceId.dwVendorId, + e->u.Usb.deviceId.dwProductId, + e->u.Usb.dwUniqueID, e->dwEventVer, + e->dwNumMatchTables); + +#ifndef NO_WINDRVR + ret = (*ioctl_func) (fd, request, wdioctl); +#else + ret = xpcu_find(e); +#endif + +#ifdef DEBUG + 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, + e->u.Usb.deviceId.dwVendorId, + e->u.Usb.deviceId.dwProductId, + e->u.Usb.dwUniqueID, e->dwEventVer, + 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", + 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); +#endif + } break; - case 0x9a7: - fprintf(stderr,"IOCTL_WDU_GET_DEVICE_DATA"); + + case TRANSFER_OLD: + case TRANSFER: + DPRINTF("TRANSFER\n"); + { + WD_TRANSFER *tr = (WD_TRANSFER*)(wdheader->data); + +#ifndef NO_WINDRVR + ret = (*ioctl_func) (fd, request, wdioctl); +#else + ret = pport->transfer(tr, fd, request, ppbase, ecpbase, 1); +#endif + } break; - case 0x98e: - fprintf(stderr,"IOCTL_WD_INT_ENABLE"); + + case MULTI_TRANSFER_OLD: + case MULTI_TRANSFER: + DPRINTF("MULTI_TRANSFER\n"); + { + WD_TRANSFER *tr = (WD_TRANSFER*)(wdheader->data); + unsigned long num = wdheader->size/sizeof(WD_TRANSFER); +#ifndef NO_WINDRVR + ret = (*ioctl_func) (fd, request, wdioctl); +#else + ret = pport->transfer(tr, fd, request, ppbase, ecpbase, num); +#endif + } break; - case 0x988: - fprintf(stderr,"IOCTL_WD_EVENT_PULL"); + + case EVENT_UNREGISTER: + { + struct event *e = (struct event*)(wdheader->data); + + DPRINTF("EVENT_UNREGISTER\n"); +#ifndef NO_WINDRVR + ret = (*ioctl_func) (fd, request, wdioctl); +#else + ret = xpcu_close(e); +#endif + } break; - case 0x981: - fprintf(stderr,"IOCTL_WDU_SET_INTERFACE"); + + case INT_WAIT: + DPRINTF("INT_WAIT\n"); + { + struct interrupt *it = (struct interrupt*)(wdheader->data); + + 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 + ret = xpcu_int_wait(it); +#endif + + 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); + } break; - default: - fprintf(stderr,"Unknown(%x)",request); - } - fprintf(stderr, ", size: %d\n", wdheader->dwSize); -} + case CARD_UNREGISTER: + DPRINTF("CARD_UNREGISTER\n"); + { + struct card_register* cr = (struct card_register*)(wdheader->data); -void parse_wdioctlans(unsigned char *wdioctl, unsigned int request, int result) { - struct header_struct* wdheader = (struct header_struct*)wdioctl; + 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); - if (wdheader->dwHeader != WD_IOCTL_HEADER_CODE) { - fprintf(stderr,"!!!ERROR: Header does not match!!!\n"); - return; - } + DPRINTF("-> hCard: %lu\n", cr->hCard); + +#ifndef NO_WINDRVR + ret = (*ioctl_func) (fd, request, wdioctl); +#else + if (pport) + pport->close(cr->hCard); - fprintf(stderr, "Answer: %d ", result); - switch(request) { - case 0x910: - fprintf(stderr,"\"%s\" (%d)", ((struct version_struct*)(wdheader->data))->version, ((struct version_struct*)(wdheader->data))->versionul); + pport = NULL; +#endif + } break; - case 0x952: - fprintf(stderr,"\"%s\" (XX,XX)", ((struct license_struct*)(wdheader->data))->cLicense); + + case EVENT_PULL: + DPRINTF("EVENT_PULL\n"); + { + struct event *e = (struct event*)(wdheader->data); +#ifdef DEBUG + int i; + + 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, + e->u.Usb.deviceId.dwProductId, + e->u.Usb.dwUniqueID, e->dwEventVer, + 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", + 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); +#endif + +#ifndef NO_WINDRVR + ret = (*ioctl_func) (fd, request, wdioctl); +#else + ret = xpcu_found(e); +#endif + +#ifdef DEBUG + 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, + e->u.Usb.deviceId.dwProductId, + e->u.Usb.dwUniqueID, e->dwEventVer, + 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", + 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); +#endif + + } break; + default: + fprintf(stderr,"!!!Unsupported IOCTL: %x!!!\n", request); +#ifndef NO_WINDRVR + ret = (*ioctl_func) (fd, request, wdioctl); +#endif break; } - fprintf(stderr, "\n"); + + return ret; } +int ioctl(int fd, unsigned long int request, ...) { + va_list args; + void *argp; + int i; + + if (!ioctl_func) + ioctl_func = (int (*) (int, int, void *)) dlsym (RTLD_NEXT, "ioctl"); + + va_start (args, request); + argp = va_arg (args, void *); + va_end (args); -typedef int (*open_funcptr_t) (const char *, int, mode_t); + for (i = 0; i < windrvrfds_count; i++) { + if (fd == windrvrfds[i]) + return do_wdioctl(fd, request, argp); + } -static windrvrfd = 0; -static void* mmapped = NULL; -static size_t mmapplen = 0; + return (*ioctl_func) (fd, request, argp); +} -int open (const char *pathname, int flags, ...) -{ - static open_funcptr_t func = NULL; +int open (const char *pathname, int flags, ...) { + static int (*func) (const char *, int, mode_t) = NULL; mode_t mode = 0; va_list args; int fd; if (!func) - func = (open_funcptr_t) dlsym (REAL_LIBC, "open"); + func = (int (*) (const char *, int, mode_t)) dlsym (RTLD_NEXT, "open"); if (flags & O_CREAT) { va_start(args, flags); @@ -146,126 +486,189 @@ int open (const char *pathname, int flags, ...) va_end(args); } - fd = (*func) (pathname, flags, mode); - if (!strcmp (pathname, "/dev/windrvr6")) { - fprintf(stderr,"opening windrvr6\n"); - windrvrfd = fd; + DPRINTF("opening windrvr6 (%d)\n", windrvrfds_count); + windrvrfds = realloc(windrvrfds, sizeof(int) * (++windrvrfds_count)); + if (!windrvrfds) + return -ENOMEM; + +#ifdef NO_WINDRVR + windrvrfds[windrvrfds_count-1] = fd = (*func) ("/dev/null", flags, mode); +#else + windrvrfds[windrvrfds_count-1] = fd = (*func) (pathname, flags, mode); +#endif + + return fd; } - return fd; + return (*func) (pathname, flags, mode); } -void diff(unsigned char *buf1, unsigned char *buf2, int len) { +int close(int fd) { + static int (*func) (int) = NULL; int i; - for(i=0; i%02x(%c)\n", i, buf1[i], ((buf1[i] >= 31 && buf1[i] <= 126)?buf1[i]:'.'), buf2[i], ((buf2[i] >= 31 && buf2[i] <= 126)?buf2[i]:'.')); + if (!func) + func = (int (*) (int)) dlsym(RTLD_NEXT, "close"); + + 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; } } + + return (*func) (fd); } -void hexdump(unsigned char *buf, int len) { +FILE *fopen(const char *path, const char *mode) { + FILE *ret; + static FILE* (*func) (const char*, const char*) = NULL; + char buf[256]; int i; - for(i=0; i %x\n", (unsigned int)start, length, prot, flags, fd, offset, (unsigned int)ret); - mmapped = ret; - mmapplen = length; + if (fp == modulesfp) { + modulesfp = NULL; + } - return ret; + if (fp == baseaddrfp) { + baseaddrfp = NULL; + } + + return (*func)(fp); } -void *mmap64(void *start, size_t length, int prot, int flags, int fd, off64_t offset) -{ - static void* (*func) (void *, size_t, int, int, int, off64_t) = NULL; - void *ret; +int access(const char *pathname, int mode) { + static int (*func) (const char*, int); if (!func) - func = (void* (*) (void *, size_t, int, int, int, off64_t)) dlsym (REAL_LIBC, "mmap64"); - - ret = (*func) (start, length, prot, flags, fd, offset); - fprintf(stderr,"MMAP64: %x, %d, %d, %d, %d, %lld -> %x\n", (unsigned int)start, length, prot, flags, fd, offset, (unsigned int)ret); - mmapped = ret; - mmapplen = length; + func = (int (*) (const char*, int)) dlsym(RTLD_NEXT, "access"); - return ret; + if (pathname && !strcmp(pathname, "/dev/windrvr6")) { + return 0; + } else { + return (*func)(pathname, mode); + } } -void *mmap2(void *start, size_t length, int prot, int flags, int fd, off_t pgoffset) -{ - static void* (*func) (void *, size_t, int, int, int, off_t) = NULL; - void *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 = (void* (*) (void *, size_t, int, int, int, off_t)) dlsym (REAL_LIBC, "mmap2"); - - ret = (*func) (start, length, prot, flags, fd, pgoffset); - fprintf(stderr,"MMAP2: %x, %d, %d, %d, %d, %d -> %x\n", (unsigned int)start, length, prot, flags, fd, pgoffset, (unsigned int)ret); - mmapped = ret; - mmapplen = length; + 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 ret; + return (*func)(__semid, __sops, __nsops); } +#endif -void *malloc(size_t size) -{ - static void* (*func) (size_t) = NULL; - void *ret; +#if __WORDSIZE == 32 +int uname (struct utsname *__name) { + static int (*func) (struct utsname*); + int ret; if (!func) - func = (void* (*) (size_t)) dlsym(REAL_LIBC, "malloc"); - - ret = (*func) (size); + func = (int (*) (struct utsname*)) dlsym(RTLD_NEXT, "uname"); - //fprintf(stderr,"MALLOC: %d -> %x\n", size, (unsigned int) ret); + ret = (*func)(__name); + if (ret == 0 && (!strcmp(__name->machine, "x86_64"))) { + strcpy(__name->machine, "i686"); + } + return ret; } - - #endif