patch-2.1.93 linux/drivers/scsi/eata.h

• Lines: 62
• Date: Sun Apr 5 11:26:29 1998
• Orig file: v2.1.92/linux/drivers/scsi/eata.h
• Orig date: Sun Dec 21 17:04:48 1997

diff -u --recursive --new-file v2.1.92/linux/drivers/scsi/eata.h linux/drivers/scsi/eata.h
@@ -1,5 +1,5 @@
 /*
- *	eata.h - used by the low-level driver for EATA/DMA SCSI host adapters.
+ *        eata.h - used by the low-level driver for EATA/DMA SCSI host adapters.
  */
 #ifndef _EATA_H
 #define _EATA_H
@@ -12,19 +12,41 @@
 int eata2x_abort(Scsi_Cmnd *);
 int eata2x_reset(Scsi_Cmnd *, unsigned int);
 
-#define EATA_VERSION "3.11.00"
+#define EATA_VERSION "4.02.00"
 
+#define LinuxVersionCode(v, p, s) (((v)<<16)+((p)<<8)+(s))
+
+#if LINUX_VERSION_CODE >= LinuxVersionCode(2,1,88)
+
+#define EATA {                                                               \
+                name:              "EATA/DMA 2.0x rev. " EATA_VERSION " ",   \
+                detect:            eata2x_detect,                            \
+                release:           eata2x_release,                           \
+                queuecommand:      eata2x_queuecommand,                      \
+                abort:             eata2x_abort,                             \
+                reset:             eata2x_reset,                             \
+                bios_param:        scsicam_bios_param,                       \
+                this_id:           7,                                        \
+                unchecked_isa_dma: 1,                                        \
+                use_clustering:    ENABLE_CLUSTERING,                        \
+                use_new_eh_code: 1    /* Enable new error code */            \
+             }
+
+#else /* Use old scsi code */
+
+#define EATA {                                                               \
+                name:              "EATA/DMA 2.0x rev. " EATA_VERSION " ",   \
+                detect:            eata2x_detect,                            \
+                release:           eata2x_release,                           \
+                queuecommand:      eata2x_queuecommand,                      \
+                abort:             eata2x_abort,                             \
+                reset:             eata2x_reset,                             \
+                bios_param:        scsicam_bios_param,                       \
+                this_id:           7,                                        \
+                unchecked_isa_dma: 1,                                        \
+                use_clustering:    ENABLE_CLUSTERING                         \
+             }
+
+#endif
 
-#define EATA {									\
-		name:              "EATA/DMA 2.0x rev. " EATA_VERSION " ",      \
-		detect:            eata2x_detect,				\
-		release:           eata2x_release,          		        \
-		queuecommand:      eata2x_queuecommand,			        \
-		abort:             eata2x_abort,				\
-		reset:             eata2x_reset,				\
-		bios_param:        scsicam_bios_param,   			\
-		this_id:           7,   /* this_id, reset by detect */          \
-		unchecked_isa_dma: 1,   /* unchecked isa dma, reset by detect */\
-		use_clustering:    ENABLE_CLUSTERING                            \
-		}
 #endif