aha1542.c aic6360.c cy.c fd.c ft.c

if_ie.c if_wl.c if_zp.c isa.c isa_device.h
labpc.c mcd.c ncr5380.c scd.c seagate.c si.c
sio.c tw.c ultra14f.c wcd.c wd.c:

	Update for changes in the callout interface.

apic_vector.s icu_vector.s ipl.s ipl_funcs.c:

	Add CAM software/hardware interrupt support.

2 files changed, 18 insertions, 10 deletions

diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index b56fc42..0ba554c 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.53 1997/09/03 01:50:24 bde Exp $
+ *	$Id: cy.c,v 1.54 1997/09/14 03:19:08 peter Exp $
  */
 
 #include "cy.h"
@@ -137,6 +137,7 @@
 #define	siowrite	cywrite
 #define	sio_timeout	cy_timeout
 #define	sio_timeouts_until_log	cy_timeouts_until_log
+#define	sio_timeout_handle cy_timeout_handle
 #define	sio_tty		cy_tty
 
 #define	CY_MAX_PORTS		(CD1400_NO_OF_CHANNELS * CY_MAX_CD1400s)
@@ -390,6 +391,8 @@ static	speed_t	comdefaultrate = TTYDEF_SPEED;
 static	u_int	com_events;	/* input chars + weighted output completions */
 static	int	sio_timeout;
 static	int	sio_timeouts_until_log;
+static	struct	callout_handle sio_timeout_handle
+    = CALLOUT_HANDLE_INITIALIZER(&sio_timeout_handle);
 #if 0 /* XXX */
 static struct tty	*sio_tty[NSIO];
 #else
@@ -2305,7 +2308,7 @@ siosettimeout()
 	 * Otherwise set it to max(1/200, 1/hz).
 	 * Enable timeouts iff some device is open.
 	 */
-	untimeout(comwakeup, (void *)NULL);
+	untimeout(comwakeup, (void *)NULL, sio_timeout_handle);
 	sio_timeout = hz;
 	someopen = FALSE;
 	for (unit = 0; unit < NSIO; ++unit) {
@@ -2323,12 +2326,13 @@ siosettimeout()
 	}
 	if (someopen) {
 		sio_timeouts_until_log = hz / sio_timeout;
-		timeout(comwakeup, (void *)NULL, sio_timeout);
+		sio_timeout_handle = timeout(comwakeup, (void *)NULL,
+					     sio_timeout);
 	} else {
 		/* Flush error messages, if any. */
 		sio_timeouts_until_log = 1;
 		comwakeup((void *)NULL);
-		untimeout(comwakeup, (void *)NULL);
+		untimeout(comwakeup, (void *)NULL, sio_timeout_handle);
 	}
 }
 
@@ -2339,7 +2343,7 @@ comwakeup(chan)
 	struct com_s	*com;
 	int		unit;
 
-	timeout(comwakeup, (void *)NULL, sio_timeout);
+	sio_timeout_handle = timeout(comwakeup, (void *)NULL, sio_timeout);
 
 #if 0
 	/*
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index b56fc42..0ba554c 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.53 1997/09/03 01:50:24 bde Exp $
+ *	$Id: cy.c,v 1.54 1997/09/14 03:19:08 peter Exp $
  */
 
 #include "cy.h"
@@ -137,6 +137,7 @@
 #define	siowrite	cywrite
 #define	sio_timeout	cy_timeout
 #define	sio_timeouts_until_log	cy_timeouts_until_log
+#define	sio_timeout_handle cy_timeout_handle
 #define	sio_tty		cy_tty
 
 #define	CY_MAX_PORTS		(CD1400_NO_OF_CHANNELS * CY_MAX_CD1400s)
@@ -390,6 +391,8 @@ static	speed_t	comdefaultrate = TTYDEF_SPEED;
 static	u_int	com_events;	/* input chars + weighted output completions */
 static	int	sio_timeout;
 static	int	sio_timeouts_until_log;
+static	struct	callout_handle sio_timeout_handle
+    = CALLOUT_HANDLE_INITIALIZER(&sio_timeout_handle);
 #if 0 /* XXX */
 static struct tty	*sio_tty[NSIO];
 #else
@@ -2305,7 +2308,7 @@ siosettimeout()
 	 * Otherwise set it to max(1/200, 1/hz).
 	 * Enable timeouts iff some device is open.
 	 */
-	untimeout(comwakeup, (void *)NULL);
+	untimeout(comwakeup, (void *)NULL, sio_timeout_handle);
 	sio_timeout = hz;
 	someopen = FALSE;
 	for (unit = 0; unit < NSIO; ++unit) {
@@ -2323,12 +2326,13 @@ siosettimeout()
 	}
 	if (someopen) {
 		sio_timeouts_until_log = hz / sio_timeout;
-		timeout(comwakeup, (void *)NULL, sio_timeout);
+		sio_timeout_handle = timeout(comwakeup, (void *)NULL,
+					     sio_timeout);
 	} else {
 		/* Flush error messages, if any. */
 		sio_timeouts_until_log = 1;
 		comwakeup((void *)NULL);
-		untimeout(comwakeup, (void *)NULL);
+		untimeout(comwakeup, (void *)NULL, sio_timeout_handle);
 	}
 }
 
@@ -2339,7 +2343,7 @@ comwakeup(chan)
 	struct com_s	*com;
 	int		unit;
 
-	timeout(comwakeup, (void *)NULL, sio_timeout);
+	sio_timeout_handle = timeout(comwakeup, (void *)NULL, sio_timeout);
 
 #if 0
 	/*