diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2011-09-11 19:29:02 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2011-09-11 19:29:02 +0000 |
| commit | ea6328b138f8eda2a827cd528193b9368db86cb5 (patch) | |
| tree | f4261df5776b3b89a1bfe4195abddbbd40811097 /sys/arch/vax/include | |
| parent | 1e08871b64c4e160947cdbadbcd5b2e490584241 (diff) | |
Define symbolic constants for the addresses of the vsbus devices on
512KB PROM systems (e.g. KA49), or 256KB PROM systems built after KA49
(e.g. KA5[234]), and use them instead of pouring magic numbers all over the (md)
tree.
No functional change.
Diffstat (limited to 'sys/arch/vax/include')
| -rw-r--r-- | sys/arch/vax/include/ka410.h | 4 | ||||
| -rw-r--r-- | sys/arch/vax/include/vsbus.h | 15 |
2 files changed, 11 insertions, 8 deletions
diff --git a/sys/arch/vax/include/ka410.h b/sys/arch/vax/include/ka410.h index 7a7b1852b34..a9461641e7c 100644 --- a/sys/arch/vax/include/ka410.h +++ b/sys/arch/vax/include/ka410.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ka410.h,v 1.6 2009/06/20 20:57:39 miod Exp $ */ +/* $OpenBSD: ka410.h,v 1.7 2011/09/11 19:29:01 miod Exp $ */ /* $NetBSD: ka410.h,v 1.2 1997/02/19 10:06:05 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -71,7 +71,7 @@ #define KA410_SER_BASE 0x200A0000 /* Serial line controller */ #define KA410_SER_END 0x200A000F #define KA410_SER_SIZE 0x10 -#define KA410_WAT_BASE ((struct ka410_clock *)0x200B0000)/* TOY clock */ +#define KA410_WAT_BASE 0x200B0000 /* TOY clock */ #define KA410_WAT_END 0x200B00FF #define KA410_WAT_SIZE 0x100 #define KA410_DKC_BASE 0x200C0000 /* Disk Controller Ports */ diff --git a/sys/arch/vax/include/vsbus.h b/sys/arch/vax/include/vsbus.h index 38d44444cc2..dd4bd09e82b 100644 --- a/sys/arch/vax/include/vsbus.h +++ b/sys/arch/vax/include/vsbus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vsbus.h,v 1.10 2011/03/23 16:54:37 pirofti Exp $ */ +/* $OpenBSD: vsbus.h,v 1.11 2011/09/11 19:29:01 miod Exp $ */ /* $NetBSD: vsbus.h,v 1.13 2000/06/25 16:00:46 ragge Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -61,11 +61,14 @@ struct vsbus_attach_args { * Some chip addresses and constants, same on all VAXstations. */ #define VS_CFGTST 0x20020000 /* config register */ -#define VS_REGS 0x20080000 /* Misc cpu internal regs */ -#define NI_ADDR 0x20090000 /* Ethernet address */ -#define DZ_CSR 0x200a0000 /* DZ11-compatible chip csr */ -#define VS_CLOCK 0x200b0000 /* clock chip address */ -#define SCA_REGS 0x200c0000 /* disk device addresses */ +#define VS_REGS 0x20080000 /* Misc cpu internal regs */ +#define VS_REGS_KA49 0x25c00000 /* ... same, on 512KB ROM systems */ +#define NI_ADDR 0x20090000 /* Ethernet address */ +#define DZ_CSR 0x200a0000 /* DZ11-compatible chip csr */ +#define DZ_CSR_KA49 0x25000000 /* ... same, on 512KB ROM systems */ +#define VS_CLOCK 0x200b0000 /* clock chip address */ +#define SCA_REGS 0x200c0000 /* disk device addresses */ +#define SCA_REGS_KA49 0x26000000 /* ... same, on 512KB ROM systems */ #define NI_BASE 0x200e0000 /* LANCE CSRs */ #define NI_IOSIZE (128 * VAX_NBPG) /* IO address size */ |