patch-2.1.75 linux/drivers/scsi/aha1542.h

• Lines: 60
• Date: Sun Dec 21 17:04:48 1997
• Orig file: v2.1.74/linux/drivers/scsi/aha1542.h
• Orig date: Thu Jun 12 15:29:27 1997

diff -u --recursive --new-file v2.1.74/linux/drivers/scsi/aha1542.h linux/drivers/scsi/aha1542.h
@@ -133,8 +133,12 @@
 int aha1542_detect(Scsi_Host_Template *);
 int aha1542_command(Scsi_Cmnd *);
 int aha1542_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
-int aha1542_abort(Scsi_Cmnd *);
-int aha1542_reset(Scsi_Cmnd *, unsigned int);
+int aha1542_abort(Scsi_Cmnd * SCpnt);
+int aha1542_bus_reset(Scsi_Cmnd * SCpnt);
+int aha1542_dev_reset(Scsi_Cmnd * SCpnt);
+int aha1542_host_reset(Scsi_Cmnd * SCpnt);
+extern int aha1542_old_abort(Scsi_Cmnd * SCpnt);
+int aha1542_old_reset(Scsi_Cmnd *, unsigned int);
 int aha1542_biosparam(Disk *, kdev_t, int*);
 
 #define AHA1542_MAILBOXES 8
@@ -147,25 +151,24 @@
 
 extern struct proc_dir_entry proc_scsi_aha1542;
 
-#define AHA1542 {  NULL, NULL,				\
-                     &proc_scsi_aha1542,/* proc_dir_entry */ \
-		     NULL,		                \
-		     "Adaptec 1542", 			\
-		     aha1542_detect,			\
-		     NULL,				\
-		     NULL,	 			\
-		     aha1542_command,			\
-		     aha1542_queuecommand,		\
-		     aha1542_abort,			\
-		     aha1542_reset,			\
-		     NULL,				\
-		     aha1542_biosparam,                 \
-		     AHA1542_MAILBOXES, 		\
-		     7, 				\
-		     AHA1542_SCATTER, 			\
-		     AHA1542_CMDLUN, 			\
-		     0, 				\
-		     1, 				\
-		     ENABLE_CLUSTERING}
+#define AHA1542 {    proc_dir:			&proc_scsi_aha1542,	\
+		     name:			"Adaptec 1542", 	\
+		     detect:			aha1542_detect,		\
+		     command:			aha1542_command,	\
+		     queuecommand:		aha1542_queuecommand,	\
+                     abort:		        aha1542_old_abort,	\
+                     reset:			aha1542_old_reset,	\
+		     eh_abort_handler:		aha1542_abort,		\
+		     eh_device_reset_handler:	aha1542_dev_reset,	\
+		     eh_bus_reset_handler:	aha1542_bus_reset,	\
+		     eh_host_reset_handler:	aha1542_host_reset,	\
+		     bios_param:		aha1542_biosparam,      \
+		     can_queue:			AHA1542_MAILBOXES, 	\
+		     this_id:			7, 			\
+		     sg_tablesize:		AHA1542_SCATTER, 	\
+		     cmd_per_lun:		AHA1542_CMDLUN, 	\
+		     unchecked_isa_dma:		1, 			\
+		     use_clustering:		ENABLE_CLUSTERING,	\
+		     use_new_eh_code:		1}
 
 #endif