Update for new callout interface.

5 files changed, 15 insertions, 11 deletions

diff --git a/sys/pci/if_fxp.c b/sys/pci/if_fxp.c
index a4d1fcc..09adcf7 100644
--- a/sys/pci/if_fxp.c
+++ b/sys/pci/if_fxp.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: if_fxp.c,v 1.39 1997/09/05 10:23:54 davidg Exp $
  */
 
 /*
@@ -515,6 +515,7 @@ fxp_attach(config_id, unit)
 	if (sc == NULL)
 		return;
 	bzero(sc, sizeof(struct fxp_softc));
+	callout_handle_init(&sc->stat_ch);
 
 	s = splimp();
 
@@ -1112,7 +1113,7 @@ fxp_stop(sc)
 	/*
 	 * Cancel stats updater.
 	 */
-	untimeout(fxp_stats_update, sc);
+	untimeout(fxp_stats_update, sc, sc->stat_ch);
 
 	/*
 	 * Issue software reset
@@ -1337,7 +1338,7 @@ fxp_init(xsc)
 	/*
 	 * Start stats updater.
 	 */
-	timeout(fxp_stats_update, sc, hz);
+	sc->stat_ch = timeout(fxp_stats_update, sc, hz);
 }
 
 void
diff --git a/sys/pci/if_fxpvar.h b/sys/pci/if_fxpvar.h
index 9c7e310..81789d6 100644
--- a/sys/pci/if_fxpvar.h
+++ b/sys/pci/if_fxpvar.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: if_fxpvar.h,v 1.1 1997/09/05 10:23:58 davidg Exp $
  */
 
 /*
@@ -53,6 +53,7 @@ struct fxp_softc {
 	struct mbuf *rfa_headm;		/* first mbuf in receive frame area */
 	struct mbuf *rfa_tailm;		/* last mbuf in receive frame area */
 	struct fxp_stats *fxp_stats;	/* Pointer to interface stats */
+	struct callout_handle stat_ch;	/* Handle for canceling our stat timeout */
 	int tx_queued;			/* # of active TxCB's */
 	int promisc_mode;		/* promiscuous mode enabled */
 	int phy_primary_addr;		/* address of primary PHY */
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index 2f0ad96..d13fc9e 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: ncr.c,v 1.109 1997/09/09 21:52:31 se Exp $
+**  $Id: ncr.c,v 1.110 1997/09/10 20:46:11 se Exp $
 **
 **  Device driver for the   NCR 53C810   PCI-SCSI-Controller.
 **
@@ -1113,6 +1113,7 @@ struct ncb {
 	u_short		ticks;
 	u_short		latetime;
 	u_long		lasttime;
+	struct		callout_handle timeout_ch;
 
 	/*-----------------------------------------------
 	**	Debug and profiling
@@ -1340,7 +1341,7 @@ static	void	ncr_attach	(pcici_t tag, int unit);
 
 
 static char ident[] =
-	"\n$Id: ncr.c,v 1.109 1997/09/09 21:52:31 se Exp $\n";
+	"\n$Id: ncr.c,v 1.110 1997/09/10 20:46:11 se Exp $\n";
 
 static const u_long	ncr_version = NCR_VERSION	* 11
 	+ (u_long) sizeof (struct ncb)	*  7
@@ -5534,7 +5535,7 @@ static void ncr_timeout (void *arg)
 		splx (oldspl);
 	}
 
-	timeout (ncr_timeout, (caddr_t) np, step ? step : 1);
+	np->timeout_ch = timeout (ncr_timeout, (caddr_t) np, step ? step : 1);
 
 	if (INB(nc_istat) & (INTF|SIP|DIP)) {
 
@@ -5895,7 +5896,7 @@ void ncr_exception (ncb_p np)
 			if (i%16==15) printf (".\n");
 		};
 
-		untimeout (ncr_timeout, (caddr_t) np);
+		untimeout (ncr_timeout, (caddr_t) np, np->timeout_ch);
 
 		printf ("%s: halted!\n", ncr_name(np));
 		/*
diff --git a/sys/pci/scsiiom.c b/sys/pci/scsiiom.c
index c611518..f178660b 100644
--- a/sys/pci/scsiiom.c
+++ b/sys/pci/scsiiom.c
@@ -1080,8 +1080,6 @@ SRBdone( PACB pACB, PDCB pDCB, PSRB pSRB )
     ULONG  swlval;
 
     pcmd = pSRB->pcmd;
-    if( !(pcmd->flags & SCSI_NOMASK) )
-	untimeout(DC390_timeout, (caddr_t) pSRB);
     plink = pcmd->sc_link;
     status = pSRB->TargetStatus;
     if(pSRB->SRBFlag & AUTO_REQSENSE)
diff --git a/sys/pci/tek390.c b/sys/pci/tek390.c
index 06d8d60..b9283dd 100644
--- a/sys/pci/tek390.c
+++ b/sys/pci/tek390.c
@@ -119,6 +119,10 @@ static void EnableMsgOut2( PACB pACB, PSRB pSRB );
 static void EnableMsgOut( PACB pACB, PSRB pSRB );
 static void DC390_InvalidCmd( PACB pACB );
 
+/*
+ * XXX No timeouts are scheduled in this driver as the timeout handler
+ *     doesn't do anything yet!!!
+ */
 static void DC390_timeout( void *arg1);
 static void DC390_reset (PACB pACB);
 static PUCHAR  phystovirt( PSRB pSRB, ULONG xferCnt );
@@ -694,7 +698,6 @@ trmamd_scsi_cmd ( PSCSICMD cmd )
     {
 	flags = splbio();
 	SendSRB( pcmd, pACB, pSRB );
-	timeout(DC390_timeout, (caddr_t)pSRB, (pcmd->timeout * hz)/1000);
 	splx(flags);
 	return( SUCCESSFULLY_QUEUED);
     }