X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/0dca330e46ffe5fe5dc5973af026f83b4d06be01..1dac51954a4ae30f94b76422a292a348b02fe441:/usb-driver.c diff --git a/usb-driver.c b/usb-driver.c index bdf3350..b3dd4d8 100644 --- a/usb-driver.c +++ b/usb-driver.c @@ -42,6 +42,9 @@ #include #include #include "usb-driver.h" +#ifdef JTAGKEY +#include "jtagkey.h" +#endif static int (*ioctl_func) (int, int, void *) = NULL; static int windrvrfd = -1; @@ -63,7 +66,6 @@ static pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER; #define NO_WINDRVR 1 #ifdef DEBUG -#define DPRINTF(format, args...) fprintf(stderr, format, ##args) void hexdump(unsigned char *buf, int len) { int i; @@ -74,8 +76,6 @@ void hexdump(unsigned char *buf, int len) { } fprintf(stderr,"\n"); } -#else -#define DPRINTF(format, args...) #endif int usb_deviceinfo(unsigned char *buf) { @@ -238,11 +238,11 @@ 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 int last_pp_write = 0; + 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, @@ -255,9 +255,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; @@ -284,11 +281,11 @@ int pp_transfer(WD_TRANSFER *tr, int fd, unsigned int request, unsigned char *wd case PP_READ: ret = ioctl(parportfd, PPRSTATUS, &val); #ifdef FORCE_PC3_IDENT - val &= 95; - if (last_pp_write & 64) - val |= 32; + val &= 0x5f; + if (last_pp_write & 0x40) + val |= 0x20; else - val |= 128; + val |= 0x80; #endif break; @@ -329,7 +326,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, @@ -355,7 +351,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.60 $"); + strcpy(version->version, "libusb-driver.so $Revision: 1.63 $"); version->versionul = 802; DPRINTF("VERSION\n"); break; @@ -385,9 +381,22 @@ 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; + + break; + } +#endif if (parportfd < 0) { snprintf(ppdev, sizeof(ppdev), "/dev/parport%lu", - (unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10); + (unsigned long)cr->Card.Item[0].I.IO.dwAddr / 0x10); DPRINTF("opening %s\n", ppdev); parportfd = open(ppdev, O_RDWR|O_EXCL); @@ -405,7 +414,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { 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; @@ -423,8 +432,11 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { } cr->hCard = parportfd; - ppbase = (unsigned long)cr->Card.Item[0].I.IO.dwAddr; } + + ppbase = (unsigned long)cr->Card.Item[0].I.IO.dwAddr; + if (ret < 0) + cr->hCard = 0; #endif DPRINTF("hCard: %lu\n", cr->hCard); } @@ -693,7 +705,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 (ppbase == 0x30) { + ret = jtagkey_transfer(tr, fd, request, ppbase, ecpbase, 1); + break; + } +#endif /* JTAGKEY */ + ret = pp_transfer(tr, fd, request); +#endif } break; @@ -704,23 +727,23 @@ 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); -#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; @@ -955,7 +978,13 @@ FILE *fopen(const char *path, const char *mode) { if (!func) func = (FILE* (*) (const char*, const char*)) dlsym(RTLD_NEXT, "fopen"); - ret = (*func) (path, mode); +#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); if (!strcmp(path, "/proc/modules")) { DPRINTF("opening /proc/modules\n");