patch-2.0.34 linux/drivers/scsi/NCR5380.c

• Lines: 50
• Date: Wed Jun 3 15:17:48 1998
• Orig file: v2.0.33/linux/drivers/scsi/NCR5380.c
• Orig date: Tue Oct 29 06:21:48 1996

diff -u --recursive --new-file v2.0.33/linux/drivers/scsi/NCR5380.c linux/drivers/scsi/NCR5380.c
@@ -491,11 +491,11 @@
  */
 #ifndef USLEEP_SLEEP
 /* 20 ms (reasonable hard disk speed) */
-#define USLEEP_SLEEP 2
+#define USLEEP_SLEEP (20*HZ/1000)
 #endif
 /* 300 RPM (floppy speed) */
 #ifndef USLEEP_POLL
-#define USLEEP_POLL 20
+#define USLEEP_POLL (200*HZ/1000)
 #endif
 
 static struct Scsi_Host * expires_first = NULL;
@@ -643,7 +643,7 @@
 	    == 0)) 
 	    trying_irqs |= mask;
 
-    timeout = jiffies + 25;
+    timeout = jiffies + 250*HZ/1000;
     probe_irq = IRQ_NONE;
 
 /*
@@ -819,7 +819,7 @@
 SPRINTF("PAS16 release=%d", PAS16_PUBLIC_RELEASE);
 #endif
 
-   SPRINTF("\nBase Addr: 0x%05X    ", (int)instance->base);
+   SPRINTF("\nBase Addr: 0x%05lX    ", (long)instance->base);
    SPRINTF("io_port: %04x      ", (int)instance->io_port);
    if (instance->irq == IRQ_NONE)
       SPRINTF("IRQ: None.\n");
@@ -1002,7 +1002,7 @@
 	case 5:
 	    printk("scsi%d: SCSI bus busy, waiting up to five seconds\n",
 		instance->host_no);
-	    timeout = jiffies + 500;
+	    timeout = jiffies + 5*HZ;
 	    while (jiffies < timeout && (NCR5380_read(STATUS_REG) & SR_BSY));
 	    break;
 	case 2:
@@ -1618,7 +1618,7 @@
      * selection.
      */
 
-    timeout = jiffies + 25; 
+    timeout = jiffies + 250*HZ/1000;
 
     /* 
      * XXX very interesting - we're seeing a bounce where the BSY we