summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorjoerg <joerg@NetBSD.org>2007-10-18 18:54:56 +0000
committerjoerg <joerg@NetBSD.org>2007-10-18 18:54:56 +0000
commitd238692c3ed2a0b261d3f0ebcd262d0d545404c8 (patch)
treeeb3e0e92276c8ce9c225ba7f11d227255350ae63 /sys
parentbc89ba23ac92689206b04b822077f3920d360cb5 (diff)
Initialise the callbacks for tty.t_rstrt_ch in ttymalloc
as all drivers but Sun/SPARC's kd.c use the same arguments. Separate callout_reset into callout_schedule and the initial callout_setfunc using that.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amiga/dev/ite.c6
-rw-r--r--sys/arch/arc/dev/pccons.c6
-rw-r--r--sys/arch/arm/footbridge/footbridge_com.c8
-rw-r--r--sys/arch/atari/dev/ite.c6
-rw-r--r--sys/arch/hp300/dev/ite.c6
-rw-r--r--sys/arch/i386/isa/pccons.c6
-rw-r--r--sys/arch/macppc/dev/ofcons.c6
-rw-r--r--sys/arch/shark/shark/pccons.c6
-rw-r--r--sys/arch/sparc/dev/kd.c7
-rw-r--r--sys/arch/sparc64/dev/kd.c8
-rw-r--r--sys/arch/sparc64/dev/pcons.c6
-rw-r--r--sys/arch/sun2/dev/kd.c8
-rw-r--r--sys/arch/sun2/dev/pcons.c6
-rw-r--r--sys/arch/sun3/dev/kd.c9
-rw-r--r--sys/arch/x68k/dev/ite.c6
-rw-r--r--sys/arch/xen/xen/xencons.c6
-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
-rw-r--r--sys/kern/tty.c5
21 files changed, 70 insertions, 69 deletions
diff --git a/sys/arch/amiga/dev/ite.c b/sys/arch/amiga/dev/ite.c
index 68d790b5705..bc3aba51506 100644
--- a/sys/arch/amiga/dev/ite.c
+++ b/sys/arch/amiga/dev/ite.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ite.c,v 1.79 2007/10/17 19:53:17 garbled Exp $ */
+/* $NetBSD: ite.c,v 1.80 2007/10/18 18:54:56 joerg Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -83,7 +83,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.79 2007/10/17 19:53:17 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.80 2007/10/18 18:54:56 joerg Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -662,7 +662,7 @@ itestart(struct tty *tp)
/* we have characters remaining. */
if (rbp->c_cc) {
tp->t_state |= TS_TIMEOUT;
- callout_reset(&tp->t_rstrt_ch, 1, ttrstrt, tp);
+ callout_schedule(&tp->t_rstrt_ch, 1);
}
/* wakeup we are below */
if (rbp->c_cc <= tp->t_lowat) {
diff --git a/sys/arch/arc/dev/pccons.c b/sys/arch/arc/dev/pccons.c
index 7ee146f2b10..5f5112c84d2 100644
--- a/sys/arch/arc/dev/pccons.c
+++ b/sys/arch/arc/dev/pccons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pccons.c,v 1.51 2007/10/17 19:53:28 garbled Exp $ */
+/* $NetBSD: pccons.c,v 1.52 2007/10/18 18:54:57 joerg Exp $ */
/* $OpenBSD: pccons.c,v 1.22 1999/01/30 22:39:37 imp Exp $ */
/* NetBSD: pccons.c,v 1.89 1995/05/04 19:35:20 cgd Exp */
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pccons.c,v 1.51 2007/10/17 19:53:28 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pccons.c,v 1.52 2007/10/18 18:54:57 joerg Exp $");
#include "opt_ddb.h"
@@ -815,7 +815,7 @@ pcstart(struct tty *tp)
tp->t_state &= ~TS_BUSY;
if (cl->c_cc) {
tp->t_state |= TS_TIMEOUT;
- callout_reset(&tp->t_rstrt_ch, 1, ttrstrt, 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/arch/arm/footbridge/footbridge_com.c b/sys/arch/arm/footbridge/footbridge_com.c
index 5869bcdbe19..b1e4aef764e 100644
--- a/sys/arch/arm/footbridge/footbridge_com.c
+++ b/sys/arch/arm/footbridge/footbridge_com.c
@@ -1,4 +1,4 @@
-/* $NetBSD: footbridge_com.c,v 1.25 2007/10/17 19:53:40 garbled Exp $ */
+/* $NetBSD: footbridge_com.c,v 1.26 2007/10/18 18:54:57 joerg Exp $ */
/*-
* Copyright (c) 1997 Mark Brinicombe
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: footbridge_com.c,v 1.25 2007/10/17 19:53:40 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: footbridge_com.c,v 1.26 2007/10/18 18:54:57 joerg Exp $");
#include "opt_ddb.h"
#include "opt_ddbparam.h"
@@ -416,7 +416,7 @@ fcomstart(tp)
s = splserial();
if (bus_space_read_4(iot, ioh, UART_FLAGS) & UART_TX_BUSY) {
tp->t_state |= TS_TIMEOUT;
- callout_reset(&tp->t_rstrt_ch, 1, ttrstrt, tp);
+ callout_schedule(&tp->t_rstrt_ch, 1);
(void)splx(s);
return;
}
@@ -440,7 +440,7 @@ fcomstart(tp)
tp->t_state &= ~TS_BUSY;
if (cl->c_cc) {
tp->t_state |= TS_TIMEOUT;
- callout_reset(&tp->t_rstrt_ch, 1, ttrstrt, 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/arch/atari/dev/ite.c b/sys/arch/atari/dev/ite.c
index f906bfe714a..a2a94412866 100644
--- a/sys/arch/atari/dev/ite.c
+++ b/sys/arch/atari/dev/ite.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ite.c,v 1.56 2007/10/17 19:53:47 garbled Exp $ */
+/* $NetBSD: ite.c,v 1.57 2007/10/18 18:54:57 joerg Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.56 2007/10/17 19:53:47 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.57 2007/10/18 18:54:57 joerg Exp $");
#include "opt_ddb.h"
@@ -679,7 +679,7 @@ itestart(tp)
/* we have characters remaining. */
if (rbp->c_cc) {
tp->t_state |= TS_TIMEOUT;
- callout_reset(&tp->t_rstrt_ch, 1, ttrstrt, tp);
+ callout_schedule(&tp->t_rstrt_ch, 1);
}
/* wakeup we are below */
if (rbp->c_cc <= tp->t_lowat) {
diff --git a/sys/arch/hp300/dev/ite.c b/sys/arch/hp300/dev/ite.c
index 0440cb9d636..90af6daf69b 100644
--- a/sys/arch/hp300/dev/ite.c
+++ b/sys/arch/hp300/dev/ite.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ite.c,v 1.77 2007/03/04 05:59:48 christos Exp $ */
+/* $NetBSD: ite.c,v 1.78 2007/10/18 18:54:57 joerg Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -119,7 +119,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.77 2007/03/04 05:59:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.78 2007/10/18 18:54:57 joerg Exp $");
#include "hil.h"
@@ -554,7 +554,7 @@ itestart(struct tty *tp)
}
if (hiwat) {
tp->t_state |= TS_TIMEOUT;
- callout_reset(&tp->t_rstrt_ch, 1, ttrstrt, tp);
+ callout_schedule(&tp->t_rstrt_ch, 1);
}
}
tp->t_state &= ~TS_BUSY;
diff --git a/sys/arch/i386/isa/pccons.c b/sys/arch/i386/isa/pccons.c
index e370b202875..aae326d4e3a 100644
--- a/sys/arch/i386/isa/pccons.c
+++ b/sys/arch/i386/isa/pccons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pccons.c,v 1.185 2007/10/17 19:54:57 garbled Exp $ */
+/* $NetBSD: pccons.c,v 1.186 2007/10/18 18:54:57 joerg Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pccons.c,v 1.185 2007/10/17 19:54:57 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pccons.c,v 1.186 2007/10/18 18:54:57 joerg Exp $");
#include "opt_ddb.h"
#include "opt_xserver.h"
@@ -1062,7 +1062,7 @@ pcstart(struct tty *tp)
tp->t_state &= ~TS_BUSY;
if (cl->c_cc) {
tp->t_state |= TS_TIMEOUT;
- callout_reset(&tp->t_rstrt_ch, 1, ttrstrt, 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/arch/macppc/dev/ofcons.c b/sys/arch/macppc/dev/ofcons.c
index 2e6886f31b6..5fa7e515630 100644
--- a/sys/arch/macppc/dev/ofcons.c
+++ b/sys/arch/macppc/dev/ofcons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofcons.c,v 1.20 2007/03/04 06:00:10 christos Exp $ */
+/* $NetBSD: ofcons.c,v 1.21 2007/10/18 18:54:58 joerg Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofcons.c,v 1.20 2007/03/04 06:00:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofcons.c,v 1.21 2007/10/18 18:54:58 joerg Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -232,7 +232,7 @@ ofcstart(struct tty *tp)
tp->t_state &= ~TS_BUSY;
if (cl->c_cc) {
tp->t_state |= TS_TIMEOUT;
- callout_reset(&tp->t_rstrt_ch, 1, ttrstrt, 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/arch/shark/shark/pccons.c b/sys/arch/shark/shark/pccons.c
index 8df4329f2d5..8ad102ad032 100644
--- a/sys/arch/shark/shark/pccons.c
+++ b/sys/arch/shark/shark/pccons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pccons.c,v 1.34 2007/10/17 19:57:10 garbled Exp $ */
+/* $NetBSD: pccons.c,v 1.35 2007/10/18 18:54:58 joerg Exp $ */
/*
* Copyright 1997
@@ -135,7 +135,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pccons.c,v 1.34 2007/10/17 19:57:10 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pccons.c,v 1.35 2007/10/18 18:54:58 joerg Exp $");
#include "opt_ddb.h"
#include "opt_xserver.h"
@@ -1892,7 +1892,7 @@ pcstart(struct tty *tp)
if (cl->c_cc)
{
tp->t_state |= TS_TIMEOUT;
- callout_reset(&tp->t_rstrt_ch, 1, ttrstrt, tp);
+ callout_schedule(&tp->t_rstrt_ch, 1);
}
/*
** Check if we are under the low water mark and
diff --git a/sys/arch/sparc/dev/kd.c b/sys/arch/sparc/dev/kd.c
index ad4722caee6..a94220c7233 100644
--- a/sys/arch/sparc/dev/kd.c
+++ b/sys/arch/sparc/dev/kd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kd.c,v 1.45 2007/10/17 19:57:12 garbled Exp $ */
+/* $NetBSD: kd.c,v 1.46 2007/10/18 18:54:58 joerg Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kd.c,v 1.45 2007/10/17 19:57:12 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kd.c,v 1.46 2007/10/18 18:54:58 joerg Exp $");
#include "opt_kgdb.h"
#include "fb.h"
@@ -131,6 +131,7 @@ kd_init(struct kd_softc *kd)
struct tty *tp;
tp = ttymalloc();
+ callout_setfunc(&tp->t_rstrt_ch, kd_later, tp);
tp->t_oproc = kdstart;
tp->t_param = kdparam;
tp->t_dev = makedev(cdevsw_lookup_major(&kd_cdevsw), 0);
@@ -360,7 +361,7 @@ kdstart(struct tty *tp)
tp->t_state &= ~TS_BUSY;
} else {
/* called at interrupt level - do it later */
- callout_reset(&tp->t_rstrt_ch, 0, kd_later, tp);
+ callout_schedule(&tp->t_rstrt_ch, 0);
}
}
if (cl->c_cc <= tp->t_lowat) {
diff --git a/sys/arch/sparc64/dev/kd.c b/sys/arch/sparc64/dev/kd.c
index c42bc6183eb..65be8faea55 100644
--- a/sys/arch/sparc64/dev/kd.c
+++ b/sys/arch/sparc64/dev/kd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kd.c,v 1.44 2007/03/04 06:00:49 christos Exp $ */
+/* $NetBSD: kd.c,v 1.45 2007/10/18 18:54:58 joerg Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kd.c,v 1.44 2007/03/04 06:00:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kd.c,v 1.45 2007/10/18 18:54:58 joerg Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -125,6 +125,7 @@ kd_init(struct kd_softc *kd)
kd = &kd_softc; /* XXX */
tp = ttymalloc();
+ callout_setfunc(&tp->t_rstrt_ch, kd_later, tp);
tp->t_oproc = kdstart;
tp->t_param = kdparam;
tp->t_dev = makedev(cdevsw_lookup_major(&kd_cdevsw), 0);
@@ -334,8 +335,7 @@ kdstart(struct tty *tp)
tp->t_state &= ~TS_BUSY;
} else {
/* called at interrupt level - do it later */
- callout_reset(&tp->t_rstrt_ch, 0,
- kd_later, tp);
+ callout_schedule(&tp->t_rstrt_ch, 0);
}
} else {
/*
diff --git a/sys/arch/sparc64/dev/pcons.c b/sys/arch/sparc64/dev/pcons.c
index f662de992cd..c19e7d3aa14 100644
--- a/sys/arch/sparc64/dev/pcons.c
+++ b/sys/arch/sparc64/dev/pcons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcons.c,v 1.26 2007/10/17 19:57:29 garbled Exp $ */
+/* $NetBSD: pcons.c,v 1.27 2007/10/18 18:54:58 joerg Exp $ */
/*-
* Copyright (c) 2000 Eduardo E. Horvath
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcons.c,v 1.26 2007/10/17 19:57:29 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcons.c,v 1.27 2007/10/18 18:54:58 joerg Exp $");
#include "opt_ddb.h"
@@ -241,7 +241,7 @@ pconsstart(struct tty *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/arch/sun2/dev/kd.c b/sys/arch/sun2/dev/kd.c
index f120d865d58..72dcb3402da 100644
--- a/sys/arch/sun2/dev/kd.c
+++ b/sys/arch/sun2/dev/kd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kd.c,v 1.16 2007/03/04 06:00:51 christos Exp $ */
+/* $NetBSD: kd.c,v 1.17 2007/10/18 18:54:59 joerg Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kd.c,v 1.16 2007/03/04 06:00:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kd.c,v 1.17 2007/10/18 18:54:59 joerg Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -135,6 +135,7 @@ kd_init(struct kd_softc *kd)
kd = &kd_softc; /* XXX */
tp = ttymalloc();
+ callout_setfunc(&tp->t_rstrt_ch, kd_later, tp);
tp->t_oproc = kdstart;
tp->t_param = kdparam;
tp->t_dev = makedev(cdevsw_lookup_major(&kd_cdevsw), 0);
@@ -378,8 +379,7 @@ kdstart(struct tty *tp)
tp->t_state &= ~TS_BUSY;
} else {
/* called at interrupt level - do it later */
- callout_reset(&tp->t_rstrt_ch, 0,
- kd_later, tp);
+ callout_schedule(&tp->t_rstrt_ch, 0);
}
} else {
/*
diff --git a/sys/arch/sun2/dev/pcons.c b/sys/arch/sun2/dev/pcons.c
index 3cc0b286eed..ed95cb5aa97 100644
--- a/sys/arch/sun2/dev/pcons.c
+++ b/sys/arch/sun2/dev/pcons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcons.c,v 1.15 2007/10/17 19:57:43 garbled Exp $ */
+/* $NetBSD: pcons.c,v 1.16 2007/10/18 18:54:59 joerg Exp $ */
/*-
* Copyright (c) 2000 Eduardo E. Horvath
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcons.c,v 1.15 2007/10/17 19:57:43 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcons.c,v 1.16 2007/10/18 18:54:59 joerg Exp $");
#include "opt_ddb.h"
@@ -239,7 +239,7 @@ pconsstart(struct tty *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/arch/sun3/dev/kd.c b/sys/arch/sun3/dev/kd.c
index 0631d29669f..b05ae4f4e9d 100644
--- a/sys/arch/sun3/dev/kd.c
+++ b/sys/arch/sun3/dev/kd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kd.c,v 1.50 2007/03/04 06:00:53 christos Exp $ */
+/* $NetBSD: kd.c,v 1.51 2007/10/18 18:54:59 joerg Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kd.c,v 1.50 2007/03/04 06:00:53 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kd.c,v 1.51 2007/10/18 18:54:59 joerg Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -115,6 +115,8 @@ kd_init(struct kd_softc *kd)
struct tty *tp;
tp = ttymalloc();
+ callout_setfunc(&tp->t_rstrt_ch, kd_later, tp);
+
tp->t_oproc = kdstart;
tp->t_param = kdparam;
tp->t_dev = makedev(cdevsw_lookup_major(&kd_cdevsw), 0);
@@ -305,8 +307,7 @@ kdstart(struct tty *tp)
tp->t_state &= ~TS_BUSY;
} else {
/* called at interrupt level - do it later */
- callout_reset(&tp->t_rstrt_ch, 0,
- kd_later, tp);
+ callout_schedule(&tp->t_rstrt_ch, 0);
}
} else {
/*
diff --git a/sys/arch/x68k/dev/ite.c b/sys/arch/x68k/dev/ite.c
index c591c08f6eb..1e97f45517c 100644
--- a/sys/arch/x68k/dev/ite.c
+++ b/sys/arch/x68k/dev/ite.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ite.c,v 1.51 2007/10/17 19:58:02 garbled Exp $ */
+/* $NetBSD: ite.c,v 1.52 2007/10/18 18:54:59 joerg Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.51 2007/10/17 19:58:02 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.52 2007/10/18 18:54:59 joerg Exp $");
#include "ite.h"
#if NITE > 0
@@ -559,7 +559,7 @@ itestart(struct tty *tp)
/* we have characters remaining. */
if (rbp->c_cc) {
tp->t_state |= TS_TIMEOUT;
- callout_reset(&tp->t_rstrt_ch, 1, ttrstrt, tp);
+ callout_schedule(&tp->t_rstrt_ch, 1);
}
/* wakeup we are below */
if (rbp->c_cc <= tp->t_lowat) {
diff --git a/sys/arch/xen/xen/xencons.c b/sys/arch/xen/xen/xencons.c
index da673cd0a4a..d75f5dca49a 100644
--- a/sys/arch/xen/xen/xencons.c
+++ b/sys/arch/xen/xen/xencons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xencons.c,v 1.22 2007/03/04 06:01:11 christos Exp $ */
+/* $NetBSD: xencons.c,v 1.23 2007/10/18 18:54:59 joerg Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -63,7 +63,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xencons.c,v 1.22 2007/03/04 06:01:11 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xencons.c,v 1.23 2007/10/18 18:54:59 joerg Exp $");
#include "opt_xen.h"
@@ -427,7 +427,7 @@ xencons_start(struct tty *tp)
tp->t_state &= ~TS_BUSY;
if (cl->c_cc) {
tp->t_state |= TS_TIMEOUT;
- callout_reset(&tp->t_rstrt_ch, 1, ttrstrt, 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/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);
}
}
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index c471370d64f..9bf1996a193 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.c,v 1.198 2007/09/25 14:04:07 ad Exp $ */
+/* $NetBSD: tty.c,v 1.199 2007/10/18 18:55:00 joerg Exp $ */
/*-
* Copyright (c) 1982, 1986, 1990, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.198 2007/09/25 14:04:07 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.199 2007/10/18 18:55:00 joerg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2645,6 +2645,7 @@ ttymalloc(void)
memset(tp, 0, sizeof(*tp));
simple_lock_init(&tp->t_slock);
callout_init(&tp->t_rstrt_ch, 0);
+ callout_setfunc(&tp->t_rstrt_ch, ttrstrt, tp);
/* XXX: default to 1024 chars for now */
clalloc(&tp->t_rawq, 1024, 1);
clalloc(&tp->t_canq, 1024, 1);