X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/ae413cee9cf3329f517cbf61c12a8a9af2f8a0e1..1dac51954a4ae30f94b76422a292a348b02fe441:/usb-driver.c diff --git a/usb-driver.c b/usb-driver.c index b4a1549..b3dd4d8 100644 --- a/usb-driver.c +++ b/usb-driver.c @@ -42,14 +42,18 @@ #include #include #include "usb-driver.h" +#ifdef JTAGKEY +#include "jtagkey.h" +#endif static int (*ioctl_func) (int, int, void *) = NULL; 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; +FILE *baseaddrfp = NULL; +int baseaddrnum = 0; static int modules_read = 0; static struct usb_bus *busses = NULL; static struct usb_device *usbdevice; @@ -62,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; @@ -73,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) { @@ -237,9 +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 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, @@ -252,75 +255,77 @@ 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; - 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; + 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; - default: - fprintf(stderr,"!!!Unsupported TRANSFER command: %lu!!!\n", tr->cmdTrans); - ret = -1; - break; - } - break; + case PP_WRITE: + ret = 0; /* Status Port is readonly */ + break; - default: - DPRINTF("access to unsupported address range (probably ECP)!\n"); - ret = 0; - 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", (unsigned long)tr->dwPort, tr->cmdTrans, tr->dwBytes, @@ -346,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, "WinDriver no more"); + strcpy(version->version, "libusb-driver.so $Revision: 1.63 $"); version->versionul = 802; DPRINTF("VERSION\n"); break; @@ -376,11 +381,24 @@ 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%d", parportnum); + 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); - parportnum++; if (parportfd < 0) fprintf(stderr,"Can't open %s: %s\n", ppdev, strerror(errno)); @@ -396,10 +414,10 @@ 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.dwBytes) { + + if (cr->Card.dwItems > 1 && cr->Card.Item[1].I.IO.dwAddr) { DPRINTF("ECP mode requested\n"); - ecpbase = cr->Card.Item[1].I.IO.dwBytes; + ecpbase = (unsigned long)cr->Card.Item[1].I.IO.dwAddr; /* TODO: Implement ECP mode */ #if 0 pmode = IEEE1284_MODE_ECP; @@ -414,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); } @@ -684,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; @@ -695,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; @@ -774,7 +806,6 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { ioctl(parportfd, PPRELEASE); close(parportfd); parportfd = -1; - parportnum--; } #endif } @@ -941,19 +972,38 @@ int close(int fd) { FILE *fopen(const char *path, const char *mode) { FILE *ret; static FILE* (*func) (const char*, const char*) = NULL; + char buf[256]; + int i; 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")) { + if (!strcmp(path, "/proc/modules")) { DPRINTF("opening /proc/modules\n"); #ifdef NO_WINDRVR modulesfp = ret; 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; } @@ -961,6 +1011,7 @@ FILE *fopen(const char *path, const char *mode) { char *fgets(char *s, int size, FILE *stream) { static char* (*func) (char*, int, FILE*) = NULL; const char modules[][256] = {"windrvr6 1 0 - Live 0xdeadbeef\n", "parport_pc 1 0 - Live 0xdeadbeef\n"}; + char buf[256]; char *ret = NULL; @@ -973,6 +1024,11 @@ char *fgets(char *s, int size, FILE *stream) { ret = s; modules_read++; } + } else if (baseaddrfp == stream) { + snprintf(s, sizeof(buf), "%d\t%d\n", + (baseaddrnum) * 0x10, + ((baseaddrnum) * 0x10) + 0x400); + ret = s; } else { ret = (*func)(s,size,stream); } @@ -989,6 +1045,10 @@ int fclose(FILE *fp) { if (fp == modulesfp) { modulesfp = NULL; } + + if (fp == baseaddrfp) { + baseaddrfp = NULL; + } return (*func)(fp); }