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

• Lines: 70
• Date: Wed May 20 16:22:59 1998
• Orig file: v2.1.102/linux/drivers/scsi/eata.h
• Orig date: Sat Apr 25 18:13:11 1998

diff -u --recursive --new-file v2.1.102/linux/drivers/scsi/eata.h linux/drivers/scsi/eata.h
@@ -11,41 +11,47 @@
 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 "4.20.00"
+#define EATA_VERSION "4.31.00"
 
 #define LinuxVersionCode(v, p, s) (((v)<<16)+((p)<<8)+(s))
 
-#if LINUX_VERSION_CODE >= LinuxVersionCode(2,1,88)
+#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_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 */            \
+                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_abort,                             \
-                reset:             eata2x_reset,                             \
-                bios_param:        scsicam_bios_param,                       \
-                this_id:           7,                                        \
-                unchecked_isa_dma: 1,                                        \
-                use_clustering:    ENABLE_CLUSTERING                         \
+                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