summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/hpc/biconsdev.c6
-rw-r--r--sys/dev/ofw/ofcons.c6
-rw-r--r--sys/dev/rcons/rcons_kern.c6
-rw-r--r--sys/dev/wscons/wsdisplay.c10
4 files changed, 13 insertions, 15 deletions
diff --git a/sys/dev/hpc/biconsdev.c b/sys/dev/hpc/biconsdev.c
index abec866f64b..9810f113a7e 100644
--- a/sys/dev/hpc/biconsdev.c
+++ b/sys/dev/hpc/biconsdev.c
@@ -1,4 +1,4 @@
-/* $NetBSD: biconsdev.c,v 1.18 2007/03/04 06:01:46 christos Exp $ */
+/* $NetBSD: biconsdev.c,v 1.19 2007/10/18 18:55:00 joerg Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: biconsdev.c,v 1.18 2007/03/04 06:01:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: biconsdev.c,v 1.19 2007/10/18 18:55:00 joerg Exp $");
#include "biconsdev.h"
#include <sys/param.h>
@@ -151,7 +151,7 @@ biconsdev_output(struct tty *tp)
/* Come back if there's more to do */
if (tp->t_outq.c_cc) {
tp->t_state |= TS_TIMEOUT;
- callout_reset(&tp->t_rstrt_ch, 1, ttrstrt, tp);
+ callout_schedule(&tp->t_rstrt_ch, 1);
}
if (tp->t_outq.c_cc <= tp->t_lowat) {
if (tp->t_state&TS_ASLEEP) {
diff --git a/sys/dev/ofw/ofcons.c b/sys/dev/ofw/ofcons.c
index b42da8b9dac..d3f6730ebdd 100644
--- a/sys/dev/ofw/ofcons.c
+++ b/sys/dev/ofw/ofcons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofcons.c,v 1.31 2007/07/09 21:00:52 ad Exp $ */
+/* $NetBSD: ofcons.c,v 1.32 2007/10/18 18:55:00 joerg Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofcons.c,v 1.31 2007/07/09 21:00:52 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofcons.c,v 1.32 2007/10/18 18:55:00 joerg Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -258,7 +258,7 @@ ofcons_start(tp)
tp->t_state &= ~TS_BUSY;
if (cl->c_cc) {
tp->t_state |= TS_TIMEOUT;
- callout_reset(&tp->t_rstrt_ch, 1, ttrstrt, (void *)tp);
+ callout_schedule(&tp->t_rstrt_ch, 1);
}
if (cl->c_cc <= tp->t_lowat) {
if (tp->t_state & TS_ASLEEP) {
diff --git a/sys/dev/rcons/rcons_kern.c b/sys/dev/rcons/rcons_kern.c
index e0cf034b6a9..d4adb982935 100644
--- a/sys/dev/rcons/rcons_kern.c
+++ b/sys/dev/rcons/rcons_kern.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rcons_kern.c,v 1.19 2007/07/09 21:01:20 ad Exp $ */
+/* $NetBSD: rcons_kern.c,v 1.20 2007/10/18 18:55:00 joerg Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rcons_kern.c,v 1.19 2007/07/09 21:01:20 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rcons_kern.c,v 1.20 2007/10/18 18:55:00 joerg Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -103,7 +103,7 @@ rcons_output(tp)
/* Come back if there's more to do */
if (tp->t_outq.c_cc) {
tp->t_state |= TS_TIMEOUT;
- callout_reset(&tp->t_rstrt_ch, 1, ttrstrt, tp);
+ callout_schedule(&tp->t_rstrt_ch, 1);
}
if (tp->t_outq.c_cc <= tp->t_lowat) {
if (tp->t_state&TS_ASLEEP) {
diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c
index b1b0556766c..dbd4d5a57ac 100644
--- a/sys/dev/wscons/wsdisplay.c
+++ b/sys/dev/wscons/wsdisplay.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay.c,v 1.109 2007/10/18 18:09:53 joerg Exp $ */
+/* $NetBSD: wsdisplay.c,v 1.110 2007/10/18 18:55:00 joerg Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.109 2007/10/18 18:09:53 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.110 2007/10/18 18:55:00 joerg Exp $");
#include "opt_wsdisplay_compat.h"
#include "opt_wsmsgattrs.h"
@@ -1473,8 +1473,7 @@ wsdisplaystart(struct tty *tp)
/* Come back if there's more to do */
if (tp->t_outq.c_cc) {
tp->t_state |= TS_TIMEOUT;
- callout_reset(&tp->t_rstrt_ch, (hz > 128) ? (hz / 128) : 1,
- ttrstrt, tp);
+ callout_schedule(&tp->t_rstrt_ch, (hz > 128) ? (hz / 128) : 1);
}
if (tp->t_outq.c_cc <= tp->t_lowat) {
if (tp->t_state&TS_ASLEEP) {
@@ -1978,8 +1977,7 @@ wsdisplay_kbdholdscreen(device_t dv, int hold)
scr->scr_hold_screen = 1;
else {
scr->scr_hold_screen = 0;
- callout_reset(&scr->scr_tty->t_rstrt_ch, 0,
- ttrstrt, scr->scr_tty); /* "immediate" */
+ callout_schedule(&scr->scr_tty->t_rstrt_ch, 0);
}
}