diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-03-30 22:18:28 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-03-30 22:18:28 +0000 |
| commit | 66416e15911955f5e0ef86b19dff8fbceb46c755 (patch) | |
| tree | 98ca47a564122aa4b484e1e1c07699544d554be4 /sys/arch/amiga/dev/zbus.c | |
| parent | f6ab5cd567eae5b6537564ff2a13e61b444e8d59 (diff) | |
From NetBSD: merge of 960317
Diffstat (limited to 'sys/arch/amiga/dev/zbus.c')
| -rw-r--r-- | sys/arch/amiga/dev/zbus.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/sys/arch/amiga/dev/zbus.c b/sys/arch/amiga/dev/zbus.c index 7cdde9dc98a..d71ae27bce2 100644 --- a/sys/arch/amiga/dev/zbus.c +++ b/sys/arch/amiga/dev/zbus.c @@ -1,4 +1,5 @@ -/* $NetBSD: zbus.c,v 1.13 1995/12/27 07:31:58 chopps Exp $ */ +/* $OpenBSD: zbus.c,v 1.3 1996/03/30 22:18:25 niklas Exp $ */ +/* $NetBSD: zbus.c,v 1.15 1996/03/06 20:13:32 is Exp $ */ /* * Copyright (c) 1994 Christian E. Hopps @@ -31,6 +32,7 @@ */ #include <sys/param.h> #include <sys/device.h> +#include <sys/systm.h> #include <machine/cpu.h> #include <machine/pte.h> #include <amiga/amiga/cfdev.h> @@ -71,6 +73,7 @@ static struct aconfdata aconftab[] = { /* Macrosystems */ { "grfrt", 18260, 6 }, { "grfrh", 18260, 16}, /* Retina BLT Z3 */ + { "grfrh", 18260, 19}, /* Altais */ /* Greater valley products */ { "gvpbus", 2017, 2 }, { "gvpbus", 2017, 11 }, @@ -133,16 +136,17 @@ static int naconfent = sizeof(aconftab) / sizeof(struct aconfdata); * the Zorro III device. */ static struct preconfdata preconftab[] = { - { 18260, 6, 0 }, - /* Retina BLT Z3 */ - { 18260, 16, 0}, + {18260, 6, 0 }, /* Retina Z2 */ + {18260, 16, 0}, /* Retina BLT Z3 */ + {18260, 19, 0}, /* Altais */ {2167, 11, 0}, /* Picasso-II mem*/ {2167, 12, 0}, /* regs */ {2193, 2, 0}, /* Spectrum mem */ {2193, 1, 0}, /* Spectrum regs */ {2195, 5, 0}, /* Piccolo mem */ {2195, 6, 0}, /* Piccolo regs */ - {1030, 0, 0} /* Ulwl board */ + {1030, 0, 0}, /* Ulwl board */ + {8512, 34, 0} /* Cybervison 64 */ }; static int npreconfent = sizeof(preconftab) / sizeof(struct preconfdata); @@ -212,7 +216,7 @@ zbusattach(pdp, dp, auxp) ecdp = &cfdev[ncfdev]; if (amiga_realconfig) { if (ZTWOMEMADDR) - printf(": mem 0x%08x-0x%08x", + printf(": mem 0x%08lx-0x%08lx", ZTWOMEMADDR, ZTWOMEMADDR + NBPG * NZTWOMEMPG - 1); if (ZBUSAVAIL) printf (": i/o size 0x%08x", ZBUSAVAIL); @@ -277,7 +281,7 @@ zbusprint(auxp, pnp) if (zap->manid == -1) rv = UNSUPP; } - printf(" rom 0x%x man/pro %d/%d", zap->pa, zap->manid, zap->prodid); + printf(" rom %p man/pro %d/%d", zap->pa, zap->manid, zap->prodid); return(rv); } |