diff options
Diffstat (limited to 'sys/arch/arc/dev')
| -rw-r--r-- | sys/arch/arc/dev/com_lbus.c | 6 | ||||
| -rw-r--r-- | sys/arch/arc/dev/lpt_lbus.c | 6 | ||||
| -rw-r--r-- | sys/arch/arc/dev/pccons.c | 14 |
3 files changed, 13 insertions, 13 deletions
diff --git a/sys/arch/arc/dev/com_lbus.c b/sys/arch/arc/dev/com_lbus.c index e837b650481..fc877aad0b8 100644 --- a/sys/arch/arc/dev/com_lbus.c +++ b/sys/arch/arc/dev/com_lbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com_lbus.c,v 1.2 1997/03/23 11:34:33 pefo Exp $ */ +/* $OpenBSD: com_lbus.c,v 1.3 1997/04/10 16:29:15 pefo Exp $ */ /* * Copyright (c) 1993, 1994 Charles Hannum. @@ -99,7 +99,7 @@ com_localbus_probe(parent, match, aux) if(!BUS_MATCHNAME(ca, "com")) return(0); iobase = (long)BUS_CVTADDR(ca); - iot = &arc_bus; + iot = &arc_bus_io; needioh = 1; /* if it's in use as console, it's there. */ @@ -133,7 +133,7 @@ com_localbus_attach(parent, self, aux) sc->sc_swflags = 0; sc->sc_iobase = iobase = (bus_addr_t)BUS_CVTADDR(ca); sc->sc_ioh = ioh = (bus_space_handle_t)iobase; - sc->sc_iot = iot = &arc_bus; + sc->sc_iot = iot = &arc_bus_io; if (iobase == comconsaddr) { comconsattached = 1; diff --git a/sys/arch/arc/dev/lpt_lbus.c b/sys/arch/arc/dev/lpt_lbus.c index 51c82aa5242..fad7e1c3244 100644 --- a/sys/arch/arc/dev/lpt_lbus.c +++ b/sys/arch/arc/dev/lpt_lbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lpt_lbus.c,v 1.2 1997/03/23 11:34:34 pefo Exp $ */ +/* $OpenBSD: lpt_lbus.c,v 1.3 1997/04/10 16:29:17 pefo Exp $ */ /* * Copyright (c) 1993, 1994 Charles Hannum. @@ -101,7 +101,7 @@ lpt_localbus_probe(parent, match, aux) if(!BUS_MATCHNAME(ca, "lpt")) return(0); - iot = &arc_bus; + iot = &arc_bus_io; base = (bus_addr_t)BUS_CVTADDR(ca); ioh = (bus_space_handle_t)base; @@ -146,7 +146,7 @@ lpt_localbus_attach(parent, self, aux) printf("\n"); sc->sc_state = 0; - iot = sc->sc_iot = &arc_bus; + iot = sc->sc_iot = &arc_bus_io; sc->sc_ioh = (bus_space_handle_t)BUS_CVTADDR(ca); bus_space_write_1(iot, ioh, lpt_control, LPC_NINIT); diff --git a/sys/arch/arc/dev/pccons.c b/sys/arch/arc/dev/pccons.c index 9d857d7dd42..0b4174f589c 100644 --- a/sys/arch/arc/dev/pccons.c +++ b/sys/arch/arc/dev/pccons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pccons.c,v 1.12 1997/03/12 19:16:52 pefo Exp $ */ +/* $OpenBSD: pccons.c,v 1.13 1997/04/10 16:29:19 pefo Exp $ */ /* $NetBSD: pccons.c,v 1.89 1995/05/04 19:35:20 cgd Exp $ */ /*- @@ -858,12 +858,12 @@ pccninit(cp) break; case DESKSTATION_RPC44: - mono_base += arc_bus.isa_io_base; - mono_buf += arc_bus.isa_mem_base; - cga_base += arc_bus.isa_io_base; - cga_buf = arc_bus.isa_mem_base + 0xa0000; - kbd_cmdp = arc_bus.isa_io_base + 0x64; - kbd_datap = arc_bus.isa_io_base + 0x60; + mono_base += arc_bus_io.bus_base; + mono_buf += arc_bus_mem.bus_base; + cga_base += arc_bus_io.bus_base; + cga_buf = arc_bus_mem.bus_base + 0xa0000; + kbd_cmdp = arc_bus_io.bus_base + 0x64; + kbd_datap = arc_bus_io.bus_base + 0x60; kbc_put8042cmd(CMDBYTE); /* Want XT codes.. */ break; } |