X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/419f2c983bc269255b2a4ce279b253de1ff174b7..7cd012c138eac61de5325a6950b8dabd3162615c:/usb-driver.c?ds=inline diff --git a/usb-driver.c b/usb-driver.c index 692208e..b39c4fc 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 @@ -21,23 +36,36 @@ #include #include #include +#include +#include +#include +#include +#include #include "usb-driver.h" +#include "config.h" +#ifdef JTAGKEY +#include "jtagkey.h" +#endif static int (*ioctl_func) (int, int, void *) = NULL; -static int windrvrfd = 0; -FILE *modulesfp; +static int windrvrfd = -1; +static int parportfd = -1; +static unsigned long ppbase = 0; +static unsigned long ecpbase = 0; +FILE *modulesfp = NULL; +FILE *baseaddrfp = NULL; +int baseaddrnum = 0; static int modules_read = 0; static struct usb_bus *busses = NULL; static struct usb_device *usbdevice; static usb_dev_handle *usb_devhandle = NULL; +static int usbinterface = -1; static unsigned long card_type; static int ints_enabled = 0; static pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER; #define NO_WINDRVR 1 -#undef DEBUG -#ifdef DEBUG void hexdump(unsigned char *buf, int len) { int i; @@ -46,8 +74,8 @@ void hexdump(unsigned char *buf, int len) { if ((i % 16) == 15) fprintf(stderr,"\n"); } + fprintf(stderr,"\n"); } -#endif int usb_deviceinfo(unsigned char *buf) { int i,j,k,l; @@ -209,6 +237,106 @@ int usb_deviceinfo(unsigned char *buf) { return len; } +int pp_transfer(WD_TRANSFER *tr, int fd, unsigned int request) { + int ret = 0; + unsigned long port = (unsigned long)tr->dwPort; + unsigned char val; + static unsigned char last_pp_write = 0; + + DPRINTF("dwPort: 0x%lx, cmdTrans: %lu, dwbytes: %ld, fautoinc: %ld, dwoptions: %ld\n", + (unsigned long)tr->dwPort, tr->cmdTrans, tr->dwBytes, + tr->fAutoinc, tr->dwOptions); + + val = tr->Data.Byte; + +#ifdef DEBUG + if (tr->cmdTrans == 13) + DPRINTF("write byte: %d\n", val); +#endif + + if (parportfd < 0) + return ret; + + if (port == ppbase + PP_DATA) { + DPRINTF("data port\n"); + switch(tr->cmdTrans) { + case PP_READ: + ret = 0; /* We don't support reading of the data port */ + break; + + case PP_WRITE: + ret = ioctl(parportfd, PPWDATA, &val); + last_pp_write = val; + break; + + default: + fprintf(stderr,"!!!Unsupported TRANSFER command: %lu!!!\n", tr->cmdTrans); + ret = -1; + break; + } + } else if (port == ppbase + PP_STATUS) { + DPRINTF("status port (last write: %d)\n", last_pp_write); + switch(tr->cmdTrans) { + case PP_READ: + ret = ioctl(parportfd, PPRSTATUS, &val); +#ifdef FORCE_PC3_IDENT + val &= 0x5f; + if (last_pp_write & 0x40) + val |= 0x20; + else + val |= 0x80; +#endif + break; + + case PP_WRITE: + ret = 0; /* Status Port is readonly */ + break; + + default: + fprintf(stderr,"!!!Unsupported TRANSFER command: %lu!!!\n", tr->cmdTrans); + ret = -1; + break; + } + } else if (port == ppbase + PP_CONTROL) { + DPRINTF("control port\n"); + switch(tr->cmdTrans) { + case PP_READ: + ret = ioctl(parportfd, PPRCONTROL, &val); + break; + + case PP_WRITE: + ret = ioctl(parportfd, PPWCONTROL, &val); + break; + + default: + fprintf(stderr,"!!!Unsupported TRANSFER command: %lu!!!\n", tr->cmdTrans); + ret = -1; + break; + } + } else if ((port == ecpbase + PP_ECP_CFGA) && ecpbase) { + DPRINTF("ECP_CFGA port\n"); + } else if ((port == ecpbase + PP_ECP_CFGB) && ecpbase) { + DPRINTF("ECP_CFGB port\n"); + } else if ((port == ecpbase + PP_ECP_ECR) && ecpbase) { + DPRINTF("ECP_ECR port\n"); + } else { + DPRINTF("access to unsupported address range!\n"); + ret = 0; + } + + tr->Data.Byte = val; + + DPRINTF("dwPortReturn: 0x%lx, cmdTrans: %lu, dwbytes: %ld, fautoinc: %ld, dwoptions: %ld\n", + (unsigned long)tr->dwPort, tr->cmdTrans, tr->dwBytes, + tr->fAutoinc, tr->dwOptions); +#ifdef DEBUG + if (tr->cmdTrans == 10) + DPRINTF("read byte: %d\n", tr->Data.Byte); +#endif + + return ret; +} + int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { struct header_struct* wdheader = (struct header_struct*)wdioctl; struct version_struct *version; @@ -219,51 +347,117 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { return (*ioctl_func) (fd, request, wdioctl); } - switch(request) { + switch(request & ~(0xc0000000)) { case VERSION: version = (struct version_struct*)(wdheader->data); - strcpy(version->version, "WinDriver no more"); + strcpy(version->version, "libusb-driver.so $Revision: 1.66 $"); version->versionul = 802; -#ifdef DEBUG - fprintf(stderr,"faking VERSION\n"); -#endif + DPRINTF("VERSION\n"); break; case LICENSE: -#ifdef DEBUG - fprintf(stderr,"faking LICENSE\n"); -#endif + DPRINTF("LICENSE\n"); break; + case CARD_REGISTER_OLD: case CARD_REGISTER: - /* TODO: Implement for LPT-support */ -#if 0 + DPRINTF("CARD_REGISTER\n"); { struct card_register* cr = (struct card_register*)(wdheader->data); - } + char ppdev[32]; + + 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 + +#ifdef JTAGKEY + if (!config_is_real_pport((unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10)) { + int num = (unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10; + + ret=jtagkey_init(config_usb_vid(num), config_usb_pid(num)); + cr->hCard = 0xff; + ppbase = (unsigned long)cr->Card.Item[0].I.IO.dwAddr; + if (ret < 0) + cr->hCard = 0; + + break; + } #endif -#ifdef DEBUG - fprintf(stderr,"faking CARD_REGISTER\n"); + + if (parportfd < 0) { + snprintf(ppdev, sizeof(ppdev), "/dev/parport%lu", + (unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10); + DPRINTF("opening %s\n", ppdev); + parportfd = open(ppdev, O_RDWR|O_EXCL); + + if (parportfd < 0) + fprintf(stderr,"Can't open %s: %s\n", ppdev, strerror(errno)); + } + + if (parportfd >= 0) { + int pmode; + + if (ioctl(parportfd, PPCLAIM) == -1) + return ret; + + ecpbase = 0; + pmode = IEEE1284_MODE_COMPAT; + if (ioctl(parportfd, PPNEGOT, &pmode) == -1) + return ret; + + if (cr->Card.dwItems > 1 && cr->Card.Item[1].I.IO.dwAddr) { + DPRINTF("ECP mode requested\n"); + ecpbase = (unsigned long)cr->Card.Item[1].I.IO.dwAddr; + /* TODO: Implement ECP mode */ +#if 0 + pmode = IEEE1284_MODE_ECP; + + if (ioctl(parportfd, PPNEGOT, &pmode) == -1) { + ecpbase = 0; + pmode = IEEE1284_MODE_COMPAT; + if (ioctl(parportfd, PPNEGOT, &pmode) == -1) + return ret; + } #endif + } + + cr->hCard = parportfd; + } + + ppbase = (unsigned long)cr->Card.Item[0].I.IO.dwAddr; + if (ret < 0) + cr->hCard = 0; +#endif + DPRINTF("hCard: %lu\n", cr->hCard); + } break; case USB_TRANSFER: -#ifdef DEBUG - fprintf(stderr,"in USB_TRANSFER"); -#endif + DPRINTF("in USB_TRANSFER"); { struct usb_transfer *ut = (struct usb_transfer*)(wdheader->data); #ifdef DEBUG - fprintf(stderr," unique: %lu, pipe: %lu, read: %lu, options: %lx, size: %lu, timeout: %lx\n", ut->dwUniqueID, ut->dwPipeNum, ut->fRead, ut->dwOptions, ut->dwBufferSize, ut->dwTimeout); - fprintf(stderr,"setup packet: "); + DPRINTF(" unique: %lu, pipe: %lu, read: %lu, options: %lx, size: %lu, timeout: %lx\n", + ut->dwUniqueID, ut->dwPipeNum, ut->fRead, + ut->dwOptions, ut->dwBufferSize, ut->dwTimeout); + DPRINTF("setup packet: "); hexdump(ut->SetupPacket, 8); - fprintf(stderr,"\n"); if (!ut->fRead && ut->dwBufferSize) { hexdump(ut->pBuffer, ut->dwBufferSize); - fprintf(stderr,"\n"); } #endif @@ -278,9 +472,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { value = ut->SetupPacket[2] | (ut->SetupPacket[3] << 8); index = ut->SetupPacket[4] | (ut->SetupPacket[5] << 8); size = ut->SetupPacket[6] | (ut->SetupPacket[7] << 8); -#ifdef DEBUG - fprintf(stderr, "requesttype: %x, request: %x, value: %u, index: %u, size: %u\n", requesttype, request, value, index, size); -#endif + DPRINTF("requesttype: %x, request: %x, value: %u, index: %u, size: %u\n", requesttype, request, value, index, size); ret = usb_control_msg(usb_devhandle, requesttype, request, value, index, ut->pBuffer, size, ut->dwTimeout); } else { if (ut->fRead) { @@ -300,29 +492,29 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { #endif #ifdef DEBUG - fprintf(stderr,"Transferred: %lu (%s)\n",ut->dwBytesTransferred, (ut->fRead?"read":"write")); + DPRINTF("Transferred: %lu (%s)\n",ut->dwBytesTransferred, (ut->fRead?"read":"write")); if (ut->fRead && ut->dwBytesTransferred) { - fprintf(stderr,"Read: "); + DPRINTF("Read: "); hexdump(ut->pBuffer, ut->dwBytesTransferred); - fprintf(stderr,"\n"); } #endif } break; + case INT_ENABLE_OLD: case INT_ENABLE: -#ifdef DEBUG - fprintf(stderr,"INT_ENABLE\n"); -#endif + DPRINTF("INT_ENABLE\n"); { struct interrupt *it = (struct interrupt*)(wdheader->data); -#ifdef DEBUG - fprintf(stderr,"Handle: %lu, 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); -#endif + DPRINTF("Handle: %lu, 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); } @@ -330,39 +522,38 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { break; case INT_DISABLE: -#ifdef DEBUG - fprintf(stderr,"INT_DISABLE\n"); -#endif + DPRINTF("INT_DISABLE\n"); { struct interrupt *it = (struct interrupt*)(wdheader->data); -#ifdef DEBUG - fprintf(stderr,"Handle: %lu, 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); -#endif + DPRINTF("Handle: %lu, 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; - pthread_mutex_unlock(&int_wait); -#endif -#ifdef DEBUG - fprintf(stderr,"Handle: %lu, 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); + if (pthread_mutex_trylock(&int_wait) == EBUSY) + pthread_mutex_unlock(&int_wait); #endif + DPRINTF("Handle: %lu, 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 USB_SET_INTERFACE: -#ifdef DEBUG - fprintf(stderr,"USB_SET_INTERFACE\n"); -#endif + DPRINTF("USB_SET_INTERFACE\n"); { struct usb_set_interface *usi = (struct usb_set_interface*)(wdheader->data); -#ifdef DEBUG - fprintf(stderr,"unique: %lu, interfacenum: %lu, alternatesetting: %lu, options: %lx\n", usi->dwUniqueID, usi->dwInterfaceNum, usi->dwAlternateSetting, usi->dwOptions); -#endif + DPRINTF("unique: %lu, 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 @@ -374,6 +565,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { ret = usb_claim_interface(usb_devhandle, usbdevice->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber); if (!ret) { if(!ret) { + usbinterface = usbdevice->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber; ret = usb_set_altinterface(usb_devhandle, usi->dwAlternateSetting); if (ret) fprintf(stderr, "usb_set_altinterface: %d\n", ret); @@ -381,27 +573,29 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { fprintf(stderr, "usb_set_configuration: %d (%s)\n", ret, usb_strerror()); } } else { - fprintf(stderr, "usb_claim_interface: %d -> %d (%s)\n", usbdevice->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber, ret, usb_strerror()); + fprintf(stderr, "usb_claim_interface: %d -> %d (%s)\n", + usbdevice->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber, + ret, usb_strerror()); } } #endif -#ifdef DEBUG - fprintf(stderr,"unique: %lu, interfacenum: %lu, alternatesetting: %lu, options: %lx\n", usi->dwUniqueID, usi->dwInterfaceNum, usi->dwAlternateSetting, usi->dwOptions); -#endif + DPRINTF("unique: %lu, interfacenum: %lu, alternatesetting: %lu, options: %lx\n", + usi->dwUniqueID, usi->dwInterfaceNum, + usi->dwAlternateSetting, usi->dwOptions); } break; + case USB_GET_DEVICE_DATA_OLD: case USB_GET_DEVICE_DATA: -#ifdef DEBUG - fprintf(stderr,"faking USB_GET_DEVICE_DATA\n"); -#endif + DPRINTF("USB_GET_DEVICE_DATA\n"); { struct usb_get_device_data *ugdd = (struct usb_get_device_data*)(wdheader->data); int pSize; -#ifdef DEBUG - fprintf(stderr, "unique: %lu, bytes: %lu, options: %lx\n", ugdd->dwUniqueID, ugdd->dwBytes, ugdd->dwOptions); -#endif + DPRINTF("unique: %lu, bytes: %lu, options: %lx\n", + ugdd->dwUniqueID, ugdd->dwBytes, + ugdd->dwOptions); + pSize = ugdd->dwBytes; if (!ugdd->dwBytes) { if (usbdevice) { @@ -413,22 +607,33 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { } break; + case EVENT_REGISTER_OLD: case EVENT_REGISTER: -#ifdef DEBUG - fprintf(stderr,"EVENT_REGISTER\n"); -#endif + DPRINTF("EVENT_REGISTER\n"); { struct event *e = (struct event*)(wdheader->data); struct usb_bus *bus; int i; -#ifdef DEBUG - fprintf(stderr,"handle: %lu, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: %lu, 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); -#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", + 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++) { -#ifdef DEBUG - fprintf(stderr,"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 + + 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 = busses; bus; bus = bus->next) { struct usb_device *dev; @@ -446,15 +651,16 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { int ai; for (ai = 0; ai < interface->num_altsetting; ai++) { -#ifdef DEBUG - fprintf(stderr, "intclass: %x, intsubclass: %x, intproto: %x\n", interface->altsetting[i].bInterfaceClass, interface->altsetting[i].bInterfaceSubClass, interface->altsetting[i].bInterfaceProtocol); -#endif + + 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! */ -#ifdef DEBUG - fprintf(stderr,"!!!FOUND DEVICE WITH LIBUSB!!!\n"); -#endif + DPRINTF("found device with libusb\n"); usbdevice = dev; card_type = e->dwCardType; } @@ -472,39 +678,91 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { #endif #ifdef DEBUG - fprintf(stderr,"handle: %lu, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: %lu, 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); + 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", + 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++) - fprintf(stderr,"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); + 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 TRANSFER_OLD: case TRANSFER: - fprintf(stderr,"TRANSFER\n"); + DPRINTF("TRANSFER\n"); + { + WD_TRANSFER *tr = (WD_TRANSFER*)(wdheader->data); + #ifndef NO_WINDRVR - ret = (*ioctl_func) (fd, request, wdioctl); + ret = (*ioctl_func) (fd, request, wdioctl); +#else + +#ifdef JTAGKEY + if (!config_is_real_pport(ppbase / 0x10)) { + ret = jtagkey_transfer(tr, fd, request, ppbase, ecpbase, 1); + break; + } +#endif /* JTAGKEY */ + ret = pp_transfer(tr, fd, request); #endif + } break; - case EVENT_UNREGISTER: -#ifdef DEBUG - fprintf(stderr,"EVENT_UNREGISTER\n"); + 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); + int i; +#ifndef NO_WINDRVR + ret = (*ioctl_func) (fd, request, wdioctl); +#else + +#ifdef JTAGKEY + if (!config_is_real_pport(ppbase / 0x10)) { + ret = jtagkey_transfer(tr, fd, request, ppbase, ecpbase, num); + break; + } +#endif /* JTAGKEY */ + + for (i = 0; i < num; i++) { + DPRINTF("Transfer %d:\n", i+1); + ret = pp_transfer(tr + i, fd, request); + } #endif + } + break; + + case EVENT_UNREGISTER: + DPRINTF("EVENT_UNREGISTER\n"); #ifndef NO_WINDRVR ret = (*ioctl_func) (fd, request, wdioctl); #endif break; case INT_WAIT: -#ifdef DEBUG - fprintf(stderr,"INT_WAIT\n"); -#endif + DPRINTF("INT_WAIT\n"); { struct interrupt *it = (struct interrupt*)(wdheader->data); -#ifdef DEBUG - fprintf(stderr,"Handle: %lu, 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); -#endif + DPRINTF("Handle: %lu, 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); @@ -522,31 +780,66 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { } #endif -#ifdef DEBUG - fprintf(stderr,"INT_WAIT_RETURN: Handle: %lu, 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); -#endif + DPRINTF("INT_WAIT_RETURN: Handle: %lu, 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 CARD_UNREGISTER: - fprintf(stderr,"CARD_UNREGISTER\n"); + DPRINTF("CARD_UNREGISTER\n"); + { + struct card_register* cr = (struct card_register*)(wdheader->data); + + 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); + #ifndef NO_WINDRVR - ret = (*ioctl_func) (fd, request, wdioctl); + ret = (*ioctl_func) (fd, request, wdioctl); +#else +#ifdef JTAGKEY + if (cr->hCard == 0xff) + jtagkey_close(); +#endif + + if (parportfd == cr->hCard && parportfd >= 0) { + ioctl(parportfd, PPRELEASE); + close(parportfd); + parportfd = -1; + } #endif + } break; case EVENT_PULL: -#ifdef DEBUG - fprintf(stderr,"EVENT_PULL\n"); -#endif + DPRINTF("EVENT_PULL\n"); { struct event *e = (struct event*)(wdheader->data); #ifdef DEBUG int i; - fprintf(stderr,"handle: %lu, action: %lu, status: %lu, eventid: %lu, cardtype: %lx, kplug: %lu, options: %lu, dev: %lx:%lx, unique: %lu, 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); + 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", + 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++) - fprintf(stderr,"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); + 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 @@ -570,9 +863,23 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { #endif #ifdef DEBUG - fprintf(stderr,"handle: %lu, action: %lu, status: %lu, eventid: %lu, cardtype: %lx, kplug: %lu, options: %lu, dev: %lx:%lx, unique: %lu, 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); + 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", + 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++) - fprintf(stderr,"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); + 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 } @@ -589,13 +896,13 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { return ret; } -int ioctl(int fd, int request, ...) { +int ioctl(int fd, unsigned long int request, ...) { va_list args; void *argp; int ret; if (!ioctl_func) - ioctl_func = (int (*) (int, int, void *)) dlsym (REAL_LIBC, "ioctl"); + ioctl_func = (int (*) (int, int, void *)) dlsym (RTLD_NEXT, "ioctl"); va_start (args, request); argp = va_arg (args, void *); @@ -616,7 +923,7 @@ int open (const char *pathname, int flags, ...) { int fd; if (!func) - func = (int (*) (const char *, int, mode_t)) dlsym (REAL_LIBC, "open"); + func = (int (*) (const char *, int, mode_t)) dlsym (RTLD_NEXT, "open"); if (flags & O_CREAT) { va_start(args, flags); @@ -625,9 +932,7 @@ int open (const char *pathname, int flags, ...) { } if (!strcmp (pathname, "/dev/windrvr6")) { -#ifdef DEBUG - fprintf(stderr,"opening windrvr6\n"); -#endif + DPRINTF("opening windrvr6\n"); #ifdef NO_WINDRVR windrvrfd = fd = (*func) ("/dev/null", flags, mode); #else @@ -651,13 +956,19 @@ int close(int fd) { static int (*func) (int) = NULL; if (!func) - func = (int (*) (int)) dlsym(REAL_LIBC, "close"); + func = (int (*) (int)) dlsym(RTLD_NEXT, "close"); - if (fd == windrvrfd) { -#ifdef DEBUG - fprintf(stderr,"close windrvrfd\n"); -#endif - windrvrfd = 0; + if (fd == windrvrfd && windrvrfd >= 0) { + DPRINTF("close windrvrfd\n"); + if (usbinterface >= 0) + usb_release_interface(usb_devhandle, usbinterface); + + if (usb_devhandle) + usb_close(usb_devhandle); + + usb_devhandle = NULL; + usbinterface = -1; + windrvrfd = -1; } return (*func) (fd); @@ -666,16 +977,35 @@ int close(int fd) { FILE *fopen(const char *path, const char *mode) { FILE *ret; static FILE* (*func) (const char*, const char*) = NULL; + char buf[256]; + int i; if (!func) - func = (FILE* (*) (const char*, const char*)) dlsym(REAL_LIBC, "fopen"); + func = (FILE* (*) (const char*, const char*)) dlsym(RTLD_NEXT, "fopen"); + + for (i = 0; i < 4; i++) { + snprintf(buf, sizeof(buf), "/proc/sys/dev/parport/parport%d/base-addr", i); + if (!strcmp(path, buf)) { + DPRINTF("open base-addr of parport%d\n", i); + if (config_is_real_pport(i)) { + ret = (*func) (path, mode); + } else { + ret = (*func) ("/dev/null", mode); + } + + if (ret) { + baseaddrfp = ret; + baseaddrnum = i; + } + + return ret; + } + } ret = (*func) (path, mode); - if (!strcmp (path, "/proc/modules")) { -#ifdef DEBUG - fprintf(stderr,"opening /proc/modules\n"); -#endif + if (!strcmp(path, "/proc/modules")) { + DPRINTF("opening /proc/modules\n"); #ifdef NO_WINDRVR modulesfp = ret; modules_read = 0; @@ -688,18 +1018,24 @@ FILE *fopen(const char *path, const char *mode) { char *fgets(char *s, int size, FILE *stream) { static char* (*func) (char*, int, FILE*) = NULL; const char modules[][256] = {"windrvr6 1 0 - Live 0xdeadbeef\n", "parport_pc 1 0 - Live 0xdeadbeef\n"}; + char buf[256]; char *ret = NULL; if (!func) - func = (char* (*) (char*, int, FILE*)) dlsym(REAL_LIBC, "fgets"); + func = (char* (*) (char*, int, FILE*)) dlsym(RTLD_NEXT, "fgets"); if (modulesfp == stream) { - if (modules_read < sizeof(modules)) { + if (modules_read < sizeof(modules) / sizeof(modules[0])) { strcpy(s, modules[modules_read]); ret = s; modules_read++; } + } else if (baseaddrfp == stream) { + snprintf(s, sizeof(buf), "%d\t%d\n", + (baseaddrnum) * 0x10, + ((baseaddrnum) * 0x10) + 0x400); + ret = s; } else { ret = (*func)(s,size,stream); } @@ -711,11 +1047,15 @@ int fclose(FILE *fp) { static int (*func) (FILE*) = NULL; if (!func) - func = (int (*) (FILE*)) dlsym(REAL_LIBC, "fclose"); + func = (int (*) (FILE*)) dlsym(RTLD_NEXT, "fclose"); if (fp == modulesfp) { modulesfp = NULL; } + + if (fp == baseaddrfp) { + baseaddrfp = NULL; + } return (*func)(fp); } @@ -724,7 +1064,7 @@ int access(const char *pathname, int mode) { static int (*func) (const char*, int); if (!func) - func = (int (*) (const char*, int)) dlsym(REAL_LIBC, "access"); + func = (int (*) (const char*, int)) dlsym(RTLD_NEXT, "access"); if (!strcmp(pathname, "/dev/windrvr6")) { return 0; @@ -732,4 +1072,3 @@ int access(const char *pathname, int mode) { return (*func)(pathname, mode); } } -#endif