First round of __P removal in sys

17 files changed, 282 insertions, 282 deletions

diff --git a/sys/arch/mvme88k/include/autoconf.h b/sys/arch/mvme88k/include/autoconf.h
index 1828521d20f..7a191ee60c4 100644
--- a/sys/arch/mvme88k/include/autoconf.h
+++ b/sys/arch/mvme88k/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.9 2001/11/09 00:12:19 miod Exp $ */
+/*	$OpenBSD: autoconf.h,v 1.10 2002/03/14 01:26:39 millert Exp $ */
 /*
  * Copyright (c) 1999, Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -58,7 +58,7 @@ struct confargs {
 #define BUS_SYSCON    6
 #define BUS_BUSSWITCH 7
 
-int always_match __P((struct device *, struct cfdata *, void *));
+int always_match(struct device *, struct cfdata *, void *);
 
 #define DEVICE_UNIT(device) (device->dv_unit)
 #define CFDATA_LOC(cfdata) (cfdata->cf_loc)
@@ -69,9 +69,9 @@ extern int	bootpart;	/* boot partition (disk) */
 
 extern	struct device *bootdv; /* boot device */
 
-void	*mapiodev __P((void *pa, int size));
-void	unmapiodev __P((void *kva, int size));
+void	*mapiodev(void *pa, int size);
+void	unmapiodev(void *kva, int size);
 
-struct device *getdevunit __P((char *name, int unit));
+struct device *getdevunit(char *name, int unit);
 
 #endif
diff --git a/sys/arch/mvme88k/include/bug.h b/sys/arch/mvme88k/include/bug.h
index ac6cee7cb89..265ad5fae22 100644
--- a/sys/arch/mvme88k/include/bug.h
+++ b/sys/arch/mvme88k/include/bug.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bug.h,v 1.8 2001/11/27 05:36:40 miod Exp $ */
+/*	$OpenBSD: bug.h,v 1.9 2002/03/14 01:26:39 millert Exp $ */
 
 #ifndef _MACHINE_BUG_H_
 #define _MACHINE_BUG_H_
@@ -8,7 +8,7 @@ struct bugenv {
 	int	dlun;
 	int	ipl;
 	int	ctlr;
-	int	(*entry) __P((void));
+	int	(*entry)(void);
 	int	cfgblk;
 	char	*argstart;
 	char	*argend;
diff --git a/sys/arch/mvme88k/include/bugio.h b/sys/arch/mvme88k/include/bugio.h
index 0f7f6dc93d2..2f58b700b47 100644
--- a/sys/arch/mvme88k/include/bugio.h
+++ b/sys/arch/mvme88k/include/bugio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bugio.h,v 1.12 2002/03/05 22:11:40 miod Exp $ */
+/*	$OpenBSD: bugio.h,v 1.13 2002/03/14 01:26:39 millert Exp $ */
 
 #ifndef __MACHINE_BUGIO_H__
 #define __MACHINE_BUGIO_H__
@@ -7,13 +7,13 @@
 
 #include <machine/prom.h>
 
-void buginit	__P((void));
-int buginstat	__P((void));
-char buginchr	__P((void));
-void bugoutchr	__P((unsigned char));
-void bugoutstr	__P((char *, char *));
-void bugrtcrd	__P((struct mvmeprom_time *));
-void bugreturn	__P((void));
-void bugbrdid	__P((struct mvmeprom_brdid *));
+void buginit(void);
+int buginstat(void);
+char buginchr(void);
+void bugoutchr(unsigned char);
+void bugoutstr(char *, char *);
+void bugrtcrd(struct mvmeprom_time *);
+void bugreturn(void);
+void bugbrdid(struct mvmeprom_brdid *);
 
 #endif /* __MACHINE_BUGIO_H__ */
diff --git a/sys/arch/mvme88k/include/cmmu.h b/sys/arch/mvme88k/include/cmmu.h
index 4428ed13348..5e2c3ca0532 100644
--- a/sys/arch/mvme88k/include/cmmu.h
+++ b/sys/arch/mvme88k/include/cmmu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmmu.h,v 1.10 2001/12/22 09:49:39 smurph Exp $ */
+/*	$OpenBSD: cmmu.h,v 1.11 2002/03/14 01:26:39 millert Exp $ */
 /* 
  * Mach Operating System
  * Copyright (c) 1993-1992 Carnegie Mellon University
@@ -77,38 +77,38 @@ extern struct simplelock cmmu_cpu_lock;
 
 /* machine dependant cmmu function pointer structure */
 struct cmmu_p {
-	void (*cmmu_init_func) __P((void));
-	void (*show_apr_func) __P((unsigned));
-	void (*setup_board_config_func) __P((void));
-	void (*setup_cmmu_config_func) __P((void));
-	void (*cmmu_dump_config_func) __P((void));
-	void (*cpu_configuration_print_func) __P((int));
-	void (*cmmu_shutdown_now_func) __P((void));
-	void (*cmmu_parity_enable_func) __P((void));
-	unsigned (*cmmu_cpu_number_func) __P((void));
-	unsigned (*cmmu_get_idr_func) __P((unsigned));
-	void (*cmmu_set_sapr_func) __P((unsigned));
-	void (*cmmu_remote_set_sapr_func) __P((unsigned, unsigned));
-	void (*cmmu_set_uapr_func) __P((unsigned));
-	void (*cmmu_set_batc_entry_func) __P((unsigned, unsigned, unsigned, unsigned));
-	void (*cmmu_set_pair_batc_entry_func) __P((unsigned, unsigned, unsigned));
-	void (*cmmu_flush_remote_tlb_func) __P((unsigned, unsigned, vm_offset_t, int));
-	void (*cmmu_flush_tlb_func) __P((unsigned, vm_offset_t, int));
-	void (*cmmu_pmap_activate_func) __P((unsigned, unsigned,
+	void (*cmmu_init_func)(void);
+	void (*show_apr_func)(unsigned);
+	void (*setup_board_config_func)(void);
+	void (*setup_cmmu_config_func)(void);
+	void (*cmmu_dump_config_func)(void);
+	void (*cpu_configuration_print_func)(int);
+	void (*cmmu_shutdown_now_func)(void);
+	void (*cmmu_parity_enable_func)(void);
+	unsigned (*cmmu_cpu_number_func)(void);
+	unsigned (*cmmu_get_idr_func)(unsigned);
+	void (*cmmu_set_sapr_func)(unsigned);
+	void (*cmmu_remote_set_sapr_func)(unsigned, unsigned);
+	void (*cmmu_set_uapr_func)(unsigned);
+	void (*cmmu_set_batc_entry_func)(unsigned, unsigned, unsigned, unsigned);
+	void (*cmmu_set_pair_batc_entry_func)(unsigned, unsigned, unsigned);
+	void (*cmmu_flush_remote_tlb_func)(unsigned, unsigned, vm_offset_t, int);
+	void (*cmmu_flush_tlb_func)(unsigned, vm_offset_t, int);
+	void (*cmmu_pmap_activate_func)(unsigned, unsigned,
 					     batc_template_t i_batc[BATC_MAX],
-					     batc_template_t d_batc[BATC_MAX]));
-	void (*cmmu_flush_remote_cache_func) __P((int, vm_offset_t, int));
-	void (*cmmu_flush_cache_func) __P((vm_offset_t, int));
-	void (*cmmu_flush_remote_inst_cache_func) __P((int, vm_offset_t, int));
-	void (*cmmu_flush_inst_cache_func) __P((vm_offset_t, int));
-	void (*cmmu_flush_remote_data_cache_func) __P((int, vm_offset_t, int));
-	void (*cmmu_flush_data_cache_func) __P((vm_offset_t, int));
-	void (*dma_cachectl_func) __P((vm_offset_t, int, int));
+					     batc_template_t d_batc[BATC_MAX]);
+	void (*cmmu_flush_remote_cache_func)(int, vm_offset_t, int);
+	void (*cmmu_flush_cache_func)(vm_offset_t, int);
+	void (*cmmu_flush_remote_inst_cache_func)(int, vm_offset_t, int);
+	void (*cmmu_flush_inst_cache_func)(vm_offset_t, int);
+	void (*cmmu_flush_remote_data_cache_func)(int, vm_offset_t, int);
+	void (*cmmu_flush_data_cache_func)(vm_offset_t, int);
+	void (*dma_cachectl_func)(vm_offset_t, int, int);
 #ifdef DDB
-	unsigned (*cmmu_get_by_mode_func) __P((int, int));
-	void (*cmmu_show_translation_func) __P((unsigned, unsigned, unsigned, int));
-	void (*cmmu_cache_state_func) __P((unsigned, unsigned));
-	void (*show_cmmu_info_func) __P((unsigned));
+	unsigned (*cmmu_get_by_mode_func)(int, int);
+	void (*cmmu_show_translation_func)(unsigned, unsigned, unsigned, int);
+	void (*cmmu_cache_state_func)(unsigned, unsigned);
+	void (*show_cmmu_info_func)(unsigned);
 #endif /* end if DDB */
 };
 
diff --git a/sys/arch/mvme88k/include/cpu.h b/sys/arch/mvme88k/include/cpu.h
index d5b62027ba3..11481c03263 100644
--- a/sys/arch/mvme88k/include/cpu.h
+++ b/sys/arch/mvme88k/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.17 2002/01/14 21:34:41 miod Exp $ */
+/*	$OpenBSD: cpu.h,v 1.18 2002/03/14 01:26:39 millert Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1992, 1993
@@ -150,14 +150,14 @@ extern int	want_resched;		/* resched() was called */
 #define	signotify(p)		(want_ast = 1)
 
 struct intrhand {
-	int	(*ih_fn) __P((void *));
+	int	(*ih_fn)(void *);
 	void	*ih_arg;
 	int	ih_ipl;
 	int	ih_wantframe;
 	struct	intrhand *ih_next;
 };
 
-int	intr_establish __P((int vec, struct intrhand *));
+int	intr_establish(int vec, struct intrhand *);
 
 /*
  * return values for intr_establish()
@@ -186,11 +186,11 @@ struct switchframe {
 
 /* This struct defines the machine dependant pointers */
 struct md_p {
-	void (*clock_init_func) __P((void));      /* interval clock init function */
-	void (*statclock_init_func) __P((void));  /* statistics clock init function */
-	void (*delayclock_init_func) __P((void)); /* delay clock init function */
-	void (*delay_func) __P((void));           /* delay clock function */
-	void (*interrupt_func) __P((u_int, struct m88100_saved_state *));       /* interrupt func */
+	void (*clock_init_func)(void);      /* interval clock init function */
+	void (*statclock_init_func)(void);  /* statistics clock init function */
+	void (*delayclock_init_func)(void); /* delay clock init function */
+	void (*delay_func)(void);           /* delay clock function */
+	void (*interrupt_func)(u_int, struct m88100_saved_state *);       /* interrupt func */
 	u_char *volatile intr_mask;
 	u_char *volatile intr_ipl;
 	u_char *volatile intr_src;
@@ -199,8 +199,8 @@ struct md_p {
 extern struct md_p md;
 
 
-int badvaddr __P((vm_offset_t va, int size));
-void nmihand __P((void *framep));
+int badvaddr(vm_offset_t va, int size);
+void nmihand(void *framep);
 
 #endif /* _KERNEL */
 #endif /* __MACHINE_CPU_H__ */
diff --git a/sys/arch/mvme88k/include/cpu_number.h b/sys/arch/mvme88k/include/cpu_number.h
index 7744fc4d8ed..afe5c25416d 100644
--- a/sys/arch/mvme88k/include/cpu_number.h
+++ b/sys/arch/mvme88k/include/cpu_number.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu_number.h,v 1.9 2001/12/19 07:04:41 smurph Exp $	*/
+/*	$OpenBSD: cpu_number.h,v 1.10 2002/03/14 01:26:39 millert Exp $	*/
 
 /* 
  * Mach Operating System
@@ -34,7 +34,7 @@
 #include <machine/param.h>
 extern unsigned number_cpus;
 
-static unsigned cpu_number __P((void));
+static unsigned cpu_number(void);
 
 static __inline__ unsigned cpu_number(void)
 {
diff --git a/sys/arch/mvme88k/include/db_machdep.h b/sys/arch/mvme88k/include/db_machdep.h
index 286f136553a..0cb1ce46d6f 100644
--- a/sys/arch/mvme88k/include/db_machdep.h
+++ b/sys/arch/mvme88k/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.19 2001/12/22 08:31:05 smurph Exp $ */
+/*	$OpenBSD: db_machdep.h,v 1.20 2002/03/14 01:26:39 millert Exp $ */
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -116,15 +116,15 @@ extern int quiet_db_read_bytes;
 /*#define	cngetc		db_getc*/
 /*#define	cnputc		db_putc*/
 
-unsigned inst_load __P((unsigned));
-unsigned inst_store __P((unsigned));
-boolean_t inst_branch __P((unsigned));
-db_addr_t next_instr_address __P((db_addr_t, unsigned));
+unsigned inst_load(unsigned);
+unsigned inst_store(unsigned);
+boolean_t inst_branch(unsigned);
+db_addr_t next_instr_address(db_addr_t, unsigned);
 db_addr_t branch_taken __P((u_int, db_addr_t,
-			    db_expr_t (*) __P((db_regs_t *, int)),
+			    db_expr_t (*)(db_regs_t *, int),
 			    db_regs_t *));
-int ddb_break_trap __P((int type, db_regs_t *eframe));
-int ddb_entry_trap __P((int level, db_regs_t *eframe));
+int ddb_break_trap(int type, db_regs_t *eframe);
+int ddb_entry_trap(int level, db_regs_t *eframe);
 
 /* breakpoint/watchpoint foo */
 #define IS_BREAKPOINT_TRAP(type,code) ((type)==T_KDB_BREAK)
@@ -138,9 +138,9 @@ int ddb_entry_trap __P((int level, db_regs_t *eframe));
 #define DB_NO_COFF 1
 
 #ifdef INTERNAL_SSTEP
-extern register_t getreg_val __P((db_regs_t *, int));
-void db_set_single_step __P((register db_regs_t *));
-void db_clear_single_step __P((register db_regs_t *));
+extern register_t getreg_val(db_regs_t *, int);
+void db_set_single_step(register db_regs_t *);
+void db_clear_single_step(register db_regs_t *);
 #else
 /* need software single step */
 #define SOFTWARE_SSTEP 1 /* we need this for mc88100 */
@@ -200,7 +200,7 @@ void db_clear_single_step __P((register db_regs_t *));
 
 #define	db_printf_enter	db_printing
 
-int m88k_print_instruction __P((unsigned iadr, long inst));
+int m88k_print_instruction(unsigned iadr, long inst);
 
 #endif	/* _LOCORE */
 
diff --git a/sys/arch/mvme88k/include/float.h b/sys/arch/mvme88k/include/float.h
index b082b29d064..12ca769eea8 100644
--- a/sys/arch/mvme88k/include/float.h
+++ b/sys/arch/mvme88k/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.5 2001/08/12 12:03:02 heko Exp $	*/
+/*	$OpenBSD: float.h,v 1.6 2002/03/14 01:26:39 millert Exp $	*/
 
 /*
  * Copyright (c) 1989 Regents of the University of California.
@@ -41,7 +41,7 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int __flt_rounds __P((void));
+int __flt_rounds(void);
 __END_DECLS
 
 #define FLT_RADIX	2		/* b */
diff --git a/sys/arch/mvme88k/include/intr.h b/sys/arch/mvme88k/include/intr.h
index c544bc10a04..1fd9dca3ea6 100644
--- a/sys/arch/mvme88k/include/intr.h
+++ b/sys/arch/mvme88k/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.7 2002/02/10 23:15:05 deraadt Exp $	*/
+/*	$OpenBSD: intr.h,v 1.8 2002/03/14 01:26:39 millert Exp $	*/
 /*
  * Copyright (C) 2000 Steve Murphree, Jr.
  * All rights reserved.
@@ -82,11 +82,11 @@ extern int intrcnt[M88K_NIRQ];
 
 #ifdef _KERNEL
 #ifndef _LOCORE
-unsigned setipl __P((unsigned level));
+unsigned setipl(unsigned level);
 #ifdef DDB
-unsigned db_setipl __P((unsigned level));
+unsigned db_setipl(unsigned level);
 #endif 
-int spl0 __P((void));
+int spl0(void);
 #endif /* _LOCORE */
 
 /* needs major cleanup - XXX nivas */
diff --git a/sys/arch/mvme88k/include/locore.h b/sys/arch/mvme88k/include/locore.h
index d90cc9d32ed..cd6edf459ca 100644
--- a/sys/arch/mvme88k/include/locore.h
+++ b/sys/arch/mvme88k/include/locore.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.h,v 1.15 2002/01/14 21:34:41 miod Exp $	*/
+/*	$OpenBSD: locore.h,v 1.16 2002/03/14 01:26:39 millert Exp $	*/
 
 #ifndef _MACHINE_LOCORE_H_
 #define _MACHINE_LOCORE_H_
@@ -11,99 +11,99 @@
 
 /* locore_asm_routines.S */
 
-unsigned int do_load_word __P((vm_offset_t address,
-    boolean_t supervisor_mode));
-unsigned int do_load_half __P((vm_offset_t address,
-    boolean_t supervisor_mode));
-unsigned int do_load_byte __P((vm_offset_t address,
-    boolean_t supervisor_mode));
-
-void do_store_word __P((vm_offset_t address, unsigned int data,
-    boolean_t supervisor_mode));
-void do_store_half __P((vm_offset_t address, unsigned int data,
-    boolean_t supervisor_mode));
-void do_store_byte __P((vm_offset_t address, unsigned int data,
-    boolean_t supervisor_mode));
-
-unsigned do_xmem_word __P((vm_offset_t address, unsigned int data,
-    boolean_t supervisor_mode));
-unsigned do_xmem_byte __P((vm_offset_t address, unsigned int data,
-    boolean_t supervisor_mode));
-
-unsigned read_processor_identification_register __P((void));
-int badaddr __P((vm_offset_t addr, int size));
+unsigned int do_load_word(vm_offset_t address,
+    boolean_t supervisor_mode);
+unsigned int do_load_half(vm_offset_t address,
+    boolean_t supervisor_mode);
+unsigned int do_load_byte(vm_offset_t address,
+    boolean_t supervisor_mode);
+
+void do_store_word(vm_offset_t address, unsigned int data,
+    boolean_t supervisor_mode);
+void do_store_half(vm_offset_t address, unsigned int data,
+    boolean_t supervisor_mode);
+void do_store_byte(vm_offset_t address, unsigned int data,
+    boolean_t supervisor_mode);
+
+unsigned do_xmem_word(vm_offset_t address, unsigned int data,
+    boolean_t supervisor_mode);
+unsigned do_xmem_byte(vm_offset_t address, unsigned int data,
+    boolean_t supervisor_mode);
+
+unsigned read_processor_identification_register(void);
+int badaddr(vm_offset_t addr, int size);
 #define badwordaddr(x) badaddr(x, 4)
-void set_cpu_number __P((unsigned number));
-void doboot __P((void));
-int db_are_interrupts_disabled __P((void));
+void set_cpu_number(unsigned number);
+void doboot(void);
+int db_are_interrupts_disabled(void);
 
-void fubail __P((void));
-void subail __P((void));
+void fubail(void);
+void subail(void);
 
-int guarded_access __P((unsigned char *volatile address,
-    unsigned len, u_char *vec));
+int guarded_access(unsigned char *volatile address,
+    unsigned len, u_char *vec);
 
 /* locore_c_routines.c */
 
 #ifdef M88100
-void dae_print __P((unsigned *eframe));
-void data_access_emulation __P((unsigned *eframe));
+void dae_print(unsigned *eframe);
+void data_access_emulation(unsigned *eframe);
 #endif 
 
-unsigned spl __P((void));
-unsigned getipl __P((void));
+unsigned spl(void);
+unsigned getipl(void);
 #ifdef DDB
-unsigned db_spl __P((void));
-unsigned db_getipl __P((void));
+unsigned db_spl(void);
+unsigned db_getipl(void);
 #endif
 
 
 /* machdep.c */
 
-void _doboot __P((void));
-vm_offset_t get_slave_stack __P((void));
-void slave_pre_main __P((void));
-int slave_main __P((void));
-int intr_findvec __P((int start, int end));
-void bugsyscall __P((void));
-void myetheraddr __P((u_char *cp));
-void dosoftint __P((void));
-void MY_info __P((struct trapframe *f, caddr_t p, int flags, char *s));
-void MY_info_done __P((struct trapframe *f, int flags));
-void mvme_bootstrap __P((void));
+void _doboot(void);
+vm_offset_t get_slave_stack(void);
+void slave_pre_main(void);
+int slave_main(void);
+int intr_findvec(int start, int end);
+void bugsyscall(void);
+void myetheraddr(u_char *cp);
+void dosoftint(void);
+void MY_info(struct trapframe *f, caddr_t p, int flags, char *s);
+void MY_info_done(struct trapframe *f, int flags);
+void mvme_bootstrap(void);
 #ifdef MVME187
-void m187_ext_int __P((u_int v, struct m88100_saved_state *eframe));
+void m187_ext_int(u_int v, struct m88100_saved_state *eframe);
 #endif
 #ifdef MVME188
-void m188_reset __P((void));
-void m188_ext_int __P((u_int v, struct m88100_saved_state *eframe));
-unsigned int safe_level __P((unsigned mask, unsigned curlevel));
+void m188_reset(void);
+void m188_ext_int(u_int v, struct m88100_saved_state *eframe);
+unsigned int safe_level(unsigned mask, unsigned curlevel);
 #endif
 #ifdef MVME197
-void m197_ext_int __P((u_int v, struct m88100_saved_state *eframe));
+void m197_ext_int(u_int v, struct m88100_saved_state *eframe);
 #endif
 
 /* eh.S */
 
 struct proc;
-void proc_do_uret __P((struct proc *));
+void proc_do_uret(struct proc *);
 #ifdef M88100
-void sigsys __P((void));
-void sigtrap __P((void));
-void stepbpt __P((void));
-void userbpt __P((void));
-void syscall_handler __P((void));
+void sigsys(void);
+void sigtrap(void);
+void stepbpt(void);
+void userbpt(void);
+void syscall_handler(void);
 #endif 
 #ifdef M88110
-void m88110_sigsys __P((void));
-void m88110_sigtrap __P((void));
-void m88110_stepbpt __P((void));
-void m88110_userbpt __P((void));
-void m88110_syscall_handler __P((void));
+void m88110_sigsys(void);
+void m88110_sigtrap(void);
+void m88110_stepbpt(void);
+void m88110_userbpt(void);
+void m88110_syscall_handler(void);
 #endif 
 
 /* process.S */
-void savectx __P((struct pcb *));
-void switch_exit __P((struct proc *));
+void savectx(struct pcb *);
+void switch_exit(struct proc *);
 
 #endif /* _MACHINE_LOCORE_H_ */
diff --git a/sys/arch/mvme88k/include/m88110.h b/sys/arch/mvme88k/include/m88110.h
index 2190b51aa25..d2ec14e6e19 100644
--- a/sys/arch/mvme88k/include/m88110.h
+++ b/sys/arch/mvme88k/include/m88110.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m88110.h,v 1.11 2001/12/22 09:49:39 smurph Exp $ */
+/*	$OpenBSD: m88110.h,v 1.12 2002/03/14 01:26:39 millert Exp $ */
 
 #ifndef	__MACHINE_M88110_H__
 #define	__MACHINE_M88110_H__
@@ -143,94 +143,94 @@
 /*
  * Prototypes from "mvme88k/mvme88k/m88110_cmmu.c"
  */
-void m88110_show_apr __P((unsigned));
-void m88110_show_sctr __P((unsigned));
-void m88110_setup_board_config __P((void));
-void m88110_setup_cmmu_config __P((void));
-void m88110_cmmu_dump_config __P((void));
-void m88110_cpu_configuration_print __P((int));
-void m88110_cmmu_shutdown_now __P((void));
-void m88110_cmmu_parity_enable __P((void));
-unsigned m88110_cmmu_cpu_number __P((void));
-unsigned m88110_cmmu_get_idr __P((unsigned));
-void m88110_cmmu_set_sapr __P((unsigned));
-void m88110_cmmu_remote_set_sapr __P((unsigned, unsigned));
-void m88110_cmmu_set_uapr __P((unsigned));
-void m88110_cmmu_set_batc_entry __P((unsigned, unsigned, unsigned, unsigned));
-void m88110_cmmu_set_pair_batc_entry __P((unsigned, unsigned, unsigned));
-void m88110_cmmu_flush_remote_tlb __P((unsigned, unsigned, vm_offset_t, int));
-void m88110_cmmu_flush_tlb __P((unsigned, vm_offset_t, int));
-void m88110_cmmu_pmap_activate __P((unsigned, unsigned, 
+void m88110_show_apr(unsigned);
+void m88110_show_sctr(unsigned);
+void m88110_setup_board_config(void);
+void m88110_setup_cmmu_config(void);
+void m88110_cmmu_dump_config(void);
+void m88110_cpu_configuration_print(int);
+void m88110_cmmu_shutdown_now(void);
+void m88110_cmmu_parity_enable(void);
+unsigned m88110_cmmu_cpu_number(void);
+unsigned m88110_cmmu_get_idr(unsigned);
+void m88110_cmmu_set_sapr(unsigned);
+void m88110_cmmu_remote_set_sapr(unsigned, unsigned);
+void m88110_cmmu_set_uapr(unsigned);
+void m88110_cmmu_set_batc_entry(unsigned, unsigned, unsigned, unsigned);
+void m88110_cmmu_set_pair_batc_entry(unsigned, unsigned, unsigned);
+void m88110_cmmu_flush_remote_tlb(unsigned, unsigned, vm_offset_t, int);
+void m88110_cmmu_flush_tlb(unsigned, vm_offset_t, int);
+void m88110_cmmu_pmap_activate(unsigned, unsigned, 
 				  batc_template_t i_batc[BATC_MAX],
-				  batc_template_t d_batc[BATC_MAX]));
-void m88110_cmmu_flush_remote_cache __P((int, vm_offset_t, int));
-void m88110_cmmu_flush_cache __P((vm_offset_t, int));
-void m88110_cmmu_flush_remote_inst_cache __P((int, vm_offset_t, int));
-void m88110_cmmu_flush_inst_cache __P((vm_offset_t, int));
-void m88110_cmmu_flush_remote_data_cache __P((int, vm_offset_t, int));
-void m88110_cmmu_flush_data_cache __P((vm_offset_t, int));
-void m88110_dma_cachectl __P((vm_offset_t, int, int));
+				  batc_template_t d_batc[BATC_MAX]);
+void m88110_cmmu_flush_remote_cache(int, vm_offset_t, int);
+void m88110_cmmu_flush_cache(vm_offset_t, int);
+void m88110_cmmu_flush_remote_inst_cache(int, vm_offset_t, int);
+void m88110_cmmu_flush_inst_cache(vm_offset_t, int);
+void m88110_cmmu_flush_remote_data_cache(int, vm_offset_t, int);
+void m88110_cmmu_flush_data_cache(vm_offset_t, int);
+void m88110_dma_cachectl(vm_offset_t, int, int);
 
 #if DDB
-unsigned m88110_cmmu_get_by_mode __P((int, int));
-void m88110_cmmu_show_translation __P((unsigned, unsigned, unsigned, int));
-void m88110_cmmu_cache_state __P((unsigned, unsigned));
-void m88110_show_cmmu_info __P((unsigned));
+unsigned m88110_cmmu_get_by_mode(int, int);
+void m88110_cmmu_show_translation(unsigned, unsigned, unsigned, int);
+void m88110_cmmu_cache_state(unsigned, unsigned);
+void m88110_show_cmmu_info(unsigned);
 #endif
 
-void m88110_cmmu_init __P((void));
-int m88110_table_search __P((pmap_t, vm_offset_t, int, int, int));
-
-void set_icmd __P((unsigned value));
-void set_ictl __P((unsigned value));
-void set_isar __P((unsigned value));
-void set_isap __P((unsigned value));
-void set_iuap __P((unsigned value));
-void set_iir  __P((unsigned value));
-void set_ibp  __P((unsigned value));
-void set_ippu __P((unsigned value));
-void set_ippl __P((unsigned value));
-void set_isr  __P((unsigned value));
-void set_ilar __P((unsigned value));
-void set_ipar __P((unsigned value));
-void set_dcmd __P((unsigned value));
-void set_dctl __P((unsigned value));
-void set_dsar __P((unsigned value));
-void set_dsap __P((unsigned value));
-void set_duap __P((unsigned value));
-void set_dir  __P((unsigned value));
-void set_dbp  __P((unsigned value));
-void set_dppu __P((unsigned value));
-void set_dppl __P((unsigned value));
-void set_dsr  __P((unsigned value));
-void set_dlar __P((unsigned value));
-void set_dpar __P((unsigned value));
+void m88110_cmmu_init(void);
+int m88110_table_search(pmap_t, vm_offset_t, int, int, int);
+
+void set_icmd(unsigned value);
+void set_ictl(unsigned value);
+void set_isar(unsigned value);
+void set_isap(unsigned value);
+void set_iuap(unsigned value);
+void set_iir(unsigned value);
+void set_ibp(unsigned value);
+void set_ippu(unsigned value);
+void set_ippl(unsigned value);
+void set_isr(unsigned value);
+void set_ilar(unsigned value);
+void set_ipar(unsigned value);
+void set_dcmd(unsigned value);
+void set_dctl(unsigned value);
+void set_dsar(unsigned value);
+void set_dsap(unsigned value);
+void set_duap(unsigned value);
+void set_dir(unsigned value);
+void set_dbp(unsigned value);
+void set_dppu(unsigned value);
+void set_dppl(unsigned value);
+void set_dsr(unsigned value);
+void set_dlar(unsigned value);
+void set_dpar(unsigned value);
 
 /* get routines */
-unsigned get_icmd __P((void));
-unsigned get_ictl __P((void));
-unsigned get_isar __P((void));
-unsigned get_isap __P((void));
-unsigned get_iuap __P((void));
-unsigned get_iir  __P((void));
-unsigned get_ibp  __P((void));
-unsigned get_ippu __P((void));
-unsigned get_ippl __P((void));
-unsigned get_isr  __P((void));
-unsigned get_ilar __P((void));
-unsigned get_ipar __P((void));
-unsigned get_dcmd __P((void));
-unsigned get_dctl __P((void));
-unsigned get_dsar __P((void));
-unsigned get_dsap __P((void));
-unsigned get_duap __P((void));
-unsigned get_dir  __P((void));
-unsigned get_dbp  __P((void));
-unsigned get_dppu __P((void));
-unsigned get_dppl __P((void));
-unsigned get_dsr  __P((void));
-unsigned get_dlar __P((void));
-unsigned get_dpar __P((void));
+unsigned get_icmd(void);
+unsigned get_ictl(void);
+unsigned get_isar(void);
+unsigned get_isap(void);
+unsigned get_iuap(void);
+unsigned get_iir(void);
+unsigned get_ibp(void);
+unsigned get_ippu(void);
+unsigned get_ippl(void);
+unsigned get_isr(void);
+unsigned get_ilar(void);
+unsigned get_ipar(void);
+unsigned get_dcmd(void);
+unsigned get_dctl(void);
+unsigned get_dsar(void);
+unsigned get_dsap(void);
+unsigned get_duap(void);
+unsigned get_dir(void);
+unsigned get_dbp(void);
+unsigned get_dppu(void);
+unsigned get_dppl(void);
+unsigned get_dsr(void);
+unsigned get_dlar(void);
+unsigned get_dpar(void);
 
 /* Cache inlines */
 
diff --git a/sys/arch/mvme88k/include/m8820x.h b/sys/arch/mvme88k/include/m8820x.h
index 64535a472dc..e30ffcee6c2 100644
--- a/sys/arch/mvme88k/include/m8820x.h
+++ b/sys/arch/mvme88k/include/m8820x.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m8820x.h,v 1.5 2001/12/22 09:49:39 smurph Exp $ */
+/*	$OpenBSD: m8820x.h,v 1.6 2002/03/14 01:26:39 millert Exp $ */
 /* 
  * Mach Operating System
  * Copyright (c) 1993-1992 Carnegie Mellon University
@@ -128,41 +128,41 @@
 /*
  * Prototypes from "mvme88k/mvme88k/m8820x.c"
  */
-void m8820x_show_apr __P((unsigned));
-void m8820x_setup_board_config __P((void));
-void m8820x_setup_cmmu_config __P((void));
-void m8820x_cmmu_dump_config __P((void));
-void m8820x_cpu_configuration_print __P((int));
-void m8820x_cmmu_shutdown_now __P((void));
-void m8820x_cmmu_parity_enable __P((void));
-unsigned m8820x_cmmu_cpu_number __P((void));
-unsigned m8820x_cmmu_get_idr __P((unsigned));
-void m8820x_cmmu_set_sapr __P((unsigned));
-void m8820x_cmmu_remote_set_sapr __P((unsigned, unsigned));
-void m8820x_cmmu_set_uapr __P((unsigned));
-void m8820x_cmmu_set_batc_entry __P((unsigned, unsigned, unsigned, unsigned));
-void m8820x_cmmu_set_pair_batc_entry __P((unsigned, unsigned, unsigned));
-void m8820x_cmmu_flush_remote_tlb __P((unsigned, unsigned, vm_offset_t, int));
-void m8820x_cmmu_flush_tlb __P((unsigned, vm_offset_t, int));
-void m8820x_cmmu_pmap_activate __P((unsigned, unsigned, 
+void m8820x_show_apr(unsigned);
+void m8820x_setup_board_config(void);
+void m8820x_setup_cmmu_config(void);
+void m8820x_cmmu_dump_config(void);
+void m8820x_cpu_configuration_print(int);
+void m8820x_cmmu_shutdown_now(void);
+void m8820x_cmmu_parity_enable(void);
+unsigned m8820x_cmmu_cpu_number(void);
+unsigned m8820x_cmmu_get_idr(unsigned);
+void m8820x_cmmu_set_sapr(unsigned);
+void m8820x_cmmu_remote_set_sapr(unsigned, unsigned);
+void m8820x_cmmu_set_uapr(unsigned);
+void m8820x_cmmu_set_batc_entry(unsigned, unsigned, unsigned, unsigned);
+void m8820x_cmmu_set_pair_batc_entry(unsigned, unsigned, unsigned);
+void m8820x_cmmu_flush_remote_tlb(unsigned, unsigned, vm_offset_t, int);
+void m8820x_cmmu_flush_tlb(unsigned, vm_offset_t, int);
+void m8820x_cmmu_pmap_activate(unsigned, unsigned, 
     batc_template_t i_batc[BATC_MAX],
-				  batc_template_t d_batc[BATC_MAX]));
-void m8820x_cmmu_flush_remote_cache __P((int, vm_offset_t, int));
-void m8820x_cmmu_flush_cache __P((vm_offset_t, int));
-void m8820x_cmmu_flush_remote_inst_cache __P((int, vm_offset_t, int));
-void m8820x_cmmu_flush_inst_cache __P((vm_offset_t, int));
-void m8820x_cmmu_flush_remote_data_cache __P((int, vm_offset_t, int));
-void m8820x_cmmu_flush_data_cache __P((vm_offset_t, int));
-void m8820x_dma_cachectl __P((vm_offset_t, int, int));
+				  batc_template_t d_batc[BATC_MAX]);
+void m8820x_cmmu_flush_remote_cache(int, vm_offset_t, int);
+void m8820x_cmmu_flush_cache(vm_offset_t, int);
+void m8820x_cmmu_flush_remote_inst_cache(int, vm_offset_t, int);
+void m8820x_cmmu_flush_inst_cache(vm_offset_t, int);
+void m8820x_cmmu_flush_remote_data_cache(int, vm_offset_t, int);
+void m8820x_cmmu_flush_data_cache(vm_offset_t, int);
+void m8820x_dma_cachectl(vm_offset_t, int, int);
 
 #if DDB
-unsigned m8820x_cmmu_get_by_mode __P((int, int));
-void m8820x_cmmu_show_translation __P((unsigned, unsigned, unsigned, int));
-void m8820x_cmmu_cache_state __P((unsigned, unsigned));
-void m8820x_show_cmmu_info __P((unsigned));
+unsigned m8820x_cmmu_get_by_mode(int, int);
+void m8820x_cmmu_show_translation(unsigned, unsigned, unsigned, int);
+void m8820x_cmmu_cache_state(unsigned, unsigned);
+void m8820x_show_cmmu_info(unsigned);
 #endif 
 
-void m8820x_cmmu_init __P((void));
+void m8820x_cmmu_init(void);
 
 #endif	/* _LOCORE */
 
diff --git a/sys/arch/mvme88k/include/mmu.h b/sys/arch/mvme88k/include/mmu.h
index a59fb8eebcc..5754b0d8641 100644
--- a/sys/arch/mvme88k/include/mmu.h
+++ b/sys/arch/mvme88k/include/mmu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mmu.h,v 1.16 2001/12/24 04:12:37 miod Exp $ */
+/*	$OpenBSD: mmu.h,v 1.17 2002/03/14 01:26:39 millert Exp $ */
 
 /*
  * This file bears almost no resemblance to the original m68k file,
@@ -265,7 +265,7 @@ typedef	u_int32_t	pt_ind_entry_t;
 #define DMA_CACHE_SYNC_INVAL	0x2
 #define DMA_CACHE_INV		0x3
 
-void dma_cachectl __P((vm_offset_t, int, int));
+void dma_cachectl(vm_offset_t, int, int);
 
 /*
  * Alignment checks for pages (must lie on page boundaries).
@@ -276,7 +276,7 @@ void dma_cachectl __P((vm_offset_t, int, int));
     if (!PAGE_ALIGNED(ad))		\
     	printf("%s: addr  %x not page aligned.\n", who, ad)
 
-unsigned invalidate_pte __P((pt_entry_t *));
+unsigned invalidate_pte(pt_entry_t *);
 
 extern vm_offset_t kmapva;
 
@@ -284,7 +284,7 @@ extern vm_offset_t kmapva;
 	((pt_entry_t *)(PG_PFNUM(*((sdt_entry_t *)kmapva + \
 	    SDTIDX(va) + SDT_ENTRIES)) << PDT_SHIFT) + PDTIDX(va))
 
-u_int kvtop __P((vm_offset_t));
+u_int kvtop(vm_offset_t);
 
 #endif /* __MACHINE_MMU_H__ */
 
diff --git a/sys/arch/mvme88k/include/param.h b/sys/arch/mvme88k/include/param.h
index ca85f79244e..5a8ed66f9c3 100644
--- a/sys/arch/mvme88k/include/param.h
+++ b/sys/arch/mvme88k/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.26 2001/12/19 07:04:41 smurph Exp $ */
+/*	$OpenBSD: param.h,v 1.27 2002/03/14 01:26:39 millert Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * Copyright (c) 1988 University of Utah.
@@ -169,7 +169,7 @@
 #include <machine/intr.h>
 
 #ifdef   _KERNEL
-extern int delay __P((int));
+extern int delay(int);
 #define  DELAY(x)             delay(x)
 
 extern int cputyp;
diff --git a/sys/arch/mvme88k/include/pmap.h b/sys/arch/mvme88k/include/pmap.h
index 1e0246cdfc8..71b0a667478 100644
--- a/sys/arch/mvme88k/include/pmap.h
+++ b/sys/arch/mvme88k/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.25 2002/02/05 22:52:48 miod Exp $ */
+/*	$OpenBSD: pmap.h,v 1.26 2002/03/14 01:26:39 millert Exp $ */
 /*
  * Mach Operating System
  * Copyright (c) 1991 Carnegie Mellon University
@@ -80,8 +80,8 @@ extern	caddr_t		vmmap;
 #define PMAP_ACTIVATE(proc)	pmap_activate(proc)
 #define PMAP_DEACTIVATE(proc)	pmap_deactivate(proc)
 
-void pmap_bootstrap __P((vaddr_t, paddr_t *, paddr_t *, vaddr_t *, vaddr_t *));
-void pmap_cache_ctrl __P((pmap_t, vaddr_t, vaddr_t, unsigned));
+void pmap_bootstrap(vaddr_t, paddr_t *, paddr_t *, vaddr_t *, vaddr_t *);
+void pmap_cache_ctrl(pmap_t, vaddr_t, vaddr_t, unsigned);
 
 #endif	/* _KERNEL */
 
diff --git a/sys/arch/mvme88k/include/pmap_table.h b/sys/arch/mvme88k/include/pmap_table.h
index d3dd661d0b1..4fb8c331ab7 100644
--- a/sys/arch/mvme88k/include/pmap_table.h
+++ b/sys/arch/mvme88k/include/pmap_table.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap_table.h,v 1.7 2001/08/12 12:03:02 heko Exp $ */
+/*	$OpenBSD: pmap_table.h,v 1.8 2002/03/14 01:26:39 millert Exp $ */
 /* 
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
@@ -44,6 +44,6 @@ typedef struct {
 
 typedef pmap_table_entry *pmap_table_t;
 
-pmap_table_t pmap_table_build __P((unsigned memory_size));
+pmap_table_t pmap_table_build(unsigned memory_size);
 #endif /* __MACHINE_PAMP_TABLE_H__ */
 
diff --git a/sys/arch/mvme88k/include/trap.h b/sys/arch/mvme88k/include/trap.h
index a03a119eaf3..702375ca1ad 100644
--- a/sys/arch/mvme88k/include/trap.h
+++ b/sys/arch/mvme88k/include/trap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.h,v 1.15 2001/12/22 17:57:11 smurph Exp $ */
+/*	$OpenBSD: trap.h,v 1.16 2002/03/14 01:26:39 millert Exp $ */
 /* 
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
@@ -73,29 +73,29 @@
 #define T_USER		29	/* user mode fault */
 
 #ifndef _LOCORE
-void panictrap		__P((int, struct m88100_saved_state *));
-void test_trap		__P((struct m88100_saved_state *));
-void error_fault	__P((struct m88100_saved_state *));
-void error_reset	__P((struct m88100_saved_state *));
-unsigned ss_get_value	__P((struct proc *, unsigned, int));
-int ss_put_value	__P((struct proc *, unsigned, unsigned, int));
+void panictrap(int, struct m88100_saved_state *);
+void test_trap(struct m88100_saved_state *);
+void error_fault(struct m88100_saved_state *);
+void error_reset(struct m88100_saved_state *);
+unsigned ss_get_value(struct proc *, unsigned, int);
+int ss_put_value(struct proc *, unsigned, unsigned, int);
 unsigned ss_branch_taken __P((unsigned, unsigned, 
-			      unsigned (*func) __P((unsigned int, struct trapframe *)),
+			      unsigned (*func)(unsigned int, struct trapframe *),
 			      struct trapframe *));  /* 'opaque' */
-unsigned ss_getreg_val	__P((unsigned, struct trapframe *));
-int ss_inst_branch	__P((unsigned));
-int ss_inst_delayed	__P((unsigned));
-unsigned ss_next_instr_address __P((struct proc *, unsigned, unsigned));
-int cpu_singlestep	__P((register struct proc *));
+unsigned ss_getreg_val(unsigned, struct trapframe *);
+int ss_inst_branch(unsigned);
+int ss_inst_delayed(unsigned);
+unsigned ss_next_instr_address(struct proc *, unsigned, unsigned);
+int cpu_singlestep(register struct proc *);
 
 #ifdef M88100
-void m88100_trap	__P((unsigned, struct m88100_saved_state *));
-void m88100_syscall	__P((register_t, struct m88100_saved_state *));
+void m88100_trap(unsigned, struct m88100_saved_state *);
+void m88100_syscall(register_t, struct m88100_saved_state *);
 #endif /* M88100 */
 
 #ifdef M88110
-void m88110_trap	__P((unsigned, struct m88100_saved_state *));
-void m88110_syscall	__P((register_t, struct m88100_saved_state *));
+void m88110_trap(unsigned, struct m88100_saved_state *);
+void m88110_syscall(register_t, struct m88100_saved_state *);
 #endif /* M88110 */
 
 #endif /* _LOCORE */