X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/ac9e3f59d8073109e43c84738e2776b95d90a403..3b1b5fa8abd003d16dff62d998d3660c24c5bd8b:/usb-driver.c diff --git a/usb-driver.c b/usb-driver.c index 825c35c..7efb628 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 * @@ -38,10 +38,17 @@ #include #include #include +#include +#include +#include #include "usb-driver.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; +static struct pports *pplist = NULL; FILE *modulesfp = NULL; static int modules_read = 0; static struct usb_bus *busses = NULL; @@ -53,7 +60,6 @@ static int ints_enabled = 0; static pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER; #define NO_WINDRVR 1 -#undef PARPORT #ifdef DEBUG #define DPRINTF(format, args...) fprintf(stderr, format, ##args) @@ -233,18 +239,95 @@ int usb_deviceinfo(unsigned char *buf) { int pp_transfer(WD_TRANSFER *tr, int fd, unsigned int request, unsigned char *wdioctl) { int ret = 0; + unsigned long port = (unsigned long)tr->dwPort; + unsigned char val; + static int 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", tr->Data.Byte); + 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 &= 95; + if (last_pp_write & 64) + val |= 32; + else + val |= 128; +#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; #endif DPRINTF("dwPortReturn: 0x%lx, cmdTrans: %lu, dwbytes: %ld, fautoinc: %ld, dwoptions: %ld\n", @@ -271,7 +354,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, "WinDriver no more"); + strcpy(version->version, "libusb-driver.so $Revision: 1.59 $"); version->versionul = 802; DPRINTF("VERSION\n"); break; @@ -282,20 +365,96 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { case CARD_REGISTER_OLD: case CARD_REGISTER: - /* TODO: Implement for LPT-support */ -#ifdef PARPORT + 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 - /* TODO: Open /dev/parport, check, ... */ - cr->hCard = 1; + if (parportfd < 0) { + int max = -1; + struct pports **port = &pplist; + + while (*port) { + DPRINTF("Looking up parallel port in linked list, entry: %d\n", (*port)->num); + if (max < (*port)->num) + max = (*port)->num; + + if ((*port)->base == (unsigned long)cr->Card.Item[0].I.IO.dwAddr) { + break; + } + + port = &((*port)->next); + } + + if (!(*port)) { /* not found */ + (*port) = malloc(sizeof(struct pports)); + if (!(*port)) { + perror("malloc"); + exit(EXIT_FAILURE); + } + + (*port)->base = (unsigned long)cr->Card.Item[0].I.IO.dwAddr; + (*port)->num = max+1; + (*port)->next = NULL; + + DPRINTF("parallel port not in linked list, new entry: %d\n", (*port)->num); + } + + snprintf(ppdev, sizeof(ppdev), "/dev/parport%d", (*port)->num); + 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; + } #endif DPRINTF("hCard: %lu\n", cr->hCard); } -#endif - DPRINTF("CARD_REGISTER\n"); break; case USB_TRANSFER: @@ -565,6 +724,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { } break; + case MULTI_TRANSFER_OLD: case MULTI_TRANSFER: DPRINTF("MULTI_TRANSFER\n"); { @@ -633,9 +793,26 @@ 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; + } #endif + } break; case EVENT_PULL: @@ -718,7 +895,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; @@ -826,7 +1003,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++;