patch-2.4.20 linux-2.4.20/drivers/scsi/esp.h

• Lines: 48
• Date: Thu Nov 28 15:53:14 2002
• Orig file: linux-2.4.19/drivers/scsi/esp.h
• Orig date: Mon Sep 18 13:40:17 2000

diff -urN linux-2.4.19/drivers/scsi/esp.h linux-2.4.20/drivers/scsi/esp.h
@@ -8,6 +8,8 @@
 #ifndef _SPARC_ESP_H
 #define _SPARC_ESP_H
 
+#include <linux/config.h>
+
 /* For dvma controller register definitions. */
 #include <asm/dma.h>
 
@@ -400,6 +402,28 @@
 			 int hostno, int inout);
 extern int esp_revoke(Scsi_Device* SDptr);
 
+#ifdef CONFIG_SPARC64
+#define SCSI_SPARC_ESP {                                        \
+		proc_name:      "esp",				\
+		proc_info:      &esp_proc_info,			\
+		name:           "Sun ESP 100/100a/200",		\
+		detect:         esp_detect,			\
+		revoke:		esp_revoke,			\
+		info:           esp_info,			\
+		command:        esp_command,			\
+		queuecommand:   esp_queue,			\
+		abort:          esp_abort,			\
+		reset:          esp_reset,			\
+		can_queue:      7,				\
+		this_id:        7,				\
+		sg_tablesize:   SG_ALL,				\
+		cmd_per_lun:    1,				\
+		use_clustering: ENABLE_CLUSTERING,		\
+		use_new_eh_code: 0,				\
+		highmem_io:	1				\
+}
+#else
+/* Sparc32's iommu code cannot handle highmem pages yet. */
 #define SCSI_SPARC_ESP {                                        \
 		proc_name:      "esp",				\
 		proc_info:      &esp_proc_info,			\
@@ -416,8 +440,8 @@
 		sg_tablesize:   SG_ALL,				\
 		cmd_per_lun:    1,				\
 		use_clustering: ENABLE_CLUSTERING,		\
-		use_new_eh_code: 0				\
 }
+#endif
 
 /* For our interrupt engine. */
 #define for_each_esp(esp) \