From d702ffc3a7b6d34753b7ff528e47bad514aba0fd Mon Sep 17 00:00:00 2001 From: kstailey Date: Wed, 15 Jan 1997 05:35:46 +0000 Subject: [PATCH] more missing prototypes and other warnings fixed --- sys/dev/ic/z8530sc.c | 8 +++++--- sys/dev/ic/z8530sc.h | 10 +++++++--- sys/dev/ic/z8530tty.c | 25 ++++++++++++++----------- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/sys/dev/ic/z8530sc.c b/sys/dev/ic/z8530sc.c index 59e9b22f3cd..a418fecd36f 100644 --- a/sys/dev/ic/z8530sc.c +++ b/sys/dev/ic/z8530sc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530sc.c,v 1.3 1996/05/26 00:27:06 deraadt Exp $ */ +/* $OpenBSD: z8530sc.c,v 1.4 1997/01/15 05:35:46 kstailey Exp $ */ /* $NetBSD: z8530sc.c,v 1.4 1996/05/17 19:30:34 gwr Exp $ */ /* @@ -68,7 +68,10 @@ #include #include -int +static void zsnull_intr __P((struct zs_chanstate *)); +static void zsnull_softint __P((struct zs_chanstate *)); + +void zs_break(cs, set) struct zs_chanstate *cs; int set; @@ -143,7 +146,6 @@ zs_loadchannelregs(cs) struct zs_chanstate *cs; { u_char *reg; - int i; /* Copy "pending" regs to "current" */ bcopy((caddr_t)cs->cs_preg, (caddr_t)cs->cs_creg, 16); diff --git a/sys/dev/ic/z8530sc.h b/sys/dev/ic/z8530sc.h index eacb529346d..5781f03b802 100644 --- a/sys/dev/ic/z8530sc.h +++ b/sys/dev/ic/z8530sc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530sc.h,v 1.6 1997/01/15 00:41:55 kstailey Exp $ */ +/* $OpenBSD: z8530sc.h,v 1.7 1997/01/15 05:35:47 kstailey Exp $ */ /* $NetBSD: z8530sc.h,v 1.4 1996/10/16 20:34:54 gwr Exp $ */ /* @@ -117,5 +117,9 @@ struct zsc_attach_args { }; #define ZS_HWFLAG_CONSOLE 1 -int zsc_intr_hard __P((void *)); -int zsc_intr_soft __P((void *)); +int zsc_intr_hard __P((void *)); +int zsc_intr_soft __P((void *)); +void zs_break __P((struct zs_chanstate *, int)); +int zs_getspeed __P((struct zs_chanstate *)); +void zs_iflush __P((struct zs_chanstate *)); +void zs_loadchannelregs __P((struct zs_chanstate *)); diff --git a/sys/dev/ic/z8530tty.c b/sys/dev/ic/z8530tty.c index 3824b99e254..24e1bd9eeea 100644 --- a/sys/dev/ic/z8530tty.c +++ b/sys/dev/ic/z8530tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530tty.c,v 1.9 1996/12/16 00:11:58 kstailey Exp $ */ +/* $OpenBSD: z8530tty.c,v 1.10 1997/01/15 05:35:47 kstailey Exp $ */ /* $NetBSD: z8530tty.c,v 1.13 1996/10/16 20:42:14 gwr Exp $ */ /* @@ -175,12 +175,16 @@ struct zsops zsops_tty; /* Routines called from other code. */ cdev_decl(zs); /* open, close, read, write, ioctl, stop, ... */ -static void zsstart(struct tty *); -static int zsparam(struct tty *, struct termios *); -static void zs_modem(struct zstty_softc *zst, int onoff); -static int zshwiflow(struct tty *, int); -static void zs_hwiflow(struct zstty_softc *, int); - +static void zsstart __P((struct tty *)); +static int zsparam __P((struct tty *, struct termios *)); +static void zs_modem __P((struct zstty_softc *zst, int onoff)); +static int zshwiflow __P((struct tty *, int)); +static void zs_hwiflow __P((struct zstty_softc *, int)); +static void zstty_rxint __P((register struct zs_chanstate *)); +static void zstty_txint __P((register struct zs_chanstate *)); +static void zstty_stint __P((register struct zs_chanstate *)); +static void zstty_softint __P((struct zs_chanstate *)); +static void zsoverrun __P((struct zstty_softc *, long *, char *)); /* * zstty_match: how is this zs channel configured? */ @@ -435,8 +439,7 @@ zsclose(dev, flags, mode, p) struct zstty_softc *zst; register struct zs_chanstate *cs; register struct tty *tp; - struct zsinfo *zi; - int hup, s; + int hup; zst = zstty_cd.cd_devs[minor(dev)]; cs = zst->zst_cs; @@ -683,7 +686,7 @@ zsparam(tp, t) register struct zstty_softc *zst; register struct zs_chanstate *cs; register int s, bps, cflag, tconst; - u_char tmp3, tmp4, tmp5, reset; + u_char tmp3, tmp4, tmp5; zst = zstty_cd.cd_devs[minor(tp->t_dev)]; cs = zst->zst_cs; @@ -1122,7 +1125,7 @@ zstty_softint(cs) register int get, c, s; int ringmask, overrun; register u_short ring_data; - register u_char rr0, rr1, delta; + register u_char rr0, delta; zst = cs->cs_private; tp = zst->zst_tty; -- 2.20.1