X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/f1405f13797febaa06b86a5c800dce2fcaada45f..ae413cee9cf3329f517cbf61c12a8a9af2f8a0e1:/usb-driver.c diff --git a/usb-driver.c b/usb-driver.c index 0bf6e81..b4a1549 100644 --- a/usb-driver.c +++ b/usb-driver.c @@ -1,4 +1,4 @@ -/* libusb connector for XILINX impact +/* libusb/ppdev connector for XILINX impact * * Copyright (c) 2007 Michael Gernoth * @@ -36,21 +36,30 @@ #include #include #include +#include +#include +#include +#include +#include #include "usb-driver.h" static int (*ioctl_func) (int, int, void *) = NULL; -static int windrvrfd = 0; -FILE *modulesfp; +static int windrvrfd = -1; +static int parportfd = -1; +static int parportnum = 0; +static unsigned long ppbase = 0; +static unsigned long ecpbase = 0; +FILE *modulesfp = NULL; 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 #define DPRINTF(format, args...) fprintf(stderr, format, ##args) @@ -228,6 +237,102 @@ int usb_deviceinfo(unsigned char *buf) { return len; } +int pp_transfer(WD_TRANSFER *tr, int fd, unsigned int request, unsigned char *wdioctl) { + int ret = 0; + unsigned char val; + + 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 + +#ifndef NO_WINDRVR + ret = (*ioctl_func) (fd, request, wdioctl); +#else + if (parportfd < 0) + return ret; + + switch((unsigned long)tr->dwPort - ppbase) { + case 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); + break; + + default: + fprintf(stderr,"!!!Unsupported TRANSFER command: %lu!!!\n", tr->cmdTrans); + ret = -1; + break; + } + break; + + case PP_STATUS: + DPRINTF("status port\n"); + switch(tr->cmdTrans) { + case PP_READ: + ret = ioctl(parportfd, PPRSTATUS, &val); + break; + + case PP_WRITE: + ret = 0; /* Status Port is readonly */ + break; + + default: + fprintf(stderr,"!!!Unsupported TRANSFER command: %lu!!!\n", tr->cmdTrans); + ret = -1; + break; + } + break; + + case 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; + } + break; + + default: + DPRINTF("access to unsupported address range (probably ECP)!\n"); + ret = 0; + break; + } + + tr->Data.Byte = val; +#endif + + 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; @@ -238,7 +343,7 @@ 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"); @@ -250,14 +355,70 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { 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 + if (parportfd < 0) { + snprintf(ppdev, sizeof(ppdev), "/dev/parport%d", parportnum); + DPRINTF("opening %s\n", ppdev); + parportfd = open(ppdev, O_RDWR|O_EXCL); + parportnum++; + + 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.dwBytes) { + DPRINTF("ECP mode requested\n"); + ecpbase = cr->Card.Item[1].I.IO.dwBytes; + /* 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 - DPRINTF("CARD_REGISTER\n"); + } + + cr->hCard = parportfd; + ppbase = (unsigned long)cr->Card.Item[0].I.IO.dwAddr; + } +#endif + DPRINTF("hCard: %lu\n", cr->hCard); + } break; case USB_TRANSFER: @@ -319,6 +480,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { } break; + case INT_ENABLE_OLD: case INT_ENABLE: DPRINTF("INT_ENABLE\n"); { @@ -330,6 +492,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { it->dwLost, it->fStopped); it->fEnableOk = 1; + it->fStopped = 0; ints_enabled = 1; pthread_mutex_trylock(&int_wait); } @@ -351,7 +514,8 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { it->dwCounter = 0; it->fStopped = 1; ints_enabled = 0; - pthread_mutex_unlock(&int_wait); + 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, @@ -379,6 +543,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); @@ -398,6 +563,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { } break; + case USB_GET_DEVICE_DATA_OLD: case USB_GET_DEVICE_DATA: DPRINTF("USB_GET_DEVICE_DATA\n"); { @@ -419,6 +585,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { } break; + case EVENT_REGISTER_OLD: case EVENT_REGISTER: DPRINTF("EVENT_REGISTER\n"); { @@ -511,11 +678,41 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { } break; + case TRANSFER_OLD: case TRANSFER: DPRINTF("TRANSFER\n"); + { + WD_TRANSFER *tr = (WD_TRANSFER*)(wdheader->data); + + ret = pp_transfer(tr, fd, request, wdioctl); + } + break; + + 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; + + + for (i = 0; i < num; i++) { + DPRINTF("Transfer %d:\n", i+1); #ifndef NO_WINDRVR - ret = (*ioctl_func) (fd, request, wdioctl); + 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; +#endif + + return ret; + } break; case EVENT_UNREGISTER: @@ -560,9 +757,27 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { case CARD_UNREGISTER: 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 + if (parportfd == cr->hCard && parportfd >= 0) { + ioctl(parportfd, PPRELEASE); + close(parportfd); + parportfd = -1; + parportnum--; + } #endif + } break; case EVENT_PULL: @@ -645,7 +860,7 @@ 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; @@ -707,9 +922,17 @@ int close(int fd) { if (!func) func = (int (*) (int)) dlsym(RTLD_NEXT, "close"); - if (fd == windrvrfd) { + if (fd == windrvrfd && windrvrfd >= 0) { DPRINTF("close windrvrfd\n"); - windrvrfd = 0; + 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); @@ -745,7 +968,7 @@ char *fgets(char *s, int size, FILE *stream) { 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++;