[src/trunk]: src/sys Fix typos from last commit (callout).

[hannken <hannken%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5e17e91eb0ac
branches:  trunk
changeset: 484053:5e17e91eb0ac
user:      hannken <hannken%NetBSD.org@localhost>
date:      Fri Mar 24 11:46:46 2000 +0000

description:
Fix typos from last commit (callout).

diffstat:

 sys/arch/sparc/dev/kd.c |  4 ++--
 sys/dev/ic/z8530tty.c   |  6 +++---
 sys/dev/sun/kbd.c       |  4 ++--
 sys/dev/sun/kbdvar.h    |  3 ++-
 4 files changed, 9 insertions(+), 8 deletions(-)

diffs (80 lines):

diff -r a30e98b24b50 -r 5e17e91eb0ac sys/arch/sparc/dev/kd.c
--- a/sys/arch/sparc/dev/kd.c   Fri Mar 24 10:30:12 2000 +0000
+++ b/sys/arch/sparc/dev/kd.c   Fri Mar 24 11:46:46 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kd.c,v 1.9 2000/03/23 06:44:45 thorpej Exp $   */
+/*     $NetBSD: kd.c,v 1.10 2000/03/24 11:46:46 hannken Exp $  */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -369,7 +369,7 @@
                        tp->t_state &= ~TS_BUSY;
                } else {
                        /* called at interrupt level - do it later */
-                       callout_reset(&tp->t_rstrt_ch, kd_later, tp, 0);
+                       callout_reset(&tp->t_rstrt_ch, 0, kd_later, tp);
                }
        }
        if (cl->c_cc <= tp->t_lowat) {
diff -r a30e98b24b50 -r 5e17e91eb0ac sys/dev/ic/z8530tty.c
--- a/sys/dev/ic/z8530tty.c     Fri Mar 24 10:30:12 2000 +0000
+++ b/sys/dev/ic/z8530tty.c     Fri Mar 24 11:46:46 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: z8530tty.c,v 1.65 2000/03/23 07:01:34 thorpej Exp $    */
+/*     $NetBSD: z8530tty.c,v 1.66 2000/03/24 11:46:47 hannken Exp $    */
 
 /*-
  * Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998, 1999
@@ -1614,7 +1614,7 @@
        if (cc == zstty_rbuf_size) {
                zst->zst_floods++;
                if (zst->zst_errors++ == 0)
-                       callout_start(&zst->zst_diag_ch, 60 * hz,
+                       callout_reset(&zst->zst_diag_ch, 60 * hz,
                            zstty_diag, zst);
        }
 
@@ -1632,7 +1632,7 @@
                        if (ISSET(rr1, ZSRR1_DO)) {
                                zst->zst_overflows++;
                                if (zst->zst_errors++ == 0)
-                                       callout_start(&zst->zst_diag_ch,
+                                       callout_reset(&zst->zst_diag_ch,
                                            60 * hz, zstty_diag, zst);
                        }
                        if (ISSET(rr1, ZSRR1_FE))
diff -r a30e98b24b50 -r 5e17e91eb0ac sys/dev/sun/kbd.c
--- a/sys/dev/sun/kbd.c Fri Mar 24 10:30:12 2000 +0000
+++ b/sys/dev/sun/kbd.c Fri Mar 24 11:46:46 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kbd.c,v 1.25 2000/03/23 07:01:44 thorpej Exp $ */
+/*     $NetBSD: kbd.c,v 1.26 2000/03/24 11:46:47 hannken Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -752,7 +752,7 @@
                /* Setup for auto-repeat after initial delay. */
                k->k_repeating = 1;
                k->k_repeatsym = keysym;
-               callout_reset(&k->k_reset_ch, k->k_repeat_start,
+               callout_reset(&k->k_repeat_ch, k->k_repeat_start,
                    kbd_repeat, k);
                return;
        }
diff -r a30e98b24b50 -r 5e17e91eb0ac sys/dev/sun/kbdvar.h
--- a/sys/dev/sun/kbdvar.h      Fri Mar 24 10:30:12 2000 +0000
+++ b/sys/dev/sun/kbdvar.h      Fri Mar 24 11:46:46 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kbdvar.h,v 1.4 2000/03/23 07:01:44 thorpej Exp $       */
+/*     $NetBSD: kbdvar.h,v 1.5 2000/03/24 11:46:48 hannken Exp $       */
 
 /*
  * Copyright (c) 1992, 1993
@@ -160,6 +160,7 @@
 struct cons_channel {
        /* Provided by lower driver */
        void    *cc_dev;                        /* Lower device private data */
+       struct callout  cc_callout;
        int     (*cc_iopen)                     /* Open lower device */
                        __P((struct cons_channel *));
        int     (*cc_iclose)                    /* Close lower device */