patch-2.1.93 linux/drivers/scsi/u14-34f.h

• Lines: 55
• Date: Sun Apr 5 11:26:29 1998
• Orig file: v2.1.92/linux/drivers/scsi/u14-34f.h
• Orig date: Sun Dec 21 17:04:49 1997

diff -u --recursive --new-file v2.1.92/linux/drivers/scsi/u14-34f.h linux/drivers/scsi/u14-34f.h
@@ -11,18 +11,41 @@
 int u14_34f_reset(Scsi_Cmnd *, unsigned int);
 int u14_34f_biosparam(Disk *, kdev_t, int *);
 
-#define U14_34F_VERSION "3.11.00"
+#define U14_34F_VERSION "4.02.00"
+
+#define LinuxVersionCode(v, p, s) (((v)<<16)+((p)<<8)+(s))
+
+#if LINUX_VERSION_CODE >= LinuxVersionCode(2,1,88)
+
+#define ULTRASTOR_14_34F {                                                   \
+                name:         "UltraStor 14F/34F rev. " U14_34F_VERSION " ", \
+                detect:       u14_34f_detect,                                \
+                release:      u14_34f_release,                               \
+                queuecommand: u14_34f_queuecommand,                          \
+                abort:        u14_34f_abort,                                 \
+                reset:        u14_34f_reset,                                 \
+                bios_param:   u14_34f_biosparam,                             \
+                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 ULTRASTOR_14_34F {                                                   \
+                name:         "UltraStor 14F/34F rev. " U14_34F_VERSION " ", \
+                detect:       u14_34f_detect,                                \
+                release:      u14_34f_release,                               \
+                queuecommand: u14_34f_queuecommand,                          \
+                abort:        u14_34f_abort,                                 \
+                reset:        u14_34f_reset,                                 \
+                bios_param:   u14_34f_biosparam,                             \
+                this_id:      7,                                             \
+                unchecked_isa_dma: 1,                                        \
+                use_clustering: ENABLE_CLUSTERING,                           \
+                }
+
+#endif
 
-#define ULTRASTOR_14_34F {							   \
-		name:              "UltraStor 14F/34F rev. " U14_34F_VERSION " ",  \
-		detect:            u14_34f_detect,                                 \
-		release:           u14_34f_release,                                \
-		queuecommand:      u14_34f_queuecommand,                           \
-		abort:             u14_34f_abort,                                  \
-		reset:             u14_34f_reset,                                  \
-		bios_param:        u14_34f_biosparam,                              \
-		this_id:           7,   /* this_id, reset by detect */             \
-		unchecked_isa_dma: 1,   /* unchecked isa dma, reset by detect */   \
-		use_clustering:    ENABLE_CLUSTERING                               \
-		}
 #endif