From ae3c9aff52010080a89325da72929b6aa865ced9 Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Fri, 2 May 2003 01:36:27 +0000 Subject: Unbreak alpha and ia64 builds. The previous change made the inclusion of specific to i386 and added a conditional define for BIOS_PADDRTOVADDR that depends on ISA_HOLE_START. The latter is undefined on alpha and ia64. Since the former is defined the same on both alpha and ia64, assume the ISA_HOLE_START dependent definition is specific to amd64 and use the identity-mapping in all other cases. This of course is getting uglier every day... --- sys/dev/fb/vga.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'sys/dev/fb') diff --git a/sys/dev/fb/vga.c b/sys/dev/fb/vga.c index b42016df98bb..7c0627f978de 100644 --- a/sys/dev/fb/vga.c +++ b/sys/dev/fb/vga.c @@ -60,10 +60,15 @@ #define VGA_DEBUG 0 #endif -/* machine/pc/bios.h has got too much i386-specific stuff in it */ +/* XXX machine/pc/bios.h has got too much i386-specific stuff in it */ #ifndef BIOS_PADDRTOVADDR +#if !defined(__amd64__) +#define BIOS_PADDRTOVADDR(x) (x) +#else #define BIOS_PADDRTOVADDR(x) (((x) - ISA_HOLE_START) + atdevbase) #endif +#endif + int vga_probe_unit(int unit, video_adapter_t *buf, int flags) { -- cgit v1.3