X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/1dac51954a4ae30f94b76422a292a348b02fe441..3eee002c15edabb57e820b2b79d664cacbdbce56:/usb-driver.c diff --git a/usb-driver.c b/usb-driver.c index b3dd4d8..18d6331 100644 --- a/usb-driver.c +++ b/usb-driver.c @@ -39,18 +39,14 @@ #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; +static struct parport_config *pport = NULL; FILE *modulesfp = NULL; FILE *baseaddrfp = NULL; int baseaddrnum = 0; @@ -65,7 +61,6 @@ 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,7 +71,6 @@ void hexdump(unsigned char *buf, int len) { } fprintf(stderr,"\n"); } -#endif int usb_deviceinfo(unsigned char *buf) { int i,j,k,l; @@ -238,106 +232,6 @@ 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; @@ -351,7 +245,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.63 $"); + strcpy(version->version, "libusb-driver.so version: " USB_DRIVER_VERSION); version->versionul = 802; DPRINTF("VERSION\n"); break; @@ -365,7 +259,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, @@ -381,62 +274,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); } @@ -708,14 +562,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { #ifndef NO_WINDRVR ret = (*ioctl_func) (fd, request, wdioctl); #else - -#ifdef JTAGKEY - if (ppbase == 0x30) { - ret = jtagkey_transfer(tr, fd, request, ppbase, ecpbase, 1); - break; - } -#endif /* JTAGKEY */ - ret = pp_transfer(tr, fd, request); + ret = pport->transfer(tr, fd, request, ppbase, ecpbase, 1); #endif } break; @@ -726,23 +573,10 @@ 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; #ifndef NO_WINDRVR ret = (*ioctl_func) (fd, request, wdioctl); #else - -#ifdef JTAGKEY - /* FIXME: Config file and mor intelligent mapping! */ - if (ppbase == 0x30) { - 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); - } + ret = pport->transfer(tr, fd, request, ppbase, ecpbase, num); #endif } break; @@ -802,11 +636,7 @@ 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; - } + pport->close(cr->hCard); #endif } break; @@ -978,13 +808,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"); @@ -993,17 +836,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; } @@ -1058,6 +890,9 @@ int access(const char *pathname, int mode) { if (!func) func = (int (*) (const char*, int)) dlsym(RTLD_NEXT, "access"); + + if (!pathname) + return -1; if (!strcmp(pathname, "/dev/windrvr6")) { return 0;