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

• Lines: 86
• Date: Wed Jun 3 15:17:48 1998
• Orig file: v2.0.33/linux/drivers/scsi/eata.h
• Orig date: Mon Sep 15 09:41:28 1997

diff -u --recursive --new-file v2.0.33/linux/drivers/scsi/eata.h linux/drivers/scsi/eata.h
@@ -1,41 +1,59 @@
 /*
- *	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
 
 #include <scsi/scsicam.h>
+#include <linux/version.h>
 
 int eata2x_detect(Scsi_Host_Template *);
 int eata2x_release(struct Scsi_Host *);
 int eata2x_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
 int eata2x_abort(Scsi_Cmnd *);
-int eata2x_reset(Scsi_Cmnd *, unsigned int);
+int eata2x_old_abort(Scsi_Cmnd *);
+int eata2x_reset(Scsi_Cmnd *);
+int eata2x_old_reset(Scsi_Cmnd *, unsigned int);
 
-#define EATA_VERSION "3.11.00"
+#define EATA_VERSION "4.31.00"
 
+#define LinuxVersionCode(v, p, s) (((v)<<16)+((p)<<8)+(s))
+
+#if LINUX_VERSION_CODE >= LinuxVersionCode(2,1,101)
+
+#define EATA {                                                               \
+                name:              "EATA/DMA 2.0x rev. " EATA_VERSION " ",   \
+                detect:                  eata2x_detect,                      \
+                release:                 eata2x_release,                     \
+                queuecommand:            eata2x_queuecommand,                \
+                abort:                   eata2x_old_abort,                   \
+                reset:                   eata2x_old_reset,                   \
+                eh_abort_handler:        eata2x_abort,                       \
+                eh_device_reset_handler: NULL,                               \
+                eh_bus_reset_handler:    NULL,                               \
+                eh_host_reset_handler:   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_old_abort,                   \
+                reset:                   eata2x_old_reset,                   \
+                bios_param:              scsicam_bios_param,                 \
+                this_id:                 7,                                  \
+                unchecked_isa_dma:       1,                                  \
+                use_clustering:          ENABLE_CLUSTERING                   \
+             }
+
+#endif
 
-#define EATA {                                                 \
-		NULL, /* Ptr for modules */                    \
-		NULL, /* usage count for modules */	       \
-		NULL,                                          \
-		NULL,                                          \
-		"EATA/DMA 2.0x rev. " EATA_VERSION " ",        \
-		eata2x_detect,				       \
-		eata2x_release,          		       \
-		NULL,					       \
-		NULL,    			       	       \
-		eata2x_queuecommand,			       \
-		eata2x_abort,				       \
-		eata2x_reset,				       \
-		NULL,					       \
-		scsicam_bios_param,   			       \
-		0,   /* can_queue, reset by detect */          \
-		7,   /* this_id, reset by detect */            \
-		0,   /* sg_tablesize, reset by detect */       \
-		0,   /* cmd_per_lun, reset by detect */        \
-		0,   /* number of boards present */            \
-		1,   /* unchecked isa dma, reset by detect */  \
-		ENABLE_CLUSTERING                              \
-		}
 #endif