patch-2.4.0-test8 linux/drivers/scsi/esp.c

• Lines: 59
• Date: Mon Aug 28 21:20:03 2000
• Orig file: v2.4.0-test7/linux/drivers/scsi/esp.c
• Orig date: Tue Apr 11 15:09:18 2000

diff -u --recursive --new-file v2.4.0-test7/linux/drivers/scsi/esp.c linux/drivers/scsi/esp.c
@@ -1,4 +1,4 @@
-/* $Id: esp.c,v 1.94 2000/03/30 02:09:10 davem Exp $
+/* $Id: esp.c,v 1.96 2000/08/24 03:51:26 davem Exp $
  * esp.c:  EnhancedScsiProcessor Sun SCSI driver code.
  *
  * Copyright (C) 1995, 1998 David S. Miller (davem@caip.rutgers.edu)
@@ -32,13 +32,16 @@
 #include <asm/sbus.h>
 #include <asm/dma.h>
 #include <asm/system.h>
-#include <asm/machines.h>
 #include <asm/ptrace.h>
 #include <asm/pgtable.h>
 #include <asm/oplib.h>
 #include <asm/io.h>
 #include <asm/irq.h>
+
+#ifndef __sparc_v9__
+#include <asm/machines.h>
 #include <asm/idprom.h>
+#endif
 
 #include <linux/module.h>
 
@@ -1596,7 +1599,9 @@
 
 	if (SDptr->sync) {
 		/* this targets sync is known */
+#ifndef __sparc_v9__
 do_sync_known:
+#endif
 		if (SDptr->disconnect)
 			*cmdp++ = IDENTIFY(1, lun);
 		else
@@ -1634,6 +1639,7 @@
 		 */
 		int cdrom_hwbug_wkaround = 0;
 
+#ifndef __sparc_v9__
 		/* Never allow disconnects or synchronous transfers on
 		 * SparcStation1 and SparcStation1+.  Allowing those
 		 * to be enabled seems to lockup the machine completely.
@@ -1654,6 +1660,7 @@
 			esp->snip = 0;
 			goto do_sync_known;
 		}
+#endif /* !(__sparc_v9__) */
 
 		/* We've talked to this guy before,
 		 * but never negotiated.  Let's try,
@@ -2578,6 +2585,8 @@
 	esp_advance_phase(SCptr, thisphase);
 	ESPDATA(("newphase<%s> ", (thisphase == in_datain) ? "DATAIN" : "DATAOUT"));
 	hmuch = dma_can_transfer(esp, SCptr);
+	if (hmuch > (64 * 1024) && (esp->erev != fashme))
+		hmuch = (64 * 1024);
 	ESPDATA(("hmuch<%d> ", hmuch));
 	esp->current_transfer_size = hmuch;