diff options
| author | Marcel Moolenaar <marcel@FreeBSD.org> | 2003-05-02 01:36:27 +0000 |
|---|---|---|
| committer | Marcel Moolenaar <marcel@FreeBSD.org> | 2003-05-02 01:36:27 +0000 |
| commit | ae3c9aff52010080a89325da72929b6aa865ced9 (patch) | |
| tree | 8efef2973628ec9c9257a37b382b8c45ac1aed95 /sys/dev/fb | |
| parent | 8a85ba6c7eaa0a4f0bf8abd42ceeb4c633ca7821 (diff) | |
| download | src-ae3c9aff52010080a89325da72929b6aa865ced9.tar.gz src-ae3c9aff52010080a89325da72929b6aa865ced9.zip | |
Unbreak alpha and ia64 builds. The previous change made the inclusion
of <machine/pc/bios.h> 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...
Notes
Notes:
svn path=/head/; revision=114485
Diffstat (limited to 'sys/dev/fb')
| -rw-r--r-- | sys/dev/fb/vga.c | 7 |
1 files changed, 6 insertions, 1 deletions
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) { |