diff options
| author | peter <peter@FreeBSD.org> | 2004-09-24 01:08:34 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2004-09-24 01:08:34 +0000 |
| commit | 04c2ef219308602e8e16a468dd7b891268ef2e3b (patch) | |
| tree | 0d32e80a39f47cf18ed420b2e7f40883dd23012c /sys/dev/fb/vga.c | |
| parent | 09b56c9832dac675750896f41018db6609e38529 (diff) | |
| download | FreeBSD-src-04c2ef219308602e8e16a468dd7b891268ef2e3b.zip FreeBSD-src-04c2ef219308602e8e16a468dd7b891268ef2e3b.tar.gz | |
Converge towards i386. I originally resisted creating <machine/pc/bios.h>
because it was mostly irrelevant - except for the silly BIOS_PADDRTOVADDR
etc macros. Along the way of working around this, I missed a few things.
* Make syscons properly inherit the bios capslock/shiftlock/etc state like
i386 does. Note that we cannot inherit the bios key repeat rate because
that requires a bios call (which is impossible for us).
* Give syscons the ability to beep on amd64. Oops.
While here, make bios.c compile and add it to files.amd64.
Diffstat (limited to 'sys/dev/fb/vga.c')
| -rw-r--r-- | sys/dev/fb/vga.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/dev/fb/vga.c b/sys/dev/fb/vga.c index 3af5fda..53b67b8 100644 --- a/sys/dev/fb/vga.c +++ b/sys/dev/fb/vga.c @@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$"); #include <vm/pmap.h> #include <machine/md_var.h> -#ifdef __i386__ +#if defined(__i386__) || defined(__amd64__) #include <machine/pc/bios.h> #endif #include <machine/bus.h> @@ -64,11 +64,7 @@ __FBSDID("$FreeBSD$"); /* 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) + KERNBASE) -#endif #endif int |
