diff options
| -rw-r--r-- | sys/arch/aviion/aviion/av400_machdep.c | 7 | ||||
| -rw-r--r-- | sys/arch/aviion/aviion/av530_machdep.c | 8 | ||||
| -rw-r--r-- | sys/arch/aviion/aviion/pmap_table.c | 6 | ||||
| -rw-r--r-- | sys/arch/aviion/include/board.h | 6 | ||||
| -rw-r--r-- | sys/arch/luna88k/luna88k/pmap_table.c | 9 | ||||
| -rw-r--r-- | sys/arch/m88k/include/pmap_table.h | 10 | ||||
| -rw-r--r-- | sys/arch/m88k/m88k/pmap.c | 4 | ||||
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/pmap_table.c | 13 |
8 files changed, 32 insertions, 31 deletions
diff --git a/sys/arch/aviion/aviion/av400_machdep.c b/sys/arch/aviion/aviion/av400_machdep.c index a877391647f..3e66c527950 100644 --- a/sys/arch/aviion/aviion/av400_machdep.c +++ b/sys/arch/aviion/aviion/av400_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: av400_machdep.c,v 1.19 2010/12/31 21:38:07 miod Exp $ */ +/* $OpenBSD: av400_machdep.c,v 1.20 2011/01/02 13:40:05 miod Exp $ */ /* * Copyright (c) 2006, 2007, Miodrag Vallat. * @@ -147,6 +147,7 @@ #include <machine/bus.h> #include <machine/cmmu.h> #include <machine/cpu.h> +#include <machine/pmap_table.h> #include <machine/reg.h> #include <machine/trap.h> @@ -167,7 +168,7 @@ u_int av400_safe_level(u_int, u_int); void av400_clock_ipi_handler(struct trapframe *); void av400_ipi_handler(struct trapframe *); -const pmap_table_entry +const struct pmap_table av400_ptable[] = { { AV400_PROM, AV400_PROM_SIZE, UVM_PROT_RW, CACHE_INH }, #if 0 /* mapped by the hardcoded BATC entries */ @@ -204,7 +205,7 @@ const struct board board_av400 = { av400_intsrc, av400_get_vme_ranges, - av400_ptable, + av400_ptable }; /* diff --git a/sys/arch/aviion/aviion/av530_machdep.c b/sys/arch/aviion/aviion/av530_machdep.c index 0b366ce0b11..7b1da1eebc6 100644 --- a/sys/arch/aviion/aviion/av530_machdep.c +++ b/sys/arch/aviion/aviion/av530_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: av530_machdep.c,v 1.5 2010/12/31 21:38:07 miod Exp $ */ +/* $OpenBSD: av530_machdep.c,v 1.6 2011/01/02 13:40:05 miod Exp $ */ /* * Copyright (c) 2006, 2007, 2010 Miodrag Vallat. * @@ -37,6 +37,7 @@ #include <machine/bus.h> #include <machine/cmmu.h> #include <machine/cpu.h> +#include <machine/pmap_table.h> #include <machine/trap.h> #include <machine/m88100.h> @@ -56,7 +57,8 @@ u_int av530_safe_level(u_int, u_int, u_int); void av530_clock_ipi_handler(struct trapframe *); void av530_ipi_handler(struct trapframe *); -const pmap_table_entry av530_ptable[] = { +const struct pmap_table +av530_ptable[] = { { AV530_PROM, AV530_PROM_SIZE, UVM_PROT_RW, CACHE_INH }, #if 0 /* mapped by the hardcoded BATC entries */ { AV530_UTILITY,AV530_UTILITY_SIZE, UVM_PROT_RW, CACHE_INH }, @@ -92,7 +94,7 @@ const struct board board_av530 = { av530_intsrc, av530_get_vme_ranges, - av530_ptable, + av530_ptable }; /* diff --git a/sys/arch/aviion/aviion/pmap_table.c b/sys/arch/aviion/aviion/pmap_table.c index 5d04979df85..62264808e2e 100644 --- a/sys/arch/aviion/aviion/pmap_table.c +++ b/sys/arch/aviion/aviion/pmap_table.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_table.c,v 1.2 2006/05/21 12:22:01 miod Exp $ */ +/* $OpenBSD: pmap_table.c,v 1.3 2011/01/02 13:40:05 miod Exp $ */ /* * Mach Operating System @@ -29,10 +29,12 @@ #include <sys/param.h> #include <sys/systm.h> +#include <uvm/uvm_extern.h> + #include <machine/board.h> #include <machine/pmap_table.h> -pmap_table_t +const struct pmap_table * pmap_table_build(void) { return (platform->ptable); diff --git a/sys/arch/aviion/include/board.h b/sys/arch/aviion/include/board.h index 8424da73872..c6478ef1884 100644 --- a/sys/arch/aviion/include/board.h +++ b/sys/arch/aviion/include/board.h @@ -1,4 +1,4 @@ -/* $OpenBSD: board.h,v 1.8 2010/04/24 18:46:55 miod Exp $ */ +/* $OpenBSD: board.h,v 1.9 2011/01/02 13:40:07 miod Exp $ */ /* * Copyright (c) 2006, 2007, Miodrag Vallat * @@ -71,7 +71,7 @@ extern int32_t cpuid; -#include <machine/pmap_table.h> +struct pmap_table; struct vme_range; struct board { @@ -92,7 +92,7 @@ struct board { u_int64_t (*intsrc)(int); const struct vme_range *(*get_vme_ranges)(void); - pmap_table_t ptable; + const struct pmap_table *ptable; }; #define md_interrupt_func(f) platform->intr(f) diff --git a/sys/arch/luna88k/luna88k/pmap_table.c b/sys/arch/luna88k/luna88k/pmap_table.c index bfa967156a3..00da551fdfd 100644 --- a/sys/arch/luna88k/luna88k/pmap_table.c +++ b/sys/arch/luna88k/luna88k/pmap_table.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_table.c,v 1.6 2010/12/31 21:38:08 miod Exp $ */ +/* $OpenBSD: pmap_table.c,v 1.7 2011/01/02 13:40:07 miod Exp $ */ /* * Mach Operating System @@ -32,7 +32,6 @@ #include <uvm/uvm_extern.h> #include <machine/board.h> -#include <machine/cmmu.h> #include <machine/pmap_table.h> #define R VM_PROT_READ @@ -42,7 +41,7 @@ #define CG CACHE_GLOBAL /* start, size, prot, cacheability */ -const pmap_table_entry +const struct pmap_table luna88k_board_table[] = { { PROM_ADDR, PROM_SPACE, R, CI }, { FUSE_ROM_ADDR, FUSE_ROM_SPACE, RW, CI }, @@ -75,8 +74,8 @@ luna88k_board_table[] = { { 0, 0xffffffff, 0, 0 }, }; -pmap_table_t -pmap_table_build(void) +const struct pmap_table * +pmap_table_build() { return luna88k_board_table; } diff --git a/sys/arch/m88k/include/pmap_table.h b/sys/arch/m88k/include/pmap_table.h index 8de566e4ef8..6f5944e7612 100644 --- a/sys/arch/m88k/include/pmap_table.h +++ b/sys/arch/m88k/include/pmap_table.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_table.h,v 1.2 2010/12/31 21:38:08 miod Exp $ */ +/* $OpenBSD: pmap_table.h,v 1.3 2011/01/02 13:40:07 miod Exp $ */ /* * Mach Operating System * Copyright (c) 1992 Carnegie Mellon University @@ -33,15 +33,13 @@ * An entry is considered invalid if size = 0, and * end of list is indicated by size 0xffffffff */ -typedef struct { +struct pmap_table { paddr_t start; psize_t size; vm_prot_t prot; unsigned int cacheability; -} pmap_table_entry; +}; -typedef const pmap_table_entry *pmap_table_t; - -pmap_table_t pmap_table_build(void); +const struct pmap_table *pmap_table_build(void); #endif /* __M88K_PMAP_TABLE_H__ */ diff --git a/sys/arch/m88k/m88k/pmap.c b/sys/arch/m88k/m88k/pmap.c index 897fbf3cab2..87fde7da4d7 100644 --- a/sys/arch/m88k/m88k/pmap.c +++ b/sys/arch/m88k/m88k/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.58 2010/12/31 21:38:08 miod Exp $ */ +/* $OpenBSD: pmap.c,v 1.59 2011/01/02 13:40:07 miod Exp $ */ /* * Copyright (c) 2001-2004, 2010, Miodrag Vallat. @@ -654,7 +654,7 @@ pmap_bootstrap() sdt_entry_t *sdt; pt_entry_t *pdt; paddr_t pa, epdtpa; - pmap_table_t ptable; + const struct pmap_table *ptable; extern void *kernelstart; extern void *etext; diff --git a/sys/arch/mvme88k/mvme88k/pmap_table.c b/sys/arch/mvme88k/mvme88k/pmap_table.c index 229bee0e38b..297ee11ee34 100644 --- a/sys/arch/mvme88k/mvme88k/pmap_table.c +++ b/sys/arch/mvme88k/mvme88k/pmap_table.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_table.c,v 1.24 2010/12/31 21:38:08 miod Exp $ */ +/* $OpenBSD: pmap_table.c,v 1.25 2011/01/02 13:40:07 miod Exp $ */ /* * Mach Operating System @@ -31,7 +31,6 @@ #include <uvm/uvm_extern.h> -#include <machine/cmmu.h> #include <machine/pmap_table.h> #define R UVM_PROT_R @@ -42,7 +41,7 @@ #ifdef MVME187 #include <machine/mvme187.h> -const pmap_table_entry +const struct pmap_table m187_board_table[] = { { BUG187_START, BUG187_SIZE, RW, CI }, #if 0 /* mapped by the hardcoded BATC entries */ @@ -54,7 +53,7 @@ m187_board_table[] = { #ifdef MVME188 #include <machine/mvme188.h> -const pmap_table_entry +const struct pmap_table m188_board_table[] = { { MVME188_EPROM, MVME188_EPROM_SIZE, RW, CI }, #if 0 /* mapped by the hardcoded BATC entries */ @@ -66,7 +65,7 @@ m188_board_table[] = { #ifdef MVME197 #include <machine/mvme197.h> -const pmap_table_entry +const struct pmap_table m197_board_table[] = { /* We need flash 1:1 mapped to access the 88410 chip underneath */ { FLASH_START, FLASH_SIZE, RW, CI }, @@ -76,8 +75,8 @@ m197_board_table[] = { }; #endif -pmap_table_t -pmap_table_build(void) +const struct pmap_table * +pmap_table_build() { switch (brdtyp) { #ifdef MVME187 |