diff options
author | jhb <jhb@FreeBSD.org> | 2004-06-10 20:31:00 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2004-06-10 20:31:00 +0000 |
commit | f7c8770debc1cb4e4c0aa95cd3a49dbf7072d704 (patch) | |
tree | 64c289342d49b723657e06e2e9f7474c95c59775 | |
parent | 30a30620eea7f0af192d7e3c5dbf11e77ae4a6cc (diff) | |
download | FreeBSD-src-f7c8770debc1cb4e4c0aa95cd3a49dbf7072d704.zip FreeBSD-src-f7c8770debc1cb4e4c0aa95cd3a49dbf7072d704.tar.gz |
Remove atdevbase and replace it's remaining uses with direct references to
KERNBASE instead.
-rw-r--r-- | sys/alpha/include/pc/bios.h | 5 | ||||
-rw-r--r-- | sys/amd64/amd64/machdep.c | 3 | ||||
-rw-r--r-- | sys/amd64/include/md_var.h | 1 | ||||
-rw-r--r-- | sys/amd64/include/pc/bios.h | 4 | ||||
-rw-r--r-- | sys/dev/atkbdc/atkbd.c | 1 | ||||
-rw-r--r-- | sys/dev/fb/vga.c | 2 | ||||
-rw-r--r-- | sys/dev/kbd/atkbd.c | 1 | ||||
-rw-r--r-- | sys/i386/bios/mca_machdep.c | 1 | ||||
-rw-r--r-- | sys/i386/bios/smapi.c | 1 | ||||
-rw-r--r-- | sys/i386/bios/smbios.c | 1 | ||||
-rw-r--r-- | sys/i386/bios/vpd.c | 1 | ||||
-rw-r--r-- | sys/i386/i386/machdep.c | 3 | ||||
-rw-r--r-- | sys/i386/i386/symbols.raw | 1 | ||||
-rw-r--r-- | sys/i386/include/md_var.h | 1 | ||||
-rw-r--r-- | sys/i386/include/pc/bios.h | 4 | ||||
-rw-r--r-- | sys/i386/isa/vesa.c | 1 | ||||
-rw-r--r-- | sys/i386/pci/pci_pir.c | 1 | ||||
-rw-r--r-- | sys/isa/syscons_isa.c | 1 | ||||
-rw-r--r-- | sys/pc98/i386/machdep.c | 3 | ||||
-rw-r--r-- | sys/pc98/pc98/machdep.c | 3 |
20 files changed, 17 insertions, 22 deletions
diff --git a/sys/alpha/include/pc/bios.h b/sys/alpha/include/pc/bios.h index d85f674..ff5edd6 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 9a63b5b..6eae41f 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 2f37e30..2e36bd8 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 32b6a52..b8d3991 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 b39d5c2..5d6822e 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 7bde1d9..9f12813 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 b39d5c2..5d6822e 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 e9bc7e0..0938d11 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 c4897d1..883676c 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 cef10f3..f9ceae2 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 b78a303..0e22abe 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 880f905..e1eb8ee 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 0641f66..c15f504 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 42bc19a..b8b38bb 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 32b6a52..b8d3991 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 7c4a2ad..80f9055 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 691561c..99b8749 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 58118d2..a0f00c3 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 a9ad6dd..15d83e1 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 a9ad6dd..15d83e1 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 |