diff options
| author | Per Fogelstrom <pefo@cvs.openbsd.org> | 1997-03-12 19:17:04 +0000 |
|---|---|---|
| committer | Per Fogelstrom <pefo@cvs.openbsd.org> | 1997-03-12 19:17:04 +0000 |
| commit | 63e70c1bce393b8e92002c93029eeb1a67f80fcc (patch) | |
| tree | 1ffb854bd1045ee6f0999913b74a788a879368bc /sys/arch/arc/dev | |
| parent | fd5a4621c16957714dbc7335eb5afa6b0f28b29e (diff) | |
Addition of support for a PCI based Vr4300 board from Algorithmics, the P-4032.
Changes to io macros were done to handle sparse bus addressing dynamically.
This is a first cut (rough).
Diffstat (limited to 'sys/arch/arc/dev')
| -rw-r--r-- | sys/arch/arc/dev/if_sn.c | 6 | ||||
| -rw-r--r-- | sys/arch/arc/dev/pccons.c | 22 |
2 files changed, 17 insertions, 11 deletions
diff --git a/sys/arch/arc/dev/if_sn.c b/sys/arch/arc/dev/if_sn.c index 7ec82f8d391..02fc28a0ee3 100644 --- a/sys/arch/arc/dev/if_sn.c +++ b/sys/arch/arc/dev/if_sn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sn.c,v 1.7 1996/10/19 10:02:51 niklas Exp $ */ +/* $OpenBSD: if_sn.c,v 1.8 1997/03/12 19:16:50 pefo Exp $ */ /* * National Semiconductor SONIC Driver * Copyright (c) 1991 Algorithmics Ltd (http://www.algor.co.uk) @@ -1241,8 +1241,8 @@ sonic_read(sc, rxp) #define sonicdataaddr(eh, off, type) ((type)(((caddr_t)((eh)+1)+(off)))) /* - * munge the recieved packet into an mbuf chain - * because we are using stupif buffer management this + * munge the received packet into a mbuf chain + * because we are using stupid buffer management this * is slow. */ struct mbuf * diff --git a/sys/arch/arc/dev/pccons.c b/sys/arch/arc/dev/pccons.c index b8f302e46ea..9d857d7dd42 100644 --- a/sys/arch/arc/dev/pccons.c +++ b/sys/arch/arc/dev/pccons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pccons.c,v 1.11 1997/01/17 23:13:57 pefo Exp $ */ +/* $OpenBSD: pccons.c,v 1.12 1997/03/12 19:16:52 pefo Exp $ */ /* $NetBSD: pccons.c,v 1.89 1995/05/04 19:35:20 cgd Exp $ */ /*- @@ -67,6 +67,7 @@ #include <machine/cpu.h> #include <machine/pio.h> +#include <machine/bus.h> #include <machine/autoconf.h> #include <machine/display.h> #include <machine/pccons.h> @@ -815,7 +816,12 @@ pccnprobe(cp) /* initialize required fields */ cp->cn_dev = makedev(maj, 0); - cp->cn_pri = CN_INTERNAL; + if(cputype == ALGOR_P4032) { + cp->cn_pri = CN_DEAD; /* XXX For now... */ + } + else { + cp->cn_pri = CN_INTERNAL; + } } /* ARGSUSED */ @@ -852,12 +858,12 @@ pccninit(cp) break; case DESKSTATION_RPC44: - mono_base += isa_io_base; - mono_buf += isa_mem_base; - cga_base += isa_io_base; - cga_buf = isa_mem_base + 0xa0000; - kbd_cmdp = isa_io_base + 0x64; - kbd_datap = isa_io_base + 0x60; + 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; kbc_put8042cmd(CMDBYTE); /* Want XT codes.. */ break; } |