diff options
author | Miod Vallat <miod@cvs.openbsd.org> | 2012-09-29 21:39:31 +0000 |
---|---|---|
committer | Miod Vallat <miod@cvs.openbsd.org> | 2012-09-29 21:39:31 +0000 |
commit | fd56e2091709076ec2d752824abd0559b6c53f07 (patch) | |
tree | e6b3b2adc0d6941e8704de4d01ceec5a9cf66632 /sys/arch/mips64/include | |
parent | 2b973049de2355df47d511a1636b501618d4ae27 (diff) |
Do not hardcode ARCBios vector base, but rather compute it at runtime.
This allows MI code to support both 32-bit ARCS systems, as well as 64-bit
R8000 and R1x000 systems.
While there, #if 0 out ARCBios routines currently not used by the kernel.
Diffstat (limited to 'sys/arch/mips64/include')
-rw-r--r-- | sys/arch/mips64/include/arcbios.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sys/arch/mips64/include/arcbios.h b/sys/arch/mips64/include/arcbios.h index 39af5146d18..8e42854c675 100644 --- a/sys/arch/mips64/include/arcbios.h +++ b/sys/arch/mips64/include/arcbios.h @@ -1,4 +1,4 @@ -/* $OpenBSD: arcbios.h,v 1.22 2012/04/16 21:08:43 miod Exp $ */ +/* $OpenBSD: arcbios.h,v 1.23 2012/09/29 21:39:28 miod Exp $ */ /*- * Copyright (c) 1996 M. Warner Losh. All rights reserved. * @@ -420,13 +420,10 @@ typedef struct arc_param_blk_64 u_int64_t adapter0_vect; /* ?? */ } arc_param_blk_64_t; -#ifdef __LP64__ -#define ArcBiosBase32 ((arc_param_blk_32_t *)0xffffffff80001000) -#define ArcBiosBase64 ((arc_param_blk_64_t *)0xffffffff80001000) -#else -#define ArcBiosBase32 ((arc_param_blk_32_t *)0x80001000) -#define ArcBiosBase64 ((arc_param_blk_64_t *)0x80001000) -#endif +#define ARCBIOS_BASE 0x0000001000 /* physical */ +extern void *bios_base; +#define ArcBiosBase32 ((arc_param_blk_32_t *)bios_base) +#define ArcBiosBase64 ((arc_param_blk_64_t *)bios_base) #define ARCBIOS_PAGE_SIZE 4096 |