Kill pmap_table_t typedef.

4 files changed, 16 insertions, 11 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)