remove old debug message

[usb-driver] / usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index 209e1559cc1effd9c11cd2987c9eb294e2ab024a..b39c4fc506264e8ed5564f25e0e1bb1f7e2466fb 100644 (file)
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -42,14 +42,19 @@
 #include <linux/parport.h>
 #include <linux/ppdev.h>
 #include "usb-driver.h"
 #include <linux/parport.h>
 #include <linux/ppdev.h>
 #include "usb-driver.h"

+#include "config.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 (*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;
 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;
 static int modules_read = 0;
 static struct usb_bus *busses = NULL;
 static struct usb_device *usbdevice;


@@ -61,8 +66,6 @@ static pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER;
 
 #define NO_WINDRVR 1
 
 
 #define NO_WINDRVR 1
 

-#ifdef DEBUG
-#define DPRINTF(format, args...) fprintf(stderr, format, ##args)

 void hexdump(unsigned char *buf, int len) {
        int i;
 
 void hexdump(unsigned char *buf, int len) {
        int i;
 


@@ -73,9 +76,6 @@ void hexdump(unsigned char *buf, int len) {
        }
        fprintf(stderr,"\n");
 }
        }
        fprintf(stderr,"\n");
 }

-#else
-#define DPRINTF(format, args...)
-#endif

 
 int usb_deviceinfo(unsigned char *buf) {
        int i,j,k,l;
 
 int usb_deviceinfo(unsigned char *buf) {
        int i,j,k,l;


@@ -237,10 +237,11 @@ int usb_deviceinfo(unsigned char *buf) {
        return len;
 }
 
        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;
        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,
 
        DPRINTF("dwPort: 0x%lx, cmdTrans: %lu, dwbytes: %ld, fautoinc: %ld, dwoptions: %ld\n",
                        (unsigned long)tr->dwPort, tr->cmdTrans, tr->dwBytes,


@@ -253,9 +254,6 @@ int pp_transfer(WD_TRANSFER *tr, int fd, unsigned int request, unsigned char *wd
                DPRINTF("write byte: %d\n", val);
 #endif
 
                DPRINTF("write byte: %d\n", val);
 #endif
 

-#ifndef NO_WINDRVR
-       ret = (*ioctl_func) (fd, request, wdioctl);
-#else

        if (parportfd < 0)
                return ret;
 
        if (parportfd < 0)
                return ret;
 


@@ -268,6 +266,7 @@ int pp_transfer(WD_TRANSFER *tr, int fd, unsigned int request, unsigned char *wd
 
                        case PP_WRITE:
                                ret = ioctl(parportfd, PPWDATA, &val);
 
                        case PP_WRITE:
                                ret = ioctl(parportfd, PPWDATA, &val);

+                               last_pp_write = val;

                                break;
 
                        default:
                                break;
 
                        default:


@@ -276,10 +275,17 @@ int pp_transfer(WD_TRANSFER *tr, int fd, unsigned int request, unsigned char *wd
                                break;
                }
        } else if (port == ppbase + PP_STATUS) {
                                break;
                }
        } else if (port == ppbase + PP_STATUS) {

-               DPRINTF("status port\n");
+               DPRINTF("status port (last write: %d)\n", last_pp_write);

                switch(tr->cmdTrans) {
                        case PP_READ:
                                ret = ioctl(parportfd, PPRSTATUS, &val);
                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:
                                break;
 
                        case PP_WRITE:


@@ -319,7 +325,6 @@ int pp_transfer(WD_TRANSFER *tr, int fd, unsigned int request, unsigned char *wd
        }
 
        tr->Data.Byte = val;
        }
 
        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,
 
        DPRINTF("dwPortReturn: 0x%lx, cmdTrans: %lu, dwbytes: %ld, fautoinc: %ld, dwoptions: %ld\n",
                        (unsigned long)tr->dwPort, tr->cmdTrans, tr->dwBytes,


@@ -345,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);
        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.66 $");

                        version->versionul = 802;
                        DPRINTF("VERSION\n");
                        break;
                        version->versionul = 802;
                        DPRINTF("VERSION\n");
                        break;


@@ -375,11 +380,26 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else

+                               
+#ifdef JTAGKEY
+                               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)
+                                               cr->hCard = 0;
+
+                                       break;
+                               }
+#endif
+

                                if (parportfd < 0) {
                                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);
                                        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));
 
                                        if (parportfd < 0)
                                                fprintf(stderr,"Can't open %s: %s\n", ppdev, strerror(errno));


@@ -395,7 +415,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                        pmode = IEEE1284_MODE_COMPAT;
                                        if (ioctl(parportfd, PPNEGOT, &pmode) == -1)
                                                return ret;
                                        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;
                                        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;


@@ -413,8 +433,11 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                        }
 
                                        cr->hCard = parportfd;
                                        }
 
                                        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);
                        }
 #endif
                                DPRINTF("hCard: %lu\n", cr->hCard);
                        }


@@ -683,7 +706,18 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        {
                                WD_TRANSFER *tr = (WD_TRANSFER*)(wdheader->data);
 
                        {
                                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;
 
                        }
                        break;
 


@@ -694,23 +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;
                                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);
 
                                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
 #endif

-
-                               return ret;

                        }
                        break;
 
                        }
                        break;
 


@@ -769,11 +802,15 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #ifndef NO_WINDRVR
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
 #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);
                                        parportfd = -1;
                                if (parportfd == cr->hCard && parportfd >= 0) {
                                        ioctl(parportfd, PPRELEASE);
                                        close(parportfd);
                                        parportfd = -1;

-                                       parportnum--;

                                }
 #endif
                        }
                                }
 #endif
                        }


@@ -940,13 +977,34 @@ int close(int fd) {
 FILE *fopen(const char *path, const char *mode) {
        FILE *ret;
        static FILE* (*func) (const char*, const char*) = NULL;
 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");
 
 
        if (!func)
                func = (FILE* (*) (const char*, const char*)) dlsym(RTLD_NEXT, "fopen");
 

+       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);
 
        ret = (*func) (path, mode);
 

-       if (!strcmp (path, "/proc/modules")) {
+       if (!strcmp(path, "/proc/modules")) {

                DPRINTF("opening /proc/modules\n");
 #ifdef NO_WINDRVR
                modulesfp = ret;
                DPRINTF("opening /proc/modules\n");
 #ifdef NO_WINDRVR
                modulesfp = ret;


@@ -960,6 +1018,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 *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;
 
 
        char *ret = NULL;
 
 


@@ -972,6 +1031,11 @@ char *fgets(char *s, int size, FILE *stream) {
                        ret = s;
                        modules_read++;
                }
                        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);
        }
        } else {
                ret = (*func)(s,size,stream);
        }


@@ -988,6 +1052,10 @@ int fclose(FILE *fp) {
        if (fp == modulesfp) {
                modulesfp = NULL;
        }
        if (fp == modulesfp) {
                modulesfp = NULL;
        }

+
+       if (fp == baseaddrfp) {
+               baseaddrfp = NULL;
+       }

        
        return (*func)(fp);
 }
        
        return (*func)(fp);
 }