X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/bccac33bca3c9d97bc148d41975f49a4f1fa5938..a270f1e37a49ae072740de471bfe98658dea3b5e:/usb-driver.c diff --git a/usb-driver.c b/usb-driver.c index 9395016..b39c4fc 100644 --- a/usb-driver.c +++ b/usb-driver.c @@ -42,6 +42,7 @@ #include #include #include "usb-driver.h" +#include "config.h" #ifdef JTAGKEY #include "jtagkey.h" #endif @@ -65,7 +66,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 +76,6 @@ void hexdump(unsigned char *buf, int len) { } fprintf(stderr,"\n"); } -#endif int usb_deviceinfo(unsigned char *buf) { int i,j,k,l; @@ -238,18 +237,12 @@ int usb_deviceinfo(unsigned char *buf) { return len; } -int pp_transfer(WD_TRANSFER *tr, int fd, unsigned int request, unsigned char *wdioctl) { +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; -#ifdef JTAGKEY - /* FIXME: Config file and mor intelligent mapping! */ - if (ppbase == 0x30) - return jtagkey_transfer(tr, fd, request, ppbase, ecpbase, 1); -#endif - 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); @@ -261,9 +254,6 @@ int pp_transfer(WD_TRANSFER *tr, int fd, unsigned int request, unsigned char *wd DPRINTF("write byte: %d\n", val); #endif -#ifndef NO_WINDRVR - ret = (*ioctl_func) (fd, request, wdioctl); -#else if (parportfd < 0) return ret; @@ -335,7 +325,6 @@ int pp_transfer(WD_TRANSFER *tr, int fd, unsigned int request, unsigned char *wd } 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, @@ -361,7 +350,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 $Revision: 1.66 $"); version->versionul = 802; DPRINTF("VERSION\n"); break; @@ -392,10 +381,11 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { 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... */ + if (!config_is_real_pport((unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10)) { + int num = (unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10; + + ret=jtagkey_init(config_usb_vid(num), config_usb_pid(num)); cr->hCard = 0xff; ppbase = (unsigned long)cr->Card.Item[0].I.IO.dwAddr; if (ret < 0) @@ -404,6 +394,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { break; } #endif + if (parportfd < 0) { snprintf(ppdev, sizeof(ppdev), "/dev/parport%lu", (unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10); @@ -715,7 +706,18 @@ 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 + +#ifdef JTAGKEY + if (!config_is_real_pport(ppbase / 0x10)) { + ret = jtagkey_transfer(tr, fd, request, ppbase, ecpbase, 1); + break; + } +#endif /* JTAGKEY */ + ret = pp_transfer(tr, fd, request); +#endif } break; @@ -726,22 +728,22 @@ 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 + if (!config_is_real_pport(ppbase / 0x10)) { + ret = jtagkey_transfer(tr, fd, request, ppbase, ecpbase, num); + break; + } +#endif /* JTAGKEY */ 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); + ret = pp_transfer(tr + i, fd, request); } - -#ifndef NO_WINDRVR - wdheader->data = tr; #endif - - return ret; } break; @@ -800,6 +802,11 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { #ifndef NO_WINDRVR ret = (*ioctl_func) (fd, request, wdioctl); #else +#ifdef JTAGKEY + if (cr->hCard == 0xff) + jtagkey_close(); +#endif + if (parportfd == cr->hCard && parportfd >= 0) { ioctl(parportfd, PPRELEASE); close(parportfd); @@ -976,13 +983,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 +1011,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; }