hp300spu.h information not needed anymore.

7 files changed, 8 insertions, 45 deletions

diff --git a/sys/arch/hp300/dev/dma.c b/sys/arch/hp300/dev/dma.c
index 8794010c755..cde3f981f0f 100644
--- a/sys/arch/hp300/dev/dma.c
+++ b/sys/arch/hp300/dev/dma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dma.c,v 1.10 2001/05/11 23:24:56 millert Exp $	*/
+/*	$OpenBSD: dma.c,v 1.11 2001/11/04 02:58:51 miod Exp $	*/
 /*	$NetBSD: dma.c,v 1.19 1997/05/05 21:02:39 thorpej Exp $	*/
 
 /*
@@ -42,8 +42,6 @@
  * DMA driver
  */
 
-#include <machine/hp300spu.h>	/* XXX param.h includes cpu.h */
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
diff --git a/sys/arch/hp300/dev/dmareg.h b/sys/arch/hp300/dev/dmareg.h
index 7698edc7e0e..defc90c22f4 100644
--- a/sys/arch/hp300/dev/dmareg.h
+++ b/sys/arch/hp300/dev/dmareg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dmareg.h,v 1.6 1997/07/06 08:01:49 downsj Exp $	*/
+/*	$OpenBSD: dmareg.h,v 1.7 2001/11/04 02:58:51 miod Exp $	*/
 /*	$NetBSD: dmareg.h,v 1.12 1997/05/05 21:02:40 thorpej Exp $	*/
 
 /*
@@ -37,7 +37,6 @@
  */
 
 #include <hp300/dev/iotypes.h>		/* XXX */
-#include <machine/hp300spu.h>
 
 /*
  * Hardware layout for the 98620[ABC]:
diff --git a/sys/arch/hp300/hp300/db_memrw.c b/sys/arch/hp300/hp300/db_memrw.c
index 1d0554c3b55..66ee26c9c35 100644
--- a/sys/arch/hp300/hp300/db_memrw.c
+++ b/sys/arch/hp300/hp300/db_memrw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_memrw.c,v 1.5 2001/06/05 16:13:14 millert Exp $	*/
+/*	$OpenBSD: db_memrw.c,v 1.6 2001/11/04 02:58:54 miod Exp $	*/
 /*	$NetBSD: db_memrw.c,v 1.5 1997/06/10 18:48:47 veego Exp $	*/
 
 /*-
@@ -65,7 +65,6 @@
 #include <machine/pte.h>
 #include <machine/db_machdep.h>
 #include <machine/cpu.h>
-#include <machine/hp300spu.h>
 
 #include <ddb/db_access.h>
 
diff --git a/sys/arch/hp300/hp300/genassym.cf b/sys/arch/hp300/hp300/genassym.cf
index dbb977f3cc4..5dcbd8eb2f7 100644
--- a/sys/arch/hp300/hp300/genassym.cf
+++ b/sys/arch/hp300/hp300/genassym.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.cf,v 1.12 2001/09/16 14:28:04 miod Exp $
+#	$OpenBSD: genassym.cf,v 1.13 2001/11/04 02:58:54 miod Exp $
 #	$NetBSD: genassym.cf,v 1.11 1998/02/16 20:58:29 thorpej Exp $
 
 #
@@ -63,30 +63,11 @@ export	MMU_68030
 export	MMU_HP
 export	MMU_68851
 
-# MMU configuration options
-ifdef M68K_MMU_HP
-define	M68K_MMU_HP		1
-endif
-ifdef M68K_MMU_MOTOROLA
-define	M68K_MMU_MOTOROLA	1
-endif
-
 # values for cputype
 export	CPU_68020
 export	CPU_68030
 export	CPU_68040
 
-# CPU configuration options
-ifdef M68020
-define	M68020			1
-endif
-ifdef M68030
-define	M68030			1
-endif
-ifdef M68040
-define	M68040			1
-endif
-
 # values for fputype
 export	FPU_68881
 export	FPU_68882
@@ -125,14 +106,6 @@ export	EC_PHYS
 export	EC_NONE
 export	EC_VIRT
 
-# Cache type configuration options
-ifdef CACHE_HAVE_VAC
-define	CACHE_HAVE_VAC		1
-endif
-ifdef CACHE_HAVE_PAC
-define	CACHE_HAVE_PAC		1
-endif
-
 # general constants
 export	UPAGES
 export	USPACE
@@ -206,7 +179,7 @@ struct	pcb
 member	pcb_ps
 member	pcb_usp
 member	pcb_regs
-member	PCB_FPCTX	pcb_fpregs
+member	PCB_FPCTX		pcb_fpregs
 define	SIZEOF_PCB		sizeof(struct pcb)
 
 # exception frame size
diff --git a/sys/arch/hp300/hp300/pmap.c b/sys/arch/hp300/hp300/pmap.c
index 13c074c8f0e..f1eb96c5cfa 100644
--- a/sys/arch/hp300/hp300/pmap.c
+++ b/sys/arch/hp300/hp300/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.28 2001/09/19 20:50:56 mickey Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.29 2001/11/04 02:58:54 miod Exp $	*/
 /*	$NetBSD: pmap.c,v 1.80 1999/09/16 14:52:06 chs Exp $	*/
 
 /*-
@@ -131,8 +131,6 @@
  *	and to when physical maps must be made correct.
  */
 
-#include <machine/hp300spu.h>	/* XXX param.h includes cpu.h */
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/arch/hp300/hp300/sys_machdep.c b/sys/arch/hp300/hp300/sys_machdep.c
index 3f1ae5b72bd..50d432f5d4a 100644
--- a/sys/arch/hp300/hp300/sys_machdep.c
+++ b/sys/arch/hp300/hp300/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_machdep.c,v 1.9 2001/06/08 08:08:45 art Exp $	*/
+/*	$OpenBSD: sys_machdep.c,v 1.10 2001/11/04 02:58:54 miod Exp $	*/
 /*	$NetBSD: sys_machdep.c,v 1.17 1997/05/19 10:15:00 veego Exp $	*/
 
 /*
@@ -36,8 +36,6 @@
  *	@(#)sys_machdep.c	8.2 (Berkeley) 1/13/94
  */
 
-#include <machine/hp300spu.h>	/* XXX param.h includes cpu.h */
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
diff --git a/sys/arch/hp300/hp300/trap.c b/sys/arch/hp300/hp300/trap.c
index eec8a4fefca..40909fb3758 100644
--- a/sys/arch/hp300/hp300/trap.c
+++ b/sys/arch/hp300/hp300/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.28 2001/09/14 06:04:58 art Exp $	*/
+/*	$OpenBSD: trap.c,v 1.29 2001/11/04 02:58:54 miod Exp $	*/
 /*	$NetBSD: trap.c,v 1.57 1998/02/16 20:58:31 thorpej Exp $	*/
 
 /*
@@ -72,8 +72,6 @@
  *	@(#)trap.c	8.5 (Berkeley) 1/4/94
  */
 
-#include <machine/hp300spu.h>	/* XXX param.h includes cpu.h */
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>