diff options
author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1997-07-07 17:08:06 +0000 |
---|---|---|
committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1997-07-07 17:08:06 +0000 |
commit | 74dbfb5bfd785550993cd14155b33a201afe3edf (patch) | |
tree | d707d0f066e7c0f5b71ce640d34a200f73ff5e5c | |
parent | c33e60b6281c53bd7ce10b42665543f62c4f5881 (diff) |
Mirror com changes
-rw-r--r-- | sys/arch/i386/isa/pccom.c | 9 | ||||
-rw-r--r-- | sys/arch/i386/isa/pccomvar.h | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/sys/arch/i386/isa/pccom.c b/sys/arch/i386/isa/pccom.c index 1ba5468f8b3..07c14f2e873 100644 --- a/sys/arch/i386/isa/pccom.c +++ b/sys/arch/i386/isa/pccom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pccom.c,v 1.10 1996/12/18 16:51:45 millert Exp $ */ +/* $OpenBSD: pccom.c,v 1.11 1997/07/07 17:08:04 niklas Exp $ */ /* $NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $ */ /*- @@ -359,10 +359,9 @@ comspeed(speed) } int -comprobe1(iot, ioh, iobase) +comprobe1(iot, ioh) bus_space_tag_t iot; bus_space_handle_t ioh; - int iobase; { int i, k; @@ -503,7 +502,7 @@ comprobe(parent, match, aux) rv = 0; goto out; } - rv = comprobe1(iot, ioh, iobase); + rv = comprobe1(iot, ioh); if (needioh) bus_space_unmap(iot, ioh, COM_NPORTS); @@ -1612,7 +1611,7 @@ comcnprobe(cp) cp->cn_pri = CN_DEAD; return; } - found = comprobe1(iot, ioh, CONADDR); + found = comprobe1(iot, ioh); bus_space_unmap(iot, ioh, COM_NPORTS); if (!found) { cp->cn_pri = CN_DEAD; diff --git a/sys/arch/i386/isa/pccomvar.h b/sys/arch/i386/isa/pccomvar.h index 234a616b441..1be68aa70ac 100644 --- a/sys/arch/i386/isa/pccomvar.h +++ b/sys/arch/i386/isa/pccomvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pccomvar.h,v 1.3 1996/12/18 16:51:44 millert Exp $ */ +/* $OpenBSD: pccomvar.h,v 1.4 1997/07/07 17:08:05 niklas Exp $ */ /* $NetBSD: comvar.h,v 1.5 1996/05/05 19:50:47 christos Exp $ */ /* @@ -92,7 +92,7 @@ struct com_softc { int sc_tbc; }; -int comprobe1 __P((bus_space_tag_t, bus_space_handle_t, int)); +int comprobe1 __P((bus_space_tag_t, bus_space_handle_t)); void cominit __P((bus_space_tag_t, bus_space_handle_t, int)); int comintr __P((void *)); void com_absent_notify __P((struct com_softc *sc)); |