Remove atdevbase and replace it's remaining uses with direct references to

KERNBASE instead.
This commit is contained in:
John Baldwin 2004-06-10 20:31:00 +00:00
parent dd4d62c7d8
commit 092a5c4530
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=130312
20 changed files with 17 additions and 22 deletions

View File

@ -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

View File

@ -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.

View File

@ -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;

View File

@ -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)
/*

View File

@ -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>

View File

@ -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

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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

View File

@ -8,7 +8,6 @@
_IdlePTD
_PTD
_panicstr
_atdevbase
# _version
#dmesg
_msgbufp

View File

@ -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;

View File

@ -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)
/*

View File

@ -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>

View File

@ -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>

View File

@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/pmap.h>
#include <vm/vm_param.h>
#include <i386/isa/timerreg.h>

View File

@ -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

View File

@ -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