patch-2.1.132 linux/drivers/scsi/hosts.c

• Lines: 145
• Date: Fri Dec 18 10:12:25 1998
• Orig file: v2.1.131/linux/drivers/scsi/hosts.c
• Orig date: Thu Nov 12 16:21:21 1998

diff -u --recursive --new-file v2.1.131/linux/drivers/scsi/hosts.c linux/drivers/scsi/hosts.c
@@ -7,6 +7,8 @@
  *      Subsequent revisions: Eric Youngdale
  *
  *  <drew@colorado.edu>
+ *
+ *  Jiffies wrap fixes (host->resetting), 3 Dec 1998 Andrea Arcangeli
  */
 
 
@@ -97,6 +99,18 @@
 #include "atari_scsi.h"
 #endif
 
+#ifdef CONFIG_MAC_SCSI_OLD
+#include "mac_scsi.h"
+#endif
+
+#ifdef CONFIG_MAC_SCSI
+#include "mac_scsinew.h"
+#endif
+
+#ifdef CONFIG_SCSI_MAC_ESP
+#include "mac_esp.h"
+#endif
+
 #ifdef CONFIG_SCSI_ADVANSYS
 #include "advansys.h"
 #endif
@@ -161,6 +175,10 @@
 #include "qlogicisp.h"
 #endif
 
+#ifdef CONFIG_SCSI_QLOGIC_FC
+#include "qlogicfc.h"
+#endif
+
 #ifdef CONFIG_SCSI_SEAGATE
 #include "seagate.h"
 #endif
@@ -189,6 +207,10 @@
 #include "wd7000.h"
 #endif
 
+#ifdef CONFIG_SCSI_MCA_53C9X
+#include "mca_53c9x.h"
+#endif
+
 #ifdef CONFIG_SCSI_IBMMCA
 #include "ibmmca.h"
 #endif
@@ -209,6 +231,14 @@
 #include "AM53C974.h"
 #endif
 
+#ifdef CONFIG_SCSI_MEGARAID
+#include "megaraid.h"
+#endif
+
+#ifdef CONFIG_SCSI_ACARD
+#include "atp870u.h"
+#endif
+
 #ifdef CONFIG_SCSI_SUNESP
 #include "esp.h"
 #endif
@@ -249,6 +279,10 @@
 #include "pluto.h"
 #endif
 
+#ifdef CONFIG_SCSI_INITIO
+#include "ini9100u.h"
+#endif
+
 #ifdef CONFIG_SCSI_DEBUG
 #include "scsi_debug.h"
 #endif
@@ -364,6 +398,18 @@
 #endif
 #endif
 
+#ifdef CONFIG_MAC
+#ifdef CONFIG_MAC_SCSI_OLD
+	MAC_SCSI,
+#endif
+#ifdef CONFIG_SCSI_MAC_ESP
+        SCSI_MAC_ESP,
+#endif
+#ifdef CONFIG_MAC_SCSI
+	MAC_NCR5380,
+#endif
+#endif
+
 #ifdef CONFIG_MVME16x_SCSI
 	MVME16x_SCSI,
 #endif
@@ -424,6 +470,9 @@
 #ifdef CONFIG_SCSI_QLOGIC_ISP
     QLOGICISP,
 #endif
+#ifdef CONFIG_SCSI_QLOGIC_FC
+    QLOGICFC,
+#endif
 #ifdef CONFIG_SCSI_PAS16
     MV_PAS16,
 #endif
@@ -451,6 +500,9 @@
 #ifdef CONFIG_SCSI_7000FASST
     WD7000,
 #endif
+#ifdef CONFIG_SCSI_MCA_53C9X
+    MCA_53C9X,
+#endif
 #ifdef CONFIG_SCSI_IBMMCA
     IBMMCA,
 #endif
@@ -463,12 +515,21 @@
 #ifdef CONFIG_SCSI_AM53C974
     AM53C974,
 #endif
+#ifdef CONFIG_SCSI_MEGARAID
+    MEGARAID,
+#endif
+#ifdef CONFIG_SCSI_ACARD
+    ATP870U,
+#endif
 #ifdef CONFIG_SCSI_SUNESP
     SCSI_SPARC_ESP,
 #endif
 #ifdef CONFIG_SCSI_GDTH
     GDTH,
 #endif
+#ifdef CONFIG_SCSI_INITIO
+    INI9100U,
+#endif
 #ifdef CONFIG_SCSI_QLOGICPTI
     QLOGICPTI,
 #endif
@@ -581,6 +642,7 @@
     next_scsi_host++;
     retval->host_queue = NULL;
     retval->host_wait = NULL;
+    retval->resetting = 0;
     retval->last_reset = 0;
     retval->irq = 0;
     retval->dma_channel = 0xff;