--- //depot/vendor/freebsd/src/sys/alpha/include/pc/bios.h	2001/07/17 00:20:42
+++ //depot/user/jhb/acpipci/alpha/include/pc/bios.h	2004/05/17 13:21:18
@@ -71,13 +71,8 @@
 };
 extern void		bios32(caddr_t func_addr, struct bios32_args *args);
 
-#if 0
-#define BIOS_PADDRTOVADDR(x)	(((x) - ISA_HOLE_START) + atdevbase)
-#define BIOS_VADDRTOPADDR(x)	(((x) - atdevbase) + ISA_HOLE_START)
-#else
 #define BIOS_PADDRTOVADDR(x)	(x)
 #define BIOS_VADDRTOPADDR(x)	(x)
-#endif
 
 /*
  * System Management BIOS / Desktop Management Interface tables
--- //depot/vendor/freebsd/src/sys/amd64/amd64/machdep.c	2004/03/07 16:20:31
+++ //depot/user/jhb/acpipci/amd64/amd64/machdep.c	2004/05/17 13:21:18
@@ -141,7 +141,6 @@
 SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL)
 
 int	_udatasel, _ucodesel, _ucode32sel;
-u_long	atdevbase;
 
 int cold = 1;
 
@@ -1119,8 +1118,6 @@
 	thread0.td_pcb = (struct pcb *)
 	   (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1;
 
-	atdevbase = ISA_HOLE_START + KERNBASE;
-
 	/*
  	 * This may be done better later if it gets more high level
  	 * components in it. If so just link td->td_proc here.
--- //depot/vendor/freebsd/src/sys/amd64/include/md_var.h	2004/04/10 21:30:29
+++ //depot/user/jhb/acpipci/amd64/include/md_var.h	2004/05/17 13:21:18
@@ -37,7 +37,6 @@
  */
 
 extern	long	Maxmem;
-extern	u_long	atdevbase;	/* offset in virtual memory of ISA io mem */
 extern	u_int	basemem;
 extern	int	busdma_swi_pending;
 extern	u_int	cpu_exthigh;
--- //depot/vendor/freebsd/src/sys/dev/fb/vga.c	2004/04/03 07:32:31
+++ //depot/user/jhb/acpipci/dev/fb/vga.c	2004/05/17 13:21:18
@@ -67,7 +67,7 @@
 #if !defined(__amd64__)
 #define	BIOS_PADDRTOVADDR(x)	(x)
 #else
-#define BIOS_PADDRTOVADDR(x) (((x) - ISA_HOLE_START) + atdevbase)
+#define BIOS_PADDRTOVADDR(x)	((x) + KERNBASE)
 #endif
 #endif
 
--- //depot/vendor/freebsd/src/sys/dev/kbd/atkbd.c	2003/10/07 02:25:29
+++ //depot/user/jhb/acpipci/dev/kbd/atkbd.c	2004/05/27 07:11:24
@@ -50,6 +50,7 @@
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
+#include <vm/vm_param.h>
 #endif /* __i386__ */
 
 #include <sys/kbio.h>
--- //depot/vendor/freebsd/src/sys/i386/i386/machdep.c	2004/05/10 12:08:15
+++ //depot/user/jhb/acpipci/i386/i386/machdep.c	2004/05/17 13:21:18
@@ -160,7 +160,7 @@
 SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL)
 
 int	_udatasel, _ucodesel;
-u_int	atdevbase, basemem;
+u_int	basemem;
 
 int cold = 1;
 
@@ -1954,7 +1954,6 @@
 	thread0.td_kstack = proc0kstack;
 	thread0.td_pcb = (struct pcb *)
 	   (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1;
-	atdevbase = ISA_HOLE_START + KERNBASE;
 
 	/*
  	 * This may be done better later if it gets more high level
--- //depot/vendor/freebsd/src/sys/i386/i386/symbols.raw	2001/07/17 00:20:42
+++ //depot/user/jhb/acpipci/i386/i386/symbols.raw	2004/05/17 13:21:18
@@ -8,7 +8,6 @@
 	_IdlePTD
 	_PTD
 	_panicstr
-	_atdevbase
 #	_version
 #dmesg
 	_msgbufp
--- //depot/vendor/freebsd/src/sys/i386/include/md_var.h	2004/04/10 21:30:29
+++ //depot/user/jhb/acpipci/i386/include/md_var.h	2004/05/17 13:21:18
@@ -42,7 +42,6 @@
 extern	int	(*copyout_vector)(const void *kaddr, void *udaddr, size_t len);
 
 extern	long	Maxmem;
-extern	u_int	atdevbase;	/* offset in virtual memory of ISA io mem */
 extern	u_int	basemem;	/* PA of original top of base memory */
 extern	int	busdma_swi_pending;
 extern	u_int	cpu_exthigh;
--- //depot/vendor/freebsd/src/sys/i386/include/pc/bios.h	2002/09/23 11:55:25
+++ //depot/user/jhb/acpipci/i386/include/pc/bios.h	2004/05/17 13:21:18
@@ -61,8 +61,8 @@
 extern u_int32_t	bios_sigsearch(u_int32_t start, u_char *sig, int siglen, 
 					 int paralen, int sigofs);
 
-#define BIOS_PADDRTOVADDR(x)	(((x) - ISA_HOLE_START) + atdevbase)
-#define BIOS_VADDRTOPADDR(x)	(((x) - atdevbase) + ISA_HOLE_START)
+#define BIOS_PADDRTOVADDR(x)	((x) + KERNBASE)
+#define BIOS_VADDRTOPADDR(x)	((x) - KERNBASE)
 
 
 /* 
--- //depot/vendor/freebsd/src/sys/i386/pci/pci_pir.c	2004/05/04 14:21:13
+++ //depot/user/jhb/acpipci/i386/pci/pci_pir.c	2004/05/27 07:11:24
@@ -38,6 +38,7 @@
 #include <sys/sysctl.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
+#include <vm/vm_param.h>
 #include <machine/md_var.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
--- //depot/vendor/freebsd/src/sys/isa/syscons_isa.c	2003/10/29 12:50:44
+++ //depot/user/jhb/acpipci/isa/syscons_isa.c	2004/05/27 07:11:24
@@ -47,6 +47,7 @@
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
+#include <vm/vm_param.h>
 
 #include <i386/isa/timerreg.h>
 
--- //depot/vendor/freebsd/src/sys/pc98/i386/machdep.c	2004/03/28 04:05:27
+++ //depot/user/jhb/acpipci/pc98/i386/machdep.c	2004/05/17 13:21:18
@@ -167,7 +167,7 @@
 #endif
 
 int	_udatasel, _ucodesel;
-u_int	atdevbase, basemem;
+u_int	basemem;
 
 #ifdef PC98
 static int	ispc98 = 1;
@@ -2013,7 +2013,6 @@
 	thread0.td_kstack = proc0kstack;
 	thread0.td_pcb = (struct pcb *)
 	   (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1;
-	atdevbase = ISA_HOLE_START + KERNBASE;
 
 	/*
  	 * This may be done better later if it gets more high level