pass MULTI_TRANSFER to jtagkey_transfer, so it can be optimized there

[usb-driver] / usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index d1d59303a148f5c6f6b5a5d6210b5c4ebf9e8547..b3dd4d8cc12066e829f0a8ac775c4595907ba17a 100644 (file)
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -238,18 +238,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 +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;
 
@@ -335,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,
@@ -361,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.61 $");
+                       strcpy(version->version, "libusb-driver.so $Revision: 1.63 $");
                        version->versionul = 802;
                        DPRINTF("VERSION\n");
                        break;
@@ -394,53 +384,54 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                
                                /* FIXME: Ugly hack which maps amontec JtagKey to 4. parallel port */
 #ifdef JTAGKEY
-                               if ((unsigned long)cr->Card.Item[0].I.IO.dwAddr != 0x30)
+                               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);
-                                               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) {
+                                       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 (parportfd >= 0) {
+                                       int pmode;
 
-                                               if (ioctl(parportfd, PPCLAIM) == -1)
-                                                       return ret;
+                                       if (ioctl(parportfd, PPCLAIM) == -1)
+                                               return ret;
 
-                                               ecpbase = 0;
-                                               pmode = IEEE1284_MODE_COMPAT;
-                                               if (ioctl(parportfd, PPNEGOT, &pmode) == -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 (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;
+                                               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
+                                               if (ioctl(parportfd, PPNEGOT, &pmode) == -1) {
+                                                       ecpbase = 0;
+                                                       pmode = IEEE1284_MODE_COMPAT;
+                                                       if (ioctl(parportfd, PPNEGOT, &pmode) == -1)
+                                                               return ret;
                                                }
-
-                                               cr->hCard = parportfd;
-                                       }
-#ifdef JTAGKEY
-                               } else {
-                                       ret=jtagkey_init(0x0403, 0xcff8); /* I need a config file... */
-                                       cr->hCard = 0xff;
 #endif
+                                       }
+
+                                       cr->hCard = parportfd;
                                }
 
                                ppbase = (unsigned long)cr->Card.Item[0].I.IO.dwAddr;
@@ -714,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;
 
@@ -725,22 +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;