header file include/define cleanup. commit N of many.

8 files changed, 47 insertions, 16 deletions

diff --git a/sys/arch/powerpc/include/adbsys.h b/sys/arch/powerpc/include/adbsys.h
index 87d7ec7316f..7ef4bc7c4a3 100644
--- a/sys/arch/powerpc/include/adbsys.h
+++ b/sys/arch/powerpc/include/adbsys.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adbsys.h,v 1.2 2001/03/29 18:41:49 drahn Exp $	*/
+/*	$OpenBSD: adbsys.h,v 1.3 2001/06/29 06:07:08 drahn Exp $	*/
 /*	$NetBSD: adbsys.h,v 1.4 2000/12/19 02:59:24 tsubai Exp $	*/
 
 /*-
@@ -169,4 +169,12 @@ typedef struct adb_listencmd_s{
 
 void	adb_init __P((void));
 
+#ifdef _KERNEL
+int	adb_poweroff __P((void));
+void	adb_restart __P((void));
+int	CountADBs __P((void));
+void	ADBReInit __P((void));
+int	adb_read_date_time __P((unsigned long *));
+#endif
+
 #endif /* _ADBSYS_MACHINE_ */
diff --git a/sys/arch/powerpc/include/db_machdep.h b/sys/arch/powerpc/include/db_machdep.h
index 2b3ab52f66a..53c5c9b5251 100644
--- a/sys/arch/powerpc/include/db_machdep.h
+++ b/sys/arch/powerpc/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.7 2001/06/23 01:59:04 drahn Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.8 2001/06/29 06:07:09 drahn Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.13 1996/04/29 20:50:08 leo Exp $	*/
 
 /* 
@@ -97,6 +97,8 @@ db_regs_t	ddb_regs;		/* register state */
 
 void	kdb_kintr __P((void *));
 int	kdb_trap __P((int, void *));
+void db_save_regs(struct trapframe *frame);
+void ddb_trap __P(());
 
 #endif /* _KERNEL */
 
diff --git a/sys/arch/powerpc/include/pcb.h b/sys/arch/powerpc/include/pcb.h
index 201ce3cffa4..1229b0b1168 100644
--- a/sys/arch/powerpc/include/pcb.h
+++ b/sys/arch/powerpc/include/pcb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcb.h,v 1.4 1998/08/25 07:44:21 pefo Exp $	*/
+/*	$OpenBSD: pcb.h,v 1.5 2001/06/29 06:07:09 drahn Exp $	*/
 /*	$NetBSD: pcb.h,v 1.1 1996/09/30 16:34:29 ws Exp $	*/
 
 /*-
@@ -67,5 +67,6 @@ struct md_coredump {
 extern struct pcb *curpcb;
 extern struct pmap *curpm;
 extern struct proc *fpuproc;
+int  setfault __P((faultbuf env));
 #endif
 #endif	/* _MACHINE_PCB_H_ */
diff --git a/sys/arch/powerpc/include/pio.h b/sys/arch/powerpc/include/pio.h
index 5927dd5a75c..b58a7a20b68 100644
--- a/sys/arch/powerpc/include/pio.h
+++ b/sys/arch/powerpc/include/pio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pio.h,v 1.5 2001/06/24 04:45:45 drahn Exp $ */
+/*	$OpenBSD: pio.h,v 1.6 2001/06/29 06:07:09 drahn Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom, Opsycon AB and RTMX Inc, USA.
@@ -38,6 +38,7 @@
  * I/O macros.
  */
 void *mapiodev(paddr_t pa, psize_t len);
+void unmapiodev(void * va, psize_t len);
 
 static __inline void
 __outb(volatile u_int8_t *a, int v)
diff --git a/sys/arch/powerpc/include/pmap.h b/sys/arch/powerpc/include/pmap.h
index 44dc901e1a5..0b18a771c49 100644
--- a/sys/arch/powerpc/include/pmap.h
+++ b/sys/arch/powerpc/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.9 2001/06/24 23:26:29 drahn Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.10 2001/06/29 06:07:09 drahn Exp $	*/
 /*	$NetBSD: pmap.h,v 1.1 1996/09/30 16:34:29 ws Exp $	*/
 
 /*-
@@ -38,6 +38,10 @@
 #include <machine/pte.h>
 
 /*
+ * FUCK 
+#define PMAP_NEW
+ */
+/*
  * Segment registers
  */
 #ifndef	_LOCORE
@@ -80,11 +84,19 @@ extern struct pmap kernel_pmap_;
 int ptebits(paddr_t pa, int bit);
 
 
-#define pmap_clear_modify(pa)		(ptemodify((pa), PTE_CHG, 0))
-#define	pmap_clear_reference(pa)	(ptemodify((pa), PTE_REF, 0))
-#define	pmap_is_modified(pa)		(ptebits((pa), PTE_CHG))
-#define	pmap_is_referenced(pa)		(ptebits((pa), PTE_REF))
+#ifdef PMAP_NEW
+#define pmap_clear_modify(page)	 (ptemodify((page)->phys_addr, PTE_CHG, 0))
+#define	pmap_clear_reference(page) (ptemodify((page)->phys_addr, PTE_REF, 0))
+#define	pmap_is_modified(page)	 (ptebits((page)->phys_addr, PTE_CHG))
+#define	pmap_is_referenced(page) (ptebits((page)->phys_addr, PTE_REF))
+#define	pmap_unwire(pm, va)
+#else
+#define pmap_clear_modify(pa)	 (ptemodify((pa), PTE_CHG, 0))
+#define	pmap_clear_reference(pa) (ptemodify((pa), PTE_REF, 0))
+#define	pmap_is_modified(pa)	 (ptebits((pa), PTE_CHG))
+#define	pmap_is_referenced(pa) (ptebits((pa), PTE_REF))
 #define	pmap_unwire(pm, va)
+#endif
 
 #define	pmap_phys_address(x)		(x)
 
@@ -100,9 +112,10 @@ int ptebits(paddr_t pa, int bit);
 
 void pmap_bootstrap __P((u_int kernelstart, u_int kernelend));
 
-void pmap_deactivate(struct proc *p);
-void pmap_activate(struct proc *p);
-void pmap_real_memory(vm_offset_t *start, vm_size_t *size);
+void pmap_deactivate __P((struct proc *p));
+void pmap_activate __P((struct proc *p));
+void pmap_real_memory __P((vm_offset_t *start, vm_size_t *size));
+void switchexit __P((struct proc *));
 
 #endif	/* _KERNEL */
 #endif	/* _LOCORE */
diff --git a/sys/arch/powerpc/include/powerpc.h b/sys/arch/powerpc/include/powerpc.h
index 6a6de1e54db..731c7fd1da8 100644
--- a/sys/arch/powerpc/include/powerpc.h
+++ b/sys/arch/powerpc/include/powerpc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: powerpc.h,v 1.5 2001/06/24 05:16:09 drahn Exp $	*/
+/*	$OpenBSD: powerpc.h,v 1.6 2001/06/29 06:07:09 drahn Exp $	*/
 /*	$NetBSD: powerpc.h,v 1.1 1996/09/30 16:34:30 ws Exp $	*/
 
 /*
@@ -77,5 +77,10 @@ struct firmware {
 };
 extern  struct firmware *fw;
 void ofwconprobe(void);
+int ppc_open_pci_bridge __P((void));
+void ppc_close_pci_bridge __P((int));
+void install_extint __P((void (*handler) (void)));
+void ppc_intr_enable __P((int enable));
+int ppc_intr_disable __P((void));
 
 #endif	/* _MACHINE_POWERPC_H_ */
diff --git a/sys/arch/powerpc/include/reg.h b/sys/arch/powerpc/include/reg.h
index ba2ab6413a9..d3b43ec642a 100644
--- a/sys/arch/powerpc/include/reg.h
+++ b/sys/arch/powerpc/include/reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: reg.h,v 1.2 1998/08/07 02:22:06 rahnds Exp $	*/
+/*	$OpenBSD: reg.h,v 1.3 2001/06/29 06:07:09 drahn Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -59,4 +59,5 @@ struct reg {
 	u_int32_t xer;
 	u_int32_t mq;
 };
+int process_read_regs __P((struct proc *p, struct reg *regs));
 #endif /* !_POWERPC_REG_H_ */
diff --git a/sys/arch/powerpc/powerpc/vm_machdep.c b/sys/arch/powerpc/powerpc/vm_machdep.c
index d571340fe39..8233e7d1a59 100644
--- a/sys/arch/powerpc/powerpc/vm_machdep.c
+++ b/sys/arch/powerpc/powerpc/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.18 2001/06/27 04:37:22 art Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.19 2001/06/29 06:07:09 drahn Exp $	*/
 /*	$NetBSD: vm_machdep.c,v 1.1 1996/09/30 16:34:57 ws Exp $	*/
 
 /*
@@ -201,7 +201,7 @@ cpu_coredump(p, vp, cred, chdr)
 	chdr->c_seghdrsize = ALIGN(sizeof cseg);
 	chdr->c_cpusize = sizeof md_core;
 
-	process_read_regs(p, &md_core);
+	process_read_regs(p, &(md_core.regs));
 	
 	CORE_SETMAGIC(cseg, CORESEGMAGIC, MID_ZERO, CORE_CPU);
 	cseg.c_addr = 0;