X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/bccac33bca3c9d97bc148d41975f49a4f1fa5938..adb51cf1e775445a863fc2cc25dc9c6f408fbffb:/usb-driver.c diff --git a/usb-driver.c b/usb-driver.c index 9395016..942cdc1 100644 --- a/usb-driver.c +++ b/usb-driver.c @@ -39,33 +39,31 @@ #include #include #include -#include -#include +#include +#include #include "usb-driver.h" -#ifdef JTAGKEY -#include "jtagkey.h" -#endif +#include "config.h" static int (*ioctl_func) (int, int, void *) = NULL; 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 struct parport_config *pport = NULL; +static FILE *modulesfp = NULL; +static FILE *baseaddrfp = NULL; +static 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 int usbalternate = -1; static unsigned long card_type; static int ints_enabled = 0; static pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER; #define NO_WINDRVR 1 -#ifdef DEBUG void hexdump(unsigned char *buf, int len) { int i; @@ -76,9 +74,8 @@ void hexdump(unsigned char *buf, int len) { } fprintf(stderr,"\n"); } -#endif -int usb_deviceinfo(unsigned char *buf) { +static int usb_deviceinfo(unsigned char *buf) { int i,j,k,l; int len = 0; WDU_CONFIGURATION **pConfigs, **pActiveConfig; @@ -238,117 +235,40 @@ int usb_deviceinfo(unsigned char *buf) { return len; } -int pp_transfer(WD_TRANSFER *tr, int fd, unsigned int request, unsigned char *wdioctl) { +static int usb_claim(int claim) { int ret = 0; - unsigned long port = (unsigned long)tr->dwPort; - unsigned char val; - static unsigned char last_pp_write = 0; - -#ifdef JTAGKEY - /* FIXME: Config file and mor intelligent mapping! */ - if (ppbase == 0x30) - return jtagkey_transfer(tr, fd, request, ppbase, ecpbase, 1); -#endif + static int claimed = 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; + if (usbinterface < 0) + return -1; -#ifdef DEBUG - if (tr->cmdTrans == 13) - DPRINTF("write byte: %d\n", val); -#endif - -#ifndef NO_WINDRVR - ret = (*ioctl_func) (fd, request, wdioctl); -#else - 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; + if (claim) { + if (claimed) + return 0; + + ret = usb_claim_interface(usb_devhandle, usbinterface); + if (!ret) { + claimed = 1; + ret = usb_set_altinterface(usb_devhandle, usbalternate); + if (ret) + fprintf(stderr, "usb_set_altinterface: %d\n", ret); + } else { + fprintf(stderr, "usb_claim_interface: %d -> %d (%s)\n", + usbinterface, ret, usb_strerror()); } - } 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; -#endif + if (!claimed) + return 0; - 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 + ret = usb_release_interface(usb_devhandle, usbinterface); + if (!ret) + claimed = 0; + } return ret; } -int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { +static int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { struct header_struct* wdheader = (struct header_struct*)wdioctl; struct version_struct *version; int ret = 0; @@ -361,7 +281,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { switch(request & ~(0xc0000000)) { case VERSION: version = (struct version_struct*)(wdheader->data); - strcpy(version->version, "libusb-driver.so $Revision: 1.62 $"); + strcpy(version->version, "libusb-driver.so version: " USB_DRIVER_VERSION); version->versionul = 802; DPRINTF("VERSION\n"); break; @@ -375,7 +295,6 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { 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, @@ -391,62 +310,23 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { #ifndef NO_WINDRVR ret = (*ioctl_func) (fd, request, wdioctl); #else - - /* FIXME: Ugly hack which maps amontec JtagKey to 4. parallel port */ -#ifdef JTAGKEY - if ((unsigned long)cr->Card.Item[0].I.IO.dwAddr == 0x30) { - ret=jtagkey_init(0x0403, 0xcff8); /* I need a config file... */ - cr->hCard = 0xff; - ppbase = (unsigned long)cr->Card.Item[0].I.IO.dwAddr; - if (ret < 0) - cr->hCard = 0; + pport = config_get((unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10); + if (!pport) break; - } -#endif - 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; - } + ret = pport->open((unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10); ppbase = (unsigned long)cr->Card.Item[0].I.IO.dwAddr; - if (ret < 0) + + 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); } @@ -461,8 +341,10 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { 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); + if (ut->dwPipeNum == 0) { + DPRINTF("setup packet: "); + hexdump(ut->SetupPacket, 8); + } if (!ut->fRead && ut->dwBufferSize) { @@ -473,6 +355,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { #ifndef NO_WINDRVR ret = (*ioctl_func) (fd, request, wdioctl); #else + usb_claim(1); /* 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; @@ -486,10 +369,10 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { } 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); } + usb_claim(0); } if (ret < 0) { @@ -567,25 +450,18 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { ret = (*ioctl_func) (fd, request, wdioctl); #else if (usbdevice) { - if (!usb_devhandle) + 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) { - 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); - } else { - fprintf(stderr, "usb_set_configuration: %d (%s)\n", ret, usb_strerror()); +#ifndef NO_USB_RESET + if (usb_devhandle) { + usb_reset(usb_devhandle); + usb_devhandle = usb_open(usbdevice); } - } else { - fprintf(stderr, "usb_claim_interface: %d -> %d (%s)\n", - usbdevice->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber, - ret, usb_strerror()); +#endif } + + usbinterface = usbdevice->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber; + usbalternate = usi->dwAlternateSetting; } #endif DPRINTF("unique: %lu, interfacenum: %lu, alternatesetting: %lu, options: %lx\n", @@ -622,6 +498,8 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { { struct event *e = (struct event*)(wdheader->data); struct usb_bus *bus; + char* devpos; + int busnum = -1, devnum = -1; int i; 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", @@ -633,6 +511,37 @@ 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", @@ -647,13 +556,17 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { for (bus = 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)) { + (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; @@ -715,7 +628,11 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { { WD_TRANSFER *tr = (WD_TRANSFER*)(wdheader->data); - ret = pp_transfer(tr, fd, request, wdioctl); +#ifndef NO_WINDRVR + ret = (*ioctl_func) (fd, request, wdioctl); +#else + ret = pport->transfer(tr, fd, request, ppbase, ecpbase, 1); +#endif } break; @@ -725,23 +642,11 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { { WD_TRANSFER *tr = (WD_TRANSFER*)(wdheader->data); unsigned long num = wdheader->size/sizeof(WD_TRANSFER); - int i; - - for (i = 0; i < num; i++) { - DPRINTF("Transfer %d:\n", i+1); #ifndef NO_WINDRVR - wdheader->size = sizeof(WD_TRANSFER); - request = TRANSFER; - wdheader->data = tr + i; -#endif - ret = pp_transfer(tr + i, fd, request, wdioctl); - } - -#ifndef NO_WINDRVR - wdheader->data = tr; + ret = (*ioctl_func) (fd, request, wdioctl); +#else + ret = pport->transfer(tr, fd, request, ppbase, ecpbase, num); #endif - - return ret; } break; @@ -800,11 +705,10 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { #ifndef NO_WINDRVR ret = (*ioctl_func) (fd, request, wdioctl); #else - if (parportfd == cr->hCard && parportfd >= 0) { - ioctl(parportfd, PPRELEASE); - close(parportfd); - parportfd = -1; - } + if (pport) + pport->close(cr->hCard); + + pport = NULL; #endif } break; @@ -953,8 +857,6 @@ int close(int fd) { 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); @@ -976,13 +878,26 @@ FILE *fopen(const char *path, const char *mode) { if (!func) func = (FILE* (*) (const char*, const char*)) dlsym(RTLD_NEXT, "fopen"); -#ifdef JTAGKEY - /* FIXME: Hack for parport mapping */ - if (!strcmp(path, "/proc/sys/dev/parport/parport3/base-addr")) { - ret = (*func) ("/dev/null", mode); - } else -#endif - ret = (*func) (path, mode); + 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")) { DPRINTF("opening /proc/modules\n"); @@ -991,17 +906,6 @@ FILE *fopen(const char *path, const char *mode) { modules_read = 0; #endif } - - if (ret) { - 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); - baseaddrfp = ret; - baseaddrnum = i; - } - } - } return ret; } @@ -1056,10 +960,28 @@ int access(const char *pathname, int mode) { if (!func) func = (int (*) (const char*, int)) dlsym(RTLD_NEXT, "access"); - - if (!strcmp(pathname, "/dev/windrvr6")) { + + if (pathname && !strcmp(pathname, "/dev/windrvr6")) { return 0; } else { return (*func)(pathname, mode); } } + +#if __WORDSIZE == 32 +int uname (struct utsname *__name) { + static int (*func) (struct utsname*); + int ret; + + if (!func) + func = (int (*) (struct utsname*)) dlsym(RTLD_NEXT, "uname"); + + ret = (*func)(__name); + + if (ret == 0 && (!strcmp(__name->machine, "x86_64"))) { + strcpy(__name->machine, "i686"); + } + + return ret; +} +#endif