X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/ac22d975d43519a0223ea0c1f4d61ae6110e7bc2..419f2c983bc269255b2a4ce279b253de1ff174b7:/usb-driver.c diff --git a/usb-driver.c b/usb-driver.c index f49cb16..692208e 100644 --- a/usb-driver.c +++ b/usb-driver.c @@ -19,15 +19,195 @@ #include #include #include -#include "xilinx.h" +#include +#include +#include "usb-driver.h" static int (*ioctl_func) (int, int, void *) = NULL; static int windrvrfd = 0; +FILE *modulesfp; +static int modules_read = 0; static struct usb_bus *busses = NULL; -static struct usb_device *usb_cable; +static struct usb_device *usbdevice; +static usb_dev_handle *usb_devhandle = NULL; +static unsigned long card_type; +static int ints_enabled = 0; +static pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER; -void hexdump(unsigned char *buf, int len); -void diff(unsigned char *buf1, unsigned char *buf2, int len); +#define NO_WINDRVR 1 +#undef DEBUG + +#ifdef DEBUG +void hexdump(unsigned char *buf, int len) { + int i; + + for(i=0; iDescriptor.bLength = sizeof(WDU_DEVICE_DESCRIPTOR); + udi->Descriptor.bDescriptorType = usbdevice->descriptor.bDescriptorType; + udi->Descriptor.bcdUSB = usbdevice->descriptor.bcdUSB; + udi->Descriptor.bDeviceClass = usbdevice->descriptor.bDeviceClass; + udi->Descriptor.bDeviceSubClass = usbdevice->descriptor.bDeviceSubClass; + udi->Descriptor.bDeviceProtocol = usbdevice->descriptor.bDeviceProtocol; + udi->Descriptor.bMaxPacketSize0 = usbdevice->descriptor.bMaxPacketSize0; + udi->Descriptor.idVendor = usbdevice->descriptor.idVendor; + udi->Descriptor.idProduct = usbdevice->descriptor.idProduct; + udi->Descriptor.bcdDevice = usbdevice->descriptor.bcdDevice; + udi->Descriptor.iManufacturer = usbdevice->descriptor.iManufacturer; + udi->Descriptor.iProduct = usbdevice->descriptor.iProduct; + udi->Descriptor.iSerialNumber = usbdevice->descriptor.iSerialNumber; + udi->Descriptor.bNumConfigurations = usbdevice->descriptor.bNumConfigurations; + + /* TODO: Fix Pipe0! */ + udi->Pipe0.dwNumber = 0x00; + udi->Pipe0.dwMaximumPacketSize = usbdevice->descriptor.bMaxPacketSize0; + udi->Pipe0.type = 0; + udi->Pipe0.direction = WDU_DIR_IN_OUT; + udi->Pipe0.dwInterval = 0; + + pConfigs = &(udi->pConfigs); + pActiveConfig = &(udi->pActiveConfig); + pActiveInterface = &(udi->pActiveInterface[0]); + } + + len = sizeof(struct usb_device_info); + + for (i=0; idescriptor.bNumConfigurations; i++) + { + struct usb_config_descriptor *conf_desc = &usbdevice->config[i]; + WDU_INTERFACE **pInterfaces; + WDU_ALTERNATE_SETTING **pAlternateSettings[conf_desc->bNumInterfaces]; + WDU_ALTERNATE_SETTING **pActiveAltSetting[conf_desc->bNumInterfaces]; + + if (buf) { + WDU_CONFIGURATION *cfg = (WDU_CONFIGURATION*)(buf+len); + + *pConfigs = cfg; + *pActiveConfig = cfg; + + cfg->Descriptor.bLength = conf_desc->bLength; + cfg->Descriptor.bDescriptorType = conf_desc->bDescriptorType; + cfg->Descriptor.wTotalLength = conf_desc->wTotalLength; + cfg->Descriptor.bNumInterfaces = conf_desc->bNumInterfaces; + cfg->Descriptor.bConfigurationValue = conf_desc->bConfigurationValue; + cfg->Descriptor.iConfiguration = conf_desc->iConfiguration; + cfg->Descriptor.bmAttributes = conf_desc->bmAttributes; + cfg->Descriptor.MaxPower = conf_desc->MaxPower; + + cfg->dwNumInterfaces = conf_desc->bNumInterfaces; + + pInterfaces = &(cfg->pInterfaces); + } + len += sizeof(WDU_CONFIGURATION); + + if (buf) { + *pInterfaces = (WDU_INTERFACE*)(buf+len); + for (j=0; jbNumInterfaces; j++) { + WDU_INTERFACE *iface = (WDU_INTERFACE*)(buf+len); + + pActiveInterface[j] = iface; + + pAlternateSettings[j] = &(iface->pAlternateSettings); + iface->dwNumAltSettings = usbdevice->config[i].interface[j].num_altsetting; + pActiveAltSetting[j] = &(iface->pActiveAltSetting); + + len += sizeof(WDU_INTERFACE); + } + } else { + len += sizeof(WDU_INTERFACE) * conf_desc->bNumInterfaces; + } + + for (j=0; jbNumInterfaces; j++) + { + struct usb_interface *interface = &usbdevice->config[i].interface[j]; + + if (buf) { + *pAlternateSettings[j] = (WDU_ALTERNATE_SETTING*)(buf+len); + /* FIXME: */ + *pActiveAltSetting[j] = (WDU_ALTERNATE_SETTING*)(buf+len); + } + + for(k=0; knum_altsetting; k++) + { + unsigned char bNumEndpoints = interface->altsetting[k].bNumEndpoints; + WDU_ENDPOINT_DESCRIPTOR **pEndpointDescriptors; + WDU_PIPE_INFO **pPipes; + + if (buf) { + WDU_ALTERNATE_SETTING *altset = (WDU_ALTERNATE_SETTING*)(buf+len); + + altset->Descriptor.bLength = interface->altsetting[k].bLength; + altset->Descriptor.bDescriptorType = interface->altsetting[k].bDescriptorType; + altset->Descriptor.bInterfaceNumber = interface->altsetting[k].bInterfaceNumber; + altset->Descriptor.bAlternateSetting = interface->altsetting[k].bAlternateSetting; + altset->Descriptor.bNumEndpoints = interface->altsetting[k].bNumEndpoints; + altset->Descriptor.bInterfaceClass = interface->altsetting[k].bInterfaceClass; + altset->Descriptor.bInterfaceSubClass = interface->altsetting[k].bInterfaceSubClass; + altset->Descriptor.bInterfaceProtocol = interface->altsetting[k].bInterfaceProtocol; + altset->Descriptor.iInterface = interface->altsetting[k].iInterface; + pEndpointDescriptors = &(altset->pEndpointDescriptors); + pPipes = &(altset->pPipes); + + } + len +=sizeof(WDU_ALTERNATE_SETTING); + + if (buf) { + *pEndpointDescriptors = (WDU_ENDPOINT_DESCRIPTOR*)(buf+len); + for (l = 0; l < bNumEndpoints; l++) { + WDU_ENDPOINT_DESCRIPTOR *ed = (WDU_ENDPOINT_DESCRIPTOR*)(buf+len); + + ed->bLength = interface->altsetting[k].endpoint[l].bLength; + ed->bDescriptorType = interface->altsetting[k].endpoint[l].bDescriptorType; + ed->bEndpointAddress = interface->altsetting[k].endpoint[l].bEndpointAddress; + ed->bmAttributes = interface->altsetting[k].endpoint[l].bmAttributes; + ed->wMaxPacketSize = interface->altsetting[k].endpoint[l].wMaxPacketSize; + ed->bInterval = interface->altsetting[k].endpoint[l].bInterval; + + len += sizeof(WDU_ENDPOINT_DESCRIPTOR); + } + + *pPipes = (WDU_PIPE_INFO*)(buf+len); + for (l = 0; l < bNumEndpoints; l++) { + WDU_PIPE_INFO *pi = (WDU_PIPE_INFO*)(buf+len); + + pi->dwNumber = interface->altsetting[k].endpoint[l].bEndpointAddress; + pi->dwMaximumPacketSize = WDU_GET_MAX_PACKET_SIZE(interface->altsetting[k].endpoint[l].wMaxPacketSize); + pi->type = interface->altsetting[k].endpoint[l].bmAttributes & USB_ENDPOINT_TYPE_MASK; + if (pi->type == PIPE_TYPE_CONTROL) + pi->direction = WDU_DIR_IN_OUT; + else + { + pi->direction = interface->altsetting[k].endpoint[l].bEndpointAddress & USB_ENDPOINT_DIR_MASK ? WDU_DIR_IN : WDU_DIR_OUT; + } + + pi->dwInterval = interface->altsetting[k].endpoint[l].bInterval; + + len += sizeof(WDU_PIPE_INFO); + } + } else { + len +=(sizeof(WDU_ENDPOINT_DESCRIPTOR)+sizeof(WDU_PIPE_INFO))*bNumEndpoints; + } + } + } + } + + return len; +} int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { struct header_struct* wdheader = (struct header_struct*)wdioctl; @@ -43,111 +223,212 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { case VERSION: version = (struct version_struct*)(wdheader->data); strcpy(version->version, "WinDriver no more"); - version->versionul = 999; + version->versionul = 802; +#ifdef DEBUG fprintf(stderr,"faking VERSION\n"); +#endif break; case LICENSE: +#ifdef DEBUG fprintf(stderr,"faking LICENSE\n"); +#endif break; case CARD_REGISTER: + /* TODO: Implement for LPT-support */ +#if 0 { - //struct card_register* cr = (struct card_register*)(wdheader->data); - /* Todo: LPT-Port already in use */ + struct card_register* cr = (struct card_register*)(wdheader->data); } +#endif +#ifdef DEBUG fprintf(stderr,"faking CARD_REGISTER\n"); +#endif break; case USB_TRANSFER: +#ifdef DEBUG fprintf(stderr,"in USB_TRANSFER"); +#endif { 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: "); hexdump(ut->SetupPacket, 8); fprintf(stderr,"\n"); + if (!ut->fRead && ut->dwBufferSize) { hexdump(ut->pBuffer, ut->dwBufferSize); fprintf(stderr,"\n"); } +#endif +#ifndef NO_WINDRVR ret = (*ioctl_func) (fd, request, wdioctl); +#else + /* 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); +#ifdef DEBUG + fprintf(stderr, "requesttype: %x, request: %x, value: %u, index: %u, size: %u\n", requesttype, request, value, index, size); +#endif + ret = usb_control_msg(usb_devhandle, requesttype, request, value, index, ut->pBuffer, size, ut->dwTimeout); + } else { + if (ut->fRead) { + ret = usb_bulk_read(usb_devhandle, ut->dwPipeNum, ut->pBuffer, ut->dwBufferSize, ut->dwTimeout); + + } else { + ret = usb_bulk_write(usb_devhandle, ut->dwPipeNum, ut->pBuffer, ut->dwBufferSize, ut->dwTimeout); + } + } + if (ret < 0) { + fprintf(stderr, "usb_transfer: %d (%s)\n", ret, usb_strerror()); + } else { + ut->dwBytesTransferred = ret; + ret = 0; + } +#endif + +#ifdef DEBUG fprintf(stderr,"Transferred: %lu (%s)\n",ut->dwBytesTransferred, (ut->fRead?"read":"write")); if (ut->fRead && ut->dwBytesTransferred) { fprintf(stderr,"Read: "); hexdump(ut->pBuffer, ut->dwBytesTransferred); + fprintf(stderr,"\n"); } - fprintf(stderr,"\n"); +#endif } break; case INT_ENABLE: - fprintf(stderr,"faking INT_ENABLE"); +#ifdef DEBUG + fprintf(stderr,"INT_ENABLE\n"); +#endif { 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 it->fEnableOk = 1; - //ret = (*ioctl_func) (fd, request, wdioctl); + ints_enabled = 1; + pthread_mutex_trylock(&int_wait); } break; case INT_DISABLE: +#ifdef DEBUG fprintf(stderr,"INT_DISABLE\n"); +#endif { 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); - //it->dwCounter = 0; - //it->fStopped = 1; +#endif +#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); +#endif } break; case USB_SET_INTERFACE: +#ifdef DEBUG fprintf(stderr,"USB_SET_INTERFACE\n"); +#endif { 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 +#ifndef NO_WINDRVR ret = (*ioctl_func) (fd, request, wdioctl); +#else + if (usbdevice) { + if (!usb_devhandle) + usb_devhandle = usb_open(usbdevice); + + /* FIXME: Select right interface! */ + ret = usb_claim_interface(usb_devhandle, usbdevice->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber); + if (!ret) { + if(!ret) { + ret = usb_set_altinterface(usb_devhandle, usi->dwAlternateSetting); + if (ret) + fprintf(stderr, "usb_set_altinterface: %d\n", ret); + } else { + 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()); + } + } +#endif +#ifdef DEBUG + fprintf(stderr,"unique: %lu, interfacenum: %lu, alternatesetting: %lu, options: %lx\n", usi->dwUniqueID, usi->dwInterfaceNum, usi->dwAlternateSetting, usi->dwOptions); +#endif } break; case USB_GET_DEVICE_DATA: - fprintf(stderr,"USB_GET_DEVICE_DATA\n"); +#ifdef DEBUG + fprintf(stderr,"faking USB_GET_DEVICE_DATA\n"); +#endif { struct usb_get_device_data *ugdd = (struct usb_get_device_data*)(wdheader->data); int pSize; - fprintf(stderr, "uniqe: %lu, bytes: %lu, options: %lx\n", ugdd->dwUniqueID, ugdd->dwBytes, ugdd->dwOptions); +#ifdef DEBUG + fprintf(stderr, "unique: %lu, bytes: %lu, options: %lx\n", ugdd->dwUniqueID, ugdd->dwBytes, ugdd->dwOptions); +#endif pSize = ugdd->dwBytes; - ret = (*ioctl_func) (fd, request, wdioctl); - if (pSize) { - hexdump(ugdd->pBuf, pSize); - fprintf(stderr, "\n"); + if (!ugdd->dwBytes) { + if (usbdevice) { + ugdd->dwBytes = usb_deviceinfo(NULL); + } + } else { + usb_deviceinfo((unsigned char*)ugdd->pBuf); } } break; case EVENT_REGISTER: +#ifdef DEBUG fprintf(stderr,"EVENT_REGISTER\n"); +#endif { 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 for (i = 0; i < e->dwNumMatchTables; i++) { - fprintf(stderr,"match: dev: %x:%x, 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); +#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 for (bus = busses; bus; bus = bus->next) { struct usb_device *dev; @@ -159,95 +440,183 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { (desc->idProduct == e->matchTables[i].ProductId) && (desc->bDeviceClass == e->matchTables[i].bDeviceClass) && (desc->bDeviceSubClass == e->matchTables[i].bDeviceSubClass)) { - struct usb_interface *interface = dev->config->interface; - int ai; - - for (ai = 0; ai < interface->num_altsetting; ai++) { - fprintf(stderr, "intclass: %x, intsubclass: %x, intproto: %x\n", interface->altsetting[i].bInterfaceClass, interface->altsetting[i].bInterfaceSubClass, interface->altsetting[i].bInterfaceProtocol); - if ((interface->altsetting[i].bInterfaceSubClass == e->matchTables[i].bInterfaceSubClass) && - (interface->altsetting[i].bInterfaceProtocol == e->matchTables[i].bInterfaceProtocol)){ - /* TODO: check interfaceClass! */ - fprintf(stderr,"!!!FOUND DEVICE WITH LIBUSB!!!\n"); - usb_cable = dev; - } - } + 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++) { +#ifdef DEBUG + fprintf(stderr, "intclass: %x, intsubclass: %x, intproto: %x\n", interface->altsetting[i].bInterfaceClass, interface->altsetting[i].bInterfaceSubClass, interface->altsetting[i].bInterfaceProtocol); +#endif + 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 + usbdevice = dev; + card_type = e->dwCardType; + } + } + } } } } } +#ifndef NO_WINDRVR ret = (*ioctl_func) (fd, request, wdioctl); +#else + e->handle++; +#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); for (i = 0; i < e->dwNumMatchTables; i++) - fprintf(stderr,"match: dev: %x:%x, 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); + 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 } break; case TRANSFER: fprintf(stderr,"TRANSFER\n"); +#ifndef NO_WINDRVR ret = (*ioctl_func) (fd, request, wdioctl); +#endif break; case EVENT_UNREGISTER: +#ifdef DEBUG fprintf(stderr,"EVENT_UNREGISTER\n"); +#endif +#ifndef NO_WINDRVR ret = (*ioctl_func) (fd, request, wdioctl); +#endif break; case INT_WAIT: +#ifdef DEBUG fprintf(stderr,"INT_WAIT\n"); +#endif { 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 +#ifndef NO_WINDRVR ret = (*ioctl_func) (fd, request, wdioctl); - 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); +#else + if (usbdevice) { + 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); + } +#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 } break; case CARD_UNREGISTER: fprintf(stderr,"CARD_UNREGISTER\n"); +#ifndef NO_WINDRVR ret = (*ioctl_func) (fd, request, wdioctl); +#endif break; case EVENT_PULL: +#ifdef DEBUG fprintf(stderr,"EVENT_PULL\n"); +#endif { struct event *e = (struct event*)(wdheader->data); +#ifdef DEBUG int i; - 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); + 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); for (i = 0; i < e->dwNumMatchTables; i++) - fprintf(stderr,"match: dev: %x:%x, 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); + 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 +#ifndef NO_WINDRVR ret = (*ioctl_func) (fd, request, wdioctl); +#else + if (usbdevice) { + struct usb_interface *interface = usbdevice->config->interface; + + e->dwCardType = card_type; + e->dwAction = 1; + e->dwEventId = 109; + e->u.Usb.dwUniqueID = 110; + e->matchTables[0].VendorId = usbdevice->descriptor.idVendor; + e->matchTables[0].ProductId = usbdevice->descriptor.idProduct; + e->matchTables[0].bDeviceClass = usbdevice->descriptor.bDeviceClass; + e->matchTables[0].bDeviceSubClass = usbdevice->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; + } +#endif - 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); +#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); for (i = 0; i < e->dwNumMatchTables; i++) - fprintf(stderr,"match: dev: %x:%x, 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); + 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 + } break; default: + fprintf(stderr,"!!!Unsupported IOCTL: %x!!!\n", request); +#ifndef NO_WINDRVR ret = (*ioctl_func) (fd, request, wdioctl); +#endif + break; } return ret; } +int ioctl(int fd, int request, ...) { + va_list args; + void *argp; + int ret; -typedef int (*open_funcptr_t) (const char *, int, mode_t); + if (!ioctl_func) + ioctl_func = (int (*) (int, int, void *)) dlsym (REAL_LIBC, "ioctl"); + + va_start (args, 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); + + return ret; +} -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 (REAL_LIBC, "open"); if (flags & O_CREAT) { va_start(args, flags); @@ -255,11 +624,15 @@ int open (const char *pathname, int flags, ...) va_end(args); } - fd = (*func) (pathname, flags, mode); - if (!strcmp (pathname, "/dev/windrvr6")) { +#ifdef DEBUG fprintf(stderr,"opening windrvr6\n"); - windrvrfd = fd; +#endif +#ifdef NO_WINDRVR + windrvrfd = fd = (*func) ("/dev/null", flags, mode); +#else + windrvrfd = fd = (*func) (pathname, flags, mode); +#endif if (!busses) { usb_init(); usb_find_busses(); @@ -267,116 +640,96 @@ int open (const char *pathname, int flags, ...) busses = usb_get_busses(); } + + return fd; } - return fd; + return (*func) (pathname, flags, mode); } -void diff(unsigned char *buf1, unsigned char *buf2, int len) { - int i; +int close(int fd) { + static int (*func) (int) = NULL; - 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(REAL_LIBC, "close"); + + if (fd == windrvrfd) { +#ifdef DEBUG + fprintf(stderr,"close windrvrfd\n"); +#endif + windrvrfd = 0; } -} - -void hexdump(unsigned char *buf, int len) { - int i; - for(i=0; i %x\n", (unsigned int)start, length, prot, flags, fd, offset, (unsigned int)ret); - mmapped = ret; - mmapplen = length; +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 *ret = NULL; - return ret; -} - -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; 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 = (char* (*) (char*, int, FILE*)) dlsym(REAL_LIBC, "fgets"); + + if (modulesfp == stream) { + if (modules_read < sizeof(modules)) { + strcpy(s, modules[modules_read]); + ret = s; + modules_read++; + } + } else { + ret = (*func)(s,size,stream); + } return ret; } -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; +int fclose(FILE *fp) { + static int (*func) (FILE*) = NULL; 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 (*) (FILE*)) dlsym(REAL_LIBC, "fclose"); - return ret; + if (fp == modulesfp) { + modulesfp = NULL; + } + + return (*func)(fp); } -void *malloc(size_t size) -{ - static void* (*func) (size_t) = NULL; - void *ret; +int access(const char *pathname, int mode) { + static int (*func) (const char*, int); if (!func) - func = (void* (*) (size_t)) dlsym(REAL_LIBC, "malloc"); - - ret = (*func) (size); + func = (int (*) (const char*, int)) dlsym(REAL_LIBC, "access"); - //fprintf(stderr,"MALLOC: %d -> %x\n", size, (unsigned int) ret); - - return ret; + if (!strcmp(pathname, "/dev/windrvr6")) { + return 0; + } else { + return (*func)(pathname, mode); + } } #endif - - -#endif