X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/543579946cacfd80e2e438b8342be6b6b84dffbc..28e7c3682ecc8082cd0b96c632860320be5cc71b:/usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index 881b67b..33268f0 100644
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -239,6 +239,7 @@ int usb_deviceinfo(unsigned char *buf) {
 
 int pp_transfer(WD_TRANSFER *tr, int fd, unsigned int request, unsigned char *wdioctl) {
 	int ret = 0;
+	unsigned long port = (unsigned long)tr->dwPort;
 	unsigned char val;
 
 	DPRINTF("dwPort: 0x%lx, cmdTrans: %lu, dwbytes: %ld, fautoinc: %ld, dwoptions: %ld\n",
@@ -258,33 +259,57 @@ int pp_transfer(WD_TRANSFER *tr, int fd, unsigned int request, unsigned char *wd
 	if (parportfd < 0)
 		return ret;
 
-	switch(tr->cmdTrans) {
-		case 10: /* Read Byte */
-			if ((unsigned long)tr->dwPort == ppbase) { /* Data Port */
+	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 */
-			} else if ((unsigned long)tr->dwPort == ppbase + 1) { /* Status Port */
-				DPRINTF("status port\n");
-				ret = ioctl(parportfd, PPRSTATUS, &val);
-			} else if ((unsigned long)tr->dwPort == ppbase + 2) { /* Control Port */
-				DPRINTF("control port\n");
-				ret = ioctl(parportfd, PPRCONTROL, &val);
-			}
-			break;
-		case 13: /* Write Byte */
-			if ((unsigned long)tr->dwPort == ppbase) { /* Data Port */
-				DPRINTF("data port\n");
+				break;
+
+			case PP_WRITE:
 				ret = ioctl(parportfd, PPWDATA, &val);
-			} else if ((unsigned long)tr->dwPort == ppbase + 1) { /* Status Port */
+				break;
+
+			default:
+				fprintf(stderr,"!!!Unsupported TRANSFER command: %lu!!!\n", tr->cmdTrans);
+				ret = -1;
+				break;
+		}
+	} else if (port == ppbase + 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 */
-			} else if ((unsigned long)tr->dwPort == ppbase + 2) { /* Control Port */
-				DPRINTF("control port\n");
+				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;
+				break;
+
+			default:
+				fprintf(stderr,"!!!Unsupported TRANSFER command: %lu!!!\n", tr->cmdTrans);
+				ret = -1;
+				break;
+		}
+	} else {
+		DPRINTF("access to unsupported address range (probably ECP)!\n");
+		ret = 0;
 	}
 
 	tr->Data.Byte = val;
@@ -349,6 +374,9 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 					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) {
@@ -357,17 +385,20 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 					if (ioctl(parportfd, PPCLAIM) == -1)
 						return ret;
 
+					ecpbase = 0;
 					pmode = IEEE1284_MODE_COMPAT;
 					if (ioctl(parportfd, PPNEGOT, &pmode) == -1)
 						return ret;
 					
-					if (cr->Card.dwItems > 1) {
+					if (cr->Card.dwItems > 1 && cr->Card.Item[1].I.IO.dwBytes) {
+						DPRINTF("ECP mode requested\n");
 						ecpbase = cr->Card.Item[1].I.IO.dwBytes;
 						/* TODO: Implement ECP mode */
 #if 0
 						pmode = IEEE1284_MODE_ECP;
 
 						if (ioctl(parportfd, PPNEGOT, &pmode) == -1) {
+							ecpbase = 0;
 							pmode = IEEE1284_MODE_COMPAT;
 							if (ioctl(parportfd, PPNEGOT, &pmode) == -1)
 								return ret;