diff options
| author | briggs <briggs@cvs.openbsd.org> | 1997-01-24 01:35:55 +0000 |
|---|---|---|
| committer | briggs <briggs@cvs.openbsd.org> | 1997-01-24 01:35:55 +0000 |
| commit | 2cf4fbaafa89ff9455907432816daebe394b533b (patch) | |
| tree | 14fe32451db6302b379b04d7ca3df0c07d26dce7 /sys/arch/mac68k/dev/z8530tty.c | |
| parent | 2ebc04f559b55bc6705d62e51a00406bee8ef115 (diff) | |
Sync w/ NETBSD_CURRENT_971122.
Diffstat (limited to 'sys/arch/mac68k/dev/z8530tty.c')
| -rw-r--r-- | sys/arch/mac68k/dev/z8530tty.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sys/arch/mac68k/dev/z8530tty.c b/sys/arch/mac68k/dev/z8530tty.c index 3a9e5806cd3..99e293fcf93 100644 --- a/sys/arch/mac68k/dev/z8530tty.c +++ b/sys/arch/mac68k/dev/z8530tty.c @@ -1,5 +1,5 @@ -/* $OpenBSD: z8530tty.c,v 1.5 1996/10/14 02:49:14 briggs Exp $ */ -/* $NetBSD: z8530tty.c,v 1.7 1996/10/13 03:21:30 christos Exp $ */ +/* $OpenBSD: z8530tty.c,v 1.6 1997/01/24 01:35:38 briggs Exp $ */ +/* $NetBSD: z8530tty.c,v 1.10 1996/12/18 05:17:44 scottr Exp $ */ /* * Copyright (c) 1994 Gordon W. Ross @@ -87,7 +87,7 @@ struct zstty_stats z8530tty_stats; /* Definition of the driver for autoconfig. */ -static int zstty_match(struct device *, void *, void *); +static int zstty_match(struct device *, struct cfdata *, void *); static void zstty_attach(struct device *, struct device *, void *); struct cfattach zstty_ca = { @@ -117,11 +117,11 @@ static int zsgetbaud __P((register struct zs_chanstate *, * zstty_match: how is this zs channel configured? */ int -zstty_match(parent, match, aux) +zstty_match(parent, cf, aux) struct device *parent; - void *match, *aux; + struct cfdata *cf; + void *aux; { - struct cfdata *cf = match; struct zsc_attach_args *args = aux; /* Exact match is better than wildcard. */ @@ -699,6 +699,8 @@ zsgetbaud(cs, rate, tc, rr4, rr11, rr14, source, sourceflag) s = -1; /* no valid source yet */ tol = ZS_TOLERANCE; + sf = 0; tc0 = 0; rate0 = 0; /* XXX Kill gcc warning */ + /* * Step through all the sources and see which one matches * the best. A source has to match BETTER than tol to be chosen. |