From 2169193596db9cc30586af31a507cc6e09cd440e Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Fri, 24 Sep 2004 01:08:34 +0000
Subject: 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.
---
 sys/dev/fb/vga.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'sys/dev/fb')

diff --git a/sys/dev/fb/vga.c b/sys/dev/fb/vga.c
index 3af5fda458dc..53b67b87bd72 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
-- 
cgit v1.3