summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2004-06-10 20:31:00 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2004-06-10 20:31:00 +0000
commit092a5c4530e8228794d938e953a42b7d5ac0a7ad (patch)
tree64c289342d49b723657e06e2e9f7474c95c59775 /sys
parentdd4d62c7d8c2bace092c9a8998d04a6f0739942f (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/alpha/include/pc/bios.h5
-rw-r--r--sys/amd64/amd64/machdep.c3
-rw-r--r--sys/amd64/include/md_var.h1
-rw-r--r--sys/amd64/include/pc/bios.h4
-rw-r--r--sys/dev/atkbdc/atkbd.c1
-rw-r--r--sys/dev/fb/vga.c2
-rw-r--r--sys/dev/kbd/atkbd.c1
-rw-r--r--sys/i386/bios/mca_machdep.c1
-rw-r--r--sys/i386/bios/smapi.c1
-rw-r--r--sys/i386/bios/smbios.c1
-rw-r--r--sys/i386/bios/vpd.c1
-rw-r--r--sys/i386/i386/machdep.c3
-rw-r--r--sys/i386/i386/symbols.raw1
-rw-r--r--sys/i386/include/md_var.h1
-rw-r--r--sys/i386/include/pc/bios.h4
-rw-r--r--sys/i386/isa/vesa.c1
-rw-r--r--sys/i386/pci/pci_pir.c1
-rw-r--r--sys/isa/syscons_isa.c1
-rw-r--r--sys/pc98/i386/machdep.c3
-rw-r--r--sys/pc98/pc98/machdep.c3
20 files changed, 17 insertions, 22 deletions
diff --git a/sys/alpha/include/pc/bios.h b/sys/alpha/include/pc/bios.h
index d85f674478d7..ff5edd6de4db 100644
--- a/sys/alpha/include/pc/bios.h
+++ b/sys/alpha/include/pc/bios.h
@@ -71,13 +71,8 @@ struct bios32_args {
};
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
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 9a63b5be67e0..6eae41fb85af 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -140,7 +140,6 @@ static int set_fpcontext(struct thread *td, const mcontext_t *mcp);
SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL)
int _udatasel, _ucodesel, _ucode32sel;
-u_long atdevbase;
int cold = 1;
@@ -1116,8 +1115,6 @@ hammer_time(u_int64_t modulep, u_int64_t physfree)
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.
diff --git a/sys/amd64/include/md_var.h b/sys/amd64/include/md_var.h
index 2f37e300bacc..2e36bd815d0e 100644
--- a/sys/amd64/include/md_var.h
+++ b/sys/amd64/include/md_var.h
@@ -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;
diff --git a/sys/amd64/include/pc/bios.h b/sys/amd64/include/pc/bios.h
index 32b6a52ae53c..b8d3991301b7 100644
--- a/sys/amd64/include/pc/bios.h
+++ b/sys/amd64/include/pc/bios.h
@@ -64,8 +64,8 @@ extern int bios32_SDlookup(struct bios32_SDentry *ent);
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)
/*
diff --git a/sys/dev/atkbdc/atkbd.c b/sys/dev/atkbdc/atkbd.c
index b39d5c219d06..5d6822ef28f7 100644
--- a/sys/dev/atkbdc/atkbd.c
+++ b/sys/dev/atkbdc/atkbd.c
@@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/pmap.h>
+#include <vm/vm_param.h>
#endif /* __i386__ */
#include <sys/kbio.h>
diff --git a/sys/dev/fb/vga.c b/sys/dev/fb/vga.c
index 7bde1d9059ac..9f128135af4b 100644
--- a/sys/dev/fb/vga.c
+++ b/sys/dev/fb/vga.c
@@ -67,7 +67,7 @@ __FBSDID("$FreeBSD$");
#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
diff --git a/sys/dev/kbd/atkbd.c b/sys/dev/kbd/atkbd.c
index b39d5c219d06..5d6822ef28f7 100644
--- a/sys/dev/kbd/atkbd.c
+++ b/sys/dev/kbd/atkbd.c
@@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/pmap.h>
+#include <vm/vm_param.h>
#endif /* __i386__ */
#include <sys/kbio.h>
diff --git a/sys/i386/bios/mca_machdep.c b/sys/i386/bios/mca_machdep.c
index e9bc7e07e79c..0938d11b5e1b 100644
--- a/sys/i386/bios/mca_machdep.c
+++ b/sys/i386/bios/mca_machdep.c
@@ -31,6 +31,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/kernel.h>
#include <vm/vm.h>
+#include <vm/vm_param.h>
#include <vm/pmap.h>
#include <machine/pmap.h>
#include <machine/md_var.h>
diff --git a/sys/i386/bios/smapi.c b/sys/i386/bios/smapi.c
index c4897d1f2c98..883676cc3a6e 100644
--- a/sys/i386/bios/smapi.c
+++ b/sys/i386/bios/smapi.c
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
/* And all this for BIOS_PADDRTOVADDR() */
#include <vm/vm.h>
+#include <vm/vm_param.h>
#include <vm/pmap.h>
#include <machine/md_var.h>
#include <machine/pc/bios.h>
diff --git a/sys/i386/bios/smbios.c b/sys/i386/bios/smbios.c
index cef10f39b0c9..f9ceae20925f 100644
--- a/sys/i386/bios/smbios.c
+++ b/sys/i386/bios/smbios.c
@@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
#include <sys/rman.h>
#include <vm/vm.h>
+#include <vm/vm_param.h>
#include <vm/pmap.h>
#include <machine/md_var.h>
#include <machine/pc/bios.h>
diff --git a/sys/i386/bios/vpd.c b/sys/i386/bios/vpd.c
index b78a3033e4e8..0e22abee24a5 100644
--- a/sys/i386/bios/vpd.c
+++ b/sys/i386/bios/vpd.c
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
#include <sys/rman.h>
#include <vm/vm.h>
+#include <vm/vm_param.h>
#include <vm/pmap.h>
#include <machine/md_var.h>
#include <machine/pc/bios.h>
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index 880f90573f52..e1eb8ee257cb 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -160,7 +160,7 @@ static void fill_fpregs_xmm(struct savexmm *, struct save87 *);
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 @@ init386(first)
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
diff --git a/sys/i386/i386/symbols.raw b/sys/i386/i386/symbols.raw
index 0641f6657978..c15f5049cbd0 100644
--- a/sys/i386/i386/symbols.raw
+++ b/sys/i386/i386/symbols.raw
@@ -8,7 +8,6 @@
_IdlePTD
_PTD
_panicstr
- _atdevbase
# _version
#dmesg
_msgbufp
diff --git a/sys/i386/include/md_var.h b/sys/i386/include/md_var.h
index 42bc19a15e42..b8b38bb0f561 100644
--- a/sys/i386/include/md_var.h
+++ b/sys/i386/include/md_var.h
@@ -42,7 +42,6 @@ extern int (*copyin_vector)(const void *udaddr, void *kaddr, size_t len);
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;
diff --git a/sys/i386/include/pc/bios.h b/sys/i386/include/pc/bios.h
index 32b6a52ae53c..b8d3991301b7 100644
--- a/sys/i386/include/pc/bios.h
+++ b/sys/i386/include/pc/bios.h
@@ -64,8 +64,8 @@ extern int bios32_SDlookup(struct bios32_SDentry *ent);
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)
/*
diff --git a/sys/i386/isa/vesa.c b/sys/i386/isa/vesa.c
index 7c4a2ad26028..80f9055f530a 100644
--- a/sys/i386/isa/vesa.c
+++ b/sys/i386/isa/vesa.c
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_extern.h>
#include <vm/vm_kern.h>
+#include <vm/vm_param.h>
#include <vm/pmap.h>
#include <machine/md_var.h>
diff --git a/sys/i386/pci/pci_pir.c b/sys/i386/pci/pci_pir.c
index 691561c1eb8e..99b8749ee9b5 100644
--- a/sys/i386/pci/pci_pir.c
+++ b/sys/i386/pci/pci_pir.c
@@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$");
#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>
diff --git a/sys/isa/syscons_isa.c b/sys/isa/syscons_isa.c
index 58118d2b5080..a0f00c37e634 100644
--- a/sys/isa/syscons_isa.c
+++ b/sys/isa/syscons_isa.c
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/pmap.h>
+#include <vm/vm_param.h>
#include <i386/isa/timerreg.h>
diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c
index a9ad6dd34c1c..15d83e14cc9f 100644
--- a/sys/pc98/i386/machdep.c
+++ b/sys/pc98/i386/machdep.c
@@ -167,7 +167,7 @@ int need_post_dma_flush; /* If 1, use invd after DMA transfer. */
#endif
int _udatasel, _ucodesel;
-u_int atdevbase, basemem;
+u_int basemem;
#ifdef PC98
static int ispc98 = 1;
@@ -2013,7 +2013,6 @@ init386(first)
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
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
index a9ad6dd34c1c..15d83e14cc9f 100644
--- a/sys/pc98/pc98/machdep.c
+++ b/sys/pc98/pc98/machdep.c
@@ -167,7 +167,7 @@ int need_post_dma_flush; /* If 1, use invd after DMA transfer. */
#endif
int _udatasel, _ucodesel;
-u_int atdevbase, basemem;
+u_int basemem;
#ifdef PC98
static int ispc98 = 1;
@@ -2013,7 +2013,6 @@ init386(first)
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
generated by cgit v1.3 (git 2.53.0) at 2026-07-31 08:23:52 +0000