de __P of sys/arch/arm.

30 files changed, 601 insertions, 601 deletions

diff --git a/sys/arch/arm/arm/arm32_machdep.c b/sys/arch/arm/arm/arm32_machdep.c
index af49de21787..49ffa909a62 100644
--- a/sys/arch/arm/arm/arm32_machdep.c
+++ b/sys/arch/arm/arm/arm32_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arm32_machdep.c,v 1.4 2004/02/26 04:58:38 drahn Exp $	*/
+/*	$OpenBSD: arm32_machdep.c,v 1.5 2004/05/19 03:17:06 drahn Exp $	*/
 /*	$NetBSD: arm32_machdep.c,v 1.42 2003/12/30 12:33:15 pk Exp $	*/
 
 /*
@@ -123,9 +123,9 @@ int allowaperture = 0;
 
 /* Prototypes */
 
-void data_abort_handler		__P((trapframe_t *frame));
-void prefetch_abort_handler	__P((trapframe_t *frame));
-extern void configure		__P((void));
+void data_abort_handler		(trapframe_t *frame);
+void prefetch_abort_handler	(trapframe_t *frame);
+extern void configure		(void);
 
 /*
  * arm32_vector_init:
diff --git a/sys/arch/arm/arm/ast.c b/sys/arch/arm/arm/ast.c
index da700bf2873..55a3386e905 100644
--- a/sys/arch/arm/arm/ast.c
+++ b/sys/arch/arm/arm/ast.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ast.c,v 1.2 2004/02/23 19:09:57 drahn Exp $	*/
+/*	$OpenBSD: ast.c,v 1.3 2004/05/19 03:17:06 drahn Exp $	*/
 /*	$NetBSD: ast.c,v 1.6 2003/10/31 16:44:34 cl Exp $	*/
 
 /*
@@ -66,7 +66,7 @@
 /*
  * Prototypes
  */
-void ast __P((struct trapframe *));
+void ast (struct trapframe *);
  
 int want_resched = 0;
 extern int astpending;
diff --git a/sys/arch/arm/arm/cpufunc.c b/sys/arch/arm/arm/cpufunc.c
index 04e41f5dbeb..811bfa24632 100644
--- a/sys/arch/arm/arm/cpufunc.c
+++ b/sys/arch/arm/arm/cpufunc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpufunc.c,v 1.1 2004/02/01 05:09:48 drahn Exp $	*/
+/*	$OpenBSD: cpufunc.c,v 1.2 2004/05/19 03:17:06 drahn Exp $	*/
 /*	$NetBSD: cpufunc.c,v 1.65 2003/11/05 12:53:15 scw Exp $	*/
 
 /*
@@ -750,7 +750,7 @@ u_int cpu_reset_needs_v4_MMU_disable;	/* flag used in locore.s */
     defined (CPU_ARM10) || \
     defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \
     defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425)
-static void get_cachetype_cp15 __P((void));
+static void get_cachetype_cp15 (void);
 
 /* Additional cache information local to this file.  Log2 of some of the
    above numbers.  */
@@ -862,7 +862,7 @@ struct cachetab cachetab[] = {
     { 0, 0, 0, 0, 0, 0, 0, 0}
 };
 
-static void get_cachetype_table __P((void));
+static void get_cachetype_table (void);
 
 static void
 get_cachetype_table()
@@ -1538,7 +1538,7 @@ struct cpu_option {
 	int	co_value;
 };
 
-static u_int parse_cpu_options __P((char *, struct cpu_option *, u_int));
+static u_int parse_cpu_options (char *, struct cpu_option *, u_int);
 
 static u_int
 parse_cpu_options(args, optlist, cpuctrl)
diff --git a/sys/arch/arm/arm/db_trace.c b/sys/arch/arm/arm/db_trace.c
index e43d464ee19..00206ef7efc 100644
--- a/sys/arch/arm/arm/db_trace.c
+++ b/sys/arch/arm/arm/db_trace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_trace.c,v 1.1 2004/02/01 05:09:48 drahn Exp $	*/
+/*	$OpenBSD: db_trace.c,v 1.2 2004/05/19 03:17:07 drahn Exp $	*/
 /*	$NetBSD: db_trace.c,v 1.8 2003/01/17 22:28:48 thorpej Exp $	*/
 
 /* 
@@ -86,7 +86,7 @@ db_stack_trace_print(addr, have_addr, count, modif, pr)
 	int             have_addr;
 	db_expr_t       count;
 	char            *modif;
-	int		(*pr) __P((const char *, ...));
+	int		(*pr) (const char *, ...);
 {
 	u_int32_t	*frame, *lastframe;
 	char c, *cp = modif;
diff --git a/sys/arch/arm/arm/sys_machdep.c b/sys/arch/arm/arm/sys_machdep.c
index 48304011db4..db168071aca 100644
--- a/sys/arch/arm/arm/sys_machdep.c
+++ b/sys/arch/arm/arm/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_machdep.c,v 1.2 2004/02/01 06:10:33 drahn Exp $	*/
+/*	$OpenBSD: sys_machdep.c,v 1.3 2004/05/19 03:17:07 drahn Exp $	*/
 /*	$NetBSD: sys_machdep.c,v 1.6 2003/07/15 00:24:42 lukem Exp $	*/
 
 /*
@@ -53,8 +53,8 @@
 #include <machine/sysarch.h>
 
 /* Prototypes */
-static int arm32_sync_icache __P((struct proc *, char *, register_t *));
-static int arm32_drain_writebuf __P((struct proc *, char *, register_t *));
+static int arm32_sync_icache (struct proc *, char *, register_t *);
+static int arm32_drain_writebuf (struct proc *, char *, register_t *);
 
 static int
 arm32_sync_icache(p, args, retval)
diff --git a/sys/arch/arm/arm/vm_machdep.c b/sys/arch/arm/arm/vm_machdep.c
index 18d3f7cd3ba..ddbe16de979 100644
--- a/sys/arch/arm/arm/vm_machdep.c
+++ b/sys/arch/arm/arm/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.2 2004/02/01 06:10:33 drahn Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.3 2004/05/19 03:17:07 drahn Exp $	*/
 /*	$NetBSD: vm_machdep.c,v 1.31 2004/01/04 11:33:29 jdolecek Exp $	*/
 
 /*
@@ -70,12 +70,12 @@
 
 extern pv_addr_t systempage;
 
-int process_read_regs	__P((struct proc *p, struct reg *regs));
-int process_read_fpregs	__P((struct proc *p, struct fpreg *regs));
+int process_read_regs	(struct proc *p, struct reg *regs);
+int process_read_fpregs	(struct proc *p, struct fpreg *regs);
 
-void	switch_exit	__P((struct proc *p, struct proc *p0,
-			     void (*)(struct proc *)));
-extern void proc_trampoline	__P((void));
+void	switch_exit	(struct proc *p, struct proc *p0,
+			     void (*)(struct proc *));
+extern void proc_trampoline	(void);
 
 /*
  * Special compilation symbols:
@@ -126,7 +126,7 @@ cpu_fork(p1, p2, stack, stacksize, func, arg)
 	struct proc *p2;
 	void *stack;
 	size_t stacksize;
-	void (*func) __P((void *));
+	void (*func) (void *);
 	void *arg;
 {
 	struct pcb *pcb = (struct pcb *)&p2->p_addr->u_pcb;
diff --git a/sys/arch/arm/footbridge/footbridge.c b/sys/arch/arm/footbridge/footbridge.c
index b150a42f171..38a1197cffa 100644
--- a/sys/arch/arm/footbridge/footbridge.c
+++ b/sys/arch/arm/footbridge/footbridge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: footbridge.c,v 1.2 2004/02/23 05:23:17 drahn Exp $	*/
+/*	$OpenBSD: footbridge.c,v 1.3 2004/05/19 03:17:07 drahn Exp $	*/
 /*	$NetBSD: footbridge.c,v 1.7 2002/05/16 01:01:33 thorpej Exp $	*/
 
 /*
@@ -65,12 +65,12 @@
 
 /* Declare prototypes */
 
-static int footbridge_match	__P((struct device *parent, void *cf,
-	                             void *aux));
-static void footbridge_attach	__P((struct device *parent, struct device *self,
-        	                     void *aux));
-static int footbridge_print	__P((void *aux, const char *pnp));
-static int footbridge_intr	__P((void *arg));
+static int footbridge_match	(struct device *parent, void *cf,
+	                             void *aux);
+static void footbridge_attach	(struct device *parent, struct device *self,
+        	                     void *aux);
+static int footbridge_print	(void *aux, const char *pnp);
+static int footbridge_intr	(void *arg);
 
 /* Driver and attach structures */
 struct cfattach footbridge_ca = {
diff --git a/sys/arch/arm/footbridge/footbridge.h b/sys/arch/arm/footbridge/footbridge.h
index 3da3c6af1a4..bb833e1ff84 100644
--- a/sys/arch/arm/footbridge/footbridge.h
+++ b/sys/arch/arm/footbridge/footbridge.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: footbridge.h,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$OpenBSD: footbridge.h,v 1.2 2004/05/19 03:17:07 drahn Exp $	*/
 /*      $NetBSD: footbridge.h,v 1.2 2002/05/04 10:04:42 chris Exp $  */
 
 #ifndef _FOOTBRIDGE_H_
@@ -6,12 +6,12 @@
 
 #include <sys/termios.h>
 #include <arm/bus.h>
-void footbridge_pci_bs_tag_init __P((void));
-void footbridge_sa110_cc_setup	__P((void));
-void footbridge_create_io_bs_tag __P((struct bus_space *, void *));
-void footbridge_create_mem_bs_tag __P((struct bus_space *, void *));
-int fcomcnattach __P((u_int, int, tcflag_t));
-int fcomcndetach __P((void));
-void calibrate_delay __P((void));
+void footbridge_pci_bs_tag_init (void);
+void footbridge_sa110_cc_setup	(void);
+void footbridge_create_io_bs_tag (struct bus_space *, void *);
+void footbridge_create_mem_bs_tag (struct bus_space *, void *);
+int fcomcnattach (u_int, int, tcflag_t);
+int fcomcndetach (void);
+void calibrate_delay (void);
 
 #endif
diff --git a/sys/arch/arm/footbridge/footbridge_clock.c b/sys/arch/arm/footbridge/footbridge_clock.c
index 43596f03384..e2fd75b197c 100644
--- a/sys/arch/arm/footbridge/footbridge_clock.c
+++ b/sys/arch/arm/footbridge/footbridge_clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: footbridge_clock.c,v 1.2 2004/02/14 00:17:06 drahn Exp $	*/
+/*	$OpenBSD: footbridge_clock.c,v 1.3 2004/05/19 03:17:07 drahn Exp $	*/
 /*	$NetBSD: footbridge_clock.c,v 1.17 2003/03/23 14:12:25 chris Exp $	*/
 
 /*
@@ -57,9 +57,9 @@
 extern struct footbridge_softc *clock_sc;
 extern u_int dc21285_fclk;
 
-int clockhandler __P((void *));
-int statclockhandler __P((void *));
-static int load_timer __P((int, int));
+int clockhandler (void *);
+int statclockhandler (void *);
+static int load_timer (int, int);
 
 /*
  * Statistics clock variance, in usec.  Variance must be a
@@ -75,8 +75,8 @@ int statcountperusec;		/* number of ticks per usec at current stathz */
 int statprev;			/* last value of we set statclock to */
 
 #if 0
-static int clockmatch	__P((struct device *parent, struct cfdata *cf, void *aux));
-static void clockattach	__P((struct device *parent, struct device *self, void *aux));
+static int clockmatch	(struct device *parent, struct cfdata *cf, void *aux);
+static void clockattach	(struct device *parent, struct device *self, void *aux);
 
 CFATTACH_DECL(footbridge_clock, sizeof(struct clock_softc),
     clockmatch, clockattach, NULL, NULL);
diff --git a/sys/arch/arm/footbridge/footbridge_com.c b/sys/arch/arm/footbridge/footbridge_com.c
index d4c1ceadf96..79e9889131e 100644
--- a/sys/arch/arm/footbridge/footbridge_com.c
+++ b/sys/arch/arm/footbridge/footbridge_com.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: footbridge_com.c,v 1.2 2004/02/11 06:42:39 miod Exp $	*/
+/*	$OpenBSD: footbridge_com.c,v 1.3 2004/05/19 03:17:07 drahn Exp $	*/
 /*	$NetBSD: footbridge_com.c,v 1.13 2003/03/23 14:12:25 chris Exp $	*/
 
 /*-
@@ -96,19 +96,19 @@ struct fcom_softc {
 
 #define RX_BUFFER_SIZE	0x100
 
-static int  fcom_probe   __P((struct device *, void*, void *));
-static void fcom_attach  __P((struct device *, struct device *, void *));
-static void fcom_softintr __P((void *));
+static int  fcom_probe   (struct device *, void*, void *);
+static void fcom_attach  (struct device *, struct device *, void *);
+static void fcom_softintr (void *);
 
-static int fcom_rxintr __P((void *));
-/*static int fcom_txintr __P((void *));*/
+static int fcom_rxintr (void *);
+/*static int fcom_txintr (void *);*/
 
 /*struct consdev;*/
-/*void	fcomcnprobe	__P((struct consdev *));
-void	fcomcninit	__P((struct consdev *));*/
-int	fcomcngetc	__P((dev_t));
-void	fcomcnputc	__P((dev_t, int));
-void	fcomcnpollc	__P((dev_t, int));
+/*void	fcomcnprobe	(struct consdev *);
+void	fcomcninit	(struct consdev *);*/
+int	fcomcngetc	(dev_t);
+void	fcomcnputc	(dev_t, int);
+void	fcomcnpollc	(dev_t, int);
 
 struct cfattach fcom_ca = {
 	sizeof (struct fcom_softc), fcom_probe, fcom_attach
@@ -139,8 +139,8 @@ const struct cdevsw fcom_cdevsw = {
 };
 #endif
 
-void fcominit	 	__P((bus_space_tag_t, bus_space_handle_t, int, int));
-void fcominitcons 	__P((bus_space_tag_t, bus_space_handle_t));
+void fcominit	 	(bus_space_tag_t, bus_space_handle_t, int, int);
+void fcominitcons 	(bus_space_tag_t, bus_space_handle_t);
 
 bus_space_tag_t fcomconstag;
 bus_space_handle_t fcomconsioh;
@@ -227,8 +227,8 @@ fcom_attach(parent, self, aux)
 		    sc->sc_dev.dv_xname);
 }
 
-static void fcomstart __P((struct tty *));
-static int fcomparam __P((struct tty *, struct termios *));
+static void fcomstart (struct tty *);
+static int fcomparam (struct tty *, struct termios *);
 
 int
 fcomopen(dev, flag, mode, p)
diff --git a/sys/arch/arm/footbridge/footbridge_irqhandler.c b/sys/arch/arm/footbridge/footbridge_irqhandler.c
index b3c1cf57341..648e4348f30 100644
--- a/sys/arch/arm/footbridge/footbridge_irqhandler.c
+++ b/sys/arch/arm/footbridge/footbridge_irqhandler.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: footbridge_irqhandler.c,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$OpenBSD: footbridge_irqhandler.c,v 1.2 2004/05/19 03:17:07 drahn Exp $	*/
 /*	$NetBSD: footbridge_irqhandler.c,v 1.9 2003/06/16 20:00:57 thorpej Exp $	*/
 
 /*
@@ -76,7 +76,7 @@ __volatile int footbridge_ipending;
 
 void footbridge_intr_dispatch(struct clockframe *frame);
 
-const struct evcnt *footbridge_pci_intr_evcnt __P((void *, pci_intr_handle_t));
+const struct evcnt *footbridge_pci_intr_evcnt (void *, pci_intr_handle_t);
 
 void footbridge_do_pending(void);
 
diff --git a/sys/arch/arm/footbridge/footbridge_pci.c b/sys/arch/arm/footbridge/footbridge_pci.c
index ed06a2a6686..ab60704e0ff 100644
--- a/sys/arch/arm/footbridge/footbridge_pci.c
+++ b/sys/arch/arm/footbridge/footbridge_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: footbridge_pci.c,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$OpenBSD: footbridge_pci.c,v 1.2 2004/05/19 03:17:07 drahn Exp $	*/
 /*	$NetBSD: footbridge_pci.c,v 1.4 2001/09/05 16:17:35 matt Exp $	*/
 
 /*
@@ -56,19 +56,19 @@
 #include <dev/isa/isavar.h>
 #endif
 
-void		footbridge_pci_attach_hook __P((struct device *,
-		    struct device *, struct pcibus_attach_args *));
-int		footbridge_pci_bus_maxdevs __P((void *, int));
-pcitag_t	footbridge_pci_make_tag __P((void *, int, int, int));
-void		footbridge_pci_decompose_tag __P((void *, pcitag_t, int *,
-		    int *, int *));
-pcireg_t	footbridge_pci_conf_read __P((void *, pcitag_t, int));
-void		footbridge_pci_conf_write __P((void *, pcitag_t, int,
-		    pcireg_t));
-int		footbridge_pci_intr_map __P((struct pci_attach_args *,
-		    pci_intr_handle_t *));
-const char	*footbridge_pci_intr_string __P((void *, pci_intr_handle_t));
-const struct evcnt *footbridge_pci_intr_evcnt __P((void *, pci_intr_handle_t));
+void		footbridge_pci_attach_hook (struct device *,
+		    struct device *, struct pcibus_attach_args *);
+int		footbridge_pci_bus_maxdevs (void *, int);
+pcitag_t	footbridge_pci_make_tag (void *, int, int, int);
+void		footbridge_pci_decompose_tag (void *, pcitag_t, int *,
+		    int *, int *);
+pcireg_t	footbridge_pci_conf_read (void *, pcitag_t, int);
+void		footbridge_pci_conf_write (void *, pcitag_t, int,
+		    pcireg_t);
+int		footbridge_pci_intr_map (struct pci_attach_args *,
+		    pci_intr_handle_t *);
+const char	*footbridge_pci_intr_string (void *, pci_intr_handle_t);
+const struct evcnt *footbridge_pci_intr_evcnt (void *, pci_intr_handle_t);
 void		*footbridge_pci_intr_establish (void *, pci_intr_handle_t,
 		    int, int (*)(void *), void *, char *);
 void		footbridge_pci_intr_disestablish (void *, void *);
@@ -369,7 +369,7 @@ void *
 footbridge_pci_intr_establish(pcv, ih, level, func, arg, name)
 	void *pcv;
 	pci_intr_handle_t ih;
-	int level, (*func) __P((void *));
+	int level, (*func) (void *);
 	void *arg;
 	char *name;
 {
diff --git a/sys/arch/arm/footbridge/isa/dsrtc.c b/sys/arch/arm/footbridge/isa/dsrtc.c
index b909ed406e1..abd0b068209 100644
--- a/sys/arch/arm/footbridge/isa/dsrtc.c
+++ b/sys/arch/arm/footbridge/isa/dsrtc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dsrtc.c,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$OpenBSD: dsrtc.c,v 1.2 2004/05/19 03:17:07 drahn Exp $	*/
 /*	$NetBSD: dsrtc.c,v 1.5 2003/03/23 14:12:26 chris Exp $	*/
 
 /*
@@ -58,15 +58,15 @@ struct dsrtc_softc {
 	bus_space_handle_t sc_ioh;
 };
 
-void dsrtcattach __P((struct device *parent, struct device *self, void *aux));
-int dsrtcmatch __P((struct device *parent, void *cf, void *aux));
-int ds1687_read __P((struct dsrtc_softc *sc, int addr));
-void ds1687_write __P((struct dsrtc_softc *sc, int addr, int data));
-int ds1687_ram_read __P((struct dsrtc_softc *sc, int addr));
-void ds1687_ram_write __P((struct dsrtc_softc *sc, int addr, int data));
-static void ds1687_bank_select __P((struct dsrtc_softc *, int));
-static int dsrtc_write __P((void *, rtc_t *));
-static int dsrtc_read __P((void *, rtc_t *));
+void dsrtcattach (struct device *parent, struct device *self, void *aux);
+int dsrtcmatch (struct device *parent, void *cf, void *aux);
+int ds1687_read (struct dsrtc_softc *sc, int addr);
+void ds1687_write (struct dsrtc_softc *sc, int addr, int data);
+int ds1687_ram_read (struct dsrtc_softc *sc, int addr);
+void ds1687_ram_write (struct dsrtc_softc *sc, int addr, int data);
+static void ds1687_bank_select (struct dsrtc_softc *, int);
+static int dsrtc_write (void *, rtc_t *);
+static int dsrtc_read (void *, rtc_t *);
 
 int
 ds1687_read(sc, addr)
diff --git a/sys/arch/arm/footbridge/isa/isa_machdep.c b/sys/arch/arm/footbridge/isa/isa_machdep.c
index 8927d26ddd6..8b74eca7e45 100644
--- a/sys/arch/arm/footbridge/isa/isa_machdep.c
+++ b/sys/arch/arm/footbridge/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isa_machdep.c,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$OpenBSD: isa_machdep.c,v 1.2 2004/05/19 03:17:07 drahn Exp $	*/
 /*	$NetBSD: isa_machdep.c,v 1.4 2003/06/16 20:00:57 thorpej Exp $	*/
 
 /*-
@@ -101,15 +101,15 @@
 #include "isadma.h"
 
 /* prototypes */
-static void isa_icu_init __P((void));
+static void isa_icu_init (void);
 
 struct arm32_isa_chipset isa_chipset_tag;
 
-void isa_strayintr __P((int));
-void intr_calculatemasks __P((void));
-int fakeintr __P((void *));
+void isa_strayintr (int);
+void intr_calculatemasks (void);
+int fakeintr (void *);
 
-int isa_irqdispatch __P((void *arg));
+int isa_irqdispatch (void *arg);
 
 u_int imask[NIPL];
 unsigned imen;
@@ -383,7 +383,7 @@ isa_intr_establish(ic, irq, type, level, ih_fun, ih_arg, name)
 	int irq;
 	int type;
 	int level;
-	int (*ih_fun) __P((void *));
+	int (*ih_fun) (void *);
 	void *ih_arg;
 	char *name;
 {
diff --git a/sys/arch/arm/footbridge/isa/sysbeep_isa.c b/sys/arch/arm/footbridge/isa/sysbeep_isa.c
index 71032afebf5..2919c5cb34d 100644
--- a/sys/arch/arm/footbridge/isa/sysbeep_isa.c
+++ b/sys/arch/arm/footbridge/isa/sysbeep_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysbeep_isa.c,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$OpenBSD: sysbeep_isa.c,v 1.2 2004/05/19 03:17:07 drahn Exp $	*/
 /*	$NetBSD: sysbeep_isa.c,v 1.4 2002/10/02 15:45:10 thorpej Exp $	*/
 
 /*-
@@ -45,9 +45,9 @@
 #include <dev/isa/pcppivar.h>
 
 /* Prototypes */
-int sysbeep_isa_match __P((struct device *parent, void *cf, void *aux));
-void sysbeep_isa_attach __P((struct device *parent, struct device *self, void *aux));
-void sysbeep_isa __P((int pitch, int period));
+int sysbeep_isa_match (struct device *parent, void *cf, void *aux);
+void sysbeep_isa_attach (struct device *parent, struct device *self, void *aux);
+void sysbeep_isa (int pitch, int period);
 
 /* device attach structure */
 struct cfattach sysbeep_isa_ca = {
diff --git a/sys/arch/arm/footbridge/todclock.c b/sys/arch/arm/footbridge/todclock.c
index 6e5d0efdb2f..03579157515 100644
--- a/sys/arch/arm/footbridge/todclock.c
+++ b/sys/arch/arm/footbridge/todclock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: todclock.c,v 1.2 2004/02/15 17:25:01 drahn Exp $	*/
+/*	$OpenBSD: todclock.c,v 1.3 2004/05/19 03:17:07 drahn Exp $	*/
 /*	$NetBSD: todclock.c,v 1.4 2002/10/02 05:02:30 thorpej Exp $	*/
 
 /*
@@ -62,7 +62,7 @@
 #error "Can only had 1 todclock device"
 #endif
 
-static int yeartoday __P((int));
+static int yeartoday (int);
  
 /*
  * softc structure for the todclock device
@@ -71,8 +71,8 @@ static int yeartoday __P((int));
 struct todclock_softc {
 	struct device	sc_dev;			/* device node */
 	void	*sc_rtc_arg;			/* arg to read/write */
-	int	(*sc_rtc_write)	__P((void *, rtc_t *));	/* rtc write function */
-	int	(*sc_rtc_read)	__P((void *, rtc_t *));	/* rtc read function */
+	int	(*sc_rtc_write)	(void *, rtc_t *);	/* rtc write function */
+	int	(*sc_rtc_read)	(void *, rtc_t *);	/* rtc read function */
 };
 
 /* prototypes for functions */
diff --git a/sys/arch/arm/footbridge/todclockvar.h b/sys/arch/arm/footbridge/todclockvar.h
index 58d296d0fa6..70c973621fd 100644
--- a/sys/arch/arm/footbridge/todclockvar.h
+++ b/sys/arch/arm/footbridge/todclockvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: todclockvar.h,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$OpenBSD: todclockvar.h,v 1.2 2004/05/19 03:17:07 drahn Exp $	*/
 /*	$NetBSD: todclockvar.h,v 1.1 2002/02/10 12:26:00 chris Exp $	*/
 
 /*
@@ -47,8 +47,8 @@
 struct todclock_attach_args {
 	const char	*ta_name;			/* device name */
 	void	*ta_rtc_arg;				/* arg to read/write */
-	int	(*ta_rtc_write) __P((void *, rtc_t *));	/* function to write rtc */
-	int	(*ta_rtc_read)  __P((void *, rtc_t *));	/* function to read rtc */
+	int	(*ta_rtc_write) (void *, rtc_t *);	/* function to write rtc */
+	int	(*ta_rtc_read)  (void *, rtc_t *);	/* function to read rtc */
 	int	ta_flags;				/* flags */
 #define TODCLOCK_FLAG_FAKE	0x01			/* tod service is faked */
 };
diff --git a/sys/arch/arm/include/bus.h b/sys/arch/arm/include/bus.h
index b1a508e9903..e33828a136c 100644
--- a/sys/arch/arm/include/bus.h
+++ b/sys/arch/arm/include/bus.h
@@ -88,8 +88,8 @@ typedef struct bus_space *bus_space_tag_t;
 typedef u_long bus_space_handle_t;
 
 /*
- *	int bus_space_map  __P((bus_space_tag_t t, bus_addr_t addr,
- *	    bus_size_t size, int flags, bus_space_handle_t *bshp));
+ *	int bus_space_map  (bus_space_tag_t t, bus_addr_t addr,
+ *	    bus_size_t size, int flags, bus_space_handle_t *bshp);
  *
  * Map a region of bus space.
  */
@@ -103,180 +103,180 @@ struct bus_space {
 	void		*bs_cookie;
 
 	/* mapping/unmapping */
-	int		(*bs_map) __P((void *, bus_addr_t, bus_size_t,
-			    int, bus_space_handle_t *));
-	void		(*bs_unmap) __P((void *, bus_space_handle_t,
-			    bus_size_t));
-	int		(*bs_subregion) __P((void *, bus_space_handle_t,
-			    bus_size_t, bus_size_t, bus_space_handle_t *));
+	int		(*bs_map) (void *, bus_addr_t, bus_size_t,
+			    int, bus_space_handle_t *);
+	void		(*bs_unmap) (void *, bus_space_handle_t,
+			    bus_size_t);
+	int		(*bs_subregion) (void *, bus_space_handle_t,
+			    bus_size_t, bus_size_t, bus_space_handle_t *);
 
 	/* allocation/deallocation */
-	int		(*bs_alloc) __P((void *, bus_addr_t, bus_addr_t,
+	int		(*bs_alloc) (void *, bus_addr_t, bus_addr_t,
 			    bus_size_t, bus_size_t, bus_size_t, int,
-			    bus_addr_t *, bus_space_handle_t *));
-	void		(*bs_free) __P((void *, bus_space_handle_t,
-			    bus_size_t));
+			    bus_addr_t *, bus_space_handle_t *);
+	void		(*bs_free) (void *, bus_space_handle_t,
+			    bus_size_t);
 
 	/* get kernel virtual address */
-	void *		(*bs_vaddr) __P((void *, bus_space_handle_t));
+	void *		(*bs_vaddr) (void *, bus_space_handle_t);
 
 	/* mmap bus space for user */
-	paddr_t		(*bs_mmap) __P((void *, bus_addr_t, off_t, int, int));
+	paddr_t		(*bs_mmap) (void *, bus_addr_t, off_t, int, int);
 
 	/* barrier */
-	void		(*bs_barrier) __P((void *, bus_space_handle_t,
-			    bus_size_t, bus_size_t, int));
+	void		(*bs_barrier) (void *, bus_space_handle_t,
+			    bus_size_t, bus_size_t, int);
 
 	/* read (single) */
-	u_int8_t	(*bs_r_1) __P((void *, bus_space_handle_t,
-			    bus_size_t));
-	u_int16_t	(*bs_r_2) __P((void *, bus_space_handle_t,
-			    bus_size_t));
-	u_int32_t	(*bs_r_4) __P((void *, bus_space_handle_t,
-			    bus_size_t));
-	u_int64_t	(*bs_r_8) __P((void *, bus_space_handle_t,
-			    bus_size_t));
+	u_int8_t	(*bs_r_1) (void *, bus_space_handle_t,
+			    bus_size_t);
+	u_int16_t	(*bs_r_2) (void *, bus_space_handle_t,
+			    bus_size_t);
+	u_int32_t	(*bs_r_4) (void *, bus_space_handle_t,
+			    bus_size_t);
+	u_int64_t	(*bs_r_8) (void *, bus_space_handle_t,
+			    bus_size_t);
 
 	/* read multiple */
-	void		(*bs_rm_1) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int8_t *, bus_size_t));
-	void		(*bs_rm_2) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int16_t *, bus_size_t));
-	void		(*bs_rm_4) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int32_t *, bus_size_t));
-	void		(*bs_rm_8) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int64_t *, bus_size_t));
+	void		(*bs_rm_1) (void *, bus_space_handle_t,
+			    bus_size_t, u_int8_t *, bus_size_t);
+	void		(*bs_rm_2) (void *, bus_space_handle_t,
+			    bus_size_t, u_int16_t *, bus_size_t);
+	void		(*bs_rm_4) (void *, bus_space_handle_t,
+			    bus_size_t, u_int32_t *, bus_size_t);
+	void		(*bs_rm_8) (void *, bus_space_handle_t,
+			    bus_size_t, u_int64_t *, bus_size_t);
 					
 	/* read region */
-	void		(*bs_rr_1) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int8_t *, bus_size_t));
-	void		(*bs_rr_2) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int16_t *, bus_size_t));
-	void		(*bs_rr_4) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int32_t *, bus_size_t));
-	void		(*bs_rr_8) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int64_t *, bus_size_t));
+	void		(*bs_rr_1) (void *, bus_space_handle_t,
+			    bus_size_t, u_int8_t *, bus_size_t);
+	void		(*bs_rr_2) (void *, bus_space_handle_t,
+			    bus_size_t, u_int16_t *, bus_size_t);
+	void		(*bs_rr_4) (void *, bus_space_handle_t,
+			    bus_size_t, u_int32_t *, bus_size_t);
+	void		(*bs_rr_8) (void *, bus_space_handle_t,
+			    bus_size_t, u_int64_t *, bus_size_t);
 					
 	/* write (single) */
-	void		(*bs_w_1) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int8_t));
-	void		(*bs_w_2) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int16_t));
-	void		(*bs_w_4) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int32_t));
-	void		(*bs_w_8) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int64_t));
+	void		(*bs_w_1) (void *, bus_space_handle_t,
+			    bus_size_t, u_int8_t);
+	void		(*bs_w_2) (void *, bus_space_handle_t,
+			    bus_size_t, u_int16_t);
+	void		(*bs_w_4) (void *, bus_space_handle_t,
+			    bus_size_t, u_int32_t);
+	void		(*bs_w_8) (void *, bus_space_handle_t,
+			    bus_size_t, u_int64_t);
 
 	/* write multiple */
-	void		(*bs_wm_1) __P((void *, bus_space_handle_t,
-			    bus_size_t, const u_int8_t *, bus_size_t));
-	void		(*bs_wm_2) __P((void *, bus_space_handle_t,
-			    bus_size_t, const u_int16_t *, bus_size_t));
-	void		(*bs_wm_4) __P((void *, bus_space_handle_t,
-			    bus_size_t, const u_int32_t *, bus_size_t));
-	void		(*bs_wm_8) __P((void *, bus_space_handle_t,
-			    bus_size_t, const u_int64_t *, bus_size_t));
+	void		(*bs_wm_1) (void *, bus_space_handle_t,
+			    bus_size_t, const u_int8_t *, bus_size_t);
+	void		(*bs_wm_2) (void *, bus_space_handle_t,
+			    bus_size_t, const u_int16_t *, bus_size_t);
+	void		(*bs_wm_4) (void *, bus_space_handle_t,
+			    bus_size_t, const u_int32_t *, bus_size_t);
+	void		(*bs_wm_8) (void *, bus_space_handle_t,
+			    bus_size_t, const u_int64_t *, bus_size_t);
 					
 	/* write region */
-	void		(*bs_wr_1) __P((void *, bus_space_handle_t,
-			    bus_size_t, const u_int8_t *, bus_size_t));
-	void		(*bs_wr_2) __P((void *, bus_space_handle_t,
-			    bus_size_t, const u_int16_t *, bus_size_t));
-	void		(*bs_wr_4) __P((void *, bus_space_handle_t,
-			    bus_size_t, const u_int32_t *, bus_size_t));
-	void		(*bs_wr_8) __P((void *, bus_space_handle_t,
-			    bus_size_t, const u_int64_t *, bus_size_t));
+	void		(*bs_wr_1) (void *, bus_space_handle_t,
+			    bus_size_t, const u_int8_t *, bus_size_t);
+	void		(*bs_wr_2) (void *, bus_space_handle_t,
+			    bus_size_t, const u_int16_t *, bus_size_t);
+	void		(*bs_wr_4) (void *, bus_space_handle_t,
+			    bus_size_t, const u_int32_t *, bus_size_t);
+	void		(*bs_wr_8) (void *, bus_space_handle_t,
+			    bus_size_t, const u_int64_t *, bus_size_t);
 
 	/* set multiple */
-	void		(*bs_sm_1) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int8_t, bus_size_t));
-	void		(*bs_sm_2) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int16_t, bus_size_t));
-	void		(*bs_sm_4) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int32_t, bus_size_t));
-	void		(*bs_sm_8) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int64_t, bus_size_t));
+	void		(*bs_sm_1) (void *, bus_space_handle_t,
+			    bus_size_t, u_int8_t, bus_size_t);
+	void		(*bs_sm_2) (void *, bus_space_handle_t,
+			    bus_size_t, u_int16_t, bus_size_t);
+	void		(*bs_sm_4) (void *, bus_space_handle_t,
+			    bus_size_t, u_int32_t, bus_size_t);
+	void		(*bs_sm_8) (void *, bus_space_handle_t,
+			    bus_size_t, u_int64_t, bus_size_t);
 
 	/* set region */
-	void		(*bs_sr_1) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int8_t, bus_size_t));
-	void		(*bs_sr_2) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int16_t, bus_size_t));
-	void		(*bs_sr_4) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int32_t, bus_size_t));
-	void		(*bs_sr_8) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int64_t, bus_size_t));
+	void		(*bs_sr_1) (void *, bus_space_handle_t,
+			    bus_size_t, u_int8_t, bus_size_t);
+	void		(*bs_sr_2) (void *, bus_space_handle_t,
+			    bus_size_t, u_int16_t, bus_size_t);
+	void		(*bs_sr_4) (void *, bus_space_handle_t,
+			    bus_size_t, u_int32_t, bus_size_t);
+	void		(*bs_sr_8) (void *, bus_space_handle_t,
+			    bus_size_t, u_int64_t, bus_size_t);
 
 	/* copy */
-	void		(*bs_c_1) __P((void *, bus_space_handle_t, bus_size_t,
-			    bus_space_handle_t, bus_size_t, bus_size_t));
-	void		(*bs_c_2) __P((void *, bus_space_handle_t, bus_size_t,
-			    bus_space_handle_t, bus_size_t, bus_size_t));
-	void		(*bs_c_4) __P((void *, bus_space_handle_t, bus_size_t,
-			    bus_space_handle_t, bus_size_t, bus_size_t));
-	void		(*bs_c_8) __P((void *, bus_space_handle_t, bus_size_t,
-			    bus_space_handle_t, bus_size_t, bus_size_t));
+	void		(*bs_c_1) (void *, bus_space_handle_t, bus_size_t,
+			    bus_space_handle_t, bus_size_t, bus_size_t);
+	void		(*bs_c_2) (void *, bus_space_handle_t, bus_size_t,
+			    bus_space_handle_t, bus_size_t, bus_size_t);
+	void		(*bs_c_4) (void *, bus_space_handle_t, bus_size_t,
+			    bus_space_handle_t, bus_size_t, bus_size_t);
+	void		(*bs_c_8) (void *, bus_space_handle_t, bus_size_t,
+			    bus_space_handle_t, bus_size_t, bus_size_t);
 
 #ifdef __BUS_SPACE_HAS_STREAM_METHODS
 	/* read stream (single) */
-	u_int8_t	(*bs_r_1_s) __P((void *, bus_space_handle_t,
-			    bus_size_t));
-	u_int16_t	(*bs_r_2_s) __P((void *, bus_space_handle_t,
-			    bus_size_t));
-	u_int32_t	(*bs_r_4_s) __P((void *, bus_space_handle_t,
-			    bus_size_t));
-	u_int64_t	(*bs_r_8_s) __P((void *, bus_space_handle_t,
-			    bus_size_t));
+	u_int8_t	(*bs_r_1_s) (void *, bus_space_handle_t,
+			    bus_size_t);
+	u_int16_t	(*bs_r_2_s) (void *, bus_space_handle_t,
+			    bus_size_t);
+	u_int32_t	(*bs_r_4_s) (void *, bus_space_handle_t,
+			    bus_size_t);
+	u_int64_t	(*bs_r_8_s) (void *, bus_space_handle_t,
+			    bus_size_t);
 
 	/* read multiple stream */
-	void		(*bs_rm_1_s) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int8_t *, bus_size_t));
-	void		(*bs_rm_2_s) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int16_t *, bus_size_t));
-	void		(*bs_rm_4_s) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int32_t *, bus_size_t));
-	void		(*bs_rm_8_s) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int64_t *, bus_size_t));
+	void		(*bs_rm_1_s) (void *, bus_space_handle_t,
+			    bus_size_t, u_int8_t *, bus_size_t);
+	void		(*bs_rm_2_s) (void *, bus_space_handle_t,
+			    bus_size_t, u_int16_t *, bus_size_t);
+	void		(*bs_rm_4_s) (void *, bus_space_handle_t,
+			    bus_size_t, u_int32_t *, bus_size_t);
+	void		(*bs_rm_8_s) (void *, bus_space_handle_t,
+			    bus_size_t, u_int64_t *, bus_size_t);
 					
 	/* read region stream */
-	void		(*bs_rr_1_s) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int8_t *, bus_size_t));
-	void		(*bs_rr_2_s) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int16_t *, bus_size_t));
-	void		(*bs_rr_4_s) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int32_t *, bus_size_t));
-	void		(*bs_rr_8_s) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int64_t *, bus_size_t));
+	void		(*bs_rr_1_s) (void *, bus_space_handle_t,
+			    bus_size_t, u_int8_t *, bus_size_t);
+	void		(*bs_rr_2_s) (void *, bus_space_handle_t,
+			    bus_size_t, u_int16_t *, bus_size_t);
+	void		(*bs_rr_4_s) (void *, bus_space_handle_t,
+			    bus_size_t, u_int32_t *, bus_size_t);
+	void		(*bs_rr_8_s) (void *, bus_space_handle_t,
+			    bus_size_t, u_int64_t *, bus_size_t);
 					
 	/* write stream (single) */
-	void		(*bs_w_1_s) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int8_t));
-	void		(*bs_w_2_s) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int16_t));
-	void		(*bs_w_4_s) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int32_t));
-	void		(*bs_w_8_s) __P((void *, bus_space_handle_t,
-			    bus_size_t, u_int64_t));
+	void		(*bs_w_1_s) (void *, bus_space_handle_t,
+			    bus_size_t, u_int8_t);
+	void		(*bs_w_2_s) (void *, bus_space_handle_t,
+			    bus_size_t, u_int16_t);
+	void		(*bs_w_4_s) (void *, bus_space_handle_t,
+			    bus_size_t, u_int32_t);
+	void		(*bs_w_8_s) (void *, bus_space_handle_t,
+			    bus_size_t, u_int64_t);
 
 	/* write multiple stream */
-	void		(*bs_wm_1_s) __P((void *, bus_space_handle_t,
-			    bus_size_t, const u_int8_t *, bus_size_t));
-	void		(*bs_wm_2_s) __P((void *, bus_space_handle_t,
-			    bus_size_t, const u_int16_t *, bus_size_t));
-	void		(*bs_wm_4_s) __P((void *, bus_space_handle_t,
-			    bus_size_t, const u_int32_t *, bus_size_t));
-	void		(*bs_wm_8_s) __P((void *, bus_space_handle_t,
-			    bus_size_t, const u_int64_t *, bus_size_t));
+	void		(*bs_wm_1_s) (void *, bus_space_handle_t,
+			    bus_size_t, const u_int8_t *, bus_size_t);
+	void		(*bs_wm_2_s) (void *, bus_space_handle_t,
+			    bus_size_t, const u_int16_t *, bus_size_t);
+	void		(*bs_wm_4_s) (void *, bus_space_handle_t,
+			    bus_size_t, const u_int32_t *, bus_size_t);
+	void		(*bs_wm_8_s) (void *, bus_space_handle_t,
+			    bus_size_t, const u_int64_t *, bus_size_t);
 					
 	/* write region stream */
-	void		(*bs_wr_1_s) __P((void *, bus_space_handle_t,
-			    bus_size_t, const u_int8_t *, bus_size_t));
-	void		(*bs_wr_2_s) __P((void *, bus_space_handle_t,
-			    bus_size_t, const u_int16_t *, bus_size_t));
-	void		(*bs_wr_4_s) __P((void *, bus_space_handle_t,
-			    bus_size_t, const u_int32_t *, bus_size_t));
-	void		(*bs_wr_8_s) __P((void *, bus_space_handle_t,
-			    bus_size_t, const u_int64_t *, bus_size_t));
+	void		(*bs_wr_1_s) (void *, bus_space_handle_t,
+			    bus_size_t, const u_int8_t *, bus_size_t);
+	void		(*bs_wr_2_s) (void *, bus_space_handle_t,
+			    bus_size_t, const u_int16_t *, bus_size_t);
+	void		(*bs_wr_4_s) (void *, bus_space_handle_t,
+			    bus_size_t, const u_int32_t *, bus_size_t);
+	void		(*bs_wr_8_s) (void *, bus_space_handle_t,
+			    bus_size_t, const u_int64_t *, bus_size_t);
 #endif	/* __BUS_SPACE_HAS_STREAM_METHODS */
 };
 
@@ -529,185 +529,185 @@ bus_space_copy_4(bus_space_tag_t bst, bus_space_handle_t h1,
  */
 
 #define bs_map_proto(f)							\
-int	__bs_c(f,_bs_map) __P((void *t, bus_addr_t addr,		\
-	    bus_size_t size, int cacheable, bus_space_handle_t *bshp));
+int	__bs_c(f,_bs_map) (void *t, bus_addr_t addr,		\
+	    bus_size_t size, int cacheable, bus_space_handle_t *bshp);
 
 #define bs_unmap_proto(f)						\
-void	__bs_c(f,_bs_unmap) __P((void *t, bus_space_handle_t bsh,	\
-	    bus_size_t size));
+void	__bs_c(f,_bs_unmap) (void *t, bus_space_handle_t bsh,	\
+	    bus_size_t size);
 
 #define bs_subregion_proto(f)						\
-int	__bs_c(f,_bs_subregion) __P((void *t, bus_space_handle_t bsh,	\
+int	__bs_c(f,_bs_subregion) (void *t, bus_space_handle_t bsh,	\
 	    bus_size_t offset, bus_size_t size, 			\
-	    bus_space_handle_t *nbshp));
+	    bus_space_handle_t *nbshp);
 
 #define bs_alloc_proto(f)						\
-int	__bs_c(f,_bs_alloc) __P((void *t, bus_addr_t rstart,		\
+int	__bs_c(f,_bs_alloc) (void *t, bus_addr_t rstart,		\
 	    bus_addr_t rend, bus_size_t size, bus_size_t align,		\
 	    bus_size_t boundary, int cacheable, bus_addr_t *addrp,	\
-	    bus_space_handle_t *bshp));
+	    bus_space_handle_t *bshp);
 
 #define bs_free_proto(f)						\
-void	__bs_c(f,_bs_free) __P((void *t, bus_space_handle_t bsh,	\
-	    bus_size_t size));
+void	__bs_c(f,_bs_free) (void *t, bus_space_handle_t bsh,	\
+	    bus_size_t size);
 
 #define bs_vaddr_proto(f)						\
-void *	__bs_c(f,_bs_vaddr) __P((void *t, bus_space_handle_t bsh));
+void *	__bs_c(f,_bs_vaddr) (void *t, bus_space_handle_t bsh);
 
 #define bs_mmap_proto(f)						\
-paddr_t	__bs_c(f,_bs_mmap) __P((void *, bus_addr_t, off_t, int, int));
+paddr_t	__bs_c(f,_bs_mmap) (void *, bus_addr_t, off_t, int, int);
 
 #define bs_barrier_proto(f)						\
-void	__bs_c(f,_bs_barrier) __P((void *t, bus_space_handle_t bsh,	\
-	    bus_size_t offset, bus_size_t len, int flags));
+void	__bs_c(f,_bs_barrier) (void *t, bus_space_handle_t bsh,	\
+	    bus_size_t offset, bus_size_t len, int flags);
 
 #define	bs_r_1_proto(f)							\
-u_int8_t	__bs_c(f,_bs_r_1) __P((void *t, bus_space_handle_t bsh,	\
-		    bus_size_t offset));
+u_int8_t	__bs_c(f,_bs_r_1) (void *t, bus_space_handle_t bsh,	\
+		    bus_size_t offset);
 
 #define	bs_r_2_proto(f)							\
-u_int16_t	__bs_c(f,_bs_r_2) __P((void *t, bus_space_handle_t bsh,	\
-		    bus_size_t offset));
+u_int16_t	__bs_c(f,_bs_r_2) (void *t, bus_space_handle_t bsh,	\
+		    bus_size_t offset);
 
 #define	bs_r_4_proto(f)							\
-u_int32_t	__bs_c(f,_bs_r_4) __P((void *t, bus_space_handle_t bsh,	\
-		    bus_size_t offset));
+u_int32_t	__bs_c(f,_bs_r_4) (void *t, bus_space_handle_t bsh,	\
+		    bus_size_t offset);
 
 #define	bs_r_8_proto(f)							\
-u_int64_t	__bs_c(f,_bs_r_8) __P((void *t, bus_space_handle_t bsh,	\
-		    bus_size_t offset));
+u_int64_t	__bs_c(f,_bs_r_8) (void *t, bus_space_handle_t bsh,	\
+		    bus_size_t offset);
 
 #define	bs_w_1_proto(f)							\
-void	__bs_c(f,_bs_w_1) __P((void *t, bus_space_handle_t bsh,		\
-	    bus_size_t offset, u_int8_t value));
+void	__bs_c(f,_bs_w_1) (void *t, bus_space_handle_t bsh,		\
+	    bus_size_t offset, u_int8_t value);
 
 #define	bs_w_2_proto(f)							\
-void	__bs_c(f,_bs_w_2) __P((void *t, bus_space_handle_t bsh,		\
-	    bus_size_t offset, u_int16_t value));
+void	__bs_c(f,_bs_w_2) (void *t, bus_space_handle_t bsh,		\
+	    bus_size_t offset, u_int16_t value);
 
 #define	bs_w_4_proto(f)							\
-void	__bs_c(f,_bs_w_4) __P((void *t, bus_space_handle_t bsh,		\
-	    bus_size_t offset, u_int32_t value));
+void	__bs_c(f,_bs_w_4) (void *t, bus_space_handle_t bsh,		\
+	    bus_size_t offset, u_int32_t value);
 
 #define	bs_w_8_proto(f)							\
-void	__bs_c(f,_bs_w_8) __P((void *t, bus_space_handle_t bsh,		\
-	    bus_size_t offset, u_int64_t value));
+void	__bs_c(f,_bs_w_8) (void *t, bus_space_handle_t bsh,		\
+	    bus_size_t offset, u_int64_t value);
 
 #define	bs_rm_1_proto(f)						\
-void	__bs_c(f,_bs_rm_1) __P((void *t, bus_space_handle_t bsh,	\
-	    bus_size_t offset, u_int8_t *addr, bus_size_t count));
+void	__bs_c(f,_bs_rm_1) (void *t, bus_space_handle_t bsh,	\
+	    bus_size_t offset, u_int8_t *addr, bus_size_t count);
 
 #define	bs_rm_2_proto(f)						\
-void	__bs_c(f,_bs_rm_2) __P((void *t, bus_space_handle_t bsh,	\
-	    bus_size_t offset, u_int16_t *addr, bus_size_t count));
+void	__bs_c(f,_bs_rm_2) (void *t, bus_space_handle_t bsh,	\
+	    bus_size_t offset, u_int16_t *addr, bus_size_t count);
 
 #define	bs_rm_4_proto(f)						\
-void	__bs_c(f,_bs_rm_4) __P((void *t, bus_space_handle_t bsh,	\
-	    bus_size_t offset, u_int32_t *addr, bus_size_t count));		
+void	__bs_c(f,_bs_rm_4) (void *t, bus_space_handle_t bsh,	\
+	    bus_size_t offset, u_int32_t *addr, bus_size_t count);		
 
 #define	bs_rm_8_proto(f)						\
-void	__bs_c(f,_bs_rm_8) __P((void *t, bus_space_handle_t bsh,	\
-	    bus_size_t offset, u_int64_t *addr, bus_size_t count));
+void	__bs_c(f,_bs_rm_8) (void *t, bus_space_handle_t bsh,	\
+	    bus_size_t offset, u_int64_t *addr, bus_size_t count);
 
 #define	bs_wm_1_proto(f)						\
-void	__bs_c(f,_bs_wm_1) __P((void *t, bus_space_handle_t bsh,	\
-	    bus_size_t offset, const u_int8_t *addr, bus_size_t count));
+void	__bs_c(f,_bs_wm_1) (void *t, bus_space_handle_t bsh,	\
+	    bus_size_t offset, const u_int8_t *addr, bus_size_t count);
 
 #define	bs_wm_2_proto(f)						\
-void	__bs_c(f,_bs_wm_2) __P((void *t, bus_space_handle_t bsh,	\
-	    bus_size_t offset, const u_int16_t *addr, bus_size_t count));
+void	__bs_c(f,_bs_wm_2) (void *t, bus_space_handle_t bsh,	\
+	    bus_size_t offset, const u_int16_t *addr, bus_size_t count);
 
 #define	bs_wm_4_proto(f)						\
-void	__bs_c(f,_bs_wm_4) __P((void *t, bus_space_handle_t bsh,	\
-	    bus_size_t offset, const u_int32_t *addr, bus_size_t count));
+void	__bs_c(f,_bs_wm_4) (void *t, bus_space_handle_t bsh,	\
+	    bus_size_t offset, const u_int32_t *addr, bus_size_t count);
 
 #define	bs_wm_8_proto(f)						\
-void	__bs_c(f,_bs_wm_8) __P((void *t, bus_space_handle_t bsh,	\
-	    bus_size_t offset, const u_int64_t *addr, bus_size_t count));
+void	__bs_c(f,_bs_wm_8) (void *t, bus_space_handle_t bsh,	\
+	    bus_size_t offset, const u_int64_t *addr, bus_size_t count);
 
 #define	bs_rr_1_proto(f)						\
-void	__bs_c(f, _bs_rr_1) __P((void *t, bus_space_handle_t bsh,	\
-	    bus_size_t offset, u_int8_t *addr, bus_size_t count));
+void	__bs_c(f, _bs_rr_1) (void *t, bus_space_handle_t bsh,	\
+	    bus_size_t offset, u_int8_t *addr, bus_size_t count);
 
 #define	bs_rr_2_proto(f)						\
-void	__bs_c(f, _bs_rr_2) __P((void *t, bus_space_handle_t bsh,	\
-	    bus_size_t offset, u_int16_t *addr, bus_size_t count));
+void	__bs_c(f, _bs_rr_2) (void *t, bus_space_handle_t bsh,	\
+	    bus_size_t offset, u_int16_t *addr, bus_size_t count);
 
 #define	bs_rr_4_proto(f)						\
-void	__bs_c(f, _bs_rr_4) __P((void *t, bus_space_handle_t bsh,	\
-	    bus_size_t offset, u_int32_t *addr, bus_size_t count));
+void	__bs_c(f, _bs_rr_4) (void *t, bus_space_handle_t bsh,	\
+	    bus_size_t offset, u_int32_t *addr, bus_size_t count);
 
 #define	bs_rr_8_proto(f)						\
-void	__bs_c(f, _bs_rr_8) __P((void *t, bus_space_handle_t bsh,	\
-	    bus_size_t offset, u_int64_t *addr, bus_size_t count));
+void	__bs_c(f, _bs_rr_8) (void *t, bus_space_handle_t bsh,	\
+	    bus_size_t offset, u_int64_t *addr, bus_size_t count);
 
 #define	bs_wr_1_proto(f)						\
-void	__bs_c(f, _bs_wr_1) __P((void *t, bus_space_handle_t bsh,	\
-	    bus_size_t offset, const u_int8_t *addr, bus_size_t count));
+void	__bs_c(f, _bs_wr_1) (void *t, bus_space_handle_t bsh,	\
+	    bus_size_t offset, const u_int8_t *addr, bus_size_t count);
 
 #define	bs_wr_2_proto(f)						\
-void	__bs_c(f, _bs_wr_2) __P((void *t, bus_space_handle_t bsh,	\
-	    bus_size_t offset, const u_int16_t *addr, bus_size_t count));
+void	__bs_c(f, _bs_wr_2) (void *t, bus_space_handle_t bsh,	\
+	    bus_size_t offset, const u_int16_t *addr, bus_size_t count);
 
 #define	bs_wr_4_proto(f)						\
-void	__bs_c(f, _bs_wr_4) __P((void *t, bus_space_handle_t bsh,	\
-	    bus_size_t offset, const u_int32_t *addr, bus_size_t count));
+void	__bs_c(f, _bs_wr_4) (void *t, bus_space_handle_t bsh,	\
+	    bus_size_t offset, const u_int32_t *addr, bus_size_t count);
 
 #define	bs_wr_8_proto(f)						\
-void	__bs_c(f, _bs_wr_8) __P((void *t, bus_space_handle_t bsh,	\
-	    bus_size_t offset, const u_int64_t *addr, bus_size_t count));
+void	__bs_c(f, _bs_wr_8) (void *t, bus_space_handle_t bsh,	\
+	    bus_size_t offset, const u_int64_t *addr, bus_size_t count);
 
 #define	bs_sm_1_proto(f)						\
-void	__bs_c(f,_bs_sm_1) __P((void *t, bus_space_handle_t bsh,	\
-	    bus_size_t offset, u_int8_t value, bus_size_t count));
+void	__bs_c(f,_bs_sm_1) (void *t, bus_space_handle_t bsh,	\
+	    bus_size_t offset, u_int8_t value, bus_size_t count);
 
 #define	bs_sm_2_proto(f)						\
-void	__bs_c(f,_bs_sm_2) __P((void *t, bus_space_handle_t bsh,	\
-	    bus_size_t offset, u_int16_t value, bus_size_t count));
+void	__bs_c(f,_bs_sm_2) (void *t, bus_space_handle_t bsh,	\
+	    bus_size_t offset, u_int16_t value, bus_size_t count);
 
 #define	bs_sm_4_proto(f)						\
-void	__bs_c(f,_bs_sm_4) __P((void *t, bus_space_handle_t bsh,	\
-	    bus_size_t offset, u_int32_t value, bus_size_t count));
+void	__bs_c(f,_bs_sm_4) (void *t, bus_space_handle_t bsh,	\
+	    bus_size_t offset, u_int32_t value, bus_size_t count);
 
 #define	bs_sm_8_proto(f)						\
-void	__bs_c(f,_bs_sm_8) __P((void *t, bus_space_handle_t bsh,	\
-	    bus_size_t offset, u_int64_t value, bus_size_t count));
+void	__bs_c(f,_bs_sm_8) (void *t, bus_space_handle_t bsh,	\
+	    bus_size_t offset, u_int64_t value, bus_size_t count);
 
 #define	bs_sr_1_proto(f)						\
-void	__bs_c(f,_bs_sr_1) __P((void *t, bus_space_handle_t bsh,	\
-	    bus_size_t offset, u_int8_t value, bus_size_t count));
+void	__bs_c(f,_bs_sr_1) (void *t, bus_space_handle_t bsh,	\
+	    bus_size_t offset, u_int8_t value, bus_size_t count);
 
 #define	bs_sr_2_proto(f)						\
-void	__bs_c(f,_bs_sr_2) __P((void *t, bus_space_handle_t bsh,	\
-	    bus_size_t offset, u_int16_t value, bus_size_t count));
+void	__bs_c(f,_bs_sr_2) (void *t, bus_space_handle_t bsh,	\
+	    bus_size_t offset, u_int16_t value, bus_size_t count);
 
 #define	bs_sr_4_proto(f)						\
-void	__bs_c(f,_bs_sr_4) __P((void *t, bus_space_handle_t bsh,	\
-	    bus_size_t offset, u_int32_t value, bus_size_t count));
+void	__bs_c(f,_bs_sr_4) (void *t, bus_space_handle_t bsh,	\
+	    bus_size_t offset, u_int32_t value, bus_size_t count);
 
 #define	bs_sr_8_proto(f)						\
-void	__bs_c(f,_bs_sr_8) __P((void *t, bus_space_handle_t bsh,	\
-	    bus_size_t offset, u_int64_t value, bus_size_t count));
+void	__bs_c(f,_bs_sr_8) (void *t, bus_space_handle_t bsh,	\
+	    bus_size_t offset, u_int64_t value, bus_size_t count);
 
 #define	bs_c_1_proto(f)							\
-void	__bs_c(f,_bs_c_1) __P((void *t, bus_space_handle_t bsh1,	\
+void	__bs_c(f,_bs_c_1) (void *t, bus_space_handle_t bsh1,	\
 	    bus_size_t offset1, bus_space_handle_t bsh2,		\
-	    bus_size_t offset2, bus_size_t count));
+	    bus_size_t offset2, bus_size_t count);
 
 #define	bs_c_2_proto(f)							\
-void	__bs_c(f,_bs_c_2) __P((void *t, bus_space_handle_t bsh1,	\
+void	__bs_c(f,_bs_c_2) (void *t, bus_space_handle_t bsh1,	\
 	    bus_size_t offset1, bus_space_handle_t bsh2,		\
-	    bus_size_t offset2, bus_size_t count));
+	    bus_size_t offset2, bus_size_t count);
 
 #define	bs_c_4_proto(f)							\
-void	__bs_c(f,_bs_c_4) __P((void *t, bus_space_handle_t bsh1,	\
+void	__bs_c(f,_bs_c_4) (void *t, bus_space_handle_t bsh1,	\
 	    bus_size_t offset1, bus_space_handle_t bsh2,		\
-	    bus_size_t offset2, bus_size_t count));
+	    bus_size_t offset2, bus_size_t count);
 
 #define	bs_c_8_proto(f)							\
-void	__bs_c(f,_bs_c_8) __P((void *t, bus_space_handle_t bsh1,	\
+void	__bs_c(f,_bs_c_8) (void *t, bus_space_handle_t bsh1,	\
 	    bus_size_t offset1, bus_space_handle_t bsh2,		\
-	    bus_size_t offset2, bus_size_t count));
+	    bus_size_t offset2, bus_size_t count);
 
 #define bs_protos(f)		\
 bs_map_proto(f);		\
@@ -853,33 +853,33 @@ struct arm32_bus_dma_tag {
 	/*
 	 * DMA mapping methods.
 	 */
-	int	(*_dmamap_create) __P((bus_dma_tag_t, bus_size_t, int,
-		    bus_size_t, bus_size_t, int, bus_dmamap_t *));
-	void	(*_dmamap_destroy) __P((bus_dma_tag_t, bus_dmamap_t));
-	int	(*_dmamap_load) __P((bus_dma_tag_t, bus_dmamap_t, void *,
-		    bus_size_t, struct proc *, int));
-	int	(*_dmamap_load_mbuf) __P((bus_dma_tag_t, bus_dmamap_t,
-		    struct mbuf *, int));
-	int	(*_dmamap_load_uio) __P((bus_dma_tag_t, bus_dmamap_t,
-		    struct uio *, int));
-	int	(*_dmamap_load_raw) __P((bus_dma_tag_t, bus_dmamap_t,
-		    bus_dma_segment_t *, int, bus_size_t, int));
-	void	(*_dmamap_unload) __P((bus_dma_tag_t, bus_dmamap_t));
-	void	(*_dmamap_sync) __P((bus_dma_tag_t, bus_dmamap_t,
-		    bus_addr_t, bus_size_t, int));
+	int	(*_dmamap_create) (bus_dma_tag_t, bus_size_t, int,
+		    bus_size_t, bus_size_t, int, bus_dmamap_t *);
+	void	(*_dmamap_destroy) (bus_dma_tag_t, bus_dmamap_t);
+	int	(*_dmamap_load) (bus_dma_tag_t, bus_dmamap_t, void *,
+		    bus_size_t, struct proc *, int);
+	int	(*_dmamap_load_mbuf) (bus_dma_tag_t, bus_dmamap_t,
+		    struct mbuf *, int);
+	int	(*_dmamap_load_uio) (bus_dma_tag_t, bus_dmamap_t,
+		    struct uio *, int);
+	int	(*_dmamap_load_raw) (bus_dma_tag_t, bus_dmamap_t,
+		    bus_dma_segment_t *, int, bus_size_t, int);
+	void	(*_dmamap_unload) (bus_dma_tag_t, bus_dmamap_t);
+	void	(*_dmamap_sync) (bus_dma_tag_t, bus_dmamap_t,
+		    bus_addr_t, bus_size_t, int);
 
 	/*
 	 * DMA memory utility functions.
 	 */
-	int	(*_dmamem_alloc) __P((bus_dma_tag_t, bus_size_t, bus_size_t,
-		    bus_size_t, bus_dma_segment_t *, int, int *, int));
-	void	(*_dmamem_free) __P((bus_dma_tag_t,
-		    bus_dma_segment_t *, int));
-	int	(*_dmamem_map) __P((bus_dma_tag_t, bus_dma_segment_t *,
-		    int, size_t, caddr_t *, int));
-	void	(*_dmamem_unmap) __P((bus_dma_tag_t, caddr_t, size_t));
-	paddr_t	(*_dmamem_mmap) __P((bus_dma_tag_t, bus_dma_segment_t *,
-		    int, off_t, int, int));
+	int	(*_dmamem_alloc) (bus_dma_tag_t, bus_size_t, bus_size_t,
+		    bus_size_t, bus_dma_segment_t *, int, int *, int);
+	void	(*_dmamem_free) (bus_dma_tag_t,
+		    bus_dma_segment_t *, int);
+	int	(*_dmamem_map) (bus_dma_tag_t, bus_dma_segment_t *,
+		    int, size_t, caddr_t *, int);
+	void	(*_dmamem_unmap) (bus_dma_tag_t, caddr_t, size_t);
+	paddr_t	(*_dmamem_mmap) (bus_dma_tag_t, bus_dma_segment_t *,
+		    int, off_t, int, int);
 };
 
 #define	bus_dmamap_create(t, s, n, m, b, f, p)			\
@@ -952,37 +952,37 @@ struct arm32_bus_dmamap {
 int	arm32_dma_range_intersect(struct arm32_dma_range *, int,
 	    paddr_t pa, psize_t size, paddr_t *pap, psize_t *sizep);
 
-int	_bus_dmamap_create __P((bus_dma_tag_t, bus_size_t, int, bus_size_t,
-	    bus_size_t, int, bus_dmamap_t *));
-void	_bus_dmamap_destroy __P((bus_dma_tag_t, bus_dmamap_t));
-int	_bus_dmamap_load __P((bus_dma_tag_t, bus_dmamap_t, void *,
-	    bus_size_t, struct proc *, int));
-int	_bus_dmamap_load_mbuf __P((bus_dma_tag_t, bus_dmamap_t,
-	    struct mbuf *, int));
-int	_bus_dmamap_load_uio __P((bus_dma_tag_t, bus_dmamap_t,
-	    struct uio *, int));
-int	_bus_dmamap_load_raw __P((bus_dma_tag_t, bus_dmamap_t,
-	    bus_dma_segment_t *, int, bus_size_t, int));
-void	_bus_dmamap_unload __P((bus_dma_tag_t, bus_dmamap_t));
-void	_bus_dmamap_sync __P((bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
-	    bus_size_t, int));
-
-int	_bus_dmamem_alloc __P((bus_dma_tag_t tag, bus_size_t size,
+int	_bus_dmamap_create (bus_dma_tag_t, bus_size_t, int, bus_size_t,
+	    bus_size_t, int, bus_dmamap_t *);
+void	_bus_dmamap_destroy (bus_dma_tag_t, bus_dmamap_t);
+int	_bus_dmamap_load (bus_dma_tag_t, bus_dmamap_t, void *,
+	    bus_size_t, struct proc *, int);
+int	_bus_dmamap_load_mbuf (bus_dma_tag_t, bus_dmamap_t,
+	    struct mbuf *, int);
+int	_bus_dmamap_load_uio (bus_dma_tag_t, bus_dmamap_t,
+	    struct uio *, int);
+int	_bus_dmamap_load_raw (bus_dma_tag_t, bus_dmamap_t,
+	    bus_dma_segment_t *, int, bus_size_t, int);
+void	_bus_dmamap_unload (bus_dma_tag_t, bus_dmamap_t);
+void	_bus_dmamap_sync (bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
+	    bus_size_t, int);
+
+int	_bus_dmamem_alloc (bus_dma_tag_t tag, bus_size_t size,
 	    bus_size_t alignment, bus_size_t boundary,
-	    bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags));
-void	_bus_dmamem_free __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
-	    int nsegs));
-int	_bus_dmamem_map __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
-	    int nsegs, size_t size, caddr_t *kvap, int flags));
-void	_bus_dmamem_unmap __P((bus_dma_tag_t tag, caddr_t kva,
-	    size_t size));
-paddr_t	_bus_dmamem_mmap __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
-	    int nsegs, off_t off, int prot, int flags));
-
-int	_bus_dmamem_alloc_range __P((bus_dma_tag_t tag, bus_size_t size,
+	    bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags);
+void	_bus_dmamem_free (bus_dma_tag_t tag, bus_dma_segment_t *segs,
+	    int nsegs);
+int	_bus_dmamem_map (bus_dma_tag_t tag, bus_dma_segment_t *segs,
+	    int nsegs, size_t size, caddr_t *kvap, int flags);
+void	_bus_dmamem_unmap (bus_dma_tag_t tag, caddr_t kva,
+	    size_t size);
+paddr_t	_bus_dmamem_mmap (bus_dma_tag_t tag, bus_dma_segment_t *segs,
+	    int nsegs, off_t off, int prot, int flags);
+
+int	_bus_dmamem_alloc_range (bus_dma_tag_t tag, bus_size_t size,
 	    bus_size_t alignment, bus_size_t boundary,
 	    bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags,
-	    vaddr_t low, vaddr_t high));
+	    vaddr_t low, vaddr_t high);
 #endif /* _ARM32_BUS_DMA_PRIVATE */
 /* These are OpenBSD extensions to the general NetBSD bus interface.  */
 #if 0
diff --git a/sys/arch/arm/include/cpu.h b/sys/arch/arm/include/cpu.h
index d552d6ec4c4..9d5bb9d675b 100644
--- a/sys/arch/arm/include/cpu.h
+++ b/sys/arch/arm/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.3 2004/02/26 04:58:38 drahn Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.4 2004/05/19 03:17:07 drahn Exp $	*/
 /*	$NetBSD: cpu.h,v 1.34 2003/06/23 11:01:08 martin Exp $	*/
 
 /*
@@ -266,8 +266,8 @@ extern int want_resched;	/* resched() was called */
  */
 
 struct device;
-void	cpu_attach	__P((struct device *));
-int	cpu_alloc_idlepcb	__P((struct cpu_info *));
+void	cpu_attach	(struct device *);
+int	cpu_alloc_idlepcb	(struct cpu_info *);
 #endif
 
 
@@ -276,24 +276,24 @@ int	cpu_alloc_idlepcb	__P((struct cpu_info *));
  */
 
 /* locore.S */
-void atomic_set_bit	__P((u_int *address, u_int setmask));
-void atomic_clear_bit	__P((u_int *address, u_int clearmask));
+void atomic_set_bit	(u_int *address, u_int setmask);
+void atomic_clear_bit	(u_int *address, u_int clearmask);
 
 /* cpuswitch.S */
 struct pcb;
-void	savectx		__P((struct pcb *pcb));
+void	savectx		(struct pcb *pcb);
 
 /* ast.c */
 void userret (register struct proc *p, u_int32_t pc, quad_t ticks);
 
 /* machdep.h */
-void bootsync		__P((void));
+void bootsync		(void);
 
 /* fault.c */
-int badaddr_read	__P((void *, size_t, void *));
+int badaddr_read	(void *, size_t, void *);
 
 /* syscall.c */
-void swi_handler	__P((trapframe_t *));
+void swi_handler	(trapframe_t *);
 
 #endif	/* !_LOCORE */
 
diff --git a/sys/arch/arm/include/cpufunc.h b/sys/arch/arm/include/cpufunc.h
index f732dfe03c2..079d88fb379 100644
--- a/sys/arch/arm/include/cpufunc.h
+++ b/sys/arch/arm/include/cpufunc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpufunc.h,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$OpenBSD: cpufunc.h,v 1.2 2004/05/19 03:17:07 drahn Exp $	*/
 /*	$NetBSD: cpufunc.h,v 1.29 2003/09/06 09:08:35 rearnsha Exp $	*/
 
 /*
@@ -52,25 +52,25 @@ struct cpu_functions {
 
 	/* CPU functions */
 	
-	u_int	(*cf_id)		__P((void));
-	void	(*cf_cpwait)		__P((void));
+	u_int	(*cf_id)		(void);
+	void	(*cf_cpwait)		(void);
 
 	/* MMU functions */
 
-	u_int	(*cf_control)		__P((u_int bic, u_int eor));
-	void	(*cf_domains)		__P((u_int domains));
-	void	(*cf_setttb)		__P((u_int ttb));
-	u_int	(*cf_faultstatus)	__P((void));
-	u_int	(*cf_faultaddress)	__P((void));
+	u_int	(*cf_control)		(u_int bic, u_int eor);
+	void	(*cf_domains)		(u_int domains);
+	void	(*cf_setttb)		(u_int ttb);
+	u_int	(*cf_faultstatus)	(void);
+	u_int	(*cf_faultaddress)	(void);
 
 	/* TLB functions */
 
-	void	(*cf_tlb_flushID)	__P((void));	
-	void	(*cf_tlb_flushID_SE)	__P((u_int va));	
-	void	(*cf_tlb_flushI)	__P((void));
-	void	(*cf_tlb_flushI_SE)	__P((u_int va));	
-	void	(*cf_tlb_flushD)	__P((void));
-	void	(*cf_tlb_flushD_SE)	__P((u_int va));	
+	void	(*cf_tlb_flushID)	(void);	
+	void	(*cf_tlb_flushID_SE)	(u_int va);	
+	void	(*cf_tlb_flushI)	(void);
+	void	(*cf_tlb_flushI_SE)	(u_int va);	
+	void	(*cf_tlb_flushD)	(void);
+	void	(*cf_tlb_flushD_SE)	(u_int va);	
 
 	/*
 	 * Cache operations:
@@ -122,34 +122,34 @@ struct cpu_functions {
 	 *		Valid virtual addresses must be passed to each
 	 *		cache operation.
 	 */
-	void	(*cf_icache_sync_all)	__P((void));
-	void	(*cf_icache_sync_range)	__P((vaddr_t, vsize_t));
+	void	(*cf_icache_sync_all)	(void);
+	void	(*cf_icache_sync_range)	(vaddr_t, vsize_t);
 
-	void	(*cf_dcache_wbinv_all)	__P((void));
-	void	(*cf_dcache_wbinv_range) __P((vaddr_t, vsize_t));
-	void	(*cf_dcache_inv_range)	__P((vaddr_t, vsize_t));
-	void	(*cf_dcache_wb_range)	__P((vaddr_t, vsize_t));
+	void	(*cf_dcache_wbinv_all)	(void);
+	void	(*cf_dcache_wbinv_range) (vaddr_t, vsize_t);
+	void	(*cf_dcache_inv_range)	(vaddr_t, vsize_t);
+	void	(*cf_dcache_wb_range)	(vaddr_t, vsize_t);
 
-	void	(*cf_idcache_wbinv_all)	__P((void));
-	void	(*cf_idcache_wbinv_range) __P((vaddr_t, vsize_t));
+	void	(*cf_idcache_wbinv_all)	(void);
+	void	(*cf_idcache_wbinv_range) (vaddr_t, vsize_t);
 
 	/* Other functions */
 
-	void	(*cf_flush_prefetchbuf)	__P((void));
-	void	(*cf_drain_writebuf)	__P((void));
-	void	(*cf_flush_brnchtgt_C)	__P((void));
-	void	(*cf_flush_brnchtgt_E)	__P((u_int va));
+	void	(*cf_flush_prefetchbuf)	(void);
+	void	(*cf_drain_writebuf)	(void);
+	void	(*cf_flush_brnchtgt_C)	(void);
+	void	(*cf_flush_brnchtgt_E)	(u_int va);
 
-	void	(*cf_sleep)		__P((int mode));
+	void	(*cf_sleep)		(int mode);
 
 	/* Soft functions */
 
-	int	(*cf_dataabt_fixup)	__P((void *arg));
-	int	(*cf_prefetchabt_fixup)	__P((void *arg));
+	int	(*cf_dataabt_fixup)	(void *arg);
+	int	(*cf_prefetchabt_fixup)	(void *arg);
 
-	void	(*cf_context_switch)	__P((void));
+	void	(*cf_context_switch)	(void);
 
-	void	(*cf_setup)		__P((char *string));
+	void	(*cf_setup)		(char *string);
 };
 
 extern struct cpu_functions cpufuncs;
@@ -197,162 +197,162 @@ extern u_int cputype;
 
 #define cpu_setup(a)			cpufuncs.cf_setup(a)
 
-int	set_cpufuncs		__P((void));
+int	set_cpufuncs		(void);
 #define ARCHITECTURE_NOT_PRESENT	1	/* known but not configured */
 #define ARCHITECTURE_NOT_SUPPORTED	2	/* not known */
 
-void	cpufunc_nullop		__P((void));
-int	cpufunc_null_fixup	__P((void *));
-int	early_abort_fixup	__P((void *));
-int	late_abort_fixup	__P((void *));
-u_int	cpufunc_id		__P((void));
-u_int	cpufunc_control		__P((u_int clear, u_int bic));
-void	cpufunc_domains		__P((u_int domains));
-u_int	cpufunc_faultstatus	__P((void));
-u_int	cpufunc_faultaddress	__P((void));
+void	cpufunc_nullop		(void);
+int	cpufunc_null_fixup	(void *);
+int	early_abort_fixup	(void *);
+int	late_abort_fixup	(void *);
+u_int	cpufunc_id		(void);
+u_int	cpufunc_control		(u_int clear, u_int bic);
+void	cpufunc_domains		(u_int domains);
+u_int	cpufunc_faultstatus	(void);
+u_int	cpufunc_faultaddress	(void);
 
 #ifdef CPU_ARM3
-u_int	arm3_control		__P((u_int clear, u_int bic));
-void	arm3_cache_flush	__P((void));
+u_int	arm3_control		(u_int clear, u_int bic);
+void	arm3_cache_flush	(void);
 #endif	/* CPU_ARM3 */
 
 #if defined(CPU_ARM6) || defined(CPU_ARM7)
-void	arm67_setttb		__P((u_int ttb));
-void	arm67_tlb_flush		__P((void));
-void	arm67_tlb_purge		__P((u_int va));
-void	arm67_cache_flush	__P((void));
-void	arm67_context_switch	__P((void));
+void	arm67_setttb		(u_int ttb);
+void	arm67_tlb_flush		(void);
+void	arm67_tlb_purge		(u_int va);
+void	arm67_cache_flush	(void);
+void	arm67_context_switch	(void);
 #endif	/* CPU_ARM6 || CPU_ARM7 */
 
 #ifdef CPU_ARM6
-void	arm6_setup		__P((char *string));
+void	arm6_setup		(char *string);
 #endif	/* CPU_ARM6 */
 
 #ifdef CPU_ARM7
-void	arm7_setup		__P((char *string));
+void	arm7_setup		(char *string);
 #endif	/* CPU_ARM7 */
 
 #ifdef CPU_ARM7TDMI
-int	arm7_dataabt_fixup	__P((void *arg));
-void	arm7tdmi_setup		__P((char *string));
-void	arm7tdmi_setttb		__P((u_int ttb));
-void	arm7tdmi_tlb_flushID	__P((void));
-void	arm7tdmi_tlb_flushID_SE	__P((u_int va));
-void	arm7tdmi_cache_flushID	__P((void));
-void	arm7tdmi_context_switch	__P((void));
+int	arm7_dataabt_fixup	(void *arg);
+void	arm7tdmi_setup		(char *string);
+void	arm7tdmi_setttb		(u_int ttb);
+void	arm7tdmi_tlb_flushID	(void);
+void	arm7tdmi_tlb_flushID_SE	(u_int va);
+void	arm7tdmi_cache_flushID	(void);
+void	arm7tdmi_context_switch	(void);
 #endif /* CPU_ARM7TDMI */
 
 #ifdef CPU_ARM8
-void	arm8_setttb		__P((u_int ttb));
-void	arm8_tlb_flushID	__P((void));
-void	arm8_tlb_flushID_SE	__P((u_int va));
-void	arm8_cache_flushID	__P((void));
-void	arm8_cache_flushID_E	__P((u_int entry));
-void	arm8_cache_cleanID	__P((void));
-void	arm8_cache_cleanID_E	__P((u_int entry));
-void	arm8_cache_purgeID	__P((void));
-void	arm8_cache_purgeID_E	__P((u_int entry));
-
-void	arm8_cache_syncI	__P((void));
-void	arm8_cache_cleanID_rng	__P((vaddr_t start, vsize_t end));
-void	arm8_cache_cleanD_rng	__P((vaddr_t start, vsize_t end));
-void	arm8_cache_purgeID_rng	__P((vaddr_t start, vsize_t end));
-void	arm8_cache_purgeD_rng	__P((vaddr_t start, vsize_t end));
-void	arm8_cache_syncI_rng	__P((vaddr_t start, vsize_t end));
-
-void	arm8_context_switch	__P((void));
-
-void	arm8_setup		__P((char *string));
-
-u_int	arm8_clock_config	__P((u_int, u_int));
+void	arm8_setttb		(u_int ttb);
+void	arm8_tlb_flushID	(void);
+void	arm8_tlb_flushID_SE	(u_int va);
+void	arm8_cache_flushID	(void);
+void	arm8_cache_flushID_E	(u_int entry);
+void	arm8_cache_cleanID	(void);
+void	arm8_cache_cleanID_E	(u_int entry);
+void	arm8_cache_purgeID	(void);
+void	arm8_cache_purgeID_E	(u_int entry);
+
+void	arm8_cache_syncI	(void);
+void	arm8_cache_cleanID_rng	(vaddr_t start, vsize_t end);
+void	arm8_cache_cleanD_rng	(vaddr_t start, vsize_t end);
+void	arm8_cache_purgeID_rng	(vaddr_t start, vsize_t end);
+void	arm8_cache_purgeD_rng	(vaddr_t start, vsize_t end);
+void	arm8_cache_syncI_rng	(vaddr_t start, vsize_t end);
+
+void	arm8_context_switch	(void);
+
+void	arm8_setup		(char *string);
+
+u_int	arm8_clock_config	(u_int, u_int);
 #endif
 
 #ifdef CPU_SA110
-void	sa110_setup		__P((char *string));
-void	sa110_context_switch	__P((void));
+void	sa110_setup		(char *string);
+void	sa110_context_switch	(void);
 #endif	/* CPU_SA110 */
 
 #if defined(CPU_SA1100) || defined(CPU_SA1110)
-void	sa11x0_drain_readbuf	__P((void));
+void	sa11x0_drain_readbuf	(void);
 
-void	sa11x0_context_switch	__P((void));
-void	sa11x0_cpu_sleep	__P((int mode));
+void	sa11x0_context_switch	(void);
+void	sa11x0_cpu_sleep	(int mode);
  
-void	sa11x0_setup		__P((char *string));
+void	sa11x0_setup		(char *string);
 #endif
 
 #if defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110)
-void	sa1_setttb		__P((u_int ttb));
+void	sa1_setttb		(u_int ttb);
 
-void	sa1_tlb_flushID_SE	__P((u_int va));
+void	sa1_tlb_flushID_SE	(u_int va);
 
-void	sa1_cache_flushID	__P((void));
-void	sa1_cache_flushI	__P((void));
-void	sa1_cache_flushD	__P((void));
-void	sa1_cache_flushD_SE	__P((u_int entry));
+void	sa1_cache_flushID	(void);
+void	sa1_cache_flushI	(void);
+void	sa1_cache_flushD	(void);
+void	sa1_cache_flushD_SE	(u_int entry);
 
-void	sa1_cache_cleanID	__P((void));
-void	sa1_cache_cleanD	__P((void));
-void	sa1_cache_cleanD_E	__P((u_int entry));
+void	sa1_cache_cleanID	(void);
+void	sa1_cache_cleanD	(void);
+void	sa1_cache_cleanD_E	(u_int entry);
 
-void	sa1_cache_purgeID	__P((void));
-void	sa1_cache_purgeID_E	__P((u_int entry));
-void	sa1_cache_purgeD	__P((void));
-void	sa1_cache_purgeD_E	__P((u_int entry));
+void	sa1_cache_purgeID	(void);
+void	sa1_cache_purgeID_E	(u_int entry);
+void	sa1_cache_purgeD	(void);
+void	sa1_cache_purgeD_E	(u_int entry);
 
-void	sa1_cache_syncI		__P((void));
-void	sa1_cache_cleanID_rng	__P((vaddr_t start, vsize_t end));
-void	sa1_cache_cleanD_rng	__P((vaddr_t start, vsize_t end));
-void	sa1_cache_purgeID_rng	__P((vaddr_t start, vsize_t end));
-void	sa1_cache_purgeD_rng	__P((vaddr_t start, vsize_t end));
-void	sa1_cache_syncI_rng	__P((vaddr_t start, vsize_t end));
+void	sa1_cache_syncI		(void);
+void	sa1_cache_cleanID_rng	(vaddr_t start, vsize_t end);
+void	sa1_cache_cleanD_rng	(vaddr_t start, vsize_t end);
+void	sa1_cache_purgeID_rng	(vaddr_t start, vsize_t end);
+void	sa1_cache_purgeD_rng	(vaddr_t start, vsize_t end);
+void	sa1_cache_syncI_rng	(vaddr_t start, vsize_t end);
 
 #endif
 
 #ifdef CPU_ARM9
-void	arm9_setttb		__P((u_int));
+void	arm9_setttb		(u_int);
 
-void	arm9_tlb_flushID_SE	__P((u_int va));
+void	arm9_tlb_flushID_SE	(u_int va);
 
-void	arm9_cache_flushID	__P((void));
-void	arm9_cache_flushID_SE	__P((u_int));
-void	arm9_cache_flushI	__P((void));
-void	arm9_cache_flushI_SE	__P((u_int));
-void	arm9_cache_flushD	__P((void));
-void	arm9_cache_flushD_SE	__P((u_int));
+void	arm9_cache_flushID	(void);
+void	arm9_cache_flushID_SE	(u_int);
+void	arm9_cache_flushI	(void);
+void	arm9_cache_flushI_SE	(u_int);
+void	arm9_cache_flushD	(void);
+void	arm9_cache_flushD_SE	(u_int);
 
-void	arm9_cache_cleanID	__P((void));
+void	arm9_cache_cleanID	(void);
 
-void	arm9_cache_syncI	__P((void));
-void	arm9_cache_flushID_rng	__P((vaddr_t, vsize_t));
-void	arm9_cache_flushD_rng	__P((vaddr_t, vsize_t));
-void	arm9_cache_syncI_rng	__P((vaddr_t, vsize_t));
+void	arm9_cache_syncI	(void);
+void	arm9_cache_flushID_rng	(vaddr_t, vsize_t);
+void	arm9_cache_flushD_rng	(vaddr_t, vsize_t);
+void	arm9_cache_syncI_rng	(vaddr_t, vsize_t);
 
-void	arm9_context_switch	__P((void));
+void	arm9_context_switch	(void);
 
-void	arm9_setup		__P((char *string));
+void	arm9_setup		(char *string);
 #endif
 
 #ifdef CPU_ARM10
-void	arm10_setttb		__P((u_int));
+void	arm10_setttb		(u_int);
 
-void	arm10_tlb_flushID_SE	__P((u_int));
-void	arm10_tlb_flushI_SE	__P((u_int));
+void	arm10_tlb_flushID_SE	(u_int);
+void	arm10_tlb_flushI_SE	(u_int);
 
-void	arm10_icache_sync_all	__P((void));
-void	arm10_icache_sync_range	__P((vaddr_t, vsize_t));
+void	arm10_icache_sync_all	(void);
+void	arm10_icache_sync_range	(vaddr_t, vsize_t);
 
-void	arm10_dcache_wbinv_all	__P((void));
-void	arm10_dcache_wbinv_range __P((vaddr_t, vsize_t));
-void	arm10_dcache_inv_range	__P((vaddr_t, vsize_t));
-void	arm10_dcache_wb_range	__P((vaddr_t, vsize_t));
+void	arm10_dcache_wbinv_all	(void);
+void	arm10_dcache_wbinv_range (vaddr_t, vsize_t);
+void	arm10_dcache_inv_range	(vaddr_t, vsize_t);
+void	arm10_dcache_wb_range	(vaddr_t, vsize_t);
 
-void	arm10_idcache_wbinv_all	__P((void));
-void	arm10_idcache_wbinv_range __P((vaddr_t, vsize_t));
+void	arm10_idcache_wbinv_all	(void);
+void	arm10_idcache_wbinv_range (vaddr_t, vsize_t);
 
-void	arm10_context_switch	__P((void));
+void	arm10_context_switch	(void);
 
-void	arm10_setup		__P((char *string));
+void	arm10_setup		(char *string);
 
 extern unsigned arm10_dcache_sets_max;
 extern unsigned arm10_dcache_sets_inc;
@@ -365,60 +365,60 @@ extern unsigned arm10_dcache_index_inc;
     defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \
     defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425)
 
-void	armv4_tlb_flushID	__P((void));
-void	armv4_tlb_flushI	__P((void));
-void	armv4_tlb_flushD	__P((void));
-void	armv4_tlb_flushD_SE	__P((u_int va));
+void	armv4_tlb_flushID	(void);
+void	armv4_tlb_flushI	(void);
+void	armv4_tlb_flushD	(void);
+void	armv4_tlb_flushD_SE	(u_int va);
 
-void	armv4_drain_writebuf	__P((void));
+void	armv4_drain_writebuf	(void);
 #endif
 
 #if defined(CPU_IXP12X0)
-void	ixp12x0_drain_readbuf	__P((void));
-void	ixp12x0_context_switch	__P((void));
-void	ixp12x0_setup		__P((char *string));
+void	ixp12x0_drain_readbuf	(void);
+void	ixp12x0_context_switch	(void);
+void	ixp12x0_setup		(char *string);
 #endif
 
 #if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \
     defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \
     (ARM_MMU_XSCALE == 1)
-void	xscale_cpwait		__P((void));
+void	xscale_cpwait		(void);
 
-void	xscale_cpu_sleep	__P((int mode));
+void	xscale_cpu_sleep	(int mode);
 
-u_int	xscale_control		__P((u_int clear, u_int bic));
+u_int	xscale_control		(u_int clear, u_int bic);
 
-void	xscale_setttb		__P((u_int ttb));
+void	xscale_setttb		(u_int ttb);
 
-void	xscale_tlb_flushID_SE	__P((u_int va));
+void	xscale_tlb_flushID_SE	(u_int va);
 
-void	xscale_cache_flushID	__P((void));
-void	xscale_cache_flushI	__P((void));
-void	xscale_cache_flushD	__P((void));
-void	xscale_cache_flushD_SE	__P((u_int entry));
+void	xscale_cache_flushID	(void);
+void	xscale_cache_flushI	(void);
+void	xscale_cache_flushD	(void);
+void	xscale_cache_flushD_SE	(u_int entry);
 
-void	xscale_cache_cleanID	__P((void));
-void	xscale_cache_cleanD	__P((void));
-void	xscale_cache_cleanD_E	__P((u_int entry));
+void	xscale_cache_cleanID	(void);
+void	xscale_cache_cleanD	(void);
+void	xscale_cache_cleanD_E	(u_int entry);
 
-void	xscale_cache_clean_minidata __P((void));
+void	xscale_cache_clean_minidata (void);
 
-void	xscale_cache_purgeID	__P((void));
-void	xscale_cache_purgeID_E	__P((u_int entry));
-void	xscale_cache_purgeD	__P((void));
-void	xscale_cache_purgeD_E	__P((u_int entry));
+void	xscale_cache_purgeID	(void);
+void	xscale_cache_purgeID_E	(u_int entry);
+void	xscale_cache_purgeD	(void);
+void	xscale_cache_purgeD_E	(u_int entry);
 
-void	xscale_cache_syncI	__P((void));
-void	xscale_cache_cleanID_rng __P((vaddr_t start, vsize_t end));
-void	xscale_cache_cleanD_rng	__P((vaddr_t start, vsize_t end));
-void	xscale_cache_purgeID_rng __P((vaddr_t start, vsize_t end));
-void	xscale_cache_purgeD_rng	__P((vaddr_t start, vsize_t end));
-void	xscale_cache_syncI_rng	__P((vaddr_t start, vsize_t end));
-void	xscale_cache_flushD_rng	__P((vaddr_t start, vsize_t end));
+void	xscale_cache_syncI	(void);
+void	xscale_cache_cleanID_rng (vaddr_t start, vsize_t end);
+void	xscale_cache_cleanD_rng	(vaddr_t start, vsize_t end);
+void	xscale_cache_purgeID_rng (vaddr_t start, vsize_t end);
+void	xscale_cache_purgeD_rng	(vaddr_t start, vsize_t end);
+void	xscale_cache_syncI_rng	(vaddr_t start, vsize_t end);
+void	xscale_cache_flushD_rng	(vaddr_t start, vsize_t end);
 
-void	xscale_context_switch	__P((void));
+void	xscale_context_switch	(void);
 
-void	xscale_setup		__P((char *string));
+void	xscale_setup		(char *string);
 #endif	/* CPU_XSCALE_80200 || CPU_XSCALE_80321 || CPU_XSCALE_PXA2X0 || CPU_XSCALE_IXP425 */
 
 #define tlb_flush	cpu_tlb_flushID
@@ -484,20 +484,20 @@ u_int	get_r15(void);
  * (in arm/arm/setstack.S)
  */
 
-void set_stackptr	__P((u_int mode, u_int address));
-u_int get_stackptr	__P((u_int mode));
+void set_stackptr	(u_int mode, u_int address);
+u_int get_stackptr	(u_int mode);
 
 /*
  * Miscellany
  */
 
-int get_pc_str_offset	__P((void));
+int get_pc_str_offset	(void);
 
 /*
  * CPU functions from locore.S
  */
 
-void cpu_reset		__P((void)) __attribute__((__noreturn__));
+void cpu_reset		(void) __attribute__((__noreturn__));
 
 /*
  * Cache info variables.
diff --git a/sys/arch/arm/include/db_machdep.h b/sys/arch/arm/include/db_machdep.h
index 073bd60d296..25221717e79 100644
--- a/sys/arch/arm/include/db_machdep.h
+++ b/sys/arch/arm/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.2 2004/05/19 03:17:07 drahn Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.5 2001/11/22 18:00:00 thorpej Exp $	*/
 
 /*
@@ -101,8 +101,8 @@ extern db_regs_t		ddb_regs;	/* register state */
 #define SOFTWARE_SSTEP
 
 db_addr_t	db_branch_taken(u_int inst, db_addr_t pc, db_regs_t *regs);
-int kdb_trap __P((int, db_regs_t *));
-void db_machine_init __P((void));
+int kdb_trap (int, db_regs_t *);
+void db_machine_init (void);
 
 #define branch_taken(ins, pc, fun, regs) \
 				db_branch_taken((ins), (pc), (regs))
@@ -111,7 +111,7 @@ void db_machine_init __P((void));
 #define DB_ELFSIZE 32
 #define DB_NO_AOUT
 
-void db_show_panic_cmd	__P((db_expr_t, int, db_expr_t, char *));
-void db_show_frame_cmd	__P((db_expr_t, int, db_expr_t, char *));
+void db_show_panic_cmd	(db_expr_t, int, db_expr_t, char *);
+void db_show_frame_cmd	(db_expr_t, int, db_expr_t, char *);
 
 #endif	/* _ARM_DB_MACHDEP_H_ */
diff --git a/sys/arch/arm/include/disklabel.h b/sys/arch/arm/include/disklabel.h
index f294c2643f1..e4bc2e7f503 100644
--- a/sys/arch/arm/include/disklabel.h
+++ b/sys/arch/arm/include/disklabel.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: disklabel.h,v 1.2 2004/02/13 22:48:14 miod Exp $	*/
-/*	$OpenBSD: disklabel.h,v 1.2 2004/02/13 22:48:14 miod Exp $	*/
+/*	$OpenBSD: disklabel.h,v 1.3 2004/05/19 03:17:07 drahn Exp $	*/
+/*	$OpenBSD: disklabel.h,v 1.3 2004/05/19 03:17:07 drahn Exp $	*/
 /*	$NetBSD: disklabel.h,v 1.2 2001/11/25 19:02:03 thorpej Exp $	*/
 
 /*
@@ -138,12 +138,12 @@ struct cpu_disklabel {
 struct buf;
 struct disklabel;
 /* for readdisklabel.  rv != 0 -> matches, msg == NULL -> success */
-int	mbr_label_read __P((dev_t, void (*)(struct buf *), struct disklabel *,
-	    struct cpu_disklabel *, char **, int *, int *));
+int	mbr_label_read (dev_t, void (*)(struct buf *), struct disklabel *,
+	    struct cpu_disklabel *, char **, int *, int *);
 
 /* for writedisklabel.  rv == 0 -> dosen't match, rv > 0 -> success */
-int	mbr_label_locate __P((dev_t, void (*)(struct buf *),
-	    struct disklabel *, struct cpu_disklabel *, int *, int *));
+int	mbr_label_locate (dev_t, void (*)(struct buf *),
+	    struct disklabel *, struct cpu_disklabel *, int *, int *);
 #endif /* _KERNEL */
 
 #endif /* _ARM_DISKLABEL_H_ */
diff --git a/sys/arch/arm/include/float.h b/sys/arch/arm/include/float.h
index 1466dd4e7d7..0795daaad25 100644
--- a/sys/arch/arm/include/float.h
+++ b/sys/arch/arm/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$OpenBSD: float.h,v 1.2 2004/05/19 03:17:07 drahn Exp $	*/
 /*	$NetBSD: float.h,v 1.1 2001/01/10 19:02:06 bjh21 Exp $	*/
 
 /*
@@ -51,7 +51,7 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-extern int __flt_rounds __P((void));
+extern int __flt_rounds (void);
 __END_DECLS
 
 #define FLT_RADIX	2		/* b */
diff --git a/sys/arch/arm/include/frame.h b/sys/arch/arm/include/frame.h
index 2db8310770d..3a64436dd4e 100644
--- a/sys/arch/arm/include/frame.h
+++ b/sys/arch/arm/include/frame.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frame.h,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$OpenBSD: frame.h,v 1.2 2004/05/19 03:17:07 drahn Exp $	*/
 /*	$NetBSD: frame.h,v 1.9 2003/12/01 08:48:33 scw Exp $	*/
 
 /*
@@ -164,7 +164,7 @@ struct frame {
 };
 
 #ifdef _KERNEL
-void validate_trapframe __P((trapframe_t *, int));
+void validate_trapframe (trapframe_t *, int);
 #endif /* _KERNEL */
 
 #else /* _LOCORE */
diff --git a/sys/arch/arm/include/machdep.h b/sys/arch/arm/include/machdep.h
index 4abb8321219..dead7bd4433 100644
--- a/sys/arch/arm/include/machdep.h
+++ b/sys/arch/arm/include/machdep.h
@@ -1,27 +1,27 @@
-/*	$OpenBSD: machdep.h,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$OpenBSD: machdep.h,v 1.2 2004/05/19 03:17:07 drahn Exp $	*/
 /* $NetBSD: machdep.h,v 1.7 2002/02/21 02:52:21 thorpej Exp $ */
 
 #ifndef _ARM32_BOOT_MACHDEP_H_
 #define _ARM32_BOOT_MACHDEP_H_
 
 /* misc prototypes used by the many arm machdeps */
-void halt __P((void));
-void parse_mi_bootargs __P((char *));
-void data_abort_handler __P((trapframe_t *));
-void prefetch_abort_handler __P((trapframe_t *));
-void undefinedinstruction_bounce __P((trapframe_t *));
-void dumpsys	__P((void));
+void halt (void);
+void parse_mi_bootargs (char *);
+void data_abort_handler (trapframe_t *);
+void prefetch_abort_handler (trapframe_t *);
+void undefinedinstruction_bounce (trapframe_t *);
+void dumpsys	(void);
 
 /* 
  * note that we use void * as all the platforms have different ideas on what
  * the structure is
  */
-u_int initarm __P((void *));
+u_int initarm (void *);
 
 /* from arm/arm/intr.c */
-void dosoftints __P((void));
-void set_spl_masks __P((void));
+void dosoftints (void);
+void set_spl_masks (void);
 #ifdef DIAGNOSTIC
-void dump_spl_masks __P((void));
+void dump_spl_masks (void);
 #endif
 #endif
diff --git a/sys/arch/arm/include/param.h b/sys/arch/arm/include/param.h
index 7f95b432d07..e8eed68c94f 100644
--- a/sys/arch/arm/include/param.h
+++ b/sys/arch/arm/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.3 2004/04/19 22:55:48 deraadt Exp $	*/
+/*	$OpenBSD: param.h,v 1.4 2004/05/19 03:17:07 drahn Exp $	*/
 /*	$NetBSD: param.h,v 1.9 2002/03/24 03:37:23 thorpej Exp $	*/
 
 /*
@@ -107,7 +107,7 @@
     
 #ifdef _KERNEL
 #ifndef _LOCORE
-void	delay __P((unsigned));
+void	delay (unsigned);
 #define DELAY(x)	delay(x)
 #endif
 #endif
diff --git a/sys/arch/arm/include/rtc.h b/sys/arch/arm/include/rtc.h
index 6c6a1666d52..06b0caf175a 100644
--- a/sys/arch/arm/include/rtc.h
+++ b/sys/arch/arm/include/rtc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtc.h,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$OpenBSD: rtc.h,v 1.2 2004/05/19 03:17:07 drahn Exp $	*/
 /*	$NetBSD: rtc.h,v 1.1 2001/02/23 21:23:50 reinoud Exp $	*/
 
 /*
@@ -77,8 +77,8 @@ typedef struct {
 #define RTC_ADDR_CENT     	0xc1
 
 #ifdef _KERNEL
-int cmos_read __P((int));
-int cmos_write __P((int, int));
+int cmos_read (int);
+int cmos_write (int, int);
 #endif /* _KERNEL */
 
 /* End of rtc.h */
diff --git a/sys/arch/arm/include/sysarch.h b/sys/arch/arm/include/sysarch.h
index b379abbecd3..155006b6333 100644
--- a/sys/arch/arm/include/sysarch.h
+++ b/sys/arch/arm/include/sysarch.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysarch.h,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$OpenBSD: sysarch.h,v 1.2 2004/05/19 03:17:07 drahn Exp $	*/
 /*	$NetBSD: sysarch.h,v 1.4 2002/03/30 06:23:39 thorpej Exp $	*/
 
 /*
@@ -52,9 +52,9 @@ struct arm_sync_icache_args {
 
 #ifndef _KERNEL
 __BEGIN_DECLS
-int	arm_sync_icache __P((u_int addr, int len));
-int	arm_drain_writebuf __P((void));
-int	sysarch __P((int, void *));
+int	arm_sync_icache (u_int addr, int len);
+int	arm_drain_writebuf (void);
+int	sysarch (int, void *);
 __END_DECLS
 #endif
 
diff --git a/sys/arch/arm/include/undefined.h b/sys/arch/arm/include/undefined.h
index dfb22764ed7..e3c38ca7e2e 100644
--- a/sys/arch/arm/include/undefined.h
+++ b/sys/arch/arm/include/undefined.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: undefined.h,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$OpenBSD: undefined.h,v 1.2 2004/05/19 03:17:07 drahn Exp $	*/
 /*	$NetBSD: undefined.h,v 1.4 2001/12/20 01:20:23 thorpej Exp $	*/
 
 /*
@@ -51,7 +51,7 @@
 
 #include <sys/queue.h>
 
-typedef int (*undef_handler_t) __P((unsigned int, unsigned int, trapframe_t *, int));
+typedef int (*undef_handler_t) (unsigned int, unsigned int, trapframe_t *, int);
 
 #define FP_COPROC	1
 #define FP_COPROC2	2
@@ -59,9 +59,9 @@ typedef int (*undef_handler_t) __P((unsigned int, unsigned int, trapframe_t *, i
 
 /* Prototypes for undefined.c */
 
-void *install_coproc_handler __P((int, undef_handler_t));
-void remove_coproc_handler __P((void *));
-void undefined_init __P((void));
+void *install_coproc_handler (int, undef_handler_t);
+void remove_coproc_handler (void *);
+void undefined_init (void);
 
 /*
  * XXX Stuff below here is for use before malloc() is available.  Most code
@@ -77,7 +77,7 @@ struct undefined_handler {
  * Handlers installed using install_coproc_handler_static shouldn't be
  * removed.
  */
-void install_coproc_handler_static __P((int, struct undefined_handler *));
+void install_coproc_handler_static (int, struct undefined_handler *);
 
 /* Calls up to undefined.c from trap handlers */
 void undefinedinstruction(struct trapframe *);
diff --git a/sys/arch/arm/mainbus/mainbus.c b/sys/arch/arm/mainbus/mainbus.c
index a472197631d..f527313ec5b 100644
--- a/sys/arch/arm/mainbus/mainbus.c
+++ b/sys/arch/arm/mainbus/mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mainbus.c,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$OpenBSD: mainbus.c,v 1.2 2004/05/19 03:17:07 drahn Exp $	*/
 /* $NetBSD: mainbus.c,v 1.3 2001/06/13 17:52:43 nathanw Exp $ */
 
 /*
@@ -68,10 +68,10 @@ extern struct bus_space mainbus_bs_tag;
 
 /* Prototypes for functions provided */
 
-int  mainbusmatch  __P((struct device *, void *, void *));
-void mainbusattach __P((struct device *, struct device *, void *));
-int  mainbusprint  __P((void *aux, const char *mainbus));
-int  mainbussearch __P((struct device *, struct cfdata *, void *));
+int  mainbusmatch  (struct device *, void *, void *);
+void mainbusattach (struct device *, struct device *, void *);
+int  mainbusprint  (void *aux, const char *mainbus);
+int  mainbussearch (struct device *, struct cfdata *, void *);
 
 /* attach and device structures for the device */