patch-2.1.48 linux/drivers/scsi/ppa.c

• Lines: 69
• Date: Sun Aug 3 00:08:52 1997
• Orig file: v2.1.47/linux/drivers/scsi/ppa.c
• Orig date: Mon Jul 7 08:24:28 1997

diff -u --recursive --new-file v2.1.47/linux/drivers/scsi/ppa.c linux/drivers/scsi/ppa.c
@@ -144,7 +144,7 @@
 	"Unknown"};
 
 typedef struct {
-	struct ppd *dev;	/* Parport device entry          */
+	struct pardevice *dev;	/* Parport device entry          */
 	int speed;		/* General PPA delay constant   */
 	int speed_fast;		/* Const for nibble/byte modes  */
 	int epp_speed;		/* Reset time period            */
@@ -210,22 +210,22 @@
 #define w_fifo(x,y)     outb(y, PPA_BASE(x)+0x400)
 #define w_ecr(x,y)      outb(y, PPA_BASE(x)+0x402)
 
-int ppa_wakeup(void *ref)
+static void ppa_wakeup(void *ref)
 {
 	ppa_struct *ppa_dev = (ppa_struct *) ref;
 
 	if (!ppa_dev->ppa_wait_q)
-		return 1;	/* Wake up whom ? */
+		return;	/* Wake up whom ? */
 
 	/* Claim the Parport */
 	if (parport_claim(ppa_dev->dev))
-		return 1;	/* Shouldn't happen */
+		return;	/* Shouldn't happen */
 
 	wake_up(&ppa_dev->ppa_wait_q);
-	return 0;
+	return;
 }
 
-int ppa_release(struct Scsi_Host *host)
+static int ppa_release(struct Scsi_Host *host)
 {
 	int host_no = host->unique_id;
 
@@ -1137,7 +1137,7 @@
 		int modes = pb->modes;
 
 		/* We only understand PC-style ports */
-		if (modes & PARPORT_MODE_SPP) {
+		if (modes & PARPORT_MODE_PCSPP) {
 
 			/* transfer global values here */
 			if (ppa_speed >= 0)
@@ -1156,16 +1156,16 @@
 			w_ctr(i, 0x0c);
 
 			ppa_hosts[i].mode = PPA_NIBBLE;
-			if (modes & (PARPORT_MODE_EPP | PARPORT_MODE_ECPEPP)) {
+			if (modes & (PARPORT_MODE_PCEPP | PARPORT_MODE_PCECPEPP)) {
 				ppa_hosts[i].mode = PPA_EPP_32;
-				printk("PPA: Parport [ EPP ]\n");
-			} else if (modes & PARPORT_MODE_ECP) {
+				printk("PPA: Parport [ PCEPP ]\n");
+			} else if (modes & PARPORT_MODE_PCECP) {
 				w_ecr(i, 0x20);
 				ppa_hosts[i].mode = PPA_PS2;
-				printk("PPA: Parport [ ECP in PS2 submode ]\n");
-			} else if (modes & PARPORT_MODE_PS2) {
+				printk("PPA: Parport [ PCECP in PS2 submode ]\n");
+			} else if (modes & PARPORT_MODE_PCPS2) {
 				ppa_hosts[i].mode = PPA_PS2;
-				printk("PPA: Parport [ PS2 ]\n");
+				printk("PPA: Parport [ PCPS2 ]\n");
 			}
 			/* Done configuration */
 			ppa_pb_release(i);