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/amd64 | |
| 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/amd64')
| -rw-r--r-- | sys/amd64/amd64/bios.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/amd64/amd64/bios.c b/sys/amd64/amd64/bios.c index b34da4d..d08f5cc 100644 --- a/sys/amd64/amd64/bios.c +++ b/sys/amd64/amd64/bios.c @@ -37,6 +37,9 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> +#include <vm/vm.h> +#include <vm/pmap.h> +#include <machine/vmparam.h> #include <machine/pc/bios.h> #define BIOS_START 0xe0000 @@ -84,7 +87,7 @@ bios_sigsearch(u_int32_t start, u_char *sig, int siglen, int paralen, int sigofs /* compare here */ if (!bcmp(sp + sigofs, sig, siglen)) { /* convert back to physical address */ - return((u_int32_t)BIOS_VADDRTOPADDR(sp)); + return((u_int32_t)(uintptr_t)BIOS_VADDRTOPADDR(sp)); } sp += paralen; } |
