X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/28e7c3682ecc8082cd0b96c632860320be5cc71b..e6293f4578d239b5616a72b6658804b7420c473a:/usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index 33268f0..fa2611e 100644
--- 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 parportnum = 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;
@@ -307,8 +307,14 @@ int pp_transfer(WD_TRANSFER *tr, int fd, unsigned int request, unsigned char *wd
 				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 (probably ECP)!\n");
+		DPRINTF("access to unsupported address range!\n");
 		ret = 0;
 	}
 
@@ -370,10 +376,38 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 				ret = (*ioctl_func) (fd, request, wdioctl);
 #else
 				if (parportfd < 0) {
-					snprintf(ppdev, sizeof(ppdev), "/dev/parport%d", 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", (*port)->num);
 					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));
@@ -390,9 +424,9 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 					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;
@@ -767,7 +801,6 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 					ioctl(parportfd, PPRELEASE);
 					close(parportfd);
 					parportfd = -1;
-					parportnum--;
 				}
 #endif
 			}