some links, libusb-dev

[usb-driver] / usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index a7d14bf5f8a93f05b9d8f53b4c9ab9663c2ab5c7..a34e5e45347f3639e83f7ac7e3ae19d9fd0292e7 100644 (file)
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -46,9 +46,9 @@
 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;
 static unsigned long ppbase = 0;
 static unsigned long ecpbase = 0;

+static struct pports *pplist = NULL;

 FILE *modulesfp = NULL;
 static int modules_read = 0;
 static struct usb_bus *busses = NULL;
 FILE *modulesfp = NULL;
 static int modules_read = 0;
 static struct usb_bus *busses = NULL;


@@ -241,6 +241,7 @@ int pp_transfer(WD_TRANSFER *tr, int fd, unsigned int request, unsigned char *wd
        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 int 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,


@@ -268,6 +269,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 +278,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 &= 95;
+                               if (last_pp_write & 64)
+                                       val |= 32;
+                               else
+                                       val |= 128;
+#endif

                                break;
 
                        case PP_WRITE:
                                break;
 
                        case PP_WRITE:


@@ -376,10 +385,36 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
                                if (parportfd < 0) {
                                ret = (*ioctl_func) (fd, request, wdioctl);
 #else
                                if (parportfd < 0) {

-                                       if (ppbase && ((unsigned long)cr->Card.Item[0].I.IO.dwAddr != ppbase))
-                                               parportnum++;
+                                       int max = -1;
+                                       struct pports **port = &pplist;
+
+                                       while (*port) {
+                                               DPRINTF("Looking up parallel port in linked list, entry: %d\n", (*port)->num);
+                                               if (max < (*port)->num)
+                                                       max = (*port)->num;
+
+                                               if ((*port)->base == (unsigned long)cr->Card.Item[0].I.IO.dwAddr) {
+                                                       break;
+                                               }
+
+                                               port = &((*port)->next);
+                                       }
+
+                                       if (!(*port)) { /* not found */
+                                               (*port) = malloc(sizeof(struct pports));
+                                               if (!(*port)) {
+                                                       perror("malloc");
+                                                       exit(EXIT_FAILURE);
+                                               }
+
+                                               (*port)->base = (unsigned long)cr->Card.Item[0].I.IO.dwAddr;
+                                               (*port)->num = max+1;
+                                               (*port)->next = NULL;
+
+                                               DPRINTF("parallel port not in linked list, new entry: %d\n", (*port)->num);
+                                       }

 
 

-                                       snprintf(ppdev, sizeof(ppdev), "/dev/parport%d", parportnum);
+                                       snprintf(ppdev, sizeof(ppdev), "/dev/parport%d", (*port)->num);

                                        DPRINTF("opening %s\n", ppdev);
                                        parportfd = open(ppdev, O_RDWR|O_EXCL);
 
                                        DPRINTF("opening %s\n", ppdev);
                                        parportfd = open(ppdev, O_RDWR|O_EXCL);