First round of __P removal in sys

96 files changed, 1292 insertions, 1297 deletions

diff --git a/sys/arch/sparc/dev/amd7930.c b/sys/arch/sparc/dev/amd7930.c
index 3e162c8f7ee..7acd6f32a43 100644
--- a/sys/arch/sparc/dev/amd7930.c
+++ b/sys/arch/sparc/dev/amd7930.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: amd7930.c,v 1.18 1999/08/06 01:26:49 jason Exp $	*/
+/*	$OpenBSD: amd7930.c,v 1.19 2002/03/14 01:26:42 millert Exp $	*/
 /*	$NetBSD: amd7930.c,v 1.37 1998/03/30 14:23:40 pk Exp $	*/
 
 /*
@@ -89,7 +89,7 @@ struct amd7930_softc {
 
 /* interrupt interfaces */
 #ifdef AUDIO_C_HANDLER
-int	amd7930hwintr __P((void *));
+int	amd7930hwintr(void *);
 #if defined(SUN4M)
 #define AUDIO_SET_SWINTR do {		\
 	if (CPU_ISSUN4M)		\
@@ -103,15 +103,15 @@ int	amd7930hwintr __P((void *));
 #else
 struct auio *auiop;
 #endif /* AUDIO_C_HANDLER */
-int	amd7930swintr __P((void *));
+int	amd7930swintr(void *);
 
 /* forward declarations */
-void	audio_setmap __P((volatile struct amd7930 *, struct mapreg *));
-static void init_amd __P((volatile struct amd7930 *));
+void	audio_setmap(volatile struct amd7930 *, struct mapreg *);
+static void init_amd(volatile struct amd7930 *);
 
 /* autoconfiguration driver */
-void	amd7930attach __P((struct device *, struct device *, void *));
-int	amd7930match __P((struct device *, void *, void *));
+void	amd7930attach(struct device *, struct device *, void *);
+int	amd7930match(struct device *, void *, void *);
 
 struct cfattach audioamd_ca = {
 	sizeof(struct amd7930_softc), amd7930match, amd7930attach
@@ -204,23 +204,23 @@ static const u_short ger_coeff[] = {
 /*
  * Define our interface to the higher level audio driver.
  */
-int	amd7930_open __P((void *, int));
-void	amd7930_close __P((void *));
-int	amd7930_query_encoding __P((void *, struct audio_encoding *));
-int	amd7930_set_params __P((void *, int, int, struct audio_params *, struct audio_params *));
-int	amd7930_round_blocksize __P((void *, int));
-int	amd7930_commit_settings __P((void *));
+int	amd7930_open(void *, int);
+void	amd7930_close(void *);
+int	amd7930_query_encoding(void *, struct audio_encoding *);
+int	amd7930_set_params(void *, int, int, struct audio_params *, struct audio_params *);
+int	amd7930_round_blocksize(void *, int);
+int	amd7930_commit_settings(void *);
 int	amd7930_start_output __P((void *, void *, int, void (*)(void *),
 				  void *));
 int	amd7930_start_input __P((void *, void *, int, void (*)(void *),
 				 void *));
-int	amd7930_halt_output __P((void *));
-int	amd7930_halt_input __P((void *));
-int	amd7930_getdev __P((void *, struct audio_device *));
-int	amd7930_set_port __P((void *, mixer_ctrl_t *));
-int	amd7930_get_port __P((void *, mixer_ctrl_t *));
-int	amd7930_query_devinfo __P((void *, mixer_devinfo_t *));
-int	amd7930_get_props __P((void *));
+int	amd7930_halt_output(void *);
+int	amd7930_halt_input(void *);
+int	amd7930_getdev(void *, struct audio_device *);
+int	amd7930_set_port(void *, mixer_ctrl_t *);
+int	amd7930_get_port(void *, mixer_ctrl_t *);
+int	amd7930_query_devinfo(void *, mixer_devinfo_t *);
+int	amd7930_get_props(void *);
 
 struct audio_hw_if sa_hw_if = {
 	amd7930_open,
@@ -480,7 +480,7 @@ amd7930_start_output(addr, p, cc, intr, arg)
 	void *addr;
 	void *p;
 	int cc;
-	void (*intr) __P((void *));
+	void (*intr)(void *);
 	void *arg;
 {
 	register struct amd7930_softc *sc = addr;
@@ -512,7 +512,7 @@ amd7930_start_input(addr, p, cc, intr, arg)
 	void *addr;
 	void *p;
 	int cc;
-	void (*intr) __P((void *));
+	void (*intr)(void *);
 	void *arg;
 {
 	register struct amd7930_softc *sc = addr;
diff --git a/sys/arch/sparc/dev/be.c b/sys/arch/sparc/dev/be.c
index 8487b6f0f91..b32ed103c4a 100644
--- a/sys/arch/sparc/dev/be.c
+++ b/sys/arch/sparc/dev/be.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: be.c,v 1.30 2002/02/08 19:05:25 jason Exp $	*/
+/*	$OpenBSD: be.c,v 1.31 2002/03/14 01:26:42 millert Exp $	*/
 
 /*
  * Copyright (c) 1998 Theo de Raadt and Jason L. Wright.
@@ -70,33 +70,33 @@
 #include <sparc/dev/bereg.h>
 #include <sparc/dev/bevar.h>
 
-int	bematch __P((struct device *, void *, void *));
-void	beattach __P((struct device *, struct device *, void *));
-
-void	beinit __P((struct besoftc *));
-void	bestart __P((struct ifnet *));
-void	bestop __P((struct besoftc *));
-void	bewatchdog __P((struct ifnet *));
-int	beioctl __P((struct ifnet *, u_long, caddr_t));
-void	bereset __P((struct besoftc *));
-
-int	beintr __P((void *));
-int	berint __P((struct besoftc *));
-int	betint __P((struct besoftc *));
-int	beqint __P((struct besoftc *, u_int32_t));
-int	beeint __P((struct besoftc *, u_int32_t));
-void	be_read __P((struct besoftc *, int, int));
-
-void	be_tcvr_idle __P((struct besoftc *));
-void	be_tcvr_init __P((struct besoftc *));
-void	be_tcvr_write __P((struct besoftc *, u_int8_t, u_int16_t));
-void	be_tcvr_write_bit __P((struct besoftc *, int));
-int	be_tcvr_read_bit1 __P((struct besoftc *));
-int	be_tcvr_read_bit2 __P((struct besoftc *));
-int	be_tcvr_read __P((struct besoftc *, u_int8_t));
-void	be_ifmedia_sts __P((struct ifnet *, struct ifmediareq *));
-int	be_ifmedia_upd __P((struct ifnet *));
-void	be_mcreset __P((struct besoftc *));
+int	bematch(struct device *, void *, void *);
+void	beattach(struct device *, struct device *, void *);
+
+void	beinit(struct besoftc *);
+void	bestart(struct ifnet *);
+void	bestop(struct besoftc *);
+void	bewatchdog(struct ifnet *);
+int	beioctl(struct ifnet *, u_long, caddr_t);
+void	bereset(struct besoftc *);
+
+int	beintr(void *);
+int	berint(struct besoftc *);
+int	betint(struct besoftc *);
+int	beqint(struct besoftc *, u_int32_t);
+int	beeint(struct besoftc *, u_int32_t);
+void	be_read(struct besoftc *, int, int);
+
+void	be_tcvr_idle(struct besoftc *);
+void	be_tcvr_init(struct besoftc *);
+void	be_tcvr_write(struct besoftc *, u_int8_t, u_int16_t);
+void	be_tcvr_write_bit(struct besoftc *, int);
+int	be_tcvr_read_bit1(struct besoftc *);
+int	be_tcvr_read_bit2(struct besoftc *);
+int	be_tcvr_read(struct besoftc *, u_int8_t);
+void	be_ifmedia_sts(struct ifnet *, struct ifmediareq *);
+int	be_ifmedia_upd(struct ifnet *);
+void	be_mcreset(struct besoftc *);
 
 struct cfdriver be_cd = {
 	NULL, "be", DV_IFNET
@@ -130,7 +130,7 @@ beattach(parent, self, aux)
 	struct ifnet *ifp = &sc->sc_arpcom.ac_if;
 	struct confargs *ca = aux;
 	struct bootpath *bp;
-	extern void myetheraddr __P((u_char *));
+	extern void myetheraddr(u_char *);
 	int pri, bmsr;
 
 	if (ca->ca_ra.ra_nintr != 1) {
diff --git a/sys/arch/sparc/dev/bpp.c b/sys/arch/sparc/dev/bpp.c
index a1fdf28a56f..08ccb6bd98a 100644
--- a/sys/arch/sparc/dev/bpp.c
+++ b/sys/arch/sparc/dev/bpp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bpp.c,v 1.2 2001/07/04 08:43:28 niklas Exp $	*/
+/*	$OpenBSD: bpp.c,v 1.3 2002/03/14 01:26:42 millert Exp $	*/
 
 /*
  * Copyright (c) 1997, Jason Downs.  All rights reserved.
@@ -62,8 +62,8 @@ struct bpp_softc {
 	volatile struct bppregs *sc_regs;
 };
 
-static int bppmatch __P((struct device *, void *, void *));
-static void bppattach __P((struct device *, struct device *, void *));
+static int bppmatch(struct device *, void *, void *);
+static void bppattach(struct device *, struct device *, void *);
 
 #define BPPUNIT(s)	minor(s)
 
@@ -75,11 +75,11 @@ struct cfdriver bpp_cd = {
 	NULL, "bpp", DV_DULL
 };
 
-static __inline__ void bpp_outb __P((struct bpp_softc *, u_int8_t));
-static __inline__ u_int8_t bpp_inb __P((struct bpp_softc *));
-static void bppreset __P((struct bpp_softc *, int));
-static void bppresetmode __P((struct bpp_softc *));
-static int bpppushbytes __P((struct bpp_softc *));
+static __inline__ void bpp_outb(struct bpp_softc *, u_int8_t);
+static __inline__ u_int8_t bpp_inb(struct bpp_softc *);
+static void bppreset(struct bpp_softc *, int);
+static void bppresetmode(struct bpp_softc *);
+static int bpppushbytes(struct bpp_softc *);
 
 static int
 bppmatch(parent, vcf, aux)
diff --git a/sys/arch/sparc/dev/btvar.h b/sys/arch/sparc/dev/btvar.h
index e08df3b8b1c..f33e9907eba 100644
--- a/sys/arch/sparc/dev/btvar.h
+++ b/sys/arch/sparc/dev/btvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: btvar.h,v 1.2 1997/08/08 08:24:41 downsj Exp $	*/
+/*	$OpenBSD: btvar.h,v 1.3 2002/03/14 01:26:42 millert Exp $	*/
 /*	$NetBSD: btvar.h,v 1.2 1994/11/20 20:51:56 deraadt Exp $ */
 
 /*
@@ -62,8 +62,8 @@ union bt_cmap {
 /*
  * Routines in bt_subr.c.
  */
-int	bt_getcmap __P((struct fbcmap *, union bt_cmap *, int));
-int	bt_putcmap __P((struct fbcmap *, union bt_cmap *, int));
+int	bt_getcmap(struct fbcmap *, union bt_cmap *, int);
+int	bt_putcmap(struct fbcmap *, union bt_cmap *, int);
 
 /*
  * Compute (x / 4) * 3 and (x / 4) * 4.  These are used in turning
diff --git a/sys/arch/sparc/dev/bwtwo.c b/sys/arch/sparc/dev/bwtwo.c
index 714b223c67e..6934d87c980 100644
--- a/sys/arch/sparc/dev/bwtwo.c
+++ b/sys/arch/sparc/dev/bwtwo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bwtwo.c,v 1.19 2001/11/06 19:53:16 miod Exp $	*/
+/*	$OpenBSD: bwtwo.c,v 1.20 2002/03/14 01:26:42 millert Exp $	*/
 /*	$NetBSD: bwtwo.c,v 1.33 1997/05/24 20:16:02 pk Exp $ */
 
 /*
@@ -103,11 +103,11 @@ struct bwtwo_softc {
 };
 
 /* autoconfiguration driver */
-static void	bwtwoattach __P((struct device *, struct device *, void *));
-static int	bwtwomatch __P((struct device *, void *, void *));
-static void	bwtwounblank __P((struct device *));
-static void	bwtwo_set_video __P((struct bwtwo_softc *, int));
-static int	bwtwo_get_video __P((struct bwtwo_softc *));
+static void	bwtwoattach(struct device *, struct device *, void *);
+static int	bwtwomatch(struct device *, void *, void *);
+static void	bwtwounblank(struct device *);
+static void	bwtwo_set_video(struct bwtwo_softc *, int);
+static int	bwtwo_get_video(struct bwtwo_softc *);
 
 struct cfattach bwtwo_ca = {
 	sizeof(struct bwtwo_softc), bwtwomatch, bwtwoattach
diff --git a/sys/arch/sparc/dev/cgeight.c b/sys/arch/sparc/dev/cgeight.c
index 8844b096c52..1ced12ab486 100644
--- a/sys/arch/sparc/dev/cgeight.c
+++ b/sys/arch/sparc/dev/cgeight.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgeight.c,v 1.12 2001/11/06 19:53:16 miod Exp $	*/
+/*	$OpenBSD: cgeight.c,v 1.13 2002/03/14 01:26:42 millert Exp $	*/
 /*	$NetBSD: cgeight.c,v 1.13 1997/05/24 20:16:04 pk Exp $	*/
 
 /*
@@ -92,7 +92,7 @@ struct cgeight_softc {
 static void	cgeightattach(struct device *, struct device *, void *);
 static int	cgeightmatch(struct device *, void *, void *);
 #if defined(SUN4)
-static void	cgeightunblank __P((struct device *));
+static void	cgeightunblank(struct device *);
 #endif
 
 struct cfattach cgeight_ca = {
@@ -112,9 +112,9 @@ static struct fbdriver cgeightfbdriver = {
 extern int fbnode;
 extern struct tty *fbconstty;
 
-static void cgeightloadcmap __P((struct cgeight_softc *, int, int));
-static int cgeight_get_video __P((struct cgeight_softc *));
-static void cgeight_set_video __P((struct cgeight_softc *, int));
+static void cgeightloadcmap(struct cgeight_softc *, int, int);
+static int cgeight_get_video(struct cgeight_softc *);
+static void cgeight_set_video(struct cgeight_softc *, int);
 #endif
 
 /*
diff --git a/sys/arch/sparc/dev/cgfour.c b/sys/arch/sparc/dev/cgfour.c
index 1ccc6e452a6..af24d4e5b9a 100644
--- a/sys/arch/sparc/dev/cgfour.c
+++ b/sys/arch/sparc/dev/cgfour.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgfour.c,v 1.12 2001/11/06 19:53:16 miod Exp $	*/
+/*	$OpenBSD: cgfour.c,v 1.13 2002/03/14 01:26:42 millert Exp $	*/
 /*	$NetBSD: cgfour.c,v 1.13 1997/05/24 20:16:06 pk Exp $	*/
 
 /*
@@ -93,10 +93,10 @@ struct cgfour_softc {
 };
 
 /* autoconfiguration driver */
-static void	cgfourattach __P((struct device *, struct device *, void *));
-static int	cgfourmatch __P((struct device *, void *, void *));
+static void	cgfourattach(struct device *, struct device *, void *);
+static int	cgfourmatch(struct device *, void *, void *);
 #if defined(SUN4)
-static void	cgfourunblank __P((struct device *));
+static void	cgfourunblank(struct device *);
 #endif
 
 struct cfattach cgfour_ca = {
@@ -116,9 +116,9 @@ static struct fbdriver cgfourfbdriver = {
 extern int fbnode;
 extern struct tty *fbconstty;
 
-static void cgfourloadcmap __P((struct cgfour_softc *, int, int));
-static int cgfour_get_video __P((struct cgfour_softc *));
-static void cgfour_set_video __P((struct cgfour_softc *, int));
+static void cgfourloadcmap(struct cgfour_softc *, int, int);
+static int cgfour_get_video(struct cgfour_softc *);
+static void cgfour_set_video(struct cgfour_softc *, int);
 #endif
 
 /*
diff --git a/sys/arch/sparc/dev/cgfourteen.c b/sys/arch/sparc/dev/cgfourteen.c
index 43d35fb7189..9c4c0719a4f 100644
--- a/sys/arch/sparc/dev/cgfourteen.c
+++ b/sys/arch/sparc/dev/cgfourteen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgfourteen.c,v 1.8 2001/11/06 19:53:16 miod Exp $	*/
+/*	$OpenBSD: cgfourteen.c,v 1.9 2002/03/14 01:26:42 millert Exp $	*/
 /*	$NetBSD: cgfourteen.c,v 1.7 1997/05/24 20:16:08 pk Exp $ */
 
 /*
@@ -122,16 +122,16 @@ static struct fbdriver cgfourteenfbdriver = {
 extern int fbnode;
 extern struct tty *fbconstty;
 
-static void cg14_set_video __P((struct cgfourteen_softc *, int));
-static int  cg14_get_video __P((struct cgfourteen_softc *));
-static int  cg14_get_cmap __P((struct fbcmap *, union cg14cmap *, int));
-static int  cg14_put_cmap __P((struct fbcmap *, union cg14cmap *, int));
-static void cg14_load_hwcmap __P((struct cgfourteen_softc *, int, int));
-static void cg14_init __P((struct cgfourteen_softc *));
-static void cg14_reset __P((struct cgfourteen_softc *));
-static void cg14_loadomap __P((struct cgfourteen_softc *));/* cursor overlay */
-static void cg14_setcursor __P((struct cgfourteen_softc *));/* set position */
-static void cg14_loadcursor __P((struct cgfourteen_softc *));/* set shape */
+static void cg14_set_video(struct cgfourteen_softc *, int);
+static int  cg14_get_video(struct cgfourteen_softc *);
+static int  cg14_get_cmap(struct fbcmap *, union cg14cmap *, int);
+static int  cg14_put_cmap(struct fbcmap *, union cg14cmap *, int);
+static void cg14_load_hwcmap(struct cgfourteen_softc *, int, int);
+static void cg14_init(struct cgfourteen_softc *);
+static void cg14_reset(struct cgfourteen_softc *);
+static void cg14_loadomap(struct cgfourteen_softc *);/* cursor overlay */
+static void cg14_setcursor(struct cgfourteen_softc *);/* set position */
+static void cg14_loadcursor(struct cgfourteen_softc *);/* set shape */
 
 /*
  * Match a cgfourteen.
diff --git a/sys/arch/sparc/dev/cgsix.c b/sys/arch/sparc/dev/cgsix.c
index 3f0fc8160b5..c63655b841d 100644
--- a/sys/arch/sparc/dev/cgsix.c
+++ b/sys/arch/sparc/dev/cgsix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgsix.c,v 1.17 2001/11/06 19:53:16 miod Exp $	*/
+/*	$OpenBSD: cgsix.c,v 1.18 2002/03/14 01:26:42 millert Exp $	*/
 /*	$NetBSD: cgsix.c,v 1.33 1997/08/07 19:12:30 pk Exp $ */
 
 /*
@@ -122,9 +122,9 @@ struct cgsix_softc {
 };
 
 /* autoconfiguration driver */
-static void	cgsixattach __P((struct device *, struct device *, void *));
-static int	cgsixmatch __P((struct device *, void *, void *));
-static void	cg6_unblank __P((struct device *));
+static void	cgsixattach(struct device *, struct device *, void *);
+static int	cgsixmatch(struct device *, void *, void *);
+static void	cg6_unblank(struct device *);
 
 struct cfattach cgsix_ca = {
 	sizeof(struct cgsix_softc), cgsixmatch, cgsixattach
@@ -153,11 +153,11 @@ int cgsix_use_rasterconsole = 1;
 
 extern int fbnode;
 
-static void cg6_reset __P((struct cgsix_softc *));
-static void cg6_loadcmap __P((struct cgsix_softc *, int, int));
-static void cg6_loadomap __P((struct cgsix_softc *));
-static void cg6_setcursor __P((struct cgsix_softc *));/* set position */
-static void cg6_loadcursor __P((struct cgsix_softc *));/* set shape */
+static void cg6_reset(struct cgsix_softc *);
+static void cg6_loadcmap(struct cgsix_softc *, int, int);
+static void cg6_loadomap(struct cgsix_softc *);
+static void cg6_setcursor(struct cgsix_softc *);/* set position */
+static void cg6_loadcursor(struct cgsix_softc *);/* set shape */
 
 /*
  * Match a cgsix.
diff --git a/sys/arch/sparc/dev/cgthree.c b/sys/arch/sparc/dev/cgthree.c
index 8bdb669de4f..4b79c751e16 100644
--- a/sys/arch/sparc/dev/cgthree.c
+++ b/sys/arch/sparc/dev/cgthree.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgthree.c,v 1.12 2001/11/06 19:53:16 miod Exp $	*/
+/*	$OpenBSD: cgthree.c,v 1.13 2002/03/14 01:26:42 millert Exp $	*/
 /*	$NetBSD: cgthree.c,v 1.33 1997/05/24 20:16:11 pk Exp $ */
 
 /*
@@ -110,9 +110,9 @@ static struct fbdriver cgthreefbdriver = {
 extern int fbnode;
 extern struct tty *fbconstty;
 
-static void cgthreeloadcmap __P((struct cgthree_softc *, int, int));
-static void cgthree_set_video __P((struct cgthree_softc *, int));
-static int cgthree_get_video __P((struct cgthree_softc *));
+static void cgthreeloadcmap(struct cgthree_softc *, int, int);
+static void cgthree_set_video(struct cgthree_softc *, int);
+static int cgthree_get_video(struct cgthree_softc *);
 
 /* Video control parameters */
 struct cg3_videoctrl {
diff --git a/sys/arch/sparc/dev/cgtwo.c b/sys/arch/sparc/dev/cgtwo.c
index bbdbdc8ba49..4653190d18d 100644
--- a/sys/arch/sparc/dev/cgtwo.c
+++ b/sys/arch/sparc/dev/cgtwo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgtwo.c,v 1.18 2001/11/06 19:53:16 miod Exp $	*/
+/*	$OpenBSD: cgtwo.c,v 1.19 2002/03/14 01:26:42 millert Exp $	*/
 /*	$NetBSD: cgtwo.c,v 1.22 1997/05/24 20:16:12 pk Exp $ */
 
 /*
@@ -90,11 +90,11 @@ struct cgtwo_softc {
 };
 
 /* autoconfiguration driver */
-static void	cgtwoattach __P((struct device *, struct device *, void *));
-static int	cgtwomatch __P((struct device *, void *, void *));
-static void	cgtwounblank __P((struct device *));
-int		cgtwogetcmap __P((struct cgtwo_softc *, struct fbcmap *));
-int		cgtwoputcmap __P((struct cgtwo_softc *, struct fbcmap *));
+static void	cgtwoattach(struct device *, struct device *, void *);
+static int	cgtwomatch(struct device *, void *, void *);
+static void	cgtwounblank(struct device *);
+int		cgtwogetcmap(struct cgtwo_softc *, struct fbcmap *);
+int		cgtwoputcmap(struct cgtwo_softc *, struct fbcmap *);
 
 struct cfattach cgtwo_ca = {
 	sizeof(struct cgtwo_softc), cgtwomatch, cgtwoattach
diff --git a/sys/arch/sparc/dev/cons.c b/sys/arch/sparc/dev/cons.c
index b9d0fcaaaf9..c74a4512ff8 100644
--- a/sys/arch/sparc/dev/cons.c
+++ b/sys/arch/sparc/dev/cons.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cons.c,v 1.12 2001/05/01 11:43:26 ho Exp $	*/
+/*	$OpenBSD: cons.c,v 1.13 2002/03/14 01:26:42 millert Exp $	*/
 /*	$NetBSD: cons.c,v 1.30 1997/07/07 23:30:23 pk Exp $	*/
 
 /*
@@ -90,15 +90,15 @@ int	cons_ocount;		/* output byte count */
  */
 struct tty cons;		/* rom console tty device */
 struct timeout cons_cnfbdma_tmo;/* for cnfdbma() timeouts */
-static int (*fcnstop) __P((struct tty *, int));
+static int (*fcnstop)(struct tty *, int);
 
-static void cnstart __P((struct tty *));
-int cnstop __P((struct tty *, int));
+static void cnstart(struct tty *);
+int cnstop(struct tty *, int);
 
-static void cnfbstart __P((struct tty *));
-static int cnfbstop __P((struct tty *, int));
-static void cnfbdma __P((void *));
-static struct tty  *xxcntty __P((dev_t));
+static void cnfbstart(struct tty *);
+static int cnfbstop(struct tty *, int);
+static void cnfbdma(void *);
+static struct tty  *xxcntty(dev_t);
 
 extern char char_type[];
 
@@ -464,8 +464,8 @@ cnstart(tp)
 {
 	register int c, s;
 	register union {
-		void (*v1)__P((int));
-		int  (*v3)__P((int, void *, int));
+		void (*v1)(int);
+		int  (*v3)(int, void *, int);
 	} putc;
 	register int fd = 0, v;
 
diff --git a/sys/arch/sparc/dev/cs4231.c b/sys/arch/sparc/dev/cs4231.c
index abb3de3c882..a632f2af0b3 100644
--- a/sys/arch/sparc/dev/cs4231.c
+++ b/sys/arch/sparc/dev/cs4231.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cs4231.c,v 1.11 2002/01/20 23:21:54 ericj Exp $	*/
+/*	$OpenBSD: cs4231.c,v 1.12 2002/03/14 01:26:42 millert Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -112,37 +112,37 @@
 
 #define CS_TIMEOUT		90000		/* recalibration timeout */
 
-int	cs4231_match	__P((struct device *, void *, void *));
-void	cs4231_attach	__P((struct device *, struct device *, void *));
-int	cs4231_intr	__P((void *));
+int	cs4231_match(struct device *, void *, void *);
+void	cs4231_attach(struct device *, struct device *, void *);
+int	cs4231_intr(void *);
 
-void	cs4231_wait		__P((struct cs4231_softc *));
-int	cs4231_set_speed	__P((struct cs4231_softc *, u_long *));
-void	cs4231_mute_monitor	__P((struct cs4231_softc *, int));
-void	cs4231_setup_output	__P((struct cs4231_softc *sc));
+void	cs4231_wait(struct cs4231_softc *);
+int	cs4231_set_speed(struct cs4231_softc *, u_long *);
+void	cs4231_mute_monitor(struct cs4231_softc *, int);
+void	cs4231_setup_output(struct cs4231_softc *sc);
 
 /* Audio interface */
-int	cs4231_open		__P((void *, int));
-void	cs4231_close		__P((void *));
-int	cs4231_query_encoding	__P((void *, struct audio_encoding *));
-int	cs4231_set_params	__P((void *, int, int, struct audio_params *,
-    struct audio_params *));
-int	cs4231_round_blocksize	__P((void *, int));
-int	cs4231_commit_settings	__P((void *));
-int	cs4231_halt_output	__P((void *));
-int	cs4231_halt_input	__P((void *));
-int	cs4231_getdev		__P((void *, struct audio_device *));
-int	cs4231_set_port		__P((void *, mixer_ctrl_t *));
-int	cs4231_get_port		__P((void *, mixer_ctrl_t *));
-int	cs4231_query_devinfo	__P((void *addr, mixer_devinfo_t *));
-void *	cs4231_alloc		__P((void *, int, size_t, int, int));
-void	cs4231_free		__P((void *, void *, int));
-size_t	cs4231_round_buffersize	__P((void *, int, size_t));
-int	cs4231_get_props	__P((void *));
+int	cs4231_open(void *, int);
+void	cs4231_close(void *);
+int	cs4231_query_encoding(void *, struct audio_encoding *);
+int	cs4231_set_params(void *, int, int, struct audio_params *,
+    struct audio_params *);
+int	cs4231_round_blocksize(void *, int);
+int	cs4231_commit_settings(void *);
+int	cs4231_halt_output(void *);
+int	cs4231_halt_input(void *);
+int	cs4231_getdev(void *, struct audio_device *);
+int	cs4231_set_port(void *, mixer_ctrl_t *);
+int	cs4231_get_port(void *, mixer_ctrl_t *);
+int	cs4231_query_devinfo(void *addr, mixer_devinfo_t *);
+void *	cs4231_alloc(void *, int, size_t, int, int);
+void	cs4231_free(void *, void *, int);
+size_t	cs4231_round_buffersize(void *, int, size_t);
+int	cs4231_get_props(void *);
 int	cs4231_trigger_output __P((void *, void *, void *, int,
-    void (*intr)__P((void *)), void *arg, struct audio_params *));
+    void (*intr)(void *), void *arg, struct audio_params *));
 int	cs4231_trigger_input __P((void *, void *, void *, int,
-    void (*intr)__P((void *)), void *arg, struct audio_params *));
+    void (*intr)(void *), void *arg, struct audio_params *));
 
 struct audio_hw_if cs4231_sa_hw_if = {
 	cs4231_open,
@@ -648,8 +648,8 @@ cs4231_set_params(addr, setmode, usemode, p, r)
 {
 	struct cs4231_softc *sc = (struct cs4231_softc *)addr;
 	int err, bits, enc;
-	void (*pswcode) __P((void *, u_char *, int cnt));
-	void (*rswcode) __P((void *, u_char *, int cnt));
+	void (*pswcode)(void *, u_char *, int cnt);
+	void (*rswcode)(void *, u_char *, int cnt);
 
 	enc = p->encoding;
 	pswcode = rswcode = 0;
@@ -1437,7 +1437,7 @@ int
 cs4231_trigger_output(addr, start, end, blksize, intr, arg, param)
 	void *addr, *start, *end;
 	int blksize;
-	void (*intr) __P((void *));
+	void (*intr)(void *);
 	void *arg;
 	struct audio_params *param;
 {
@@ -1504,7 +1504,7 @@ int
 cs4231_trigger_input(addr, start, end, blksize, intr, arg, param)
 	void *addr, *start, *end;
 	int blksize;
-	void (*intr) __P((void *));
+	void (*intr)(void *);
 	void *arg;
 	struct audio_params *param;
 {
diff --git a/sys/arch/sparc/dev/daadio.c b/sys/arch/sparc/dev/daadio.c
index 6ff4ba3757e..7d125a97e59 100644
--- a/sys/arch/sparc/dev/daadio.c
+++ b/sys/arch/sparc/dev/daadio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: daadio.c,v 1.1 1999/07/23 19:11:24 jason Exp $	*/
+/*	$OpenBSD: daadio.c,v 1.2 2002/03/14 01:26:42 millert Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -59,9 +59,9 @@
 #include <sparc/dev/fgavar.h>
 #include <sparc/dev/daadioreg.h>
 
-int	daadiomatch	__P((struct device *, void *, void *));
-void	daadioattach	__P((struct device *, struct device *, void *));
-int	daadiointr	__P((void *));
+int	daadiomatch(struct device *, void *, void *);
+void	daadioattach(struct device *, struct device *, void *);
+int	daadiointr(void *);
 
 struct daadio_softc {
 	struct		device sc_dv;		/* base device */
@@ -78,8 +78,8 @@ struct cfdriver daadio_cd = {
 	NULL, "daadio", DV_DULL
 };
 
-void	daadio_ier_setbit __P((struct daadio_softc *, u_int8_t));
-void	daadio_ier_clearbit __P((struct daadio_softc *, u_int8_t));
+void	daadio_ier_setbit(struct daadio_softc *, u_int8_t);
+void	daadio_ier_clearbit(struct daadio_softc *, u_int8_t);
 
 int
 daadiomatch(parent, vcf, aux)
diff --git a/sys/arch/sparc/dev/dma.c b/sys/arch/sparc/dev/dma.c
index 937429112ae..c9326f358bd 100644
--- a/sys/arch/sparc/dev/dma.c
+++ b/sys/arch/sparc/dev/dma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dma.c,v 1.16 1999/09/10 23:32:02 art Exp $	*/
+/*	$OpenBSD: dma.c,v 1.17 2002/03/14 01:26:42 millert Exp $	*/
 /*	$NetBSD: dma.c,v 1.46 1997/08/27 11:24:16 bouyer Exp $ */
 
 /*
@@ -59,20 +59,20 @@
 #include <sparc/dev/dmavar.h>
 #include <sparc/dev/espvar.h>
 
-int dmaprint		__P((void *, const char *));
-void dmaattach		__P((struct device *, struct device *, void *));
-int dmamatch		__P((struct device *, void *, void *));
-void dma_reset		__P((struct dma_softc *, int));
-void espdma_reset	__P((struct dma_softc *));
-int ledmamatch		__P((struct device *, void *, void *));
-void ledma_reset	__P((struct dma_softc *));
-void dma_enintr		__P((struct dma_softc *));
-int dma_isintr		__P((struct dma_softc *));
-int espdmaintr		__P((struct dma_softc *));
-int ledmaintr		__P((struct dma_softc *));
-int dma_setup		__P((struct dma_softc *, caddr_t *, size_t *,
-			     int, size_t *));
-void dma_go		__P((struct dma_softc *));
+int dmaprint(void *, const char *);
+void dmaattach(struct device *, struct device *, void *);
+int dmamatch(struct device *, void *, void *);
+void dma_reset(struct dma_softc *, int);
+void espdma_reset(struct dma_softc *);
+int ledmamatch(struct device *, void *, void *);
+void ledma_reset(struct dma_softc *);
+void dma_enintr(struct dma_softc *);
+int dma_isintr(struct dma_softc *);
+int espdmaintr(struct dma_softc *);
+int ledmaintr(struct dma_softc *);
+int dma_setup(struct dma_softc *, caddr_t *, size_t *,
+			     int, size_t *);
+void dma_go(struct dma_softc *);
 
 struct cfattach dma_ca = {
 	sizeof(struct dma_softc), dmamatch, dmaattach
diff --git a/sys/arch/sparc/dev/esp.c b/sys/arch/sparc/dev/esp.c
index bfe094a03f4..feacd96c0a2 100644
--- a/sys/arch/sparc/dev/esp.c
+++ b/sys/arch/sparc/dev/esp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: esp.c,v 1.17 2001/09/27 04:01:42 jason Exp $	*/
+/*	$OpenBSD: esp.c,v 1.18 2002/03/14 01:26:42 millert Exp $	*/
 /*	$NetBSD: esp.c,v 1.69 1997/08/27 11:24:18 bouyer Exp $	*/
 
 /*
@@ -128,8 +128,8 @@
 #include <sparc/dev/dmavar.h>
 #include <sparc/dev/espvar.h>
 
-void	espattach	__P((struct device *, struct device *, void *));
-int	espmatch	__P((struct device *, void *, void *));
+void	espattach(struct device *, struct device *, void *);
+int	espmatch(struct device *, void *, void *);
 
 /* Linkup to the rest of the kernel */
 struct cfattach esp_ca = {
@@ -153,16 +153,16 @@ struct scsi_device esp_dev = {
 /*
  * Functions and the switch for the MI code.
  */
-u_char	esp_read_reg __P((struct ncr53c9x_softc *, int));
-void	esp_write_reg __P((struct ncr53c9x_softc *, int, u_char));
-int	esp_dma_isintr __P((struct ncr53c9x_softc *));
-void	esp_dma_reset __P((struct ncr53c9x_softc *));
-int	esp_dma_intr __P((struct ncr53c9x_softc *));
-int	esp_dma_setup __P((struct ncr53c9x_softc *, caddr_t *,
-	    size_t *, int, size_t *));
-void	esp_dma_go __P((struct ncr53c9x_softc *));
-void	esp_dma_stop __P((struct ncr53c9x_softc *));
-int	esp_dma_isactive __P((struct ncr53c9x_softc *));
+u_char	esp_read_reg(struct ncr53c9x_softc *, int);
+void	esp_write_reg(struct ncr53c9x_softc *, int, u_char);
+int	esp_dma_isintr(struct ncr53c9x_softc *);
+void	esp_dma_reset(struct ncr53c9x_softc *);
+int	esp_dma_intr(struct ncr53c9x_softc *);
+int	esp_dma_setup(struct ncr53c9x_softc *, caddr_t *,
+	    size_t *, int, size_t *);
+void	esp_dma_go(struct ncr53c9x_softc *);
+void	esp_dma_stop(struct ncr53c9x_softc *);
+int	esp_dma_isactive(struct ncr53c9x_softc *);
 
 struct ncr53c9x_glue esp_glue = {
 	esp_read_reg,
diff --git a/sys/arch/sparc/dev/fb.c b/sys/arch/sparc/dev/fb.c
index c7e126ce752..77e588883bc 100644
--- a/sys/arch/sparc/dev/fb.c
+++ b/sys/arch/sparc/dev/fb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fb.c,v 1.17 2001/11/01 12:13:46 art Exp $	*/
+/*	$OpenBSD: fb.c,v 1.18 2002/03/14 01:26:42 millert Exp $	*/
 /*	$NetBSD: fb.c,v 1.23 1997/07/07 23:30:22 pk Exp $ */
 
 /*
@@ -187,7 +187,7 @@ fbmmap(dev, off, prot)
 	off_t off;
 	int prot;
 {
-	paddr_t (*map)__P((dev_t, off_t, int)) = devfb->fb_driver->fbd_mmap;
+	paddr_t (*map)(dev_t, off_t, int) = devfb->fb_driver->fbd_mmap;
 
 	if (map == NULL)
 		return (-1);
@@ -361,10 +361,10 @@ fb_setsize(fb, depth, def_width, def_height, node, bustype)
 #ifdef RASTERCONSOLE
 #include <machine/kbd.h>
 
-static void fb_bell __P((int));
+static void fb_bell(int);
 
 #if !(defined(RASTERCONS_FULLSCREEN) || defined(RASTERCONS_SMALLFONT))
-static int a2int __P((char *, int));
+static int a2int(char *, int);
 
 static int
 a2int(cp, deflt)
diff --git a/sys/arch/sparc/dev/fd.c b/sys/arch/sparc/dev/fd.c
index 5cea4853fff..29af5b3073b 100644
--- a/sys/arch/sparc/dev/fd.c
+++ b/sys/arch/sparc/dev/fd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fd.c,v 1.25 2002/03/13 00:24:21 miod Exp $	*/
+/*	$OpenBSD: fd.c,v 1.26 2002/03/14 01:26:42 millert Exp $	*/
 /*	$NetBSD: fd.c,v 1.51 1997/05/24 20:16:19 pk Exp $	*/
 
 /*-
@@ -149,8 +149,8 @@ extern	struct fdcio	*fdciop;
 #endif
 
 /* controller driver configuration */
-int	fdcmatch __P((struct device *, void *, void *));
-void	fdcattach __P((struct device *, struct device *, void *));
+int	fdcmatch(struct device *, void *, void *);
+void	fdcattach(struct device *, struct device *, void *);
 
 struct cfattach fdc_ca = {
 	sizeof(struct fdc_softc), fdcmatch, fdcattach
@@ -160,7 +160,7 @@ struct cfdriver fdc_cd = {
 	NULL, "fdc", DV_DULL
 };
 
-__inline struct fd_type *fd_dev_to_type __P((struct fd_softc *, dev_t));
+__inline struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t);
 
 /* The order of entries in the following table is important -- BEWARE! */
 struct fd_type fd_types[] = {
@@ -206,8 +206,8 @@ struct fd_softc {
 };
 
 /* floppy driver configuration */
-int	fdmatch __P((struct device *, void *, void *));
-void	fdattach __P((struct device *, struct device *, void *));
+int	fdmatch(struct device *, void *, void *);
+void	fdattach(struct device *, struct device *, void *);
 
 struct cfattach fd_ca = {
 	sizeof(struct fd_softc), fdmatch, fdattach
@@ -217,38 +217,38 @@ struct cfdriver fd_cd = {
 	NULL, "fd", DV_DISK
 };
 
-void fdgetdisklabel __P((dev_t));
-int fd_get_parms __P((struct fd_softc *));
-void fdstrategy __P((struct buf *));
-void fdstart __P((struct fd_softc *));
-int fdprint __P((void *, const char *));
+void fdgetdisklabel(dev_t);
+int fd_get_parms(struct fd_softc *);
+void fdstrategy(struct buf *);
+void fdstart(struct fd_softc *);
+int fdprint(void *, const char *);
 
 struct dkdriver fddkdriver = { fdstrategy };
 
-struct	fd_type *fd_nvtotype __P((char *, int, int));
-void	fd_set_motor __P((struct fdc_softc *fdc));
-void	fd_motor_off __P((void *arg));
-void	fd_motor_on __P((void *arg));
-int	fdcresult __P((struct fdc_softc *fdc));
-int	out_fdc __P((struct fdc_softc *fdc, u_char x));
-void	fdcstart __P((struct fdc_softc *fdc));
-void	fdcstatus __P((struct device *dv, int n, char *s));
-void	fdc_reset __P((struct fdc_softc *fdc));
-void	fdctimeout __P((void *arg));
-void	fdcpseudointr __P((void *arg));
+struct	fd_type *fd_nvtotype(char *, int, int);
+void	fd_set_motor(struct fdc_softc *fdc);
+void	fd_motor_off(void *arg);
+void	fd_motor_on(void *arg);
+int	fdcresult(struct fdc_softc *fdc);
+int	out_fdc(struct fdc_softc *fdc, u_char x);
+void	fdcstart(struct fdc_softc *fdc);
+void	fdcstatus(struct device *dv, int n, char *s);
+void	fdc_reset(struct fdc_softc *fdc);
+void	fdctimeout(void *arg);
+void	fdcpseudointr(void *arg);
 #ifdef FDC_C_HANDLER
-int	fdchwintr __P((struct fdc_softc *));
+int	fdchwintr(struct fdc_softc *);
 #else
-void	fdchwintr __P((void));
+void	fdchwintr(void);
 #endif
-int	fdcswintr __P((struct fdc_softc *));
-int	fdcstate __P((struct fdc_softc *));
-void	fdcretry __P((struct fdc_softc *fdc));
-void	fdfinish __P((struct fd_softc *fd, struct buf *bp));
-int	fdformat __P((dev_t, struct fd_formb *, struct proc *));
-void	fd_do_eject __P((struct fd_softc *));
-void	fd_mountroot_hook __P((struct device *));
-static void fdconf __P((struct fdc_softc *));
+int	fdcswintr(struct fdc_softc *);
+int	fdcstate(struct fdc_softc *);
+void	fdcretry(struct fdc_softc *fdc);
+void	fdfinish(struct fd_softc *fd, struct buf *bp);
+int	fdformat(dev_t, struct fd_formb *, struct proc *);
+void	fd_do_eject(struct fd_softc *);
+void	fd_mountroot_hook(struct device *);
+static void fdconf(struct fdc_softc *);
 
 #if PIL_FDSOFT == 4
 #define IE_FDSOFT	IE_L4
diff --git a/sys/arch/sparc/dev/fga.c b/sys/arch/sparc/dev/fga.c
index 2234c63b868..b3c61f22a12 100644
--- a/sys/arch/sparc/dev/fga.c
+++ b/sys/arch/sparc/dev/fga.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fga.c,v 1.6 2001/12/08 02:24:07 art Exp $	*/
+/*	$OpenBSD: fga.c,v 1.7 2002/03/14 01:26:42 millert Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -61,13 +61,13 @@
 #include <sparc/dev/fgavar.h>
 #include <machine/fgaio.h>
 
-int	fgamatch	__P((struct device *, void *, void *));
-void	fgaattach	__P((struct device *, struct device *, void *));
-int	fvmematch	__P((struct device *, void *, void *));
-void	fvmeattach	__P((struct device *, struct device *, void *));
-int	fgaprint	__P((void *, const char *));
-int	fvmeprint	__P((void *, const char *));
-int	fvmescan	__P((struct device *parent, void *, void *));
+int	fgamatch(struct device *, void *, void *);
+void	fgaattach(struct device *, struct device *, void *);
+int	fvmematch(struct device *, void *, void *);
+void	fvmeattach(struct device *, struct device *, void *);
+int	fgaprint(void *, const char *);
+int	fvmeprint(void *, const char *);
+int	fvmescan(struct device *parent, void *, void *);
 
 struct fga_softc {
 	struct		device sc_dev;		/* base device */
@@ -89,24 +89,24 @@ struct fga_softc {
 	u_int8_t	sc_established;		/* which hw intrs installed */
 };
 
-int	fgaopen		__P((dev_t, int, int, struct proc *));
-int	fgaclose	__P((dev_t, int, int, struct proc *));
-int	fgaioctl	__P((dev_t, u_long, caddr_t, int, struct proc *));
-
-int	fga_vmerangemap	__P((struct fga_softc *, u_int32_t, u_int32_t,
-    int, int, u_int32_t, struct confargs *));
-int	fga_intr_establish __P((struct fga_softc *, int, int,
-    struct intrhand *));
-int	fga_hwintr_establish __P((struct fga_softc *, u_int8_t));
-
-int	fga_hwintr1 __P((void *));
-int	fga_hwintr2 __P((void *));
-int	fga_hwintr3 __P((void *));
-int	fga_hwintr4 __P((void *));
-int	fga_hwintr5 __P((void *));
-int	fga_hwintr6 __P((void *));
-int	fga_hwintr7 __P((void *));
-int	fga_intrvec __P((struct fga_softc *, int));
+int	fgaopen(dev_t, int, int, struct proc *);
+int	fgaclose(dev_t, int, int, struct proc *);
+int	fgaioctl(dev_t, u_long, caddr_t, int, struct proc *);
+
+int	fga_vmerangemap(struct fga_softc *, u_int32_t, u_int32_t,
+    int, int, u_int32_t, struct confargs *);
+int	fga_intr_establish(struct fga_softc *, int, int,
+    struct intrhand *);
+int	fga_hwintr_establish(struct fga_softc *, u_int8_t);
+
+int	fga_hwintr1(void *);
+int	fga_hwintr2(void *);
+int	fga_hwintr3(void *);
+int	fga_hwintr4(void *);
+int	fga_hwintr5(void *);
+int	fga_hwintr6(void *);
+int	fga_hwintr7(void *);
+int	fga_intrvec(struct fga_softc *, int);
 
 struct cfattach fga_ca = {
 	sizeof (struct fga_softc), fgamatch, fgaattach
diff --git a/sys/arch/sparc/dev/fgavar.h b/sys/arch/sparc/dev/fgavar.h
index 7edecd8ae3d..7b2091897d3 100644
--- a/sys/arch/sparc/dev/fgavar.h
+++ b/sys/arch/sparc/dev/fgavar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fgavar.h,v 1.1 1999/07/23 19:11:25 jason Exp $	*/
+/*	$OpenBSD: fgavar.h,v 1.2 2002/03/14 01:26:43 millert Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -35,4 +35,4 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-int fvmeintrestablish __P((struct device *, int, int, struct intrhand *));
+int fvmeintrestablish(struct device *, int, int, struct intrhand *);
diff --git a/sys/arch/sparc/dev/flash.c b/sys/arch/sparc/dev/flash.c
index e7b68f459a0..caa9592bb4e 100644
--- a/sys/arch/sparc/dev/flash.c
+++ b/sys/arch/sparc/dev/flash.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: flash.c,v 1.1 1999/07/23 19:11:26 jason Exp $	*/
+/*	$OpenBSD: flash.c,v 1.2 2002/03/14 01:26:43 millert Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -48,15 +48,15 @@
 #include <sparc/cpu.h>
 #include <sparc/sparc/cpuvar.h>
 
-int	flashmatch	__P((struct device *, void *, void *));
-void	flashattach	__P((struct device *, struct device *, void *));
+int	flashmatch(struct device *, void *, void *);
+void	flashattach(struct device *, struct device *, void *);
 
-int	flashopen	__P((dev_t, int, int, struct proc *p));
-int	flashclose	__P((dev_t, int, int, struct proc *p));
-int	flashread	__P((dev_t, struct uio *, int));
-int	flashwrite	__P((dev_t, struct uio *, int));
-int	flashrw		__P((dev_t, struct uio *, int));
-int	flashioctl	__P((dev_t, u_long, caddr_t, int, struct proc *));
+int	flashopen(dev_t, int, int, struct proc *p);
+int	flashclose(dev_t, int, int, struct proc *p);
+int	flashread(dev_t, struct uio *, int);
+int	flashwrite(dev_t, struct uio *, int);
+int	flashrw(dev_t, struct uio *, int);
+int	flashioctl(dev_t, u_long, caddr_t, int, struct proc *);
 
 /*
  * We see the flash-memory in 512k windows.  The current window is
diff --git a/sys/arch/sparc/dev/hme.c b/sys/arch/sparc/dev/hme.c
index f8e9d1e615b..7542fe5db19 100644
--- a/sys/arch/sparc/dev/hme.c
+++ b/sys/arch/sparc/dev/hme.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hme.c,v 1.34 2001/08/24 05:14:05 jason Exp $	*/
+/*	$OpenBSD: hme.c,v 1.35 2002/03/14 01:26:43 millert Exp $	*/
 
 /*
  * Copyright (c) 1998 Jason L. Wright (jason@thought.net)
@@ -82,47 +82,47 @@
 #include <sparc/dev/hmereg.h>
 #include <sparc/dev/hmevar.h>
 
-int	hmematch	__P((struct device *, void *, void *));
-void	hmeattach	__P((struct device *, struct device *, void *));
-void	hmewatchdog	__P((struct ifnet *));
-int	hmeintr		__P((void *));
-int	hmeioctl	__P((struct ifnet *, u_long, caddr_t));
-void	hmereset	__P((struct hme_softc *));
-void	hmestart	__P((struct ifnet *));
-void	hmestop		__P((struct hme_softc *));
-void	hmeinit		__P((struct hme_softc *));
-void	hme_meminit	__P((struct hme_softc *));
+int	hmematch(struct device *, void *, void *);
+void	hmeattach(struct device *, struct device *, void *);
+void	hmewatchdog(struct ifnet *);
+int	hmeintr(void *);
+int	hmeioctl(struct ifnet *, u_long, caddr_t);
+void	hmereset(struct hme_softc *);
+void	hmestart(struct ifnet *);
+void	hmestop(struct hme_softc *);
+void	hmeinit(struct hme_softc *);
+void	hme_meminit(struct hme_softc *);
 
-void	hme_tcvr_bb_writeb  __P((struct hme_softc *, int));
-int	hme_tcvr_bb_readb   __P((struct hme_softc *, int));
+void	hme_tcvr_bb_writeb(struct hme_softc *, int);
+int	hme_tcvr_bb_readb(struct hme_softc *, int);
 
-void	hme_poll_stop	__P((struct hme_softc *sc));
+void	hme_poll_stop(struct hme_softc *sc);
 
-int	hme_rint	__P((struct hme_softc *));
-int	hme_tint	__P((struct hme_softc *));
-int	hme_mint	__P((struct hme_softc *, u_int32_t));
-int	hme_eint	__P((struct hme_softc *, u_int32_t));
+int	hme_rint(struct hme_softc *);
+int	hme_tint(struct hme_softc *);
+int	hme_mint(struct hme_softc *, u_int32_t);
+int	hme_eint(struct hme_softc *, u_int32_t);
 
-void	hme_reset_rx	__P((struct hme_softc *));
-void	hme_reset_tx	__P((struct hme_softc *));
+void	hme_reset_rx(struct hme_softc *);
+void	hme_reset_tx(struct hme_softc *);
 
-void		hme_read __P((struct hme_softc *, int, int));
-int		hme_put __P((struct hme_softc *, int, struct mbuf *));
+void		hme_read(struct hme_softc *, int, int);
+int		hme_put(struct hme_softc *, int, struct mbuf *);
 
 /*
  * ifmedia glue
  */
-int	hme_mediachange __P((struct ifnet *));
-void	hme_mediastatus __P((struct ifnet *, struct ifmediareq *));
+int	hme_mediachange(struct ifnet *);
+void	hme_mediastatus(struct ifnet *, struct ifmediareq *);
 
 /*
  * mii glue
  */
-int	hme_mii_read __P((struct device *, int, int));
-void	hme_mii_write __P((struct device *, int, int, int));
-void	hme_mii_statchg __P((struct device *));
+int	hme_mii_read(struct device *, int, int);
+void	hme_mii_write(struct device *, int, int, int);
+void	hme_mii_statchg(struct device *);
 
-void	hme_mcreset __P((struct hme_softc *));
+void	hme_mcreset(struct hme_softc *);
 
 struct cfattach hme_ca = {
 	sizeof (struct hme_softc), hmematch, hmeattach
@@ -162,7 +162,7 @@ hmeattach(parent, self, aux)
 	int pri;
 	struct bootpath *bp;
 	/* XXX the following declaration should be elsewhere */
-	extern void myetheraddr __P((u_char *));
+	extern void myetheraddr(u_char *);
 
 	if (ca->ca_ra.ra_nintr != 1) {
 		printf(": expected 1 interrupt, got %d\n",
diff --git a/sys/arch/sparc/dev/if_en_sbus.c b/sys/arch/sparc/dev/if_en_sbus.c
index 499f80901fc..0c73a96b688 100644
--- a/sys/arch/sparc/dev/if_en_sbus.c
+++ b/sys/arch/sparc/dev/if_en_sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_en_sbus.c,v 1.3 1997/08/08 08:25:08 downsj Exp $	*/
+/*	$OpenBSD: if_en_sbus.c,v 1.4 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: if_en_sbus.c,v 1.4 1997/05/24 20:16:22 pk Exp $	*/
 
 /*
@@ -84,8 +84,8 @@ struct en_sbus_softc {
  * prototypes
  */
 
-static	int en_sbus_match __P((struct device *, void *, void *));
-static	void en_sbus_attach __P((struct device *, struct device *, void *));
+static	int en_sbus_match(struct device *, void *, void *);
+static	void en_sbus_attach(struct device *, struct device *, void *);
 
 /*
  * SBUS autoconfig attachments
diff --git a/sys/arch/sparc/dev/if_ie.c b/sys/arch/sparc/dev/if_ie.c
index 0374cd3bbb2..c6000e5adc6 100644
--- a/sys/arch/sparc/dev/if_ie.c
+++ b/sys/arch/sparc/dev/if_ie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ie.c,v 1.22 2001/12/08 02:24:07 art Exp $	*/
+/*	$OpenBSD: if_ie.c,v 1.23 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: if_ie.c,v 1.33 1997/07/29 17:55:38 fair Exp $	*/
 
 /*-
@@ -232,15 +232,15 @@ struct ie_softc {
 
 	struct arpcom sc_arpcom;/* system arpcom structure */
 
-	void (*reset_586) __P((struct ie_softc *));
+	void (*reset_586)(struct ie_softc *);
 				/* card dependent reset function */
-	void (*chan_attn) __P((struct ie_softc *));
+	void (*chan_attn)(struct ie_softc *);
 				/* card dependent attn function */
-	void (*run_586) __P((struct ie_softc *));
+	void (*run_586)(struct ie_softc *);
 				/* card depenent "go on-line" function */
-	void (*memcopy) __P((const void *, void *, u_int));
+	void (*memcopy)(const void *, void *, u_int);
 	                        /* card dependent memory copy function */
-        void (*memzero) __P((void *, u_int));
+        void (*memzero)(void *, u_int);
 	                        /* card dependent memory zero function */
 
 
@@ -292,55 +292,55 @@ struct ie_softc {
 #endif
 };
 
-static void ie_obreset __P((struct ie_softc *));
-static void ie_obattend __P((struct ie_softc *));
-static void ie_obrun __P((struct ie_softc *));
-static void ie_vmereset __P((struct ie_softc *));
-static void ie_vmeattend __P((struct ie_softc *));
-static void ie_vmerun __P((struct ie_softc *));
-
-void iewatchdog __P((struct ifnet *));
-int ieintr __P((void *));
-int ieinit __P((struct ie_softc *));
-int ieioctl __P((struct ifnet *, u_long, caddr_t));
-void iestart __P((struct ifnet *));
-void iereset __P((struct ie_softc *));
-static void ie_readframe __P((struct ie_softc *, int));
-static void ie_drop_packet_buffer __P((struct ie_softc *));
-int ie_setupram __P((struct ie_softc *));
-static int command_and_wait __P((struct ie_softc *, int,
-    void volatile *, int));
-/*static*/ void ierint __P((struct ie_softc *));
-/*static*/ void ietint __P((struct ie_softc *));
-static int ieget __P((struct ie_softc *, struct mbuf **,
-		      struct ether_header *, int *));
-static void setup_bufs __P((struct ie_softc *));
-static int mc_setup __P((struct ie_softc *, void *));
-static void mc_reset __P((struct ie_softc *));
-static __inline int ether_equal __P((u_char *, u_char *));
-static __inline void ie_ack __P((struct ie_softc *, u_int));
-static __inline void ie_setup_config __P((volatile struct ie_config_cmd *,
-					  int, int));
-static __inline int check_eh __P((struct ie_softc *, struct ether_header *,
-				  int *));
-static __inline int ie_buflen __P((struct ie_softc *, int));
-static __inline int ie_packet_len __P((struct ie_softc *));
-static __inline void iexmit __P((struct ie_softc *));
-static __inline caddr_t Align __P((caddr_t));
-
-static void chan_attn_timeout __P((void *));
-static void run_tdr __P((struct ie_softc *, struct ie_tdr_cmd *));
-static void iestop __P((struct ie_softc *));
+static void ie_obreset(struct ie_softc *);
+static void ie_obattend(struct ie_softc *);
+static void ie_obrun(struct ie_softc *);
+static void ie_vmereset(struct ie_softc *);
+static void ie_vmeattend(struct ie_softc *);
+static void ie_vmerun(struct ie_softc *);
+
+void iewatchdog(struct ifnet *);
+int ieintr(void *);
+int ieinit(struct ie_softc *);
+int ieioctl(struct ifnet *, u_long, caddr_t);
+void iestart(struct ifnet *);
+void iereset(struct ie_softc *);
+static void ie_readframe(struct ie_softc *, int);
+static void ie_drop_packet_buffer(struct ie_softc *);
+int ie_setupram(struct ie_softc *);
+static int command_and_wait(struct ie_softc *, int,
+    void volatile *, int);
+/*static*/ void ierint(struct ie_softc *);
+/*static*/ void ietint(struct ie_softc *);
+static int ieget(struct ie_softc *, struct mbuf **,
+		      struct ether_header *, int *);
+static void setup_bufs(struct ie_softc *);
+static int mc_setup(struct ie_softc *, void *);
+static void mc_reset(struct ie_softc *);
+static __inline int ether_equal(u_char *, u_char *);
+static __inline void ie_ack(struct ie_softc *, u_int);
+static __inline void ie_setup_config(volatile struct ie_config_cmd *,
+					  int, int);
+static __inline int check_eh(struct ie_softc *, struct ether_header *,
+				  int *);
+static __inline int ie_buflen(struct ie_softc *, int);
+static __inline int ie_packet_len(struct ie_softc *);
+static __inline void iexmit(struct ie_softc *);
+static __inline caddr_t Align(caddr_t);
+
+static void chan_attn_timeout(void *);
+static void run_tdr(struct ie_softc *, struct ie_tdr_cmd *);
+static void iestop(struct ie_softc *);
 
 #ifdef IEDEBUG
-void print_rbd __P((volatile struct ie_recv_buf_desc *));
+void print_rbd(volatile struct ie_recv_buf_desc *);
 
 int in_ierint = 0;
 int in_ietint = 0;
 #endif
 
-int iematch __P((struct device *, void *, void *));
-void ieattach __P((struct device *, struct device *, void *));
+int iematch(struct device *, void *, void *);
+void ieattach(struct device *, struct device *, void *);
 
 struct cfattach ie_ca = {
 	sizeof(struct ie_softc), iematch, ieattach
diff --git a/sys/arch/sparc/dev/if_le.c b/sys/arch/sparc/dev/if_le.c
index df6591847bb..4cdeffedcce 100644
--- a/sys/arch/sparc/dev/if_le.c
+++ b/sys/arch/sparc/dev/if_le.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le.c,v 1.18 2001/06/11 00:29:49 miod Exp $	*/
+/*	$OpenBSD: if_le.c,v 1.19 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: if_le.c,v 1.50 1997/09/09 20:54:48 pk Exp $	*/
 
 /*-
@@ -79,26 +79,26 @@
 #include <sparc/dev/if_lereg.h>
 #include <sparc/dev/if_levar.h>
 
-int	lematch __P((struct device *, void *, void *));
-void	leattach __P((struct device *, struct device *, void *));
+int	lematch(struct device *, void *, void *);
+void	leattach(struct device *, struct device *, void *);
 
 /*
  * ifmedia interfaces
  */
-int	lemediachange __P((struct ifnet *));
-void	lemediastatus __P((struct ifnet *, struct ifmediareq *));
+int	lemediachange(struct ifnet *);
+void	lemediastatus(struct ifnet *, struct ifmediareq *);
 
 #if defined(SUN4M)
 /*
  * media change methods (only for sun4m)
  */
-void	lesetutp __P((struct am7990_softc *));
-void	lesetaui __P((struct am7990_softc *));
+void	lesetutp(struct am7990_softc *);
+void	lesetaui(struct am7990_softc *);
 #endif /* SUN4M */
 
 #if defined(SUN4M)	/* XXX */
-int	myleintr __P((void *));
-int	ledmaintr __P((struct dma_softc *));
+int	myleintr(void *);
+int	ledmaintr(struct dma_softc *);
 
 int
 myleintr(arg)
@@ -127,11 +127,11 @@ struct cfattach le_ca = {
 	sizeof(struct le_softc), lematch, leattach
 };
 
-hide void lewrcsr __P((struct am7990_softc *, u_int16_t, u_int16_t));
-hide u_int16_t lerdcsr __P((struct am7990_softc *, u_int16_t));
-hide void lehwreset __P((struct am7990_softc *));
-hide void lehwinit __P((struct am7990_softc *));
-hide void lenocarrier __P((struct am7990_softc *));
+hide void lewrcsr(struct am7990_softc *, u_int16_t, u_int16_t);
+hide u_int16_t lerdcsr(struct am7990_softc *, u_int16_t);
+hide void lehwreset(struct am7990_softc *);
+hide void lehwinit(struct am7990_softc *);
+hide void lenocarrier(struct am7990_softc *);
 
 hide void
 lewrcsr(sc, port, val)
@@ -423,7 +423,7 @@ leattach(parent, self, aux)
 #endif
 
 	/* XXX the following declarations should be elsewhere */
-	extern void myetheraddr __P((u_char *));
+	extern void myetheraddr(u_char *);
 
 	if (ca->ca_ra.ra_nintr != 1) {
 		printf(": expected 1 interrupt, got %d\n", ca->ca_ra.ra_nintr);
diff --git a/sys/arch/sparc/dev/isp_sbus.c b/sys/arch/sparc/dev/isp_sbus.c
index 99548e366e3..671308cdde4 100644
--- a/sys/arch/sparc/dev/isp_sbus.c
+++ b/sys/arch/sparc/dev/isp_sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isp_sbus.c,v 1.19 2001/12/14 00:20:54 mjacob Exp $	*/
+/*	$OpenBSD: isp_sbus.c,v 1.20 2002/03/14 01:26:43 millert Exp $	*/
 /*
  * SBus specific probe and attach routines for Qlogic ISP SCSI adapters.
  *
@@ -98,8 +98,8 @@ struct isp_sbussoftc {
 };
 
 
-static int isp_match __P((struct device *, void *, void *));
-static void isp_sbus_attach __P((struct device *, struct device *, void *));
+static int isp_match(struct device *, void *, void *);
+static void isp_sbus_attach(struct device *, struct device *, void *);
 struct cfattach isp_sbus_ca = {
 	sizeof (struct isp_sbussoftc), isp_match, isp_sbus_attach
 };
diff --git a/sys/arch/sparc/dev/kbd.c b/sys/arch/sparc/dev/kbd.c
index fe5ceb1ca20..ed9119878bd 100644
--- a/sys/arch/sparc/dev/kbd.c
+++ b/sys/arch/sparc/dev/kbd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kbd.c,v 1.15 2001/09/24 23:06:02 mickey Exp $	*/
+/*	$OpenBSD: kbd.c,v 1.16 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: kbd.c,v 1.28 1997/09/13 19:12:18 pk Exp $ */
 
 /*
@@ -377,8 +377,8 @@ struct kbd_state {
 struct kbd_softc {
 	struct	tty *k_cons;		/* uplink for ASCII data to console */
 	struct	tty *k_kbd;		/* downlink for output to keyboard */
-	void	(*k_open) __P((struct tty *));	/* enable dataflow */
-	void	(*k_close) __P((struct tty *));	/* disable dataflow */
+	void	(*k_open)(struct tty *);	/* enable dataflow */
+	void	(*k_close)(struct tty *);	/* disable dataflow */
 	int	k_evmode;		/* set if we should produce events */
 	struct	kbd_state k_state;	/* ASCII decode state */
 	struct	evvar k_events;		/* event queue state */
@@ -388,12 +388,12 @@ struct kbd_softc {
 } kbd_softc;
 
 /* Prototypes */
-void	kbd_reset __P((struct kbd_state *));
-static	int kbd_translate __P((int, struct kbd_state *));
-void	kbdattach __P((int));
-void	kbd_repeat __P((void *arg));
-u_short	kbd_cnv_entry __P((u_short));
-u_short	kbd_cnv_out __P((u_short));
+void	kbd_reset(struct kbd_state *);
+static	int kbd_translate(int, struct kbd_state *);
+void	kbdattach(int);
+void	kbd_repeat(void *arg);
+u_short	kbd_cnv_entry(u_short);
+u_short	kbd_cnv_out(u_short);
 
 /* set in kbdattach() */
 int kbd_repeat_start;
@@ -419,8 +419,8 @@ kbd_ascii(tp)
 void
 kbd_serial(tp, iopen, iclose)
 	struct tty *tp;
-	void (*iopen) __P((struct tty *));
-	void (*iclose) __P((struct tty *));
+	void (*iopen)(struct tty *);
+	void (*iclose)(struct tty *);
 {
 	register struct kbd_softc *k;
 	register char *cp;
diff --git a/sys/arch/sparc/dev/lebuffer.c b/sys/arch/sparc/dev/lebuffer.c
index 9e99c092881..fbc3c8d6c32 100644
--- a/sys/arch/sparc/dev/lebuffer.c
+++ b/sys/arch/sparc/dev/lebuffer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lebuffer.c,v 1.4 1998/11/11 00:26:00 jason Exp $	*/
+/*	$OpenBSD: lebuffer.c,v 1.5 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: lebuffer.c,v 1.3 1997/05/24 20:16:28 pk Exp $ */
 
 /*
@@ -49,9 +49,9 @@
 #include <sparc/dev/lebuffervar.h>
 #include <sparc/dev/dmareg.h>/*XXX*/
 
-int	lebufprint __P((void *, const char *));
-int	lebufmatch __P((struct device *, void *, void *));
-void	lebufattach __P((struct device *, struct device *, void *));
+int	lebufprint(void *, const char *);
+int	lebufmatch(struct device *, void *, void *);
+void	lebufattach(struct device *, struct device *, void *);
 
 struct cfattach lebuffer_ca = {
 	sizeof(struct lebuf_softc), lebufmatch, lebufattach
diff --git a/sys/arch/sparc/dev/led.c b/sys/arch/sparc/dev/led.c
index 867c14aa543..6f080214f0b 100644
--- a/sys/arch/sparc/dev/led.c
+++ b/sys/arch/sparc/dev/led.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: led.c,v 1.8 2001/06/11 21:33:42 miod Exp $	*/
+/*	$OpenBSD: led.c,v 1.9 2002/03/14 01:26:43 millert Exp $	*/
 
 /*
  * Copyright (c) 1998 Jason L. Wright (jason@thought.net)
@@ -52,9 +52,9 @@
 #include <sparc/sparc/cpuvar.h>
 #include <sparc/dev/led.h>
 
-int	ledmatch	__P((struct device *, void *, void *));
-void	ledattach	__P((struct device *, struct device *, void *));
-void	led_cycle	__P((void *));
+int	ledmatch(struct device *, void *, void *);
+void	ledattach(struct device *, struct device *, void *);
+void	led_cycle(void *);
 
 struct cfattach led_ca = {
 	sizeof (struct led_softc), ledmatch, ledattach
diff --git a/sys/arch/sparc/dev/led.h b/sys/arch/sparc/dev/led.h
index 202d66cdbd6..29cfb4d52d1 100644
--- a/sys/arch/sparc/dev/led.h
+++ b/sys/arch/sparc/dev/led.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: led.h,v 1.4 2001/01/30 03:55:10 jason Exp $	*/
+/*	$OpenBSD: led.h,v 1.5 2002/03/14 01:26:43 millert Exp $	*/
 
 /*
  * Copyright (c) 1998 Jason L. Wright (jason@thought.net)
@@ -44,4 +44,4 @@ struct led_softc {
 };
 extern struct led_softc *led_sc;
 
-void	led_cycle	__P((void *));
+void	led_cycle(void *);
diff --git a/sys/arch/sparc/dev/magmareg.h b/sys/arch/sparc/dev/magmareg.h
index a85598cfc6f..213f9f16551 100644
--- a/sys/arch/sparc/dev/magmareg.h
+++ b/sys/arch/sparc/dev/magmareg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: magmareg.h,v 1.6 2002/01/30 20:45:34 nordin Exp $	*/
+/*	$OpenBSD: magmareg.h,v 1.7 2002/03/14 01:26:43 millert Exp $	*/
 
 /* magmareg.h
  *
@@ -195,29 +195,29 @@ struct mbpp_softc {
 
 /* internal function prototypes */
 
-int cd1400_compute_baud __P((speed_t, int, int *, int *));
-__inline void cd1400_write_ccr __P((struct cd1400 *, u_char));
-__inline u_char cd1400_read_reg __P((struct cd1400 *, int));
-__inline void cd1400_write_reg __P((struct cd1400 *, int, u_char));
-void cd1400_enable_transmitter __P((struct cd1400 *, int));
-
-int magma_match __P((struct device *, void *, void *));
-void magma_attach __P((struct device *, struct device *, void *));
-int magma_hard __P((void *));
-int magma_soft __P((void *));
-
-int mtty_match __P((struct device *, void *, void *));
-void mtty_attach __P((struct device *, struct device *, void *));
-int mtty_modem_control __P((struct mtty_port *, int, int));
-int mtty_param __P((struct tty *, struct termios *));
-void mtty_start __P((struct tty *));
-
-int mbpp_match __P((struct device *, void *, void *));
-void mbpp_attach __P((struct device *, struct device *, void *));
-int mbpp_rw __P((dev_t, struct uio *));
-void mbpp_timeout __P((void *));
-void mbpp_start __P((void *));
-int mbpp_send __P((struct mbpp_port *, caddr_t, int));
-int mbpp_recv __P((struct mbpp_port *, caddr_t, int));
-int mbpp_hztoms __P((int));
-int mbpp_mstohz __P((int));
+int cd1400_compute_baud(speed_t, int, int *, int *);
+__inline void cd1400_write_ccr(struct cd1400 *, u_char);
+__inline u_char cd1400_read_reg(struct cd1400 *, int);
+__inline void cd1400_write_reg(struct cd1400 *, int, u_char);
+void cd1400_enable_transmitter(struct cd1400 *, int);
+
+int magma_match(struct device *, void *, void *);
+void magma_attach(struct device *, struct device *, void *);
+int magma_hard(void *);
+int magma_soft(void *);
+
+int mtty_match(struct device *, void *, void *);
+void mtty_attach(struct device *, struct device *, void *);
+int mtty_modem_control(struct mtty_port *, int, int);
+int mtty_param(struct tty *, struct termios *);
+void mtty_start(struct tty *);
+
+int mbpp_match(struct device *, void *, void *);
+void mbpp_attach(struct device *, struct device *, void *);
+int mbpp_rw(dev_t, struct uio *);
+void mbpp_timeout(void *);
+void mbpp_start(void *);
+int mbpp_send(struct mbpp_port *, caddr_t, int);
+int mbpp_recv(struct mbpp_port *, caddr_t, int);
+int mbpp_hztoms(int);
+int mbpp_mstohz(int);
diff --git a/sys/arch/sparc/dev/ms.c b/sys/arch/sparc/dev/ms.c
index d314a7e5adb..db8b58043bb 100644
--- a/sys/arch/sparc/dev/ms.c
+++ b/sys/arch/sparc/dev/ms.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ms.c,v 1.7 1999/09/05 16:27:58 jason Exp $	*/
+/*	$OpenBSD: ms.c,v 1.8 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: ms.c,v 1.10 1996/09/12 01:36:18 mrg Exp $ */
 
 /*
@@ -84,8 +84,8 @@ struct ms_softc {
 	int	ms_dx;			/* delta-x */
 	int	ms_dy;			/* delta-y */
 	struct	tty *ms_mouse;		/* downlink for output to mouse */
-	void	(*ms_open) __P((struct tty *));	/* enable dataflow */
-	void	(*ms_close) __P((struct tty *));/* disable dataflow */
+	void	(*ms_open)(struct tty *);	/* enable dataflow */
+	void	(*ms_close)(struct tty *);/* disable dataflow */
 	volatile int ms_ready;		/* event queue is ready */
 	struct	evvar ms_events;	/* event queue state */
 } ms_softc;
@@ -98,8 +98,8 @@ struct ms_softc {
 void
 ms_serial(tp, iopen, iclose)
 	struct tty *tp;
-	void (*iopen) __P((struct tty *));
-	void (*iclose) __P((struct tty *));
+	void (*iopen)(struct tty *);
+	void (*iclose)(struct tty *);
 {
 
 	ms_softc.ms_mouse = tp;
diff --git a/sys/arch/sparc/dev/obio.c b/sys/arch/sparc/dev/obio.c
index 95d5f1d1abd..bd0f3a46bc5 100644
--- a/sys/arch/sparc/dev/obio.c
+++ b/sys/arch/sparc/dev/obio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: obio.c,v 1.11 2002/01/10 00:06:17 nordin Exp $	*/
+/*	$OpenBSD: obio.c,v 1.12 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: obio.c,v 1.37 1997/07/29 09:58:11 fair Exp $	*/
 
 /*
@@ -74,20 +74,20 @@ struct bus_softc {
 
 
 /* autoconfiguration driver */
-static int	busmatch __P((struct device *, void *, void *));
-static void	obioattach __P((struct device *, struct device *, void *));
-static void	vmesattach __P((struct device *, struct device *, void *));
-static void	vmelattach __P((struct device *, struct device *, void *));
-static void	vmeattach __P((struct device *, struct device *, void *));
-
-int		busprint __P((void *, const char *));
-int		vmeprint __P((void *, const char *));
-static int	busattach __P((struct device *, void *, void *, int));
-int		obio_scan __P((struct device *, void *, void *));
-int 		vmes_scan __P((struct device *, void *, void *));
-int 		vmel_scan __P((struct device *, void *, void *));
-void		vmebus_translate __P((struct device *, struct confargs *, int));
-int 		vmeintr __P((void *));
+static int	busmatch(struct device *, void *, void *);
+static void	obioattach(struct device *, struct device *, void *);
+static void	vmesattach(struct device *, struct device *, void *);
+static void	vmelattach(struct device *, struct device *, void *);
+static void	vmeattach(struct device *, struct device *, void *);
+
+int		busprint(void *, const char *);
+int		vmeprint(void *, const char *);
+static int	busattach(struct device *, void *, void *, int);
+int		obio_scan(struct device *, void *, void *);
+int 		vmes_scan(struct device *, void *, void *);
+int 		vmel_scan(struct device *, void *, void *);
+void		vmebus_translate(struct device *, struct confargs *, int);
+int 		vmeintr(void *);
 
 struct cfattach obio_ca = {
 	sizeof(struct bus_softc), busmatch, obioattach
diff --git a/sys/arch/sparc/dev/p9100.c b/sys/arch/sparc/dev/p9100.c
index 0e1bf109e7a..2c3e2c7edf9 100644
--- a/sys/arch/sparc/dev/p9100.c
+++ b/sys/arch/sparc/dev/p9100.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: p9100.c,v 1.6 2001/11/06 19:53:16 miod Exp $	*/
+/*	$OpenBSD: p9100.c,v 1.7 2002/03/14 01:26:43 millert Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -99,9 +99,9 @@ struct fbdriver p9100fbdriver = {
 extern int fbnode;
 extern struct tty *fbconstty;
 
-void p9100loadcmap __P((struct p9100_softc *, int, int));
-void p9100_set_video __P((struct p9100_softc *, int));
-int p9100_get_video __P((struct p9100_softc *));
+void p9100loadcmap(struct p9100_softc *, int, int);
+void p9100_set_video(struct p9100_softc *, int);
+int p9100_get_video(struct p9100_softc *);
 
 /*
  * System control and command registers
diff --git a/sys/arch/sparc/dev/pfour.c b/sys/arch/sparc/dev/pfour.c
index 50f53484c3e..0dfe5e3e7d3 100644
--- a/sys/arch/sparc/dev/pfour.c
+++ b/sys/arch/sparc/dev/pfour.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfour.c,v 1.7 2001/11/06 19:53:16 miod Exp $ */
+/*	$OpenBSD: pfour.c,v 1.8 2002/03/14 01:26:43 millert Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -56,8 +56,8 @@ struct pfour_softc {
 	int	nothing;
 };
 
-static int	pfourmatch __P((struct device *, void *, void *));
-static void	pfourattach __P((struct device *, struct device *, void *));
+static int	pfourmatch(struct device *, void *, void *);
+static void	pfourattach(struct device *, struct device *, void *);
 struct cfdriver pfourcd = { NULL, "pfour", pfourmatch, pfourattach,
 	DV_DULL, sizeof(struct pfour_softc)
 };
diff --git a/sys/arch/sparc/dev/power.c b/sys/arch/sparc/dev/power.c
index 0d31d68c9d4..8e356a7f563 100644
--- a/sys/arch/sparc/dev/power.c
+++ b/sys/arch/sparc/dev/power.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: power.c,v 1.5 1999/05/05 07:08:03 deraadt Exp $	*/
+/*	$OpenBSD: power.c,v 1.6 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: power.c,v 1.2 1996/05/16 15:56:56 abrown Exp $ */
 
 /*
@@ -50,8 +50,8 @@
 
 #include <sparc/dev/power.h>
 
-static int powermatch __P((struct device *, void *, void *));
-static void powerattach __P((struct device *, struct device *, void *));
+static int powermatch(struct device *, void *, void *);
+static void powerattach(struct device *, struct device *, void *);
 
 struct cfattach power_ca = {
 	sizeof(struct device), powermatch, powerattach
diff --git a/sys/arch/sparc/dev/power.h b/sys/arch/sparc/dev/power.h
index 4ed01e64b5b..48654220cde 100644
--- a/sys/arch/sparc/dev/power.h
+++ b/sys/arch/sparc/dev/power.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: power.h,v 1.2 2000/03/03 00:54:55 todd Exp $ */
+/*	$OpenBSD: power.h,v 1.3 2002/03/14 01:26:43 millert Exp $ */
 /*	$NetBSD: power.h,v 1.2 1996/05/16 15:56:57 abrown Exp $ */
 
 /*
@@ -57,4 +57,4 @@
 volatile u_char *power_reg;
 #endif
 
-void powerdown __P((void));		/* power off function */
+void powerdown(void);		/* power off function */
diff --git a/sys/arch/sparc/dev/qe.c b/sys/arch/sparc/dev/qe.c
index aee12234387..d216a45a88a 100644
--- a/sys/arch/sparc/dev/qe.c
+++ b/sys/arch/sparc/dev/qe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qe.c,v 1.20 2002/02/08 19:02:41 jason Exp $	*/
+/*	$OpenBSD: qe.c,v 1.21 2002/03/14 01:26:43 millert Exp $	*/
 
 /*
  * Copyright (c) 1998, 2000 Jason L. Wright.
@@ -79,24 +79,24 @@
 #include <sparc/dev/qereg.h>
 #include <sparc/dev/qevar.h>
 
-int	qematch __P((struct device *, void *, void *));
-void	qeattach __P((struct device *, struct device *, void *));
-
-void	qeinit __P((struct qesoftc *));
-void	qestart __P((struct ifnet *));
-void	qestop __P((struct qesoftc *));
-void	qewatchdog __P((struct ifnet *));
-int	qeioctl __P((struct ifnet *, u_long, caddr_t));
-void	qereset __P((struct qesoftc *));
-
-int		qeintr __P((void *));
-int		qe_eint __P((struct qesoftc *, u_int32_t));
-int		qe_rint __P((struct qesoftc *));
-int		qe_tint __P((struct qesoftc *));
-void		qe_read __P((struct qesoftc *, int, int));
-void		qe_mcreset __P((struct qesoftc *));
-void		qe_ifmedia_sts __P((struct ifnet *, struct ifmediareq *));
-int		qe_ifmedia_upd __P((struct ifnet *));
+int	qematch(struct device *, void *, void *);
+void	qeattach(struct device *, struct device *, void *);
+
+void	qeinit(struct qesoftc *);
+void	qestart(struct ifnet *);
+void	qestop(struct qesoftc *);
+void	qewatchdog(struct ifnet *);
+int	qeioctl(struct ifnet *, u_long, caddr_t);
+void	qereset(struct qesoftc *);
+
+int		qeintr(void *);
+int		qe_eint(struct qesoftc *, u_int32_t);
+int		qe_rint(struct qesoftc *);
+int		qe_tint(struct qesoftc *);
+void		qe_read(struct qesoftc *, int, int);
+void		qe_mcreset(struct qesoftc *);
+void		qe_ifmedia_sts(struct ifnet *, struct ifmediareq *);
+int		qe_ifmedia_upd(struct ifnet *);
 
 struct cfdriver qe_cd = {
 	NULL, "qe", DV_IFNET
@@ -130,7 +130,7 @@ qeattach(parent, self, aux)
 	struct ifnet *ifp = &sc->sc_arpcom.ac_if;
 	struct confargs *ca = aux;
 	struct bootpath *bp;
-	extern void myetheraddr __P((u_char *));
+	extern void myetheraddr(u_char *);
 	int pri;
 
 	if (qec->sc_pri == 0) {
diff --git a/sys/arch/sparc/dev/qec.c b/sys/arch/sparc/dev/qec.c
index 98c57ebc56a..b7ba3aff655 100644
--- a/sys/arch/sparc/dev/qec.c
+++ b/sys/arch/sparc/dev/qec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qec.c,v 1.14 2002/02/08 18:52:25 jason Exp $	*/
+/*	$OpenBSD: qec.c,v 1.15 2002/03/14 01:26:43 millert Exp $	*/
 
 /*
  * Copyright (c) 1998 Theo de Raadt and Jason L. Wright.
@@ -63,11 +63,11 @@
 #include <sparc/dev/qecreg.h>
 #include <sparc/dev/qecvar.h>
 
-int	qecprint	__P((void *, const char *));
-int	qecmatch	__P((struct device *, void *, void *));
-void	qecattach	__P((struct device *, struct device *, void *));
-void	qec_fix_range	__P((struct qec_softc *, struct sbus_softc *));
-void	qec_translate	__P((struct qec_softc *, struct confargs *));
+int	qecprint(void *, const char *);
+int	qecmatch(struct device *, void *, void *);
+void	qecattach(struct device *, struct device *, void *);
+void	qec_fix_range(struct qec_softc *, struct sbus_softc *);
+void	qec_translate(struct qec_softc *, struct confargs *);
 
 struct cfattach qec_ca = {
 	sizeof(struct qec_softc), qecmatch, qecattach
diff --git a/sys/arch/sparc/dev/qecvar.h b/sys/arch/sparc/dev/qecvar.h
index d6d47c75d62..3f7ebfb1426 100644
--- a/sys/arch/sparc/dev/qecvar.h
+++ b/sys/arch/sparc/dev/qecvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qecvar.h,v 1.8 2001/01/30 07:17:07 jason Exp $	*/
+/*	$OpenBSD: qecvar.h,v 1.9 2002/03/14 01:26:43 millert Exp $	*/
 
 /*
  * Copyright (c) 1998 Theo de Raadt and Jason L. Wright.
@@ -47,6 +47,6 @@ struct qec_softc {
 	u_int32_t	sc_rsize;	/* qec buffer size for receive */
 };
 
-void	qec_reset __P((struct qec_softc *));
-int	qec_put __P((u_int8_t *, struct mbuf *));
-struct mbuf *qec_get __P((struct ifnet *, u_int8_t *, int));
+void	qec_reset(struct qec_softc *);
+int	qec_put(u_int8_t *, struct mbuf *);
+struct mbuf *qec_get(struct ifnet *, u_int8_t *, int);
diff --git a/sys/arch/sparc/dev/sbus.c b/sys/arch/sparc/dev/sbus.c
index 140776501e2..294ffff2009 100644
--- a/sys/arch/sparc/dev/sbus.c
+++ b/sys/arch/sparc/dev/sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbus.c,v 1.10 2001/11/19 19:22:43 deraadt Exp $	*/
+/*	$OpenBSD: sbus.c,v 1.11 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: sbus.c,v 1.17 1997/06/01 22:10:39 pk Exp $ */
 
 /*
@@ -63,12 +63,12 @@
 #include <sparc/dev/xboxvar.h>
 #include <sparc/dev/dmareg.h>
 
-int sbus_print __P((void *, const char *));
-void sbusreset __P((int));
+int sbus_print(void *, const char *);
+void sbusreset(int);
 
 /* autoconfiguration driver */
-void	sbus_attach __P((struct device *, struct device *, void *));
-int	sbus_match __P((struct device *, void *, void *));
+void	sbus_attach(struct device *, struct device *, void *);
+int	sbus_match(struct device *, void *, void *);
 
 struct cfattach sbus_ca = {
 	sizeof(struct sbus_softc), sbus_match, sbus_attach
diff --git a/sys/arch/sparc/dev/sbusvar.h b/sys/arch/sparc/dev/sbusvar.h
index 90abe2456fc..e43cc3e35e0 100644
--- a/sys/arch/sparc/dev/sbusvar.h
+++ b/sys/arch/sparc/dev/sbusvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbusvar.h,v 1.5 1998/11/11 00:26:01 jason Exp $	*/
+/*	$OpenBSD: sbusvar.h,v 1.6 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: sbusvar.h,v 1.4 1996/04/22 02:35:05 abrown Exp $ */
 
 /*
@@ -51,7 +51,7 @@
 struct sbusdev {
 	struct	device *sd_dev;		/* backpointer to generic */
 	struct	sbusdev *sd_bchain;	/* forward link in bus chain */
-	void	(*sd_reset) __P((struct device *));
+	void	(*sd_reset)(struct device *);
 };
 
 /*
@@ -73,7 +73,7 @@ struct sbus_softc {
 	int	sc_burst;		/* burst transfer sizes supported */
 };
 
-int	sbusdev_match __P((struct cfdata *, void *));
-void	sbus_establish __P((struct sbusdev *, struct device *));
-void	sbus_translate __P((struct device *, struct confargs *));
-int	sbus_testdma __P((struct sbus_softc *, struct confargs *));
+int	sbusdev_match(struct cfdata *, void *);
+void	sbus_establish(struct sbusdev *, struct device *);
+void	sbus_translate(struct device *, struct confargs *);
+int	sbus_testdma(struct sbus_softc *, struct confargs *);
diff --git a/sys/arch/sparc/dev/scf.c b/sys/arch/sparc/dev/scf.c
index 3955015fdfc..2b9b08b33c9 100644
--- a/sys/arch/sparc/dev/scf.c
+++ b/sys/arch/sparc/dev/scf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scf.c,v 1.3 2001/03/24 10:07:20 ho Exp $	*/
+/*	$OpenBSD: scf.c,v 1.4 2002/03/14 01:26:43 millert Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -57,12 +57,12 @@
 #include <machine/scfio.h>
 #include <sparc/dev/scfreg.h>
 
-int	scfmatch	__P((struct device *, void *, void *));
-void	scfattach	__P((struct device *, struct device *, void *));
+int	scfmatch(struct device *, void *, void *);
+void	scfattach(struct device *, struct device *, void *);
 
-int	scfopen	__P((dev_t, int, int, struct proc *));
-int	scfclose	__P((dev_t, int, int, struct proc *));
-int	scfioctl	__P((dev_t, u_long, caddr_t, int, struct proc *));
+int	scfopen(dev_t, int, int, struct proc *);
+int	scfclose(dev_t, int, int, struct proc *);
+int	scfioctl(dev_t, u_long, caddr_t, int, struct proc *);
 
 struct scf_softc {
 	struct	device sc_dv;			/* base device */
diff --git a/sys/arch/sparc/dev/si.c b/sys/arch/sparc/dev/si.c
index 032fc2aaf8b..3b6a078287a 100644
--- a/sys/arch/sparc/dev/si.c
+++ b/sys/arch/sparc/dev/si.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: si.c,v 1.14 2000/09/21 17:45:12 mickey Exp $	*/
+/*	$OpenBSD: si.c,v 1.15 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: si.c,v 1.38 1997/08/27 11:24:20 bouyer Exp $	*/
 
 /*-
@@ -201,31 +201,31 @@ int sw_options = SI_ENABLE_DMA;
 /* How long to wait for DMA before declaring an error. */
 int si_dma_intr_timo = 500;	/* ticks (sec. X 100) */
 
-static int	si_match __P((struct device *, void *, void *));
-static void	si_attach __P((struct device *, struct device *, void *));
-static int	si_intr __P((void *));
-static void	si_reset_adapter __P((struct ncr5380_softc *));
-static void	si_minphys __P((struct buf *));
+static int	si_match(struct device *, void *, void *);
+static void	si_attach(struct device *, struct device *, void *);
+static int	si_intr(void *);
+static void	si_reset_adapter(struct ncr5380_softc *);
+static void	si_minphys(struct buf *);
 
-void si_dma_alloc __P((struct ncr5380_softc *));
-void si_dma_free __P((struct ncr5380_softc *));
-void si_dma_poll __P((struct ncr5380_softc *));
+void si_dma_alloc(struct ncr5380_softc *);
+void si_dma_free(struct ncr5380_softc *);
+void si_dma_poll(struct ncr5380_softc *);
 
-void si_vme_dma_setup __P((struct ncr5380_softc *));
-void si_vme_dma_start __P((struct ncr5380_softc *));
-void si_vme_dma_eop __P((struct ncr5380_softc *));
-void si_vme_dma_stop __P((struct ncr5380_softc *));
+void si_vme_dma_setup(struct ncr5380_softc *);
+void si_vme_dma_start(struct ncr5380_softc *);
+void si_vme_dma_eop(struct ncr5380_softc *);
+void si_vme_dma_stop(struct ncr5380_softc *);
 
-void si_vme_intr_on  __P((struct ncr5380_softc *));
-void si_vme_intr_off __P((struct ncr5380_softc *));
+void si_vme_intr_on(struct ncr5380_softc *);
+void si_vme_intr_off(struct ncr5380_softc *);
 
-void si_obio_dma_setup __P((struct ncr5380_softc *));
-void si_obio_dma_start __P((struct ncr5380_softc *));
-void si_obio_dma_eop __P((struct ncr5380_softc *));
-void si_obio_dma_stop __P((struct ncr5380_softc *));
+void si_obio_dma_setup(struct ncr5380_softc *);
+void si_obio_dma_start(struct ncr5380_softc *);
+void si_obio_dma_eop(struct ncr5380_softc *);
+void si_obio_dma_stop(struct ncr5380_softc *);
 
-void si_obio_intr_on __P((struct ncr5380_softc *));
-void si_obio_intr_off __P((struct ncr5380_softc *));
+void si_obio_intr_on(struct ncr5380_softc *);
+void si_obio_intr_off(struct ncr5380_softc *);
 
 static struct scsi_adapter	si_ops = {
 	ncr5380_scsi_cmd,		/* scsi_cmd()		*/
diff --git a/sys/arch/sparc/dev/spif.c b/sys/arch/sparc/dev/spif.c
index 7af04e8bef4..99e06b56e32 100644
--- a/sys/arch/sparc/dev/spif.c
+++ b/sys/arch/sparc/dev/spif.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spif.c,v 1.9 2002/01/30 20:45:34 nordin Exp $	*/
+/*	$OpenBSD: spif.c,v 1.10 2002/03/14 01:26:43 millert Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -68,42 +68,42 @@
 # error "no suitable software interrupt bit"
 #endif
 
-int	spifmatch	__P((struct device *, void *, void *));
-void	spifattach	__P((struct device *, struct device *, void *));
-
-int	sttymatch	__P((struct device *, void *, void *));
-void	sttyattach	__P((struct device *, struct device *, void *));
-int	sttyopen	__P((dev_t, int, int, struct proc *));
-int	sttyclose	__P((dev_t, int, int, struct proc *));
-int	sttyread	__P((dev_t, struct uio *, int));
-int	sttywrite	__P((dev_t, struct uio *, int));
-int	sttyioctl	__P((dev_t, u_long, caddr_t, int, struct proc *));
-int	sttystop	__P((struct tty *, int));
-
-int	spifstcintr		__P((void *));
-int	spifstcintr_mx		__P((struct spif_softc *, int *));
-int	spifstcintr_tx		__P((struct spif_softc *, int *));
-int	spifstcintr_rx		__P((struct spif_softc *, int *));
-int	spifstcintr_rxexception	__P((struct spif_softc *, int *));
-int	spifsoftintr		__P((void *));
-
-int	stty_param	__P((struct tty *, struct termios *));
-struct tty *sttytty	__P((dev_t));
-int	stty_modem_control __P((struct stty_port *, int, int));
-static __inline	void	stty_write_ccr __P((struct stcregs *, u_int8_t));
-int	stty_compute_baud __P((speed_t, int, u_int8_t *, u_int8_t *));
-void	stty_start	__P((struct tty *));
-
-int	sbppmatch	__P((struct device *, void *, void *));
-void	sbppattach	__P((struct device *, struct device *, void *));
-int	sbppopen	__P((dev_t, int, int, struct proc *));
-int	sbppclose	__P((dev_t, int, int, struct proc *));
-int	sbppread	__P((dev_t, struct uio *, int));
-int	sbppwrite	__P((dev_t, struct uio *, int));
-int	sbpp_rw	__P((dev_t, struct uio *));
-int	spifppcintr	__P((void *));
-int	sbppselect	__P((dev_t, int, struct proc *));
-int	sbppioctl	__P((dev_t, u_long, caddr_t, int, struct proc *));
+int	spifmatch(struct device *, void *, void *);
+void	spifattach(struct device *, struct device *, void *);
+
+int	sttymatch(struct device *, void *, void *);
+void	sttyattach(struct device *, struct device *, void *);
+int	sttyopen(dev_t, int, int, struct proc *);
+int	sttyclose(dev_t, int, int, struct proc *);
+int	sttyread(dev_t, struct uio *, int);
+int	sttywrite(dev_t, struct uio *, int);
+int	sttyioctl(dev_t, u_long, caddr_t, int, struct proc *);
+int	sttystop(struct tty *, int);
+
+int	spifstcintr(void *);
+int	spifstcintr_mx(struct spif_softc *, int *);
+int	spifstcintr_tx(struct spif_softc *, int *);
+int	spifstcintr_rx(struct spif_softc *, int *);
+int	spifstcintr_rxexception(struct spif_softc *, int *);
+int	spifsoftintr(void *);
+
+int	stty_param(struct tty *, struct termios *);
+struct tty *sttytty(dev_t);
+int	stty_modem_control(struct stty_port *, int, int);
+static __inline	void	stty_write_ccr(struct stcregs *, u_int8_t);
+int	stty_compute_baud(speed_t, int, u_int8_t *, u_int8_t *);
+void	stty_start(struct tty *);
+
+int	sbppmatch(struct device *, void *, void *);
+void	sbppattach(struct device *, struct device *, void *);
+int	sbppopen(dev_t, int, int, struct proc *);
+int	sbppclose(dev_t, int, int, struct proc *);
+int	sbppread(dev_t, struct uio *, int);
+int	sbppwrite(dev_t, struct uio *, int);
+int	sbpp_rw(dev_t, struct uio *);
+int	spifppcintr(void *);
+int	sbppselect(dev_t, int, struct proc *);
+int	sbppioctl(dev_t, u_long, caddr_t, int, struct proc *);
 
 struct cfattach spif_ca = {
 	sizeof (struct spif_softc), spifmatch, spifattach
diff --git a/sys/arch/sparc/dev/tctrl.c b/sys/arch/sparc/dev/tctrl.c
index 0c86714b7cb..108bfff17e3 100644
--- a/sys/arch/sparc/dev/tctrl.c
+++ b/sys/arch/sparc/dev/tctrl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tctrl.c,v 1.2 1999/09/07 12:36:20 jason Exp $	*/
+/*	$OpenBSD: tctrl.c,v 1.3 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: tctrl.c,v 1.2 1999/08/11 00:46:06 matt Exp $	*/
 
 /*-
@@ -100,14 +100,14 @@ struct tctrl_softc {
 	struct evcnt sc_intrcnt;	/* interrupt counting */
 };
 
-int tctrl_match		__P((struct device *, void *, void *));
-void tctrl_attach	__P((struct device *, struct device *, void *));
+int tctrl_match(struct device *, void *, void *);
+void tctrl_attach(struct device *, struct device *, void *);
 
-void tctrl_write_data		__P((struct tctrl_softc *, u_int8_t));
-u_int8_t tctrl_read_data	__P((struct tctrl_softc *));
-int tctrl_intr			__P((void *));
-void tctrl_setup_bitport	__P((struct tctrl_softc *, int));
-void tctrl_process_response	__P((struct tctrl_softc *));
+void tctrl_write_data(struct tctrl_softc *, u_int8_t);
+u_int8_t tctrl_read_data(struct tctrl_softc *);
+int tctrl_intr(void *);
+void tctrl_setup_bitport(struct tctrl_softc *, int);
+void tctrl_process_response(struct tctrl_softc *);
 
 struct cfattach tctrl_ca = {
 	sizeof(struct tctrl_softc), tctrl_match, tctrl_attach
diff --git a/sys/arch/sparc/dev/tcx.c b/sys/arch/sparc/dev/tcx.c
index 36ff835dd2a..ef8f0b120ce 100644
--- a/sys/arch/sparc/dev/tcx.c
+++ b/sys/arch/sparc/dev/tcx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcx.c,v 1.5 2001/11/06 19:53:16 miod Exp $	*/
+/*	$OpenBSD: tcx.c,v 1.6 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: tcx.c,v 1.8 1997/07/29 09:58:14 fair Exp $ */
 
 /* 
@@ -104,9 +104,9 @@ struct tcx_softc {
 };
 
 /* autoconfiguration driver */
-static void	tcxattach __P((struct device *, struct device *, void *));
-static int	tcxmatch __P((struct device *, void *, void *));
-static void	tcx_unblank __P((struct device *));
+static void	tcxattach(struct device *, struct device *, void *);
+static int	tcxmatch(struct device *, void *, void *);
+static void	tcx_unblank(struct device *);
 
 struct cfattach tcx_ca = {
 	sizeof(struct tcx_softc), tcxmatch, tcxattach
@@ -123,8 +123,8 @@ static struct fbdriver tcx_fbdriver = {
 
 extern int fbnode;
 
-static void tcx_reset __P((struct tcx_softc *));
-static void tcx_loadcmap __P((struct tcx_softc *, int, int));
+static void tcx_reset(struct tcx_softc *);
+static void tcx_loadcmap(struct tcx_softc *, int, int);
 
 #define OBPNAME	"SUNW,tcx"
 /*
diff --git a/sys/arch/sparc/dev/xbox.c b/sys/arch/sparc/dev/xbox.c
index a534e0c4b2e..119ccffd545 100644
--- a/sys/arch/sparc/dev/xbox.c
+++ b/sys/arch/sparc/dev/xbox.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xbox.c,v 1.1 1999/04/18 03:24:26 jason Exp $	*/
+/*	$OpenBSD: xbox.c,v 1.2 2002/03/14 01:26:43 millert Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -53,10 +53,10 @@
 #include <sparc/dev/xboxreg.h>
 #include <sparc/dev/xboxvar.h>
 
-int	xboxmatch	__P((struct device *, void *, void *));
-void	xboxattach	__P((struct device *, struct device *, void *));
-int	xboxprint	__P((void *, const char *));
-void	xbox_fix_range	__P((struct xbox_softc *sc, struct sbus_softc *sbp));
+int	xboxmatch(struct device *, void *, void *);
+void	xboxattach(struct device *, struct device *, void *);
+int	xboxprint(void *, const char *);
+void	xbox_fix_range(struct xbox_softc *sc, struct sbus_softc *sbp);
 
 struct cfattach xbox_ca = {
 	sizeof (struct xbox_softc), xboxmatch, xboxattach
diff --git a/sys/arch/sparc/dev/xd.c b/sys/arch/sparc/dev/xd.c
index 4d2e3d5e3d5..76a433b9149 100644
--- a/sys/arch/sparc/dev/xd.c
+++ b/sys/arch/sparc/dev/xd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xd.c,v 1.20 2001/11/06 19:53:16 miod Exp $	*/
+/*	$OpenBSD: xd.c,v 1.21 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: xd.c,v 1.37 1997/07/29 09:58:16 fair Exp $	*/
 
 /*
@@ -207,36 +207,36 @@
 extern int pil_to_vme[];	/* from obio.c */
 
 /* internals */
-int	xdc_cmd __P((struct xdc_softc *, int, int, int, int, int, char *, int));
-char   *xdc_e2str __P((int));
-int	xdc_error __P((struct xdc_softc *, struct xd_iorq *,
-		   struct xd_iopb *, int, int));
-int	xdc_ioctlcmd __P((struct xd_softc *, dev_t dev, struct xd_iocmd *));
-void	xdc_perror __P((struct xd_iorq *, struct xd_iopb *, int));
-int	xdc_piodriver __P((struct xdc_softc *, int, int));
-int	xdc_remove_iorq __P((struct xdc_softc *));
-int	xdc_reset __P((struct xdc_softc *, int, int, int, struct xd_softc *));
-inline void xdc_rqinit __P((struct xd_iorq *, struct xdc_softc *,
+int	xdc_cmd(struct xdc_softc *, int, int, int, int, int, char *, int);
+char   *xdc_e2str(int);
+int	xdc_error(struct xdc_softc *, struct xd_iorq *,
+		   struct xd_iopb *, int, int);
+int	xdc_ioctlcmd(struct xd_softc *, dev_t dev, struct xd_iocmd *);
+void	xdc_perror(struct xd_iorq *, struct xd_iopb *, int);
+int	xdc_piodriver(struct xdc_softc *, int, int);
+int	xdc_remove_iorq(struct xdc_softc *);
+int	xdc_reset(struct xdc_softc *, int, int, int, struct xd_softc *);
+inline void xdc_rqinit(struct xd_iorq *, struct xdc_softc *,
 			    struct xd_softc *, int, u_long, int,
-			    caddr_t, struct buf *));
-void	xdc_rqtopb __P((struct xd_iorq *, struct xd_iopb *, int, int));
-void	xdc_start __P((struct xdc_softc *, int));
-int	xdc_startbuf __P((struct xdc_softc *, struct xd_softc *, struct buf *));
-int	xdc_submit_iorq __P((struct xdc_softc *, int, int));
-void	xdc_tick __P((void *));
-void	xdc_xdreset __P((struct xdc_softc *, struct xd_softc *));
+			    caddr_t, struct buf *);
+void	xdc_rqtopb(struct xd_iorq *, struct xd_iopb *, int, int);
+void	xdc_start(struct xdc_softc *, int);
+int	xdc_startbuf(struct xdc_softc *, struct xd_softc *, struct buf *);
+int	xdc_submit_iorq(struct xdc_softc *, int, int);
+void	xdc_tick(void *);
+void	xdc_xdreset(struct xdc_softc *, struct xd_softc *);
 
 /* machine interrupt hook */
-int	xdcintr __P((void *));
+int	xdcintr(void *);
 
 /* autoconf */
-int	xdcmatch __P((struct device *, void *, void *));
-void	xdcattach __P((struct device *, struct device *, void *));
-int	xdmatch __P((struct device *, void *, void *));
-void	xdattach __P((struct device *, struct device *, void *));
+int	xdcmatch(struct device *, void *, void *);
+void	xdcattach(struct device *, struct device *, void *);
+int	xdmatch(struct device *, void *, void *);
+void	xdattach(struct device *, struct device *, void *);
 
-static	void xddummystrat __P((struct buf *));
-int	xdgetdisklabel __P((struct xd_softc *, void *));
+static	void xddummystrat(struct buf *);
+int	xdgetdisklabel(struct xd_softc *, void *);
 
 /*
  * cfdrivers: device driver interface to autoconfig
diff --git a/sys/arch/sparc/dev/xy.c b/sys/arch/sparc/dev/xy.c
index b9278ca6231..05c948e501f 100644
--- a/sys/arch/sparc/dev/xy.c
+++ b/sys/arch/sparc/dev/xy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xy.c,v 1.17 2001/11/06 19:53:16 miod Exp $	*/
+/*	$OpenBSD: xy.c,v 1.18 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: xy.c,v 1.26 1997/07/19 21:43:56 pk Exp $	*/
 
 /*
@@ -144,40 +144,40 @@
 extern int pil_to_vme[];	/* from obio.c */
 
 /* internals */
-struct xy_iopb *xyc_chain __P((struct xyc_softc *, struct xy_iorq *));
-int	xyc_cmd __P((struct xyc_softc *, int, int, int, int, int, char *, int));
-char   *xyc_e2str __P((int));
-int	xyc_entoact __P((int));
-int	xyc_error __P((struct xyc_softc *, struct xy_iorq *,
-		   struct xy_iopb *, int));
-int	xyc_ioctlcmd __P((struct xy_softc *, dev_t dev, struct xd_iocmd *));
-void	xyc_perror __P((struct xy_iorq *, struct xy_iopb *, int));
-int	xyc_piodriver __P((struct xyc_softc *, struct xy_iorq *));
-int	xyc_remove_iorq __P((struct xyc_softc *));
-int	xyc_reset __P((struct xyc_softc *, int, struct xy_iorq *, int,
-			struct xy_softc *));
-inline void xyc_rqinit __P((struct xy_iorq *, struct xyc_softc *,
+struct xy_iopb *xyc_chain(struct xyc_softc *, struct xy_iorq *);
+int	xyc_cmd(struct xyc_softc *, int, int, int, int, int, char *, int);
+char   *xyc_e2str(int);
+int	xyc_entoact(int);
+int	xyc_error(struct xyc_softc *, struct xy_iorq *,
+		   struct xy_iopb *, int);
+int	xyc_ioctlcmd(struct xy_softc *, dev_t dev, struct xd_iocmd *);
+void	xyc_perror(struct xy_iorq *, struct xy_iopb *, int);
+int	xyc_piodriver(struct xyc_softc *, struct xy_iorq *);
+int	xyc_remove_iorq(struct xyc_softc *);
+int	xyc_reset(struct xyc_softc *, int, struct xy_iorq *, int,
+			struct xy_softc *);
+inline void xyc_rqinit(struct xy_iorq *, struct xyc_softc *,
 			    struct xy_softc *, int, u_long, int,
-			    caddr_t, struct buf *));
-void	xyc_rqtopb __P((struct xy_iorq *, struct xy_iopb *, int, int));
-void	xyc_start __P((struct xyc_softc *, struct xy_iorq *));
-int	xyc_startbuf __P((struct xyc_softc *, struct xy_softc *, struct buf *));
-int	xyc_submit_iorq __P((struct xyc_softc *, struct xy_iorq *, int));
-void	xyc_tick __P((void *));
-int	xyc_unbusy __P((struct xyc *, int));
-void	xyc_xyreset __P((struct xyc_softc *, struct xy_softc *));
+			    caddr_t, struct buf *);
+void	xyc_rqtopb(struct xy_iorq *, struct xy_iopb *, int, int);
+void	xyc_start(struct xyc_softc *, struct xy_iorq *);
+int	xyc_startbuf(struct xyc_softc *, struct xy_softc *, struct buf *);
+int	xyc_submit_iorq(struct xyc_softc *, struct xy_iorq *, int);
+void	xyc_tick(void *);
+int	xyc_unbusy(struct xyc *, int);
+void	xyc_xyreset(struct xyc_softc *, struct xy_softc *);
 
 /* machine interrupt hook */
-int	xycintr __P((void *));
+int	xycintr(void *);
 
 /* autoconf */
-int	xycmatch __P((struct device *, void *, void *));
-void	xycattach __P((struct device *, struct device *, void *));
-int	xymatch __P((struct device *, void *, void *));
-void	xyattach __P((struct device *, struct device *, void *));
+int	xycmatch(struct device *, void *, void *);
+void	xycattach(struct device *, struct device *, void *);
+int	xymatch(struct device *, void *, void *);
+void	xyattach(struct device *, struct device *, void *);
 
-static	void xydummystrat __P((struct buf *));
-int	xygetdisklabel __P((struct xy_softc *, void *));
+static	void xydummystrat(struct buf *);
+int	xygetdisklabel(struct xy_softc *, void *);
 
 /*
  * cfdrivers: device driver interface to autoconfig
diff --git a/sys/arch/sparc/dev/zs.c b/sys/arch/sparc/dev/zs.c
index 3762e8118a9..5cbda3bb015 100644
--- a/sys/arch/sparc/dev/zs.c
+++ b/sys/arch/sparc/dev/zs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zs.c,v 1.32 2002/03/13 00:24:21 miod Exp $	*/
+/*	$OpenBSD: zs.c,v 1.33 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: zs.c,v 1.49 1997/08/31 21:26:37 pk Exp $ */
 
 /*
@@ -125,8 +125,8 @@ struct zs_softc {
 };
 
 /* Definition of the driver for autoconfig. */
-static int	zsmatch __P((struct device *, void *, void *));
-static void	zsattach __P((struct device *, struct device *, void *));
+static int	zsmatch(struct device *, void *, void *);
+static void	zsattach(struct device *, struct device *, void *);
 
 struct cfattach zs_ca = {
 	sizeof(struct zs_softc), zsmatch, zsattach
@@ -137,53 +137,53 @@ struct cfdriver zs_cd = {
 };
 
 /* Interrupt handlers. */
-static int	zshard __P((void *));
+static int	zshard(void *);
 static struct intrhand levelhard = { zshard };
-static int	zssoft __P((void *));
+static int	zssoft(void *);
 static struct intrhand levelsoft = { zssoft };
 
 struct zs_chanstate *zslist;
 
 /* Routines called from other code. */
-static void	zsiopen __P((struct tty *));
-static void	zsiclose __P((struct tty *));
-static void	zsstart __P((struct tty *));
-static int	zsparam __P((struct tty *, struct termios *));
+static void	zsiopen(struct tty *);
+static void	zsiclose(struct tty *);
+static void	zsstart(struct tty *);
+static int	zsparam(struct tty *, struct termios *);
 
 /* Routines purely local to this driver. */
-static int	zs_getspeed __P((volatile struct zschan *));
+static int	zs_getspeed(volatile struct zschan *);
 #ifdef KGDB
-static void	zs_reset __P((volatile struct zschan *, int, int));
+static void	zs_reset(volatile struct zschan *, int, int);
 #endif
-static void	zs_modem __P((struct zs_chanstate *, int));
-static void	zs_loadchannelregs __P((volatile struct zschan *, u_char *));
-static void	tiocm_to_zs __P((struct zs_chanstate *, int how, int data));
+static void	zs_modem(struct zs_chanstate *, int);
+static void	zs_loadchannelregs(volatile struct zschan *, u_char *);
+static void	tiocm_to_zs(struct zs_chanstate *, int how, int data);
 
 /* Console stuff. */
 static struct tty *zs_ctty;	/* console `struct tty *' */
 static int zs_consin = -1, zs_consout = -1;
 static struct zs_chanstate *zs_conscs = NULL; /*console channel state */
-static void zscnputc __P((int));	/* console putc function */
+static void zscnputc(int);	/* console putc function */
 static volatile struct zschan *zs_conschan;
-static struct tty *zs_checkcons __P((struct zs_softc *, int,
-    struct zs_chanstate *));
+static struct tty *zs_checkcons(struct zs_softc *, int,
+    struct zs_chanstate *);
 
 #ifdef KGDB
 /* KGDB stuff.  Must reboot to change zs_kgdbunit. */
 extern int kgdb_dev, kgdb_rate;
 static int zs_kgdb_savedspeed;
-static void zs_checkkgdb __P((int, struct zs_chanstate *, struct tty *));
-void zskgdb __P((int));
-static int zs_kgdb_getc __P((void *));
-static void zs_kgdb_putc __P((void *, int));
+static void zs_checkkgdb(int, struct zs_chanstate *, struct tty *);
+void zskgdb(int);
+static int zs_kgdb_getc(void *);
+static void zs_kgdb_putc(void *, int);
 #endif
 
-static int zsrint __P((struct zs_chanstate *, volatile struct zschan *));
-static int zsxint __P((struct zs_chanstate *, volatile struct zschan *));
-static int zssint __P((struct zs_chanstate *, volatile struct zschan *));
+static int zsrint(struct zs_chanstate *, volatile struct zschan *);
+static int zsxint(struct zs_chanstate *, volatile struct zschan *);
+static int zssint(struct zs_chanstate *, volatile struct zschan *);
 
-void zsabort __P((int));
-static void zsoverrun __P((int, long *, char *));
+void zsabort(int);
+static void zsoverrun(int, long *, char *);
 
 static volatile struct zsdevice *zsaddr[NZS];	/* XXX, but saves work */
 
@@ -203,8 +203,8 @@ int zshardscope;
 int zsshortcuts;		/* number of "shortcut" software interrupts */
 
 #ifdef SUN4
-static u_int zs_read __P((volatile struct zschan *, u_int reg));
-static u_int zs_write __P((volatile struct zschan *, u_int, u_int));
+static u_int zs_read(volatile struct zschan *, u_int reg);
+static u_int zs_write(volatile struct zschan *, u_int, u_int);
 
 static u_int
 zs_read(zc, reg)
@@ -445,7 +445,7 @@ zsconsole(tp, unit, out, fnstop)
 	register struct tty *tp;
 	register int unit;
 	int out;
-	int (**fnstop) __P((struct tty *, int));
+	int (**fnstop)(struct tty *, int);
 {
 	int zs;
 	volatile struct zsdevice *addr;
@@ -853,9 +853,9 @@ zstty(dev)
 	return (cs->cs_ttyp);
 }
 
-static int zsrint __P((struct zs_chanstate *, volatile struct zschan *));
-static int zsxint __P((struct zs_chanstate *, volatile struct zschan *));
-static int zssint __P((struct zs_chanstate *, volatile struct zschan *));
+static int zsrint(struct zs_chanstate *, volatile struct zschan *);
+static int zsxint(struct zs_chanstate *, volatile struct zschan *);
+static int zssint(struct zs_chanstate *, volatile struct zschan *);
 
 /*
  * ZS hardware interrupt.  Scan all ZS channels.  NB: we know here that
diff --git a/sys/arch/sparc/fpu/fpu_extern.h b/sys/arch/sparc/fpu/fpu_extern.h
index fa7ca68daec..a1a1df73beb 100644
--- a/sys/arch/sparc/fpu/fpu_extern.h
+++ b/sys/arch/sparc/fpu/fpu_extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_extern.h,v 1.2 1997/08/08 08:25:53 downsj Exp $	*/
+/*	$OpenBSD: fpu_extern.h,v 1.3 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: fpu_extern.h,v 1.1 1996/03/14 19:41:56 christos Exp $	*/
 
 /*
@@ -38,40 +38,40 @@ struct fpemu;
 struct fpn;
 
 /* fpu.c */
-void fpu_cleanup __P((struct proc *, struct fpstate *));
-int fpu_emulate __P((struct proc *, struct trapframe *, struct fpstate *));
-int fpu_execute __P((struct fpemu *, union instr));
+void fpu_cleanup(struct proc *, struct fpstate *);
+int fpu_emulate(struct proc *, struct trapframe *, struct fpstate *);
+int fpu_execute(struct fpemu *, union instr);
 
 /* fpu_add.c */
-struct fpn *fpu_add __P((struct fpemu *));
+struct fpn *fpu_add(struct fpemu *);
 
 /* fpu_compare.c */
-void fpu_compare __P((struct fpemu *, int));
+void fpu_compare(struct fpemu *, int);
 
 /* fpu_div.c */
-struct fpn *fpu_div __P((struct fpemu *));
+struct fpn *fpu_div(struct fpemu *);
 
 /* fpu_explode.c */
-int fpu_itof __P((struct fpn *, u_int));
-int fpu_stof __P((struct fpn *, u_int));
-int fpu_dtof __P((struct fpn *, u_int, u_int ));
-int fpu_xtof __P((struct fpn *, u_int, u_int , u_int , u_int ));
-void fpu_explode __P((struct fpemu *, struct fpn *, int, int ));
+int fpu_itof(struct fpn *, u_int);
+int fpu_stof(struct fpn *, u_int);
+int fpu_dtof(struct fpn *, u_int, u_int );
+int fpu_xtof(struct fpn *, u_int, u_int , u_int , u_int );
+void fpu_explode(struct fpemu *, struct fpn *, int, int );
 
 /* fpu_implode.c */
-u_int fpu_ftoi __P((struct fpemu *, struct fpn *));
-u_int fpu_ftos __P((struct fpemu *, struct fpn *));
-u_int fpu_ftod __P((struct fpemu *, struct fpn *, u_int *));
-u_int fpu_ftox __P((struct fpemu *, struct fpn *, u_int *));
-void fpu_implode __P((struct fpemu *, struct fpn *, int, u_int *));
+u_int fpu_ftoi(struct fpemu *, struct fpn *);
+u_int fpu_ftos(struct fpemu *, struct fpn *);
+u_int fpu_ftod(struct fpemu *, struct fpn *, u_int *);
+u_int fpu_ftox(struct fpemu *, struct fpn *, u_int *);
+void fpu_implode(struct fpemu *, struct fpn *, int, u_int *);
 
 /* fpu_mul.c */
-struct fpn *fpu_mul __P((struct fpemu *));
+struct fpn *fpu_mul(struct fpemu *);
 
 /* fpu_sqrt.c */
-struct fpn *fpu_sqrt __P((struct fpemu *));
+struct fpn *fpu_sqrt(struct fpemu *);
 
 /* fpu_subr.c */
-int fpu_shr __P((register struct fpn *, register int));
-void fpu_norm __P((register struct fpn *));
-struct fpn *fpu_newnan __P((register struct fpemu *));
+int fpu_shr(register struct fpn *, register int);
+void fpu_norm(register struct fpn *);
+struct fpn *fpu_newnan(register struct fpemu *);
diff --git a/sys/arch/sparc/fpu/fpu_implode.c b/sys/arch/sparc/fpu/fpu_implode.c
index 5d07ac1e23b..b3eca3edc0d 100644
--- a/sys/arch/sparc/fpu/fpu_implode.c
+++ b/sys/arch/sparc/fpu/fpu_implode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu_implode.c,v 1.3 1997/08/08 08:25:56 downsj Exp $	*/
+/*	$OpenBSD: fpu_implode.c,v 1.4 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: fpu_implode.c,v 1.3 1996/03/14 19:41:59 christos Exp $ */
 
 /*
@@ -61,8 +61,8 @@
 #include <sparc/fpu/fpu_emu.h>
 #include <sparc/fpu/fpu_extern.h>
 
-static int round __P((register struct fpemu *, register struct fpn *));
-static int toinf __P((struct fpemu *, int));
+static int round(register struct fpemu *, register struct fpn *);
+static int toinf(struct fpemu *, int);
 
 /*
  * Round a number (algorithm from Motorola MC68882 manual, modified for
diff --git a/sys/arch/sparc/include/autoconf.h b/sys/arch/sparc/include/autoconf.h
index 88688854650..346059f0ef2 100644
--- a/sys/arch/sparc/include/autoconf.h
+++ b/sys/arch/sparc/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.8 2001/05/05 22:34:17 art Exp $	*/
+/*	$OpenBSD: autoconf.h,v 1.9 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: autoconf.h,v 1.20 1997/05/24 20:03:03 pk Exp $ */
 
 /*
@@ -126,8 +126,8 @@ struct confargs {
  * it will use that instead of creating one, but you must only do this if
  * you get it from ../sparc/vaddrs.h.
  */
-void	*mapdev __P((struct rom_reg *pa, int va,
-		     int offset, int size));
+void	*mapdev(struct rom_reg *pa, int va,
+		     int offset, int size);
 #define	mapiodev(pa, offset, size) \
 	mapdev(pa, 0, offset, size)
 /*
@@ -137,18 +137,18 @@ void	*mapdev __P((struct rom_reg *pa, int va,
 	(((u_int)(rr)->rr_paddr + (offset)) | PMAP_IOENC((rr)->rr_iospace) )
 
 /* For VME and sun4/obio busses */
-void	*bus_map __P((struct rom_reg *, int));
-void	bus_untmp __P((void));
+void	*bus_map(struct rom_reg *, int);
+void	bus_untmp(void);
 
 /*
  * The various getprop* functions obtain `properties' from the ROMs.
  * getprop() obtains a property as a byte-sequence, and returns its
  * length; the others convert or make some other guarantee.
  */
-int	getproplen __P((int node, char *name));
-int	getprop __P((int node, char *name, void *buf, int bufsiz));
-char	*getpropstring __P((int node, char *name));
-int	getpropint __P((int node, char *name, int deflt));
+int	getproplen(int node, char *name);
+int	getprop(int node, char *name, void *buf, int bufsiz);
+char	*getpropstring(int node, char *name);
+int	getpropint(int node, char *name, int deflt);
 
 /* Frequently used options node */
 extern int optionsnode;
@@ -158,7 +158,7 @@ extern int optionsnode;
  * and fills in a romaux.  It returns 1 on success, 0 if the physical
  * address is not available as a "reg" property.
  */
-int	romprop __P((struct romaux *ra, const char *name, int node));
+int	romprop(struct romaux *ra, const char *name, int node);
 
 /*
  * The matchbyname function is useful in drivers that are matched
@@ -168,13 +168,13 @@ int	romprop __P((struct romaux *ra, const char *name, int node));
  */
 struct device;
 struct cfdata;
-int	matchbyname __P((struct device *, void *cf, void *aux));
+int	matchbyname(struct device *, void *cf, void *aux);
 
 /*
  * `clockfreq' produces a printable representation of a clock frequency
  * (this is just a frill).
  */
-char	*clockfreq __P((int freq));
+char	*clockfreq(int freq);
 
 /*
  * Memory description arrays.  Shared between pmap.c and autoconf.c; no
@@ -190,7 +190,7 @@ int	makememarr(struct memarr *, int max, int which);
 #define	MEMARR_TOTALPHYS	1
 
 /* Pass a string to the FORTH interpreter.  May fail silently. */
-void	rominterpret __P((char *));
+void	rominterpret(char *);
 
 /* Openprom V2 style boot path */
 struct bootpath {
@@ -199,24 +199,24 @@ struct bootpath {
 	struct device *dev;	/* device that recognised this component */
 };
 
-struct bootpath	*bootpath_store __P((int, struct bootpath *));
-int		sd_crazymap __P((int));
+struct bootpath	*bootpath_store(int, struct bootpath *);
+int		sd_crazymap(int);
 
 /* Parse a disk string into a dev_t, return device struct pointer */
-struct	device *parsedisk __P((char *, int, int, dev_t *));
+struct	device *parsedisk(char *, int, int, dev_t *);
 
 /* Establish a mountroot_hook, for benefit of floppy drive, mostly. */
-void	mountroot_hook_establish __P((void (*) __P((struct device *)),
+void	mountroot_hook_establish __P((void (*)(struct device *),
 				      struct device *));
 
-void	bootstrap __P((void));
-int	firstchild __P((int));
-int	nextsibling __P((int));
-void	callrom __P((void));
-struct device *getdevunit __P((char *, int));
-void	*findzs __P((int));
-int	romgetcursoraddr __P((int **, int **));
-int	findroot __P((void));
-int	findnode __P((int, const char *));
-int	opennode __P((char *));
-int	node_has_property __P((int, const char *));
+void	bootstrap(void);
+int	firstchild(int);
+int	nextsibling(int);
+void	callrom(void);
+struct device *getdevunit(char *, int);
+void	*findzs(int);
+int	romgetcursoraddr(int **, int **);
+int	findroot(void);
+int	findnode(int, const char *);
+int	opennode(char *);
+int	node_has_property(int, const char *);
diff --git a/sys/arch/sparc/include/bsd_openprom.h b/sys/arch/sparc/include/bsd_openprom.h
index 40f37590f22..b7b89d9078c 100644
--- a/sys/arch/sparc/include/bsd_openprom.h
+++ b/sys/arch/sparc/include/bsd_openprom.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bsd_openprom.h,v 1.8 2001/08/08 13:48:21 art Exp $	*/
+/*	$OpenBSD: bsd_openprom.h,v 1.9 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: bsd_openprom.h,v 1.11 1996/05/18 12:27:43 mrg Exp $ */
 
 /*
@@ -75,15 +75,15 @@
  * and so forth).
  */
 struct v0devops {
-	int	(*v0_open) __P((char *dev));
-	int	(*v0_close) __P((int d));
-	int	(*v0_rbdev) __P((int d, int nblks, int blkno, void *addr));
-	int	(*v0_wbdev) __P((int d, int nblks, int blkno, void *addr));
-	int	(*v0_wnet) __P((int d, int nbytes, void *addr));
-	int	(*v0_rnet) __P((int d, int nbytes, void *addr));
-	int	(*v0_rcdev) __P((int d, int nbytes, int, void *addr));
-	int	(*v0_wcdev) __P((int d, int nbytes, int, void *addr));
-	int	(*v0_seek) __P((int d, long offset, int whence));
+	int	(*v0_open)(char *dev);
+	int	(*v0_close)(int d);
+	int	(*v0_rbdev)(int d, int nblks, int blkno, void *addr);
+	int	(*v0_wbdev)(int d, int nblks, int blkno, void *addr);
+	int	(*v0_wnet)(int d, int nbytes, void *addr);
+	int	(*v0_rnet)(int d, int nbytes, void *addr);
+	int	(*v0_rcdev)(int d, int nbytes, int, void *addr);
+	int	(*v0_wcdev)(int d, int nbytes, int, void *addr);
+	int	(*v0_seek)(int d, long offset, int whence);
 };
 
 /*
@@ -101,25 +101,25 @@ struct v2devops {
 	 * Convert an `instance handle' (acquired through v2_open()) to
 	 * a `package handle', a.k.a. a `node'.
 	 */
-	int	(*v2_fd_phandle) __P((int d));
+	int	(*v2_fd_phandle)(int d);
 
 	/* Memory allocation and release. */
-	void	*(*v2_malloc) __P((caddr_t va, u_int sz));
-	void	(*v2_free) __P((caddr_t va, u_int sz));
+	void	*(*v2_malloc)(caddr_t va, u_int sz);
+	void	(*v2_free)(caddr_t va, u_int sz);
 
 	/* Device memory mapper. */
-	caddr_t	(*v2_mmap) __P((caddr_t va, int asi, u_int pa, u_int sz));
-	void	(*v2_munmap) __P((caddr_t va, u_int sz));
+	caddr_t	(*v2_mmap)(caddr_t va, int asi, u_int pa, u_int sz);
+	void	(*v2_munmap)(caddr_t va, u_int sz);
 
 	/* Device open, close, etc. */
-	int	(*v2_open) __P((char *devpath));
-	void	(*v2_close) __P((int d));
-	int	(*v2_read) __P((int d, void *buf, int nbytes));
-	int	(*v2_write) __P((int d, void *buf, int nbytes));
-	void	(*v2_seek) __P((int d, int hi, int lo));
-
-	void	(*v2_chain) __P((void));	/* ??? */
-	void	(*v2_release) __P((void));	/* ??? */
+	int	(*v2_open)(char *devpath);
+	void	(*v2_close)(int d);
+	int	(*v2_read)(int d, void *buf, int nbytes);
+	int	(*v2_write)(int d, void *buf, int nbytes);
+	void	(*v2_seek)(int d, int hi, int lo);
+
+	void	(*v2_chain)(void);	/* ??? */
+	void	(*v2_release)(void);	/* ??? */
 };
 
 /*
@@ -209,37 +209,37 @@ struct promvec {
 #define	PROMDEV_TTYB	2		/* in/out to ttyb */
 
 	/* Blocking getchar/putchar.  NOT REENTRANT! (grr) */
-	int	(*pv_getchar) __P((void));
-	void	(*pv_putchar) __P((int ch));
+	int	(*pv_getchar)(void);
+	void	(*pv_putchar)(int ch);
 
 	/* Non-blocking variants that return -1 on error. */
-	int	(*pv_nbgetchar) __P((void));
-	int	(*pv_nbputchar) __P((int ch));
+	int	(*pv_nbgetchar)(void);
+	int	(*pv_nbputchar)(int ch);
 
 	/* Put counted string (can be very slow). */
-	void	(*pv_putstr) __P((char *str, int len));
+	void	(*pv_putstr)(char *str, int len);
 
 	/* Miscellany. */
-	void	(*pv_reboot) __P((char *bootstr));
-	void	(*pv_printf) __P((const char *fmt, ...));
-	void	(*pv_abort) __P((void));	/* L1-A abort */
+	void	(*pv_reboot)(char *bootstr);
+	void	(*pv_printf)(const char *fmt, ...);
+	void	(*pv_abort)(void);	/* L1-A abort */
 	int	*pv_ticks;		/* Ticks since last reset */
-	void	(*pv_halt) __P((void)) __attribute__((__noreturn__));/* Halt! */
-	void	(**pv_synchook) __P((void));	/* "sync" command hook */
+	void	(*pv_halt)(void) __attribute__((__noreturn__));/* Halt! */
+	void	(**pv_synchook)(void);	/* "sync" command hook */
 
 	/*
 	 * This eval's a FORTH string.  Unfortunately, its interface
 	 * changed between V0 and V2, which gave us much pain.
 	 */
 	union {
-		void	(*v0_eval) __P((int len, char *str));
-		void	(*v2_eval) __P((char *str));
+		void	(*v0_eval)(int len, char *str);
+		void	(*v2_eval)(char *str);
 	} pv_fortheval;
 
 	struct	v0bootargs **pv_v0bootargs;	/* V0: Boot args */
 
 	/* Extract Ethernet address from network device. */
-	u_int	(*pv_enaddr) __P((int d, char *enaddr));
+	u_int	(*pv_enaddr)(int d, char *enaddr);
 
 	struct	v2bootargs pv_v2bootargs;	/* V2: Boot args + std in/out */
 	struct	v2devops pv_v2devops;	/* V2: device operations */
@@ -257,17 +257,17 @@ struct promvec {
 	 * all memory references go to the PROM, so the PROM can do it
 	 * easily.
 	 */
-	void	(*pv_setctxt) __P((int ctxt, caddr_t va, int pmeg));
+	void	(*pv_setctxt)(int ctxt, caddr_t va, int pmeg);
 #if defined(SUN4M) && defined(notyet)
 	/*
 	 * The following are V3 ROM functions to handle MP machines in the
 	 * Sun4m series. They have undefined results when run on a uniprocessor!
 	 */
-	int	(*pv_v3cpustart) __P((u_int module, u_int ctxtbl,
-				      int context, caddr_t pc));
-	int 	(*pv_v3cpustop) __P((u_int module));
-	int	(*pv_v3cpuidle) __P((u_int module));
-	int 	(*pv_v3cpuresume) __P((u_int module));
+	int	(*pv_v3cpustart)(u_int module, u_int ctxtbl,
+				      int context, caddr_t pc);
+	int 	(*pv_v3cpustop)(u_int module);
+	int	(*pv_v3cpuidle)(u_int module);
+	int 	(*pv_v3cpuresume)(u_int module);
 #endif
 };
 
@@ -305,22 +305,22 @@ struct nodeops {
 	/*
 	 * Tree traversal.
 	 */
-	int	(*no_nextnode) __P((int node));	/* next(node) */
-	int	(*no_child) __P((int node));	/* first child */
+	int	(*no_nextnode)(int node);	/* next(node) */
+	int	(*no_child)(int node);	/* first child */
 
 	/*
 	 * Property functions.  Proper use of getprop requires calling
 	 * proplen first to make sure it fits.  Kind of a pain, but no
 	 * doubt more convenient for the PROM coder.
 	 */
-	int	(*no_proplen) __P((int node, caddr_t name));
-	int	(*no_getprop) __P((int node, caddr_t name, caddr_t val));
-	int	(*no_setprop) __P((int node, caddr_t name, caddr_t val,
-				   int len));
-	caddr_t	(*no_nextprop) __P((int node, caddr_t name));
+	int	(*no_proplen)(int node, caddr_t name);
+	int	(*no_getprop)(int node, caddr_t name, caddr_t val);
+	int	(*no_setprop)(int node, caddr_t name, caddr_t val,
+				   int len);
+	caddr_t	(*no_nextprop)(int node, caddr_t name);
 };
 
-__dead void	romhalt __P((void));
-__dead void	romboot __P((char *));
+__dead void	romhalt(void);
+__dead void	romboot(char *);
 
 extern struct promvec *promvec;
diff --git a/sys/arch/sparc/include/cpu.h b/sys/arch/sparc/include/cpu.h
index a6082b68af8..c23c0b32ef3 100644
--- a/sys/arch/sparc/include/cpu.h
+++ b/sys/arch/sparc/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.11 2001/11/06 18:41:10 art Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.12 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: cpu.h,v 1.24 1997/03/15 22:25:15 pk Exp $ */
 
 /*
@@ -112,7 +112,7 @@ extern union sir sir;
 #define SIR_CLOCK	1
 
 #if defined(SUN4M)
-extern void	raise __P((int, int));
+extern void	raise(int, int);
 #if !(defined(SUN4) || defined(SUN4C))
 #define setsoftint()	raise(0,1)
 #else /* both defined */
@@ -155,13 +155,13 @@ extern int	foundfpu;		/* true => we have an FPU */
  * argument, or with a pointer to a clockframe if ih_arg is NULL.
  */
 struct intrhand {
-	int	(*ih_fun) __P((void *));
+	int	(*ih_fun)(void *);
 	void	*ih_arg;
 	struct	intrhand *ih_next;
 };
 extern struct intrhand *intrhand[15];
-void	intr_establish __P((int level, struct intrhand *));
-void	vmeintr_establish __P((int vec, int level, struct intrhand *));
+void	intr_establish(int level, struct intrhand *);
+void	vmeintr_establish(int vec, int level, struct intrhand *);
 
 /*
  * intr_fasttrap() is a lot like intr_establish, but is used for ``fast''
@@ -171,68 +171,68 @@ void	vmeintr_establish __P((int vec, int level, struct intrhand *));
 void	intr_fasttrap __P((int level, void (*vec)(void)));
 
 /* auxreg.c */
-void led_blink __P((void *));
+void led_blink(void *);
 /* scf.c */
-void scfblink __P((void *));
+void scfblink(void *);
 /* disksubr.c */
 struct dkbad;
-int isbad __P((struct dkbad *bt, int, int, int));
+int isbad(struct dkbad *bt, int, int, int);
 /* machdep.c */
-int	ldcontrolb __P((caddr_t));
-void	dumpconf __P((void));
-caddr_t	reserve_dumppages __P((caddr_t));
+int	ldcontrolb(caddr_t);
+void	dumpconf(void);
+caddr_t	reserve_dumppages(caddr_t);
 /* clock.c */
 struct timeval;
-void	lo_microtime __P((struct timeval *));
-int	statintr __P((void *));
-int	clockintr __P((void *));/* level 10 (clock) interrupt code */
-int	statintr __P((void *));	/* level 14 (statclock) interrupt code */
+void	lo_microtime(struct timeval *);
+int	statintr(void *);
+int	clockintr(void *);/* level 10 (clock) interrupt code */
+int	statintr(void *);	/* level 14 (statclock) interrupt code */
 /* locore.s */
 struct fpstate;
-void	savefpstate __P((struct fpstate *));
-void	loadfpstate __P((struct fpstate *));
-int	probeget __P((caddr_t, int));
-void	write_all_windows __P((void));
-void	write_user_windows __P((void));
-void 	proc_trampoline __P((void));
+void	savefpstate(struct fpstate *);
+void	loadfpstate(struct fpstate *);
+int	probeget(caddr_t, int);
+void	write_all_windows(void);
+void	write_user_windows(void);
+void 	proc_trampoline(void);
 struct pcb;
-void	snapshot __P((struct pcb *));
-struct frame *getfp __P((void));
-int	xldcontrolb __P((caddr_t, struct pcb *));
-void	copywords __P((const void *, void *, size_t));
-void	qcopy __P((const void *, void *, size_t));
-void	qzero __P((void *, size_t));
+void	snapshot(struct pcb *);
+struct frame *getfp(void);
+int	xldcontrolb(caddr_t, struct pcb *);
+void	copywords(const void *, void *, size_t);
+void	qcopy(const void *, void *, size_t);
+void	qzero(void *, size_t);
 /* locore2.c */
-void	remrunqueue __P((struct proc *));
+void	remrunqueue(struct proc *);
 /* trap.c */
-void	kill_user_windows __P((struct proc *));
-int	rwindow_save __P((struct proc *));
+void	kill_user_windows(struct proc *);
+int	rwindow_save(struct proc *);
 /* amd7930intr.s */
-void	amd7930_trap __P((void));
+void	amd7930_trap(void);
 /* cons.c */
-int	cnrom __P((void));
+int	cnrom(void);
 /* zs.c */
 void zsconsole __P((struct tty *, int, int, int (**)(struct tty *, int)));
 #ifdef KGDB
-void zs_kgdb_init __P((void));
+void zs_kgdb_init(void);
 #endif
 /* fb.c */
-void	fb_unblank __P((void));
+void	fb_unblank(void);
 /* cache.c */
-void cache_flush __P((caddr_t, u_int));
+void cache_flush(caddr_t, u_int);
 /* kgdb_stub.c */
 #ifdef KGDB
 void kgdb_attach __P((int (*)(void *), void (*)(void *, int), void *));
-void kgdb_connect __P((int));
-void kgdb_panic __P((void));
+void kgdb_connect(int);
+void kgdb_panic(void);
 #endif
 /* iommu.c */
-void	iommu_enter __P((u_int, u_int));
-void	iommu_remove __P((u_int, u_int));
+void	iommu_enter(u_int, u_int);
+void	iommu_remove(u_int, u_int);
 /* emul.c */
 struct trapframe;
-int fixalign __P((struct proc *, struct trapframe *));
-int emulinstr __P((int, struct trapframe *));
+int fixalign(struct proc *, struct trapframe *);
+int emulinstr(int, struct trapframe *);
 
 /*
  *
@@ -253,8 +253,8 @@ struct trapvec {
 };
 extern struct trapvec *trapbase;	/* the 256 vectors */
 
-extern void wzero __P((void *, u_int));
-extern void wcopy __P((const void *, void *, u_int));
+extern void wzero(void *, u_int);
+extern void wcopy(const void *, void *, u_int);
 
 #endif /* _KERNEL */
 #endif /* _SPARC_CPU_H_ */
diff --git a/sys/arch/sparc/include/db_machdep.h b/sys/arch/sparc/include/db_machdep.h
index 93d6161e098..fa8860c157d 100644
--- a/sys/arch/sparc/include/db_machdep.h
+++ b/sys/arch/sparc/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.7 2001/11/06 19:53:16 miod Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.8 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.10 1997/08/31 21:23:40 pk Exp $ */
 
 /*
@@ -86,8 +86,8 @@ db_regs_t		ddb_regs;	/* register state */
 
 #define DB_MACHINE_COMMANDS
 
-void db_machine_init __P((void));
-int kdb_trap __P((int, struct trapframe *));
+void db_machine_init(void);
+int kdb_trap(int, struct trapframe *);
 
 /*
  * We use a.out symbols in DDB.
diff --git a/sys/arch/sparc/include/eeprom.h b/sys/arch/sparc/include/eeprom.h
index 4a7d4c39ea1..7be53cc0e04 100644
--- a/sys/arch/sparc/include/eeprom.h
+++ b/sys/arch/sparc/include/eeprom.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eeprom.h,v 1.8 1997/11/11 12:50:53 niklas Exp $	*/
+/*	$OpenBSD: eeprom.h,v 1.9 2002/03/14 01:26:43 millert Exp $	*/
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -361,7 +361,7 @@ struct eeprom {
 
 #ifdef _KERNEL
 extern	char *eeprom_va;
-int	eeprom_uio __P((struct uio *));
+int	eeprom_uio(struct uio *);
 
 /*
  * Compatibility defines with NetBSD's eeprom.h.
diff --git a/sys/arch/sparc/include/fbvar.h b/sys/arch/sparc/include/fbvar.h
index a9491f2eda9..6ddf438f567 100644
--- a/sys/arch/sparc/include/fbvar.h
+++ b/sys/arch/sparc/include/fbvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fbvar.h,v 1.4 2001/11/01 12:13:46 art Exp $	*/
+/*	$OpenBSD: fbvar.h,v 1.5 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: fbvar.h,v 1.9 1997/07/07 23:31:30 pk Exp $ */
 
 /*
@@ -56,11 +56,11 @@
 
 struct fbdriver {
 	/* device unblank function (force kernel output to display) */
-	void	(*fbd_unblank) __P((struct device *));
-	int	(*fbd_open) __P((dev_t, int, int, struct proc *));
-	int	(*fbd_close) __P((dev_t, int, int, struct proc *));
-	int	(*fbd_ioctl) __P((dev_t, u_long, caddr_t, int, struct proc *));
-	paddr_t	(*fbd_mmap) __P((dev_t, off_t, int));
+	void	(*fbd_unblank)(struct device *);
+	int	(*fbd_open)(dev_t, int, int, struct proc *);
+	int	(*fbd_close)(dev_t, int, int, struct proc *);
+	int	(*fbd_ioctl)(dev_t, u_long, caddr_t, int, struct proc *);
+	paddr_t	(*fbd_mmap)(dev_t, off_t, int);
 #ifdef notyet
 	void	(*fbd_wrrop)();		/* `write region' rasterop */
 	void	(*fbd_cprop)();		/* `copy region' rasterop */
@@ -90,16 +90,16 @@ struct fbdevice {
 #endif
 };
 
-void	fb_attach __P((struct fbdevice *, int));
-void	fb_setsize __P((struct fbdevice *, int, int, int, int, int));
+void	fb_attach(struct fbdevice *, int);
+void	fb_setsize(struct fbdevice *, int, int, int, int, int);
 #ifdef RASTERCONSOLE
-void	fbrcons_init __P((struct fbdevice *));
-int	fbrcons_rows __P((void));
-int	fbrcons_cols __P((void));
+void	fbrcons_init(struct fbdevice *);
+int	fbrcons_rows(void);
+int	fbrcons_cols(void);
 #endif
 
 #if defined(SUN4)
-int	fb_pfour_id __P((void *));
-int	fb_pfour_get_video __P((struct fbdevice *));
-void	fb_pfour_set_video __P((struct fbdevice *, int));
+int	fb_pfour_id(void *);
+int	fb_pfour_get_video(struct fbdevice *);
+void	fb_pfour_set_video(struct fbdevice *, int);
 #endif
diff --git a/sys/arch/sparc/include/float.h b/sys/arch/sparc/include/float.h
index 8a724573044..e6c33429deb 100644
--- a/sys/arch/sparc/include/float.h
+++ b/sys/arch/sparc/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.3 1997/08/08 08:26:19 downsj Exp $	*/
+/*	$OpenBSD: float.h,v 1.4 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: float.h,v 1.6 1997/07/18 05:11:52 thorpej Exp $ */
 
 /*
@@ -51,7 +51,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/sparc/include/kbd.h b/sys/arch/sparc/include/kbd.h
index f957a62d815..b42aea16183 100644
--- a/sys/arch/sparc/include/kbd.h
+++ b/sys/arch/sparc/include/kbd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kbd.h,v 1.7 1999/08/21 20:31:39 maja Exp $	*/
+/*	$OpenBSD: kbd.h,v 1.8 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: kbd.h,v 1.6 1996/03/31 22:21:35 pk Exp $ */
 
 /*
@@ -164,8 +164,8 @@ void 	kbd_serial __P((struct tty *,
 			void (*)(struct tty *), void (*)(struct tty *)));
 void 	ms_serial __P((struct tty *,
 			void (*)(struct tty *), void (*)(struct tty *)));
-void 	kbd_rint __P((int));
-void 	ms_rint __P((int));
-void 	kbd_ascii __P((struct tty *));
-int	kbd_docmd __P((int, int));
+void 	kbd_rint(int);
+void 	ms_rint(int);
+void 	kbd_ascii(struct tty *);
+int	kbd_docmd(int, int);
 #endif
diff --git a/sys/arch/sparc/include/oldmon.h b/sys/arch/sparc/include/oldmon.h
index cd3288dcec2..0fc60a09c06 100644
--- a/sys/arch/sparc/include/oldmon.h
+++ b/sys/arch/sparc/include/oldmon.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: oldmon.h,v 1.7 2001/08/08 13:48:21 art Exp $	*/
+/*	$OpenBSD: oldmon.h,v 1.8 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: oldmon.h,v 1.11 1996/03/31 22:21:38 pk Exp $ */
 
 /*
@@ -116,15 +116,12 @@ struct saioreq {
  */
 struct om_boottable {
 	char	b_devname[2];		/* The name of the device */
-	int	(*b_probe) __P((void));	/* probe() --> -1 or found controller
+	int	(*b_probe)(void);	/* probe() --> -1 or found controller
 					   number */
-	int	(*b_boot) __P((void));	/* boot(bp) --> -1 or start address */
-	int	(*b_open)
-		__P((struct saioreq *));/* open(iobp) --> -1 or 0 */
-	int	(*b_close)
-		__P((struct saioreq *));/* close(iobp) --> -1 or 0 */
-	int	(*b_strategy)
-		__P((struct saioreq *, int));/* strategy(iobp,rw) --> -1 or 0 */
+	int	(*b_boot)(void);	/* boot(bp) --> -1 or start address */
+	int	(*b_open)(struct saioreq *);/* open(iobp) --> -1 or 0 */
+	int	(*b_close)(struct saioreq *);/* close(iobp) --> -1 or 0 */
+	int	(*b_strategy)(struct saioreq *, int);/* strategy(iobp,rw) --> -1 or 0 */
 	char	*b_desc;		/* Printable string describing dev */
 	struct devinfo *b_devinfo;      /* info to configure device. */
 };
@@ -154,7 +151,7 @@ struct om_bootparam {
  */
 struct om_vector {
 	char	*initSp;		/* Initial system stack ptr for hardware */
-	int	(*startMon) __P((void));/* Initial PC for hardware */
+	int	(*startMon)(void);/* Initial PC for hardware */
 	int	*diagberr;		/* Bus err handler for diags */
 
 	/* Monitor and hardware revision and identification */
@@ -162,10 +159,10 @@ struct om_vector {
  	u_long	*memorySize;		/* Usable memory in bytes */
 
 	/* Single-character input and output */
-	int	(*getChar) __P((void));	/* Get char from input source */
-	void	(*putChar) __P((int));	/* Put char to output sink */
-	int	(*mayGet) __P((void));	/* Maybe get char, or -1 */
-	int	(*mayPut) __P((int));	/* Maybe put char, or -1 */
+	int	(*getChar)(void);	/* Get char from input source */
+	void	(*putChar)(int);	/* Put char to output sink */
+	int	(*mayGet)(void);	/* Maybe get char, or -1 */
+	int	(*mayPut)(int);	/* Maybe put char, or -1 */
 	u_char	*echo;			/* Should getchar echo? */
 	u_char	*inSource;		/* Input source selector */
 	u_char	*outSink;		/* Output sink selector */
@@ -175,8 +172,8 @@ struct om_vector {
 #define	PROMDEV_TTYB	2		/* in/out to ttyb */
 
 	/* Keyboard input (scanned by monitor nmi routine) */
-	int	(*getKey) __P((void));	/* Get next key if one exists */
-	int	(*initGetKey) __P((void));/* Initialize get key */
+	int	(*getKey)(void);	/* Get next key if one exists */
+	int	(*initGetKey)(void);/* Initialize get key */
 	u_int	*translation;		/* Kbd translation selector */
 	u_char	*keyBid;		/* Keyboard ID byte */
 	int	*screen_x;		/* V2: Screen x pos (R/O) */
@@ -187,36 +184,36 @@ struct om_vector {
 	char	*monId;
 
 	/* Frame buffer output and terminal emulation */
-	int	(*fbWriteChar) __P((void));/* Write a character to FB */
+	int	(*fbWriteChar)(void);/* Write a character to FB */
 	int	*fbAddr;		/* Address of frame buffer */
 	char	**font;			/* Font table for FB */
-	void	(*fbWriteStr) __P((char *, int));
+	void	(*fbWriteStr)(char *, int);
 					/* Quickly write string to FB */
 
 	/* Reboot interface routine -- resets and reboots system. */
-	void	(*reBoot) __P((char *));	/* e.g. reBoot("xy()vmunix") */
+	void	(*reBoot)(char *);	/* e.g. reBoot("xy()vmunix") */
 
 	/* Line input and parsing */
 	u_char	*lineBuf;		/* The line input buffer */
 	u_char	**linePtr;		/* Cur pointer into linebuf */
 	int	*lineSize;		/* length of line in linebuf */
-	int	(*getLine) __P((void));	/* Get line from user */
-	u_char	(*getNextChar) __P((void));/* Get next char from linebuf */
-	u_char	(*peekNextChar) __P((void));/* Peek at next char */
+	int	(*getLine)(void);	/* Get line from user */
+	u_char	(*getNextChar)(void);/* Get next char from linebuf */
+	u_char	(*peekNextChar)(void);/* Peek at next char */
 	int	*fbThere;		/* =1 if frame buffer there */
-	int	(*getNum) __P((void));	/* Grab hex num from line */
+	int	(*getNum)(void);	/* Grab hex num from line */
 
 	/* Print formatted output to current output sink */
-	int	(*printf) __P((void));	/* Similar to "Kernel printf" */
-	int	(*printHex) __P((void));/* Format N digits in hex */
+	int	(*printf)(void);	/* Similar to "Kernel printf" */
+	int	(*printHex)(void);/* Format N digits in hex */
 
 	/* Led stuff */
 	u_char	*leds;			/* RAM copy of LED register */
-	int	(*setLeds) __P((void));	/* Sets LED's and RAM copy */
+	int	(*setLeds)(void);	/* Sets LED's and RAM copy */
 
 	/* Non-maskable interrupt  (nmi) information */
-	int	(*nmiAddr) __P((void));	/* Addr for level 7 vector */
-	void	(*abortEntry) __P((void));/* Entry for keyboard abort */
+	int	(*nmiAddr)(void);	/* Addr for level 7 vector */
+	void	(*abortEntry)(void);/* Entry for keyboard abort */
 	int	*nmiClock;		/* Counts up in msec */
 
 	/* Frame buffer type: see <machine/fbio.h> */
@@ -234,11 +231,10 @@ struct om_vector {
 	long	*resetMap;		/* pgmap entry for resetaddr */
 					/* Really struct pgmapent *  */
 
-	void	(*exitToMon) __P((void)) __attribute__((__noreturn__));/* Exit from user program */
+	void	(*exitToMon)(void) __attribute__((__noreturn__));/* Exit from user program */
 	u_char	**memorybitmap;		/* V1: &{0 or &bits} */
-	void	(*setcxsegmap)		/* Set seg in any context */
-		    __P((int, caddr_t, int));
-	void	(**vector_cmd) __P((u_long, char *));/* V2: Handler for 'v' cmd */
+	void	(*setcxsegmap)		/* Set seg in any context */(int, caddr_t, int);
+	void	(**vector_cmd)(u_long, char *);/* V2: Handler for 'v' cmd */
   	u_long	*ExpectedTrapSig;
   	u_long	*TrapVectorTable;
 	int	dummy1z;
@@ -306,8 +302,8 @@ struct saif {
 
 
 #if defined(SUN4)
-void	oldmon_w_trace __P((u_long));
-void	oldmon_w_cmd __P((u_long, char *));
+void	oldmon_w_trace(u_long);
+void	oldmon_w_cmd(u_long, char *);
 #endif
 
 #endif /* _MACHINE_OLDMON_H */
diff --git a/sys/arch/sparc/include/param.h b/sys/arch/sparc/include/param.h
index 6cc039b0f4b..2772902ae78 100644
--- a/sys/arch/sparc/include/param.h
+++ b/sys/arch/sparc/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.24 2002/03/13 00:24:21 miod Exp $	*/
+/*	$OpenBSD: param.h,v 1.25 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: param.h,v 1.29 1997/03/10 22:50:37 pk Exp $ */
 
 /*
@@ -165,12 +165,12 @@ extern vaddr_t		dvma_base;
 extern vaddr_t		dvma_end;
 extern struct extent	*dvmamap_extent;
 
-extern caddr_t	kdvma_mapin __P((caddr_t, int, int));
-extern caddr_t	dvma_malloc_space  __P((size_t, void *, int, int));
-extern void	dvma_free __P((caddr_t, size_t, void *));
+extern caddr_t	kdvma_mapin(caddr_t, int, int);
+extern caddr_t	dvma_malloc_space(size_t, void *, int, int);
+extern void	dvma_free(caddr_t, size_t, void *);
 #define		dvma_malloc(len,kaddr,flags)	dvma_malloc_space(len,kaddr,flags,0)
 
-extern void	delay __P((unsigned int));
+extern void	delay(unsigned int);
 #define	DELAY(n)	delay(n)
 
 extern int cputyp;
diff --git a/sys/arch/sparc/include/pmap.h b/sys/arch/sparc/include/pmap.h
index ff2f0d93710..abf6e162643 100644
--- a/sys/arch/sparc/include/pmap.h
+++ b/sys/arch/sparc/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.30 2001/12/19 08:58:05 art Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.31 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: pmap.h,v 1.30 1997/08/04 20:00:47 pk Exp $ */
 
 /*
@@ -260,8 +260,8 @@ extern struct pmap	kernel_pmap_store;
 /* Encode IO space for pmap_enter() */
 #define PMAP_IOENC(io)	(CPU_ISSUN4M ? PMAP_IOENC_SRMMU(io) : PMAP_IOENC_4(io))
 
-int             pmap_dumpsize __P((void));
-int             pmap_dumpmmu __P((int (*)__P((dev_t, daddr_t, caddr_t, size_t)),
+int             pmap_dumpsize(void);
+int             pmap_dumpmmu __P((int (*)(dev_t, daddr_t, caddr_t, size_t),
                                  daddr_t));
 
 #define	pmap_kernel()	(&kernel_pmap_store)
@@ -276,37 +276,37 @@ int             pmap_dumpmmu __P((int (*)__P((dev_t, daddr_t, caddr_t, size_t)),
 /* FUNCTION DECLARATIONS FOR COMMON PMAP MODULE */
 
 struct proc;
-void		pmap_activate __P((struct proc *));
-void		pmap_deactivate __P((struct proc *));
-void		pmap_bootstrap __P((int nmmu, int nctx, int nregion));
-int		pmap_count_ptes __P((struct pmap *));
-void		pmap_prefer __P((vaddr_t, vaddr_t *));
-int		pmap_pa_exists __P((paddr_t));
-void		*pmap_bootstrap_alloc __P((int));
-void		pmap_unwire __P((pmap_t, vaddr_t));
-void		pmap_collect __P((pmap_t));
-void		pmap_copy __P((pmap_t, pmap_t, vaddr_t, vsize_t, vaddr_t));
-pmap_t		pmap_create __P((void));
-void		pmap_destroy __P((pmap_t));
-void		pmap_init __P((void));
-vaddr_t		pmap_map __P((vaddr_t, paddr_t, paddr_t, int));
-vaddr_t		pmap_phys_address __P((int));
-void		pmap_pinit __P((pmap_t));
-void		pmap_reference __P((pmap_t));
-void		pmap_release __P((pmap_t));
-void		pmap_remove __P((pmap_t, vaddr_t, vaddr_t));
-void		pmap_init __P((void));
-int		pmap_page_index __P((paddr_t));
-void		pmap_virtual_space __P((vaddr_t *, vaddr_t *));
-void		pmap_redzone __P((void));
-void		kvm_setcache __P((caddr_t, int, int));
+void		pmap_activate(struct proc *);
+void		pmap_deactivate(struct proc *);
+void		pmap_bootstrap(int nmmu, int nctx, int nregion);
+int		pmap_count_ptes(struct pmap *);
+void		pmap_prefer(vaddr_t, vaddr_t *);
+int		pmap_pa_exists(paddr_t);
+void		*pmap_bootstrap_alloc(int);
+void		pmap_unwire(pmap_t, vaddr_t);
+void		pmap_collect(pmap_t);
+void		pmap_copy(pmap_t, pmap_t, vaddr_t, vsize_t, vaddr_t);
+pmap_t		pmap_create(void);
+void		pmap_destroy(pmap_t);
+void		pmap_init(void);
+vaddr_t		pmap_map(vaddr_t, paddr_t, paddr_t, int);
+vaddr_t		pmap_phys_address(int);
+void		pmap_pinit(pmap_t);
+void		pmap_reference(pmap_t);
+void		pmap_release(pmap_t);
+void		pmap_remove(pmap_t, vaddr_t, vaddr_t);
+void		pmap_init(void);
+int		pmap_page_index(paddr_t);
+void		pmap_virtual_space(vaddr_t *, vaddr_t *);
+void		pmap_redzone(void);
+void		kvm_setcache(caddr_t, int, int);
 #define		kvm_uncache(addr, npages) kvm_setcache(addr, npages, 0)
 #define		kvm_recache(addr, npages) kvm_setcache(addr, npages, 1)
-void		pmap_cache_enable __P((void));
+void		pmap_cache_enable(void);
 struct user;
-void		switchexit __P((struct proc *));
-int		mmu_pagein __P((struct pmap *pm, vaddr_t, int));
-void		pmap_writetext __P((unsigned char *, int));
+void		switchexit(struct proc *);
+int		mmu_pagein(struct pmap *pm, vaddr_t, int);
+void		pmap_writetext(unsigned char *, int);
 
 #define		pmap_update(pm)		/* nothing */
 #define		pmap_copy(DP,SP,D,L,S)	/* nothing */
@@ -314,37 +314,37 @@ void		pmap_writetext __P((unsigned char *, int));
 /* SUN4/SUN4C SPECIFIC DECLARATIONS */
 
 #if defined(SUN4) || defined(SUN4C)
-boolean_t	pmap_clear_modify4_4c __P((struct vm_page *));
-boolean_t	pmap_clear_reference4_4c __P((struct vm_page *));
-void		pmap_copy_page4_4c __P((paddr_t, paddr_t));
-int		pmap_enter4_4c __P((pmap_t, vaddr_t, paddr_t, vm_prot_t, int));
-boolean_t	pmap_extract4_4c __P((pmap_t, vaddr_t, paddr_t *));
-boolean_t	pmap_is_modified4_4c __P((struct vm_page *));
-boolean_t	pmap_is_referenced4_4c __P((struct vm_page *));
-void		pmap_kenter_pa4_4c __P((vaddr_t, paddr_t, vm_prot_t));
-void		pmap_kremove4_4c __P((vaddr_t, vsize_t));
-void		pmap_page_protect4_4c __P((struct vm_page *, vm_prot_t));
-void		pmap_protect4_4c __P((pmap_t, vaddr_t, vaddr_t, vm_prot_t));
-void		pmap_zero_page4_4c __P((paddr_t));
-void		pmap_changeprot4_4c __P((pmap_t, vaddr_t, vm_prot_t, int));
+boolean_t	pmap_clear_modify4_4c(struct vm_page *);
+boolean_t	pmap_clear_reference4_4c(struct vm_page *);
+void		pmap_copy_page4_4c(paddr_t, paddr_t);
+int		pmap_enter4_4c(pmap_t, vaddr_t, paddr_t, vm_prot_t, int);
+boolean_t	pmap_extract4_4c(pmap_t, vaddr_t, paddr_t *);
+boolean_t	pmap_is_modified4_4c(struct vm_page *);
+boolean_t	pmap_is_referenced4_4c(struct vm_page *);
+void		pmap_kenter_pa4_4c(vaddr_t, paddr_t, vm_prot_t);
+void		pmap_kremove4_4c(vaddr_t, vsize_t);
+void		pmap_page_protect4_4c(struct vm_page *, vm_prot_t);
+void		pmap_protect4_4c(pmap_t, vaddr_t, vaddr_t, vm_prot_t);
+void		pmap_zero_page4_4c(paddr_t);
+void		pmap_changeprot4_4c(pmap_t, vaddr_t, vm_prot_t, int);
 #endif
 
 /* SIMILAR DECLARATIONS FOR SUN4M MODULE */
 
 #if defined(SUN4M)
-boolean_t	pmap_clear_modify4m __P((struct vm_page *));
-boolean_t	pmap_clear_reference4m __P((struct vm_page *));
-void		pmap_copy_page4m __P((paddr_t, paddr_t));
-int		pmap_enter4m __P((pmap_t, vaddr_t, paddr_t, vm_prot_t, int));
-boolean_t	pmap_extract4m __P((pmap_t, vaddr_t, paddr_t *));
-boolean_t	pmap_is_modified4m __P((struct vm_page *));
-boolean_t	pmap_is_referenced4m __P((struct vm_page *));
-void		pmap_kenter_pa4m __P((vaddr_t, paddr_t, vm_prot_t));
-void		pmap_kremove4m __P((vaddr_t, vsize_t));
-void		pmap_page_protect4m __P((struct vm_page *, vm_prot_t));
-void		pmap_protect4m __P((pmap_t, vaddr_t, vaddr_t, vm_prot_t));
-void		pmap_zero_page4m __P((paddr_t));
-void		pmap_changeprot4m __P((pmap_t, vaddr_t, vm_prot_t, int));
+boolean_t	pmap_clear_modify4m(struct vm_page *);
+boolean_t	pmap_clear_reference4m(struct vm_page *);
+void		pmap_copy_page4m(paddr_t, paddr_t);
+int		pmap_enter4m(pmap_t, vaddr_t, paddr_t, vm_prot_t, int);
+boolean_t	pmap_extract4m(pmap_t, vaddr_t, paddr_t *);
+boolean_t	pmap_is_modified4m(struct vm_page *);
+boolean_t	pmap_is_referenced4m(struct vm_page *);
+void		pmap_kenter_pa4m(vaddr_t, paddr_t, vm_prot_t);
+void		pmap_kremove4m(vaddr_t, vsize_t);
+void		pmap_page_protect4m(struct vm_page *, vm_prot_t);
+void		pmap_protect4m(pmap_t, vaddr_t, vaddr_t, vm_prot_t);
+void		pmap_zero_page4m(paddr_t);
+void		pmap_changeprot4m(pmap_t, vaddr_t, vm_prot_t, int);
 #endif /* defined SUN4M */
 
 #if !defined(SUN4M) && (defined(SUN4) || defined(SUN4C))
@@ -381,23 +381,23 @@ void		pmap_changeprot4m __P((pmap_t, vaddr_t, vm_prot_t, int));
 
 #else  /* must use function pointers */
 
-extern boolean_t	(*pmap_clear_modify_p) __P((struct vm_page *));
-extern boolean_t	(*pmap_clear_reference_p) __P((struct vm_page *));
-extern void		(*pmap_copy_page_p) __P((paddr_t, paddr_t));
-extern int		(*pmap_enter_p) __P((pmap_t, vaddr_t, paddr_t,
-					     vm_prot_t, int));
-extern boolean_t	(*pmap_extract_p) __P((pmap_t, vaddr_t, paddr_t *));
-extern boolean_t	(*pmap_is_modified_p) __P((struct vm_page *));
-extern boolean_t	(*pmap_is_referenced_p) __P((struct vm_page *));
-extern void		(*pmap_kenter_pa_p) __P((vaddr_t, paddr_t, vm_prot_t));
-extern void		(*pmap_kremove_p) __P((vaddr_t, vsize_t));
-extern void		(*pmap_page_protect_p) __P((struct vm_page *, 
-						    vm_prot_t));
-extern void		(*pmap_protect_p) __P((pmap_t, vaddr_t, vaddr_t,
-					       vm_prot_t));
-extern void		(*pmap_zero_page_p) __P((paddr_t));
-extern void		(*pmap_changeprot_p) __P((pmap_t, vaddr_t,
-						  vm_prot_t, int));
+extern boolean_t	(*pmap_clear_modify_p)(struct vm_page *);
+extern boolean_t	(*pmap_clear_reference_p)(struct vm_page *);
+extern void		(*pmap_copy_page_p)(paddr_t, paddr_t);
+extern int		(*pmap_enter_p)(pmap_t, vaddr_t, paddr_t,
+					     vm_prot_t, int);
+extern boolean_t	(*pmap_extract_p)(pmap_t, vaddr_t, paddr_t *);
+extern boolean_t	(*pmap_is_modified_p)(struct vm_page *);
+extern boolean_t	(*pmap_is_referenced_p)(struct vm_page *);
+extern void		(*pmap_kenter_pa_p)(vaddr_t, paddr_t, vm_prot_t);
+extern void		(*pmap_kremove_p)(vaddr_t, vsize_t);
+extern void		(*pmap_page_protect_p)(struct vm_page *, 
+						    vm_prot_t);
+extern void		(*pmap_protect_p)(pmap_t, vaddr_t, vaddr_t,
+					       vm_prot_t);
+extern void		(*pmap_zero_page_p)(paddr_t);
+extern void		(*pmap_changeprot_p)(pmap_t, vaddr_t,
+						  vm_prot_t, int);
 
 #define		pmap_clear_modify	(*pmap_clear_modify_p)
 #define		pmap_clear_reference	(*pmap_clear_reference_p)
diff --git a/sys/arch/sparc/include/psl.h b/sys/arch/sparc/include/psl.h
index 8959f9f1072..11ee3b022b2 100644
--- a/sys/arch/sparc/include/psl.h
+++ b/sys/arch/sparc/include/psl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: psl.h,v 1.8 2001/12/19 08:58:05 art Exp $	*/
+/*	$OpenBSD: psl.h,v 1.9 2002/03/14 01:26:43 millert Exp $	*/
 /*	$NetBSD: psl.h,v 1.12 1997/03/10 21:49:11 pk Exp $ */
 
 /*
@@ -80,12 +80,12 @@
 
 #if defined(_KERNEL) && !defined(_LOCORE)
 
-static __inline int getpsr __P((void));
-static __inline void setpsr __P((int));
-static __inline int spl0 __P((void));
-static __inline int splhigh __P((void));
-static __inline void splx __P((int));
-static __inline int getmid __P((void));
+static __inline int getpsr(void);
+static __inline void setpsr(int);
+static __inline int spl0(void);
+static __inline int splhigh(void);
+static __inline void splx(int);
+static __inline int getmid(void);
 
 /*
  * GCC pseudo-functions for manipulating PSR (primarily PIL field).
@@ -142,7 +142,7 @@ static __inline int spl0()
  * into the ipl field.)
  */
 #define	SPL(name, newipl) \
-static __inline int name __P((void)); \
+static __inline int name(void); \
 static __inline int name() \
 { \
 	int psr, oldipl; \
@@ -156,7 +156,7 @@ static __inline int name() \
 }
 /* A non-priority-decreasing version of SPL */
 #define	SPLHOLD(name, newipl) \
-static __inline int name __P((void)); \
+static __inline int name(void); \
 static __inline int name() \
 { \
 	int psr, oldipl; \
diff --git a/sys/arch/sparc/include/sun_disklabel.h b/sys/arch/sparc/include/sun_disklabel.h
index a137ae3e34d..234051e21ed 100644
--- a/sys/arch/sparc/include/sun_disklabel.h
+++ b/sys/arch/sparc/include/sun_disklabel.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sun_disklabel.h,v 1.7 2002/01/23 19:16:09 fgsch Exp $	*/
+/*	$OpenBSD: sun_disklabel.h,v 1.8 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: sun_disklabel.h,v 1.6 1996/01/07 22:03:09 thorpej Exp $ */
 
 /*
@@ -115,8 +115,8 @@ struct sun_disklabel {			/* total size = 512 bytes */
 
 #ifdef _KERNEL
 /* reads sun label in sector at [cp..cp+511] and sets *lp to BSD label */
-int	sun_disklabel __P((caddr_t, struct disklabel *)); /* true on success */
+int	sun_disklabel(caddr_t, struct disklabel *); /* true on success */
 
 /* compatibility dk ioctl's */
-int	sun_dkioctl __P((struct disk *, u_long, caddr_t, int));
+int	sun_dkioctl(struct disk *, u_long, caddr_t, int);
 #endif
diff --git a/sys/arch/sparc/include/svr4_machdep.h b/sys/arch/sparc/include/svr4_machdep.h
index a4984efdc72..77b8e9b8251 100644
--- a/sys/arch/sparc/include/svr4_machdep.h
+++ b/sys/arch/sparc/include/svr4_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: svr4_machdep.h,v 1.6 1997/08/08 08:26:50 downsj Exp $	*/
+/*	$OpenBSD: svr4_machdep.h,v 1.7 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: svr4_machdep.h,v 1.4 1996/03/31 22:21:45 pk Exp $	 */
 
 /*
@@ -99,11 +99,11 @@ typedef struct {
 
 struct svr4_ucontext;
 
-void svr4_getcontext __P((struct proc *, struct svr4_ucontext *,
-			  int, int));
-int svr4_setcontext __P((struct proc *p, struct svr4_ucontext *));
-void svr4_sendsig __P((sig_t, int, int, u_long, int, union sigval));
-int svr4_trap __P((int, struct proc *));
+void svr4_getcontext(struct proc *, struct svr4_ucontext *,
+			  int, int);
+int svr4_setcontext(struct proc *p, struct svr4_ucontext *);
+void svr4_sendsig(sig_t, int, int, u_long, int, union sigval);
+int svr4_trap(int, struct proc *);
 
 /*
  * Processor traps
diff --git a/sys/arch/sparc/include/vmparam.h b/sys/arch/sparc/include/vmparam.h
index 20feed1b633..2c36e5edec3 100644
--- a/sys/arch/sparc/include/vmparam.h
+++ b/sys/arch/sparc/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.23 2002/02/17 22:59:53 maja Exp $	*/
+/*	$OpenBSD: vmparam.h,v 1.24 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.13 1997/07/12 16:20:03 perry Exp $	*/
 
 /*
@@ -127,8 +127,8 @@ struct pmap_physseg {
 #if defined (_KERNEL) && !defined(_LOCORE)
 struct vm_map;
 #define		dvma_mapin(map,va,len,canwait)	dvma_mapin_space(map,va,len,canwait,0)
-vaddr_t		dvma_mapin_space __P((struct vm_map *, vaddr_t, int, int, int));
-void		dvma_mapout __P((vaddr_t, vaddr_t, int));
+vaddr_t		dvma_mapin_space(struct vm_map *, vaddr_t, int, int, int);
+void		dvma_mapout(vaddr_t, vaddr_t, int);
 #endif
 
 #endif /* _SPARC_VMPARAM_H_ */
diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c
index c9ba0bc7899..39355f676db 100644
--- a/sys/arch/sparc/sparc/autoconf.c
+++ b/sys/arch/sparc/sparc/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.48 2002/02/15 20:45:30 nordin Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.49 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.73 1997/07/29 09:41:53 fair Exp $ */
 
 /*
@@ -104,26 +104,26 @@ extern	int kgdb_debug_panic;
 #endif
 
 static	int rootnode;
-void	setroot __P((void));
-static	char *str2hex __P((char *, int *));
-static	int getstr __P((char *, int));
-int	findblkmajor __P((struct device *));
-char	*findblkname __P((int));
-static	struct device *getdisk __P((char *, int, int, dev_t *));
-static	int mbprint __P((void *, const char *));
-static	void crazymap __P((char *, int *));
-int	st_crazymap __P((int));
-void	swapconf __P((void));
-void	sync_crash __P((void));
-int	mainbus_match __P((struct device *, void *, void *));
-static	void mainbus_attach __P((struct device *, struct device *, void *));
+void	setroot(void);
+static	char *str2hex(char *, int *);
+static	int getstr(char *, int);
+int	findblkmajor(struct device *);
+char	*findblkname(int);
+static	struct device *getdisk(char *, int, int, dev_t *);
+static	int mbprint(void *, const char *);
+static	void crazymap(char *, int *);
+int	st_crazymap(int);
+void	swapconf(void);
+void	sync_crash(void);
+int	mainbus_match(struct device *, void *, void *);
+static	void mainbus_attach(struct device *, struct device *, void *);
 
 struct	bootpath bootpath[8];
 int	nbootpath;
-static	void bootpath_build __P((void));
-static	void bootpath_fake __P((struct bootpath *, char *));
-static	void bootpath_print __P((struct bootpath *));
-int	search_prom __P((int, char *));
+static	void bootpath_build(void);
+static	void bootpath_fake(struct bootpath *, char *);
+static	void bootpath_print(struct bootpath *);
+int	search_prom(int, char *);
 char	mainbus_model[30];
 
 /*
@@ -134,7 +134,7 @@ char	mainbus_model[30];
 struct mountroot_hook {
 	LIST_ENTRY(mountroot_hook) mr_link;
 	struct	device *mr_device;
-	void	(*mr_func) __P((struct device *));
+	void	(*mr_func)(struct device *);
 };
 LIST_HEAD(, mountroot_hook) mrh_list;
 
@@ -202,7 +202,7 @@ bootstrap()
 {
 #if defined(SUN4)
 	if (CPU_ISSUN4) {
-		extern void oldmon_w_cmd __P((u_long, char *));
+		extern void oldmon_w_cmd(u_long, char *);
 
 		/*
 		 * XXX:
@@ -272,7 +272,7 @@ bootstrap()
 		struct romaux ra;
 		register u_int pte;
 		register int i;
-		extern void setpte4m __P((u_int, u_int));
+		extern void setpte4m(u_int, u_int);
 		extern struct timer_4m *timerreg_4m;
 		extern struct counter_4m *counterreg_4m;
 
@@ -1586,7 +1586,7 @@ nextsibling(node)
 	return (promvec->pv_nodeops->no_nextnode(node));
 }
 
-u_int      hexatoi __P((const char *));
+u_int      hexatoi(const char *);
 
 /* The following recursively searches a PROM tree for a given node */
 int
@@ -1853,7 +1853,7 @@ parsedisk(str, len, defpart, devp)
 
 void
 mountroot_hook_establish(func, dev)
-	void (*func) __P((struct device *));
+	void (*func)(struct device *);
 	struct device *dev;
 {
 	struct mountroot_hook *mrhp;
diff --git a/sys/arch/sparc/sparc/auxioreg.h b/sys/arch/sparc/sparc/auxioreg.h
index 82dc31b45b4..751cd09c3fa 100644
--- a/sys/arch/sparc/sparc/auxioreg.h
+++ b/sys/arch/sparc/sparc/auxioreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auxioreg.h,v 1.1 1997/08/25 08:38:46 downsj Exp $	*/
+/*	$OpenBSD: auxioreg.h,v 1.2 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: auxreg.h,v 1.7 1997/05/17 17:52:52 pk Exp $ */
 
 /*
@@ -125,6 +125,6 @@
 #ifndef _LOCORE
 volatile u_char *auxio_reg;	/* Copy of AUXIO_REG */
 u_char auxio_regval;
-unsigned int auxregbisc __P((int, int));
+unsigned int auxregbisc(int, int);
 #endif
 
diff --git a/sys/arch/sparc/sparc/auxreg.c b/sys/arch/sparc/sparc/auxreg.c
index 7728814a834..27d3c4ce681 100644
--- a/sys/arch/sparc/sparc/auxreg.c
+++ b/sys/arch/sparc/sparc/auxreg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auxreg.c,v 1.8 2000/07/19 15:31:26 art Exp $	*/
+/*	$OpenBSD: auxreg.c,v 1.9 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: auxreg.c,v 1.21 1997/05/24 20:15:59 pk Exp $ */
 
 /*
@@ -56,8 +56,8 @@
 #include <sparc/sparc/vaddrs.h>
 #include <sparc/sparc/auxioreg.h>
 
-static int auxregmatch __P((struct device *, void *, void *));
-static void auxregattach __P((struct device *, struct device *, void *));
+static int auxregmatch(struct device *, void *, void *);
+static void auxregattach(struct device *, struct device *, void *);
 
 struct cfattach auxreg_ca = {
 	sizeof(struct device), auxregmatch, auxregattach
diff --git a/sys/arch/sparc/sparc/cache.h b/sys/arch/sparc/sparc/cache.h
index e4c58416831..9c0accc6c82 100644
--- a/sys/arch/sparc/sparc/cache.h
+++ b/sys/arch/sparc/sparc/cache.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cache.h,v 1.6 2001/12/19 08:58:05 art Exp $	*/
+/*	$OpenBSD: cache.h,v 1.7 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: cache.h,v 1.16 1997/07/06 21:15:14 pk Exp $ */
 
 /*
@@ -150,55 +150,55 @@ extern int cache_alias_bits;
 /*
  * Routines for dealing with the cache.
  */
-void	sun4_cache_enable __P((void));		/* turn it on */
-void	ms1_cache_enable __P((void));		/* turn it on */
-void	viking_cache_enable __P((void));	/* turn it on */
-void	hypersparc_cache_enable __P((void));	/* turn it on */
-void	swift_cache_enable __P((void));		/* turn it on */
-void	cypress_cache_enable __P((void));	/* turn it on */
-void	turbosparc_cache_enable __P((void));	/* turn it on */
+void	sun4_cache_enable(void);		/* turn it on */
+void	ms1_cache_enable(void);		/* turn it on */
+void	viking_cache_enable(void);	/* turn it on */
+void	hypersparc_cache_enable(void);	/* turn it on */
+void	swift_cache_enable(void);		/* turn it on */
+void	cypress_cache_enable(void);	/* turn it on */
+void	turbosparc_cache_enable(void);	/* turn it on */
 
-void	sun4_vcache_flush_context __P((void));	/* flush current context */
-void	sun4_vcache_flush_region __P((int));	/* flush region in cur ctx */
-void	sun4_vcache_flush_segment __P((int, int));/* flush seg in cur ctx */
-void	sun4_vcache_flush_page __P((int va));	/* flush page in cur ctx */
-void	sun4_cache_flush __P((caddr_t, u_int));/* flush region */
+void	sun4_vcache_flush_context(void);	/* flush current context */
+void	sun4_vcache_flush_region(int);	/* flush region in cur ctx */
+void	sun4_vcache_flush_segment(int, int);/* flush seg in cur ctx */
+void	sun4_vcache_flush_page(int va);	/* flush page in cur ctx */
+void	sun4_cache_flush(caddr_t, u_int);/* flush region */
 
-void	srmmu_vcache_flush_context __P((void));	/* flush current context */
-void	srmmu_vcache_flush_region __P((int));	/* flush region in cur ctx */
-void	srmmu_vcache_flush_segment __P((int, int));/* flush seg in cur ctx */
-void	srmmu_vcache_flush_page __P((int va));	/* flush page in cur ctx */
-void	srmmu_cache_flush __P((caddr_t, u_int));/* flush region */
-void	hypersparc_pure_vcache_flush __P((void));
+void	srmmu_vcache_flush_context(void);	/* flush current context */
+void	srmmu_vcache_flush_region(int);	/* flush region in cur ctx */
+void	srmmu_vcache_flush_segment(int, int);/* flush seg in cur ctx */
+void	srmmu_vcache_flush_page(int va);	/* flush page in cur ctx */
+void	srmmu_cache_flush(caddr_t, u_int);/* flush region */
+void	hypersparc_pure_vcache_flush(void);
 
-void	ms1_cache_flush_all __P((void));
-void	srmmu_cache_flush_all __P((void));
-void	cypress_cache_flush_all __P((void));
-void	hypersparc_cache_flush_all __P((void));
+void	ms1_cache_flush_all(void);
+void	srmmu_cache_flush_all(void);
+void	cypress_cache_flush_all(void);
+void	hypersparc_cache_flush_all(void);
 
-void	ms1_cache_flush __P((caddr_t, u_int));
-void	viking_cache_flush __P((caddr_t, u_int));
-void	viking_pcache_flush_line __P((int, int));
-void	srmmu_pcache_flush_line __P((int, int));
+void	ms1_cache_flush(caddr_t, u_int);
+void	viking_cache_flush(caddr_t, u_int);
+void	viking_pcache_flush_line(int, int);
+void	srmmu_pcache_flush_line(int, int);
 
-extern void sparc_noop __P((void));
+extern void sparc_noop(void);
 
 #define noop_vcache_flush_context \
-	(void (*)__P((void))) sparc_noop
+	(void (*)(void)) sparc_noop
 #define noop_vcache_flush_region \
-	(void (*)__P((int))) sparc_noop
+	(void (*)(int)) sparc_noop
 #define noop_vcache_flush_segment \
-	(void (*)__P((int,int))) sparc_noop
+	(void (*)(int,int)) sparc_noop
 #define noop_vcache_flush_page \
-	(void (*)__P((int))) sparc_noop
+	(void (*)(int)) sparc_noop
 #define noop_cache_flush \
-	(void (*)__P((caddr_t, u_int))) sparc_noop
+	(void (*)(caddr_t, u_int)) sparc_noop
 #define noop_pcache_flush_line \
-	(void (*)__P((int, int))) sparc_noop
+	(void (*)(int, int)) sparc_noop
 #define noop_pure_vcache_flush \
-	(void (*)__P((void))) sparc_noop
+	(void (*)(void)) sparc_noop
 #define noop_cache_flush_all \
-	(void (*)__P((void))) sparc_noop
+	(void (*)(void)) sparc_noop
 
 #define cache_flush_page(va)		cpuinfo.vcache_flush_page(va)
 #define cache_flush_segment(vr,vs)	cpuinfo.vcache_flush_segment(vr,vs)
diff --git a/sys/arch/sparc/sparc/clock.c b/sys/arch/sparc/sparc/clock.c
index 68a5bdc0bcd..380e9c6b3ae 100644
--- a/sys/arch/sparc/sparc/clock.c
+++ b/sys/arch/sparc/sparc/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.15 2001/11/06 19:53:16 miod Exp $	*/
+/*	$OpenBSD: clock.c,v 1.16 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: clock.c,v 1.52 1997/05/24 20:16:05 pk Exp $ */
 
 /*
@@ -121,16 +121,16 @@ extern struct idprom idprom;
 static int oldclk = 0;
 struct intersil7170 *i7;
 
-long	oclk_get_secs __P((void));
-void	oclk_get_dt __P((struct intersil_dt *));
-void	dt_to_gmt __P((struct intersil_dt *, long *));
-void	oclk_set_dt __P((struct intersil_dt *));
-void	oclk_set_secs __P((long));
-void	gmt_to_dt __P((long *, struct intersil_dt *));
+long	oclk_get_secs(void);
+void	oclk_get_dt(struct intersil_dt *);
+void	dt_to_gmt(struct intersil_dt *, long *);
+void	oclk_set_dt(struct intersil_dt *);
+void	oclk_set_secs(long);
+void	gmt_to_dt(long *, struct intersil_dt *);
 #endif
 
-int	oclockmatch __P((struct device *, void *, void *));
-void	oclockattach __P((struct device *, struct device *, void *));
+int	oclockmatch(struct device *, void *, void *);
+void	oclockattach(struct device *, struct device *, void *);
 
 struct cfattach oclock_ca = {
 	sizeof(struct device), oclockmatch, oclockattach
@@ -154,13 +154,13 @@ char		*eeprom_va = NULL;
 static int	eeprom_busy = 0;
 static int	eeprom_wanted = 0;
 static int	eeprom_nvram = 0;	/* non-zero if eeprom is on Mostek */
-int	eeprom_take __P((void));
-void	eeprom_give __P((void));
-int	eeprom_update __P((char *, int, int));
+int	eeprom_take(void);
+void	eeprom_give(void);
+int	eeprom_update(char *, int, int);
 #endif
 
-int	eeprom_match __P((struct device *, void *, void *));
-void	eeprom_attach __P((struct device *, struct device *, void *));
+int	eeprom_match(struct device *, void *, void *);
+void	eeprom_attach(struct device *, struct device *, void *);
 
 struct cfattach eeprom_ca = {
 	sizeof(struct device), eeprom_match, eeprom_attach
@@ -170,8 +170,8 @@ struct	cfdriver eeprom_cd = {
 	NULL, "eeprom", DV_DULL
 };
 
-int	clockmatch __P((struct device *, void *, void *));
-void	clockattach __P((struct device *, struct device *, void *));
+int	clockmatch(struct device *, void *, void *);
+void	clockattach(struct device *, struct device *, void *);
 
 struct cfattach clock_ca = {
 	sizeof(struct device), clockmatch, clockattach
@@ -181,8 +181,8 @@ struct cfdriver clock_cd = {
 	NULL, "clock", DV_DULL
 };
 
-int	timermatch __P((struct device *, void *, void *));
-void	timerattach __P((struct device *, struct device *, void *));
+int	timermatch(struct device *, void *, void *);
+void	timerattach(struct device *, struct device *, void *);
 
 struct timer_4m	*timerreg_4m;	/* XXX - need more cleanup */
 struct counter_4m	*counterreg_4m;
@@ -197,10 +197,10 @@ struct cfdriver timer_cd = {
 };
 
 struct chiptime;
-void clk_wenable __P((int));
-void myetheraddr __P((u_char *));
-int chiptotime __P((int, int, int, int, int, int));
-void timetochip __P((struct chiptime *));
+void clk_wenable(int);
+void myetheraddr(u_char *);
+int chiptotime(int, int, int, int, int, int);
+void timetochip(struct chiptime *);
 
 int timerblurb = 10; /* Guess a value; used before clock is attached */
 
diff --git a/sys/arch/sparc/sparc/cpu.c b/sys/arch/sparc/sparc/cpu.c
index e2662c99a49..c32239bfdce 100644
--- a/sys/arch/sparc/sparc/cpu.c
+++ b/sys/arch/sparc/sparc/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.36 2001/12/19 08:58:05 art Exp $	*/
+/*	$OpenBSD: cpu.c,v 1.37 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: cpu.c,v 1.56 1997/09/15 20:52:36 pk Exp $ */
 
 /*
@@ -84,8 +84,8 @@ extern char mainbus_model[];		/* from autoconf.c */
 int	foundfpu;			/* from machine/cpu.h */
 
 /* The CPU configuration driver. */
-void cpu_attach __P((struct device *, struct device *, void *));
-int  cpu_match __P((struct device *, void *, void *));
+void cpu_attach(struct device *, struct device *, void *);
+int  cpu_match(struct device *, void *, void *);
 
 struct cfattach cpu_ca = {
 	sizeof(struct cpu_softc), cpu_match, cpu_attach
@@ -95,11 +95,11 @@ struct cfdriver cpu_cd = {
 	NULL, "cpu", DV_CPU
 };
 
-char *fsrtoname __P((int, int, int, char *));
-void cache_print __P((struct cpu_softc *));
-void cpu_spinup __P((struct cpu_softc *));
-void fpu_init __P((struct cpu_softc *));
-void replacemul __P((void));
+char *fsrtoname(int, int, int, char *);
+void cache_print(struct cpu_softc *);
+void cpu_spinup(struct cpu_softc *);
+void fpu_init(struct cpu_softc *);
+void replacemul(void);
 
 #define	IU_IMPL(psr)	((u_int)(psr) >> 28)
 #define	IU_VERS(psr)	(((psr) >> 24) & 0xf)
@@ -358,40 +358,40 @@ cache_print(sc)
 /*------------*/
 
 
-void cpumatch_unknown __P((struct cpu_softc *, struct module_info *, int));
-void cpumatch_sun4 __P((struct cpu_softc *, struct module_info *, int));
-void cpumatch_sun4c __P((struct cpu_softc *, struct module_info *, int));
-void cpumatch_ms __P((struct cpu_softc *, struct module_info *, int));
-void cpumatch_viking __P((struct cpu_softc *, struct module_info *, int));
-void cpumatch_hypersparc __P((struct cpu_softc *, struct module_info *, int));
-void cpumatch_turbosparc __P((struct cpu_softc *, struct module_info *, int));
-
-void getcacheinfo_sun4 __P((struct cpu_softc *, int node));
-void getcacheinfo_sun4c __P((struct cpu_softc *, int node));
-void getcacheinfo_obp __P((struct cpu_softc *, int node));
-
-void sun4_hotfix __P((struct cpu_softc *));
-void viking_hotfix __P((struct cpu_softc *));
-void turbosparc_hotfix __P((struct cpu_softc *));
-void swift_hotfix __P((struct cpu_softc *));
-
-void ms1_mmu_enable __P((void));
-void viking_mmu_enable __P((void));
-void swift_mmu_enable __P((void));
-void hypersparc_mmu_enable __P((void));
-
-void srmmu_get_syncflt __P((void));
-void ms1_get_syncflt __P((void));
-void viking_get_syncflt __P((void));
-void swift_get_syncflt __P((void));
-void turbosparc_get_syncflt __P((void));
-void hypersparc_get_syncflt __P((void));
-void cypress_get_syncflt __P((void));
-
-int srmmu_get_asyncflt __P((u_int *, u_int *));
-int hypersparc_get_asyncflt __P((u_int *, u_int *));
-int cypress_get_asyncflt __P((u_int *, u_int *));
-int no_asyncflt_regs __P((u_int *, u_int *));
+void cpumatch_unknown(struct cpu_softc *, struct module_info *, int);
+void cpumatch_sun4(struct cpu_softc *, struct module_info *, int);
+void cpumatch_sun4c(struct cpu_softc *, struct module_info *, int);
+void cpumatch_ms(struct cpu_softc *, struct module_info *, int);
+void cpumatch_viking(struct cpu_softc *, struct module_info *, int);
+void cpumatch_hypersparc(struct cpu_softc *, struct module_info *, int);
+void cpumatch_turbosparc(struct cpu_softc *, struct module_info *, int);
+
+void getcacheinfo_sun4(struct cpu_softc *, int node);
+void getcacheinfo_sun4c(struct cpu_softc *, int node);
+void getcacheinfo_obp(struct cpu_softc *, int node);
+
+void sun4_hotfix(struct cpu_softc *);
+void viking_hotfix(struct cpu_softc *);
+void turbosparc_hotfix(struct cpu_softc *);
+void swift_hotfix(struct cpu_softc *);
+
+void ms1_mmu_enable(void);
+void viking_mmu_enable(void);
+void swift_mmu_enable(void);
+void hypersparc_mmu_enable(void);
+
+void srmmu_get_syncflt(void);
+void ms1_get_syncflt(void);
+void viking_get_syncflt(void);
+void swift_get_syncflt(void);
+void turbosparc_get_syncflt(void);
+void hypersparc_get_syncflt(void);
+void cypress_get_syncflt(void);
+
+int srmmu_get_asyncflt(u_int *, u_int *);
+int hypersparc_get_asyncflt(u_int *, u_int *);
+int cypress_get_asyncflt(u_int *, u_int *);
+int no_asyncflt_regs(u_int *, u_int *);
 
 struct module_info module_unknown = {
 	CPUTYP_UNKNOWN,
@@ -491,7 +491,7 @@ getcacheinfo_sun4(sc, node)
 }
 
 struct	idprom idprom;
-void	getidprom __P((struct idprom *, int size));
+void	getidprom(struct idprom *, int size);
 
 void
 cpumatch_sun4(sc, mp, node)
diff --git a/sys/arch/sparc/sparc/cpuvar.h b/sys/arch/sparc/sparc/cpuvar.h
index fc6e4de2778..86a39b6d872 100644
--- a/sys/arch/sparc/sparc/cpuvar.h
+++ b/sys/arch/sparc/sparc/cpuvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpuvar.h,v 1.7 2001/12/19 08:58:05 art Exp $	*/
+/*	$OpenBSD: cpuvar.h,v 1.8 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: cpuvar.h,v 1.4 1997/07/06 21:14:25 pk Exp $ */
 
 /*
@@ -56,24 +56,24 @@ struct cpu_softc;
 struct module_info {
 	int  cpu_type;
 	enum vactype vactype;
-	void (*cpu_match) __P((struct cpu_softc *, struct module_info *, int));
-	void (*getcacheinfo) __P((struct cpu_softc *sc, int node));
-	void (*hotfix) __P((struct cpu_softc *));
-	void (*mmu_enable) __P((void));
-	void (*cache_enable) __P((void));
+	void (*cpu_match)(struct cpu_softc *, struct module_info *, int);
+	void (*getcacheinfo)(struct cpu_softc *sc, int node);
+	void (*hotfix)(struct cpu_softc *);
+	void (*mmu_enable)(void);
+	void (*cache_enable)(void);
 	int  ncontext;			/* max. # of contexts (we use) */
 
-	void (*get_syncflt) __P((void));
-	int  (*get_asyncflt) __P((u_int *, u_int *));
-	void (*cache_flush) __P((caddr_t, u_int));
-	void (*vcache_flush_page) __P((int));
-	void (*vcache_flush_segment) __P((int, int));
-	void (*vcache_flush_region) __P((int));
-	void (*vcache_flush_context) __P((void));
-	void (*pcache_flush_line) __P((int, int));
-	void (*pure_vcache_flush) __P((void));
-	void (*cache_flush_all)__P((void));
-	void (*memerr) __P((unsigned, u_int, u_int, struct trapframe *));
+	void (*get_syncflt)(void);
+	int  (*get_asyncflt)(u_int *, u_int *);
+	void (*cache_flush)(caddr_t, u_int);
+	void (*vcache_flush_page)(int);
+	void (*vcache_flush_segment)(int, int);
+	void (*vcache_flush_region)(int);
+	void (*vcache_flush_context)(void);
+	void (*pcache_flush_line)(int, int);
+	void (*pure_vcache_flush)(void);
+	void (*cache_flush_all)(void);
+	void (*memerr)(unsigned, u_int, u_int, struct trapframe *);
 };
 
 
@@ -160,15 +160,15 @@ struct cpu_softc {
 	 */
 
 	/* bootup things: access to physical memory */
-	u_int	(*read_physmem) __P((u_int addr, int space));
-	void	(*write_physmem) __P((u_int addr, u_int data));
-	void	(*cache_tablewalks) __P((void));
-	void	(*mmu_enable) __P((void));
-	void	(*hotfix) __P((struct cpu_softc *));
+	u_int	(*read_physmem)(u_int addr, int space);
+	void	(*write_physmem)(u_int addr, u_int data);
+	void	(*cache_tablewalks)(void);
+	void	(*mmu_enable)(void);
+	void	(*hotfix)(struct cpu_softc *);
 
 	/* locore defined: */
-	void	(*get_syncflt) __P((void));		/* Not C-callable */
-	int	(*get_asyncflt) __P((u_int *, u_int *));
+	void	(*get_syncflt)(void);		/* Not C-callable */
+	int	(*get_asyncflt)(u_int *, u_int *);
 
        	/* Synchronous Fault Status; temporary storage */
        	struct {
@@ -177,31 +177,30 @@ struct cpu_softc {
 	} syncfltdump;
 
 	/* Cache handling functions */
-	void	(*cache_enable) __P((void));
-	void	(*cache_flush)__P((caddr_t, u_int));
-	void	(*vcache_flush_page)__P((int));
-	void	(*vcache_flush_segment)__P((int, int));
-	void	(*vcache_flush_region)__P((int));
-	void	(*vcache_flush_context)__P((void));
-	void	(*pcache_flush_line)__P((int, int));
-	void	(*pure_vcache_flush) __P((void));
-	void	(*cache_flush_all)__P((void));
+	void	(*cache_enable)(void);
+	void	(*cache_flush)(caddr_t, u_int);
+	void	(*vcache_flush_page)(int);
+	void	(*vcache_flush_segment)(int, int);
+	void	(*vcache_flush_region)(int);
+	void	(*vcache_flush_context)(void);
+	void	(*pcache_flush_line)(int, int);
+	void	(*pure_vcache_flush)(void);
+	void	(*cache_flush_all)(void);
 
 #ifdef SUN4M
 	/* hardware-assisted block operation routines */
-	void		(*hwbcopy)
-				__P((const void *from, void *to, size_t len));
-	void		(*hwbzero) __P((void *buf, size_t len));
+	void		(*hwbcopy)(const void *from, void *to, size_t len);
+	void		(*hwbzero)(void *buf, size_t len);
 
 	/* routine to clear mbus-sbus buffers */
-	void		(*mbusflush) __P((void));
+	void		(*mbusflush)(void);
 #endif
 
 	/*
 	 * Memory error handler; parity errors, unhandled NMIs and other
 	 * unrecoverable faults end up here.
 	 */
-	void    (*memerr)__P((unsigned, u_int, u_int, struct trapframe *));
+	void    (*memerr)(unsigned, u_int, u_int, struct trapframe *);
 	/* XXX: Add more here! */
 };
 
@@ -281,9 +280,9 @@ struct cpu_softc {
 /*
  * Related function prototypes
  */
-void getcpuinfo __P((struct cpu_softc *sc, int node));
-void mmu_install_tables __P((struct cpu_softc *));
-void pmap_alloc_cpu __P((struct cpu_softc *));
+void getcpuinfo(struct cpu_softc *sc, int node);
+void mmu_install_tables(struct cpu_softc *);
+void pmap_alloc_cpu(struct cpu_softc *);
 
 #define cpuinfo	(*(struct cpu_softc *)CPUINFO_VA)
 #endif	/* _SPARC_CPUVAR_H */
diff --git a/sys/arch/sparc/sparc/db_interface.c b/sys/arch/sparc/sparc/db_interface.c
index 378063f2434..81e696a9536 100644
--- a/sys/arch/sparc/sparc/db_interface.c
+++ b/sys/arch/sparc/sparc/db_interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.c,v 1.9 2001/11/06 19:53:16 miod Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.10 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: db_interface.c,v 1.18 1997/09/01 00:16:31 pk Exp $ */
 
 /*
@@ -159,8 +159,8 @@ int	db_active = 0;
 
 extern char *trap_type[];
 
-void kdb_kbd_trap __P((struct trapframe *));
-void db_prom_cmd __P((db_expr_t, int, db_expr_t, char *));
+void kdb_kbd_trap(struct trapframe *);
+void db_prom_cmd(db_expr_t, int, db_expr_t, char *);
 
 /*
  * Received keyboard interrupt sequence.
diff --git a/sys/arch/sparc/sparc/disksubr.c b/sys/arch/sparc/sparc/disksubr.c
index ba941b0bc80..e0825040fa7 100644
--- a/sys/arch/sparc/sparc/disksubr.c
+++ b/sys/arch/sparc/sparc/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.26 2001/10/15 04:03:45 jason Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.27 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.16 1996/04/28 20:25:59 thorpej Exp $ */
 
 /*
@@ -58,9 +58,9 @@
 #warn beware: Sun disklabel compatibility assumes MAXPARTITIONS == 16
 #endif
 
-static	char *disklabel_sun_to_bsd __P((char *, struct disklabel *));
-static	int disklabel_bsd_to_sun __P((struct disklabel *, char *));
-static __inline u_long sun_extended_sum __P((struct sun_disklabel *));
+static	char *disklabel_sun_to_bsd(char *, struct disklabel *);
+static	int disklabel_bsd_to_sun(struct disklabel *, char *);
+static __inline u_long sun_extended_sum(struct sun_disklabel *);
 
 #define b_cylin		b_resid
 
@@ -122,7 +122,7 @@ dk_establish(dk, dev)
 
 #if NCD > 0
 /* XXX for comparison below. */
-extern void cdstrategy __P((struct buf *));
+extern void cdstrategy(struct buf *);
 #endif
 
 /*
@@ -140,7 +140,7 @@ extern void cdstrategy __P((struct buf *));
 char *
 readdisklabel(dev, strat, lp, clp, spoofonly)
 	dev_t dev;
-	void (*strat) __P((struct buf *));
+	void (*strat)(struct buf *);
 	struct disklabel *lp;
 	struct cpu_disklabel *clp;
 	int spoofonly;
@@ -268,7 +268,7 @@ setdisklabel(olp, nlp, openmask, clp)
 int
 writedisklabel(dev, strat, lp, clp)
 	dev_t dev;
-	void (*strat) __P((struct buf *));
+	void (*strat)(struct buf *);
 	register struct disklabel *lp;
 	struct cpu_disklabel *clp;
 {
diff --git a/sys/arch/sparc/sparc/emul.c b/sys/arch/sparc/sparc/emul.c
index a591bd9d04c..b8cd88b5e3e 100644
--- a/sys/arch/sparc/sparc/emul.c
+++ b/sys/arch/sparc/sparc/emul.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: emul.c,v 1.2 2000/02/21 21:05:59 art Exp $	*/
+/*	$OpenBSD: emul.c,v 1.3 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: emul.c,v 1.3 1997/07/29 09:42:01 fair Exp $	*/
 
 /*
@@ -49,13 +49,13 @@
 #define IPR(tf, i)	((int32_t *) tf->tf_out[6])[i - 16]
 #define FPR(p, i)	((int32_t) p->p_md.md_fpstate->fs_regs[i])
 
-static __inline int readgpreg __P((struct trapframe *, int, void *));
-static __inline int readfpreg __P((struct proc *, int, void *));
-static __inline int writegpreg __P((struct trapframe *, int, const void *));
-static __inline int writefpreg __P((struct proc *, int, const void *));
-static __inline int decodeaddr __P((struct trapframe *, union instr *, void *));
-static int muldiv __P((struct trapframe *, union instr *, int32_t *, int32_t *,
-    int32_t *));
+static __inline int readgpreg(struct trapframe *, int, void *);
+static __inline int readfpreg(struct proc *, int, void *);
+static __inline int writegpreg(struct trapframe *, int, const void *);
+static __inline int writefpreg(struct proc *, int, const void *);
+static __inline int decodeaddr(struct trapframe *, union instr *, void *);
+static int muldiv(struct trapframe *, union instr *, int32_t *, int32_t *,
+    int32_t *);
 
 #define	REGNAME(i)	"goli"[i >> 3], i & 7
 
diff --git a/sys/arch/sparc/sparc/intr.c b/sys/arch/sparc/sparc/intr.c
index 5da80cea168..8d53eab0140 100644
--- a/sys/arch/sparc/sparc/intr.c
+++ b/sys/arch/sparc/sparc/intr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.c,v 1.17 2001/11/06 19:53:16 miod Exp $ */
+/*	$OpenBSD: intr.c,v 1.18 2002/03/14 01:26:44 millert Exp $ */
 /*	$NetBSD: intr.c,v 1.20 1997/07/29 09:42:03 fair Exp $ */
 
 /*
@@ -78,8 +78,8 @@
 #include <netinet6/ip6_var.h>
 #endif
 
-void	strayintr __P((struct clockframe *));
-int	soft01intr __P((void *));
+void	strayintr(struct clockframe *);
+int	soft01intr(void *);
 
 /*
  * Stray interrupt handler.  Clear it if possible.
@@ -148,7 +148,7 @@ soft01intr(fp)
 }
 
 #if defined(SUN4M)
-void	nmi_hard __P((void));
+void	nmi_hard(void);
 void
 nmi_hard()
 {
@@ -297,7 +297,7 @@ intr_establish(level, ih)
 void
 intr_fasttrap(level, vec)
 	int level;
-	void (*vec) __P((void));
+	void (*vec)(void);
 {
 	struct trapvec *tv;
 	u_long hi22, lo10;
diff --git a/sys/arch/sparc/sparc/intreg.h b/sys/arch/sparc/sparc/intreg.h
index 2c619934ee8..7b9fe8661d9 100644
--- a/sys/arch/sparc/sparc/intreg.h
+++ b/sys/arch/sparc/sparc/intreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intreg.h,v 1.4 2000/02/21 17:08:36 art Exp $	*/
+/*	$OpenBSD: intreg.h,v 1.5 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: intreg.h,v 1.6 1997/07/22 20:19:10 pk Exp $ */
 
 /*
@@ -73,8 +73,8 @@
 #define	IE_ALLIE	0x01	/* enable interrupts */
 
 #ifndef _LOCORE
-void	ienab_bis __P((int bis));	/* set given bits */
-void	ienab_bic __P((int bic));	/* clear given bits */
+void	ienab_bis(int bis);	/* set given bits */
+void	ienab_bic(int bic);	/* clear given bits */
 #endif
 
 #if defined(SUN4M)
diff --git a/sys/arch/sparc/sparc/iommu.c b/sys/arch/sparc/sparc/iommu.c
index 871857a51c1..5775aee68af 100644
--- a/sys/arch/sparc/sparc/iommu.c
+++ b/sys/arch/sparc/sparc/iommu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iommu.c,v 1.14 2002/02/21 19:55:13 jason Exp $	*/
+/*	$OpenBSD: iommu.c,v 1.15 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: iommu.c,v 1.13 1997/07/29 09:42:04 fair Exp $ */
 
 /*
@@ -66,9 +66,9 @@ int	has_iocache;
 
 
 /* autoconfiguration driver */
-int	iommu_print __P((void *, const char *));
-void	iommu_attach __P((struct device *, struct device *, void *));
-int	iommu_match __P((struct device *, void *, void *));
+int	iommu_print(void *, const char *);
+void	iommu_attach(struct device *, struct device *, void *);
+int	iommu_match(struct device *, void *, void *);
 
 struct cfattach iommu_ca = {
 	sizeof(struct iommu_softc), iommu_match, iommu_attach
diff --git a/sys/arch/sparc/sparc/kgdb_machdep.c b/sys/arch/sparc/sparc/kgdb_machdep.c
index c331beb4c73..15e3883e98d 100644
--- a/sys/arch/sparc/sparc/kgdb_machdep.c
+++ b/sys/arch/sparc/sparc/kgdb_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kgdb_machdep.c,v 1.4 2001/11/06 19:53:16 miod Exp $ */
+/*	$OpenBSD: kgdb_machdep.c,v 1.5 2002/03/14 01:26:44 millert Exp $ */
 /*	$NetBSD: kgdb_machdep.c,v 1.1 1997/08/31 21:22:45 pk Exp $ */
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -114,8 +114,8 @@
 #define	setpte4(va, pte)	sta(va, ASI_PTE, pte)
 #endif
 
-static __inline void kgdb_copy __P((char *, char *, int));
-static __inline void kgdb_zero __P((char *, int));
+static __inline void kgdb_copy(char *, char *, int);
+static __inline void kgdb_zero(char *, int);
 
 /*
  * This little routine exists simply so that bcopy() can be debugged.
diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c
index 7026027154e..936d909d1aa 100644
--- a/sys/arch/sparc/sparc/machdep.c
+++ b/sys/arch/sparc/sparc/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.80 2002/02/20 22:28:23 deraadt Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.81 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: machdep.c,v 1.85 1997/09/12 08:55:02 pk Exp $ */
 
 /*
@@ -153,9 +153,9 @@ int   safepri = 0;
 vaddr_t dvma_base, dvma_end;
 struct extent *dvmamap_extent;
 
-caddr_t allocsys __P((caddr_t));
-void	dumpsys __P((void));
-void	stackdump __P((void));
+caddr_t allocsys(caddr_t);
+void	dumpsys(void);
+void	stackdump(void);
 
 /*
  * Machine-dependent startup code
@@ -826,7 +826,7 @@ dumpsys()
 {
 	int psize;
 	daddr_t blkno;
-	int (*dump)	__P((dev_t, daddr_t, caddr_t, size_t));
+	int (*dump)(dev_t, daddr_t, caddr_t, size_t);
 	int error = 0;
 	struct memarr *mp;
 	int nmem;
@@ -1008,7 +1008,7 @@ cpu_exec_aout_makecmds(p, epp)
 	int error = ENOEXEC;
 
 #ifdef COMPAT_SUNOS
-	extern int sunos_exec_aout_makecmds __P((struct proc *, struct exec_package *));
+	extern int sunos_exec_aout_makecmds(struct proc *, struct exec_package *);
 	if ((error = sunos_exec_aout_makecmds(p, epp)) == 0)
 		return 0;
 #endif
diff --git a/sys/arch/sparc/sparc/memreg.c b/sys/arch/sparc/sparc/memreg.c
index 4d186cd2b5c..fb74e9f3276 100644
--- a/sys/arch/sparc/sparc/memreg.c
+++ b/sys/arch/sparc/sparc/memreg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: memreg.c,v 1.9 2000/02/21 17:08:37 art Exp $	*/
+/*	$OpenBSD: memreg.c,v 1.10 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: memreg.c,v 1.21 1997/07/29 09:42:08 fair Exp $ */
 
 /*
@@ -62,8 +62,8 @@
 #include <machine/reg.h>	/* for trapframe */
 #include <machine/trap.h>	/* for trap types */
 
-int memregmatch __P((struct device *, void *, void *));
-void memregattach __P((struct device *, struct device *, void *));
+int memregmatch(struct device *, void *, void *);
+void memregattach(struct device *, struct device *, void *);
 
 struct cfattach memreg_ca = {
 	sizeof(struct device), memregmatch, memregattach
@@ -74,7 +74,7 @@ struct cfdriver memreg_cd = {
 };
 
 #if defined(SUN4M)
-void hardmemerr4m __P((unsigned int, u_int, u_int, u_int, u_int));
+void hardmemerr4m(unsigned int, u_int, u_int, u_int, u_int);
 #endif
 
 /*
diff --git a/sys/arch/sparc/sparc/memreg.h b/sys/arch/sparc/sparc/memreg.h
index e2e63df8cfd..595570c04b4 100644
--- a/sys/arch/sparc/sparc/memreg.h
+++ b/sys/arch/sparc/sparc/memreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: memreg.h,v 1.5 2000/02/21 17:08:37 art Exp $	*/
+/*	$OpenBSD: memreg.h,v 1.6 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: memreg.h,v 1.4 1996/03/31 22:52:13 pk Exp $ */
 
 /*
@@ -72,7 +72,7 @@ volatile u_int	*par_err_reg;	/* virtual address; NULL if not yet mapped */
  * sun4m ...
  */
 struct trapframe;
-void memerr4_4c __P((unsigned, u_int, u_int, u_int, u_int, struct trapframe *));
-void memerr4m __P((unsigned, u_int, u_int, struct trapframe *));
-void viking_memerr __P((unsigned, u_int, u_int, struct trapframe *));
-void hypersparc_memerr __P((unsigned, u_int, u_int, struct trapframe *));
+void memerr4_4c(unsigned, u_int, u_int, u_int, u_int, struct trapframe *);
+void memerr4m(unsigned, u_int, u_int, struct trapframe *);
+void viking_memerr(unsigned, u_int, u_int, struct trapframe *);
+void hypersparc_memerr(unsigned, u_int, u_int, struct trapframe *);
diff --git a/sys/arch/sparc/sparc/openprom.c b/sys/arch/sparc/sparc/openprom.c
index ed362afe3cd..70a413344ca 100644
--- a/sys/arch/sparc/sparc/openprom.c
+++ b/sys/arch/sparc/sparc/openprom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: openprom.c,v 1.3 1997/08/08 08:27:34 downsj Exp $	*/
+/*	$OpenBSD: openprom.c,v 1.4 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: openprom.c,v 1.8 1996/03/31 23:45:34 pk Exp $ */
 
 /*
@@ -62,8 +62,8 @@ static	int lastnode;			/* speed hack */
 extern	int optionsnode;		/* node ID of ROM's options */
 extern	struct promvec *promvec;
 
-static int openpromcheckid __P((int, int));
-static int openpromgetstr __P((int, char *, char **));
+static int openpromcheckid(int, int);
+static int openpromgetstr(int, char *, char **);
 
 int
 openpromopen(dev, flags, mode, p)
diff --git a/sys/arch/sparc/sparc/pmap.c b/sys/arch/sparc/sparc/pmap.c
index 477df39f5b6..f9231f5e3a6 100644
--- a/sys/arch/sparc/sparc/pmap.c
+++ b/sys/arch/sparc/sparc/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.120 2002/03/13 00:24:21 miod Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.121 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: pmap.c,v 1.118 1998/05/19 19:00:18 thorpej Exp $ */
 
 /*
@@ -162,12 +162,12 @@ int	pmapdebug = 0;
 /*
  * Internal helpers.
  */
-static __inline struct pvlist *pvhead __P((int));
-static __inline struct pvlist *pvalloc __P((void));
-static __inline void pvfree __P((struct pvlist *));
+static __inline struct pvlist *pvhead(int);
+static __inline struct pvlist *pvalloc(void);
+static __inline void pvfree(struct pvlist *);
 
 #if defined(SUN4M)
-static u_int	VA2PA __P((caddr_t));
+static u_int	VA2PA(caddr_t);
 #endif
 
 /*
@@ -221,13 +221,13 @@ struct pool_allocator pgt_allocator = {
 	pgt_page_alloc, pgt_page_free, 0,
 };
 
-void    pcache_flush __P((caddr_t, caddr_t, int));
+void    pcache_flush(caddr_t, caddr_t, int);
 void
 pcache_flush(va, pa, n)
         caddr_t va, pa;
         int     n;
 {
-        void (*f)__P((int,int)) = cpuinfo.pcache_flush_line;
+        void (*f)(int,int) = cpuinfo.pcache_flush_line;
 
         while ((n -= 4) >= 0)
                 (*f)((u_int)va+n, (u_int)pa+n);
@@ -402,9 +402,9 @@ vaddr_t pagetables_start, pagetables_end;
 struct	memarr pmemarr[MA_SIZE];/* physical memory regions */
 int	npmemarr;		/* number of entries in pmemarr */
 
-static void pmap_page_upload __P((paddr_t));
-void pmap_pinit __P((pmap_t));
-void pmap_release __P((pmap_t));
+static void pmap_page_upload(paddr_t);
+void pmap_pinit(pmap_t);
+void pmap_release(pmap_t);
 
 int mmu_has_hole;
 
@@ -462,9 +462,9 @@ static u_long segfixmask = 0xffffffff; /* all bits valid to start */
 #if defined(SUN4M)
 #define getpte4m(va)		lda((va & 0xFFFFF000) | ASI_SRMMUFP_L3, \
 				    ASI_SRMMUFP)
-u_int	*getptep4m __P((struct pmap *, vaddr_t));
-static __inline void	setpgt4m __P((int *, int));
-void	setpte4m __P((vaddr_t va, int pte));
+u_int	*getptep4m(struct pmap *, vaddr_t);
+static __inline void	setpgt4m(int *, int);
+void	setpte4m(vaddr_t va, int pte);
 #endif
 
 #if defined(SUN4) || defined(SUN4C)
@@ -486,35 +486,35 @@ void	setpte4m __P((vaddr_t va, int pte));
  */
 
 #if defined(SUN4M)
-static void mmu_setup4m_L1 __P((int, struct pmap *));
-static void mmu_setup4m_L2 __P((int, struct regmap *));
-static void  mmu_setup4m_L3 __P((int, struct segmap *));
-void	mmu_reservemon4m __P((struct pmap *));
-
-void	pmap_rmk4m __P((struct pmap *, vaddr_t, vaddr_t, int, int));
-void	pmap_rmu4m __P((struct pmap *, vaddr_t, vaddr_t, int, int));
-int	pmap_enk4m __P((struct pmap *, vaddr_t, vm_prot_t,
-			  int, struct pvlist *, int));
-int	pmap_enu4m __P((struct pmap *, vaddr_t, vm_prot_t,
-			  int, struct pvlist *, int));
-void	pv_changepte4m __P((struct pvlist *, int, int));
-int	pv_syncflags4m __P((struct pvlist *));
-int	pv_link4m __P((struct pvlist *, struct pmap *, vaddr_t, int));
-void	pv_unlink4m __P((struct pvlist *, struct pmap *, vaddr_t));
+static void mmu_setup4m_L1(int, struct pmap *);
+static void mmu_setup4m_L2(int, struct regmap *);
+static void  mmu_setup4m_L3(int, struct segmap *);
+void	mmu_reservemon4m(struct pmap *);
+
+void	pmap_rmk4m(struct pmap *, vaddr_t, vaddr_t, int, int);
+void	pmap_rmu4m(struct pmap *, vaddr_t, vaddr_t, int, int);
+int	pmap_enk4m(struct pmap *, vaddr_t, vm_prot_t,
+			  int, struct pvlist *, int);
+int	pmap_enu4m(struct pmap *, vaddr_t, vm_prot_t,
+			  int, struct pvlist *, int);
+void	pv_changepte4m(struct pvlist *, int, int);
+int	pv_syncflags4m(struct pvlist *);
+int	pv_link4m(struct pvlist *, struct pmap *, vaddr_t, int);
+void	pv_unlink4m(struct pvlist *, struct pmap *, vaddr_t);
 #endif
 
 #if defined(SUN4) || defined(SUN4C)
-void	mmu_reservemon4_4c __P((int *, int *));
-void	pmap_rmk4_4c __P((struct pmap *, vaddr_t, vaddr_t, int, int));
-void	pmap_rmu4_4c __P((struct pmap *, vaddr_t, vaddr_t, int, int));
-int	pmap_enk4_4c __P((struct pmap *, vaddr_t, vm_prot_t,
-			  int, struct pvlist *, int));
-int	pmap_enu4_4c __P((struct pmap *, vaddr_t, vm_prot_t,
-			  int, struct pvlist *, int));
-void	pv_changepte4_4c __P((struct pvlist *, int, int));
-int	pv_syncflags4_4c __P((struct pvlist *));
-int	pv_link4_4c __P((struct pvlist *, struct pmap *, vaddr_t, int));
-void	pv_unlink4_4c __P((struct pvlist *, struct pmap *, vaddr_t));
+void	mmu_reservemon4_4c(int *, int *);
+void	pmap_rmk4_4c(struct pmap *, vaddr_t, vaddr_t, int, int);
+void	pmap_rmu4_4c(struct pmap *, vaddr_t, vaddr_t, int, int);
+int	pmap_enk4_4c(struct pmap *, vaddr_t, vm_prot_t,
+			  int, struct pvlist *, int);
+int	pmap_enu4_4c(struct pmap *, vaddr_t, vm_prot_t,
+			  int, struct pvlist *, int);
+void	pv_changepte4_4c(struct pvlist *, int, int);
+int	pv_syncflags4_4c(struct pvlist *);
+int	pv_link4_4c(struct pvlist *, struct pmap *, vaddr_t, int);
+void	pv_unlink4_4c(struct pvlist *, struct pmap *, vaddr_t);
 #endif
 
 #if !defined(SUN4M) && (defined(SUN4) || defined(SUN4C))
@@ -529,22 +529,22 @@ void	pv_unlink4_4c __P((struct pvlist *, struct pmap *, vaddr_t));
 
 /* function pointer declarations */
 /* from pmap.h: */
-boolean_t	(*pmap_clear_modify_p) __P((struct vm_page *));
-boolean_t	(*pmap_clear_reference_p) __P((struct vm_page *));
-void		(*pmap_copy_page_p) __P((paddr_t, paddr_t));
-int		(*pmap_enter_p) __P((pmap_t, vaddr_t, paddr_t, vm_prot_t, int));
-boolean_t	(*pmap_extract_p) __P((pmap_t, vaddr_t, paddr_t *));
-boolean_t	(*pmap_is_modified_p) __P((struct vm_page *));
-boolean_t	(*pmap_is_referenced_p) __P((struct vm_page *));
-void		(*pmap_kenter_pa_p) __P((vaddr_t, paddr_t, vm_prot_t));
-void		(*pmap_kremove_p) __P((vaddr_t, vsize_t));
-void		(*pmap_page_protect_p) __P((struct vm_page *, vm_prot_t));
-void		(*pmap_protect_p) __P((pmap_t, vaddr_t, vaddr_t, vm_prot_t));
-void            (*pmap_zero_page_p) __P((paddr_t));
-void	       	(*pmap_changeprot_p) __P((pmap_t, vaddr_t, vm_prot_t, int));
+boolean_t	(*pmap_clear_modify_p)(struct vm_page *);
+boolean_t	(*pmap_clear_reference_p)(struct vm_page *);
+void		(*pmap_copy_page_p)(paddr_t, paddr_t);
+int		(*pmap_enter_p)(pmap_t, vaddr_t, paddr_t, vm_prot_t, int);
+boolean_t	(*pmap_extract_p)(pmap_t, vaddr_t, paddr_t *);
+boolean_t	(*pmap_is_modified_p)(struct vm_page *);
+boolean_t	(*pmap_is_referenced_p)(struct vm_page *);
+void		(*pmap_kenter_pa_p)(vaddr_t, paddr_t, vm_prot_t);
+void		(*pmap_kremove_p)(vaddr_t, vsize_t);
+void		(*pmap_page_protect_p)(struct vm_page *, vm_prot_t);
+void		(*pmap_protect_p)(pmap_t, vaddr_t, vaddr_t, vm_prot_t);
+void            (*pmap_zero_page_p)(paddr_t);
+void	       	(*pmap_changeprot_p)(pmap_t, vaddr_t, vm_prot_t, int);
 /* local: */
-void 		(*pmap_rmk_p) __P((struct pmap *, vaddr_t, vaddr_t, int, int));
-void 		(*pmap_rmu_p) __P((struct pmap *, vaddr_t, vaddr_t, int, int));
+void 		(*pmap_rmk_p)(struct pmap *, vaddr_t, vaddr_t, int, int);
+void 		(*pmap_rmu_p)(struct pmap *, vaddr_t, vaddr_t, int, int);
 
 #define		pmap_rmk	(*pmap_rmk_p)
 #define		pmap_rmu	(*pmap_rmu_p)
@@ -709,15 +709,15 @@ setpte4m(va, pte)
 } while (0)
 
 
-static void sortm __P((struct memarr *, int));
-void	ctx_alloc __P((struct pmap *));
-void	ctx_free __P((struct pmap *));
-void	pv_flushcache __P((struct pvlist *));
-void	kvm_iocache __P((caddr_t, int));
+static void sortm(struct memarr *, int);
+void	ctx_alloc(struct pmap *);
+void	ctx_free(struct pmap *);
+void	pv_flushcache(struct pvlist *);
+void	kvm_iocache(caddr_t, int);
 #ifdef DEBUG
-void	pm_check __P((char *, struct pmap *));
-void	pm_check_k __P((char *, struct pmap *));
-void	pm_check_u __P((char *, struct pmap *));
+void	pm_check(char *, struct pmap *);
+void	pm_check_k(char *, struct pmap *);
+void	pm_check_u(char *, struct pmap *);
 #endif
 
 /*
@@ -1146,10 +1146,10 @@ mmu_setup4m_L3(pagtblptd, sp)
 /*
  * MMU management.
  */
-struct mmuentry *me_alloc __P((struct mmuhd *, struct pmap *, int, int));
-void		me_free __P((struct pmap *, u_int));
-struct mmuentry	*region_alloc __P((struct mmuhd *, struct pmap *, int));
-void		region_free __P((struct pmap *, u_int));
+struct mmuentry *me_alloc(struct mmuhd *, struct pmap *, int, int);
+void		me_free(struct pmap *, u_int);
+struct mmuentry	*region_alloc(struct mmuhd *, struct pmap *, int);
+void		region_free(struct pmap *, u_int);
 
 /*
  * Change contexts.  We need the old context number as well as the new
@@ -2559,10 +2559,10 @@ int nptesg;
 #endif
 
 #if defined(SUN4M)
-static void pmap_bootstrap4m __P((void));
+static void pmap_bootstrap4m(void);
 #endif
 #if defined(SUN4) || defined(SUN4C)
-static void pmap_bootstrap4_4c __P((int, int, int));
+static void pmap_bootstrap4_4c(int, int, int);
 #endif
 
 /*
@@ -6460,7 +6460,7 @@ pmap_dumpsize()
 int
 pmap_dumpmmu(dump, blkno)
 	daddr_t blkno;
-	int (*dump)	__P((dev_t, daddr_t, caddr_t, size_t));
+	int (*dump)(dev_t, daddr_t, caddr_t, size_t);
 {
 	kcore_seg_t	*ksegp;
 	cpu_kcore_hdr_t	*kcpup;
@@ -6619,7 +6619,7 @@ pmap_writetext(dst, ch)
 
 #ifdef EXTREME_DEBUG
 
-static void test_region __P((int, int, int));
+static void test_region(int, int, int);
 
 void
 debug_pagetables()
diff --git a/sys/arch/sparc/sparc/svr4_machdep.c b/sys/arch/sparc/sparc/svr4_machdep.c
index 92bb3522029..cfd23afdf5d 100644
--- a/sys/arch/sparc/sparc/svr4_machdep.c
+++ b/sys/arch/sparc/sparc/svr4_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: svr4_machdep.c,v 1.9 1997/08/08 08:27:42 downsj Exp $	*/
+/*	$OpenBSD: svr4_machdep.c,v 1.10 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: svr4_machdep.c,v 1.24 1997/07/29 10:04:45 fair Exp $	 */
 
 /*
@@ -55,7 +55,7 @@
 #include <machine/trap.h>
 #include <machine/svr4_machdep.h>
 
-static void svr4_getsiginfo __P((union svr4_siginfo *, int, u_long, int, caddr_t));
+static void svr4_getsiginfo(union svr4_siginfo *, int, u_long, int, caddr_t);
 
 #ifdef DEBUG
 extern int sigdebug;
@@ -66,7 +66,7 @@ extern int sigpid;
 #endif
 
 #ifdef DEBUG_SVR4
-static void svr4_printcontext __P((const char *, struct svr4_ucontext *));
+static void svr4_printcontext(const char *, struct svr4_ucontext *);
 
 static void
 svr4_printcontext(fun, uc)
diff --git a/sys/arch/sparc/sparc/swapgeneric.c b/sys/arch/sparc/sparc/swapgeneric.c
index 4869f641952..b840d91c58d 100644
--- a/sys/arch/sparc/sparc/swapgeneric.c
+++ b/sys/arch/sparc/sparc/swapgeneric.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: swapgeneric.c,v 1.6 2001/09/29 18:40:32 miod Exp $ */
+/*	$OpenBSD: swapgeneric.c,v 1.7 2002/03/14 01:26:44 millert Exp $ */
 /*	$NetBSD: swapgeneric.c,v 1.8 1996/03/14 21:09:32 christos Exp $ */
 
 /*-
@@ -43,7 +43,7 @@
 #include <sys/param.h>
 #include <sys/conf.h>
 
-int (*mountroot) __P((void)) = NULL;	/* tells autoconf.c that we are "generic" */
+int (*mountroot)(void) = NULL;	/* tells autoconf.c that we are "generic" */
 
 dev_t	rootdev = NODEV;
 dev_t	dumpdev = NODEV;
diff --git a/sys/arch/sparc/sparc/trap.c b/sys/arch/sparc/sparc/trap.c
index 22ed3032786..7b11d51d082 100644
--- a/sys/arch/sparc/sparc/trap.c
+++ b/sys/arch/sparc/sparc/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.35 2001/11/28 13:47:39 art Exp $	*/
+/*	$OpenBSD: trap.c,v 1.36 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: trap.c,v 1.58 1997/09/12 08:55:01 pk Exp $ */
 
 /*
@@ -192,12 +192,12 @@ const char *trap_type[] = {
 
 #define	N_TRAP_TYPES	(sizeof trap_type / sizeof *trap_type)
 
-static __inline void userret __P((struct proc *, int,  u_quad_t));
-void trap __P((unsigned, int, int, struct trapframe *));
-static __inline void share_fpu __P((struct proc *, struct trapframe *));
-void mem_access_fault __P((unsigned, int, u_int, int, int, struct trapframe *));
-void mem_access_fault4m __P((unsigned, u_int, u_int, struct trapframe *));
-void syscall __P((register_t, struct trapframe *, register_t));
+static __inline void userret(struct proc *, int,  u_quad_t);
+void trap(unsigned, int, int, struct trapframe *);
+static __inline void share_fpu(struct proc *, struct trapframe *);
+void mem_access_fault(unsigned, int, u_int, int, int, struct trapframe *);
+void mem_access_fault4m(unsigned, u_int, u_int, struct trapframe *);
+void syscall(register_t, struct trapframe *, register_t);
 
 int ignore_bogus_traps = 0;
 
diff --git a/sys/arch/sparc/stand/boot/boot.c b/sys/arch/sparc/stand/boot/boot.c
index 91cab33ac59..827e18955a1 100644
--- a/sys/arch/sparc/stand/boot/boot.c
+++ b/sys/arch/sparc/stand/boot/boot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: boot.c,v 1.2 1999/06/21 23:35:41 deraadt Exp $	*/
+/*	$OpenBSD: boot.c,v 1.3 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: boot.c,v 1.2 1997/09/14 19:27:21 pk Exp $	*/
 
 /*-
@@ -43,8 +43,8 @@
 
 #include <sparc/stand/common/promdev.h>
 
-void copyunix __P((int, char *));
-void promsyms __P((int, struct exec *));
+void copyunix(int, char *);
+void promsyms(int, struct exec *);
 int debug;
 int netif_debug;
 
@@ -59,9 +59,9 @@ char			*strtab;
 int			strtablen;
 char			fbuf[80], dbuf[128];
 
-typedef void (*entry_t)__P((caddr_t, int, int, int, long, long));
+typedef void (*entry_t)(caddr_t, int, int, int, long, long);
 
-void	loadfile __P((int, caddr_t));
+void	loadfile(int, caddr_t);
 
 main()
 {
diff --git a/sys/arch/sparc/stand/bootxx/bootxx.c b/sys/arch/sparc/stand/bootxx/bootxx.c
index bf7a4bfaaa2..2b9325548fe 100644
--- a/sys/arch/sparc/stand/bootxx/bootxx.c
+++ b/sys/arch/sparc/stand/bootxx/bootxx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bootxx.c,v 1.1 1997/09/17 10:46:16 downsj Exp $	*/
+/*	$OpenBSD: bootxx.c,v 1.2 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: bootxx.c,v 1.2 1997/09/14 19:28:17 pk Exp $	*/
 
 /*
@@ -60,14 +60,14 @@ int32_t			block_count = MAXBLOCKNUM;
 daddr_t			block_table[MAXBLOCKNUM] = { 0 };
 
 
-void	loadboot __P((struct open_file *, caddr_t));
+void	loadboot(struct open_file *, caddr_t);
 
 int
 main()
 {
 	char	*dummy;
 	size_t	n;
-	register void (*entry)__P((caddr_t)) = (void (*)__P((caddr_t)))LOADADDR;
+	register void (*entry)(caddr_t) = (void (*)(caddr_t))LOADADDR;
 
 	prom_init();
 	io.f_flags = F_RAW;
diff --git a/sys/arch/sparc/stand/common/dvma.c b/sys/arch/sparc/stand/common/dvma.c
index 7e6351baf88..9fa1f58ec20 100644
--- a/sys/arch/sparc/stand/common/dvma.c
+++ b/sys/arch/sparc/stand/common/dvma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dvma.c,v 1.1 1997/09/17 10:46:18 downsj Exp $	*/
+/*	$OpenBSD: dvma.c,v 1.2 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: dvma.c,v 1.2 1995/09/17 00:50:56 pk Exp $	*/
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -96,7 +96,7 @@ dvma_mapout(char *addr, size_t len)
 	return ((char *)va);
 }
 
-extern char *alloc __P((int));
+extern char *alloc(int);
 
 char *
 dvma_alloc(int len)
diff --git a/sys/arch/sparc/stand/common/promdev.c b/sys/arch/sparc/stand/common/promdev.c
index 15f4c412b61..58735dedb52 100644
--- a/sys/arch/sparc/stand/common/promdev.c
+++ b/sys/arch/sparc/stand/common/promdev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: promdev.c,v 1.3 2001/01/29 03:59:05 jason Exp $	*/
+/*	$OpenBSD: promdev.c,v 1.4 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: promdev.c,v 1.16 1995/11/14 15:04:01 pk Exp $ */
 
 /*
@@ -49,31 +49,31 @@
 /* u_long	_randseed = 1; */
 
 
-int	obp_close __P((struct open_file *));
-int	obp_strategy __P((void *, int, daddr_t, size_t, void *, size_t *));
-ssize_t	obp_xmit __P((struct promdata *, void *, size_t));
-ssize_t	obp_recv __P((struct promdata *, void *, size_t));
-int	prom0_close __P((struct open_file *));
-int	prom0_strategy __P((void *, int, daddr_t, size_t, void *, size_t *));
-void	prom0_iclose __P((struct saioreq *));
-int	prom0_iopen __P((struct promdata *));
-ssize_t	prom0_xmit __P((struct promdata *, void *, size_t));
-ssize_t	prom0_recv __P((struct promdata *, void *, size_t));
+int	obp_close(struct open_file *);
+int	obp_strategy(void *, int, daddr_t, size_t, void *, size_t *);
+ssize_t	obp_xmit(struct promdata *, void *, size_t);
+ssize_t	obp_recv(struct promdata *, void *, size_t);
+int	prom0_close(struct open_file *);
+int	prom0_strategy(void *, int, daddr_t, size_t, void *, size_t *);
+void	prom0_iclose(struct saioreq *);
+int	prom0_iopen(struct promdata *);
+ssize_t	prom0_xmit(struct promdata *, void *, size_t);
+ssize_t	prom0_recv(struct promdata *, void *, size_t);
 
-static char	*prom_mapin __P((u_long, int, int));
+static char	*prom_mapin(u_long, int, int);
 
-int	getdevtype __P((int, char *));
-int	getprop __P((int, char *, void *, int));
-char	*getpropstring __P((int, char *));
+int	getdevtype(int, char *);
+int	getprop(int, char *, void *, int);
+char	*getpropstring(int, char *);
 
-static void	prom0_fake __P((void));
+static void	prom0_fake(void);
 
 extern struct filesystem file_system_nfs[];
 extern struct filesystem file_system_cd9660[];
 extern struct filesystem file_system_ufs[];
 
-int prom_open __P((struct open_file *f, ...)) { return 0; }
-int prom_ioctl __P((struct open_file *f, u_long c, void *d)) { return EIO; }
+int prom_open(struct open_file *f, ...) { return 0; }
+int prom_ioctl(struct open_file *f, u_long c, void *d) { return EIO; }
 
 struct devsw devsw[] = {
 	{ "prom0", prom0_strategy, prom_open, prom0_close, prom_ioctl },
diff --git a/sys/arch/sparc/stand/common/promdev.h b/sys/arch/sparc/stand/common/promdev.h
index 8413cde7d18..4c2e1a0705e 100644
--- a/sys/arch/sparc/stand/common/promdev.h
+++ b/sys/arch/sparc/stand/common/promdev.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: promdev.h,v 1.1 1997/09/17 10:46:19 downsj Exp $	*/
+/*	$OpenBSD: promdev.h,v 1.2 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: promdev.h,v 1.3 1995/09/18 21:31:50 pk Exp $ */
 
 /*
@@ -41,8 +41,8 @@ struct promdata {
 #define DT_NET		2
 #define DT_BYTE		3
 	/* Hooks for netif.c */
-	int	(*xmit) __P((struct promdata *, void *, size_t));
-	int	(*recv) __P((struct promdata *, void *, size_t));
+	int	(*xmit)(struct promdata *, void *, size_t);
+	int	(*recv)(struct promdata *, void *, size_t);
 };
 
 #define LOADADDR	((caddr_t)0x4000)
@@ -58,12 +58,12 @@ extern int	hz;
 extern int	cputyp, nbpg, pgofset, pgshift;
 extern int	debug;
 
-extern void	prom_init __P((void));
+extern void	prom_init(void);
 
 /* Note: dvma_*() routines are for "oldmon" machines only */
-extern char	*dvma_mapin __P((char *, size_t));
-extern char	*dvma_mapout __P((char *, size_t));
-extern char	*dvma_alloc __P((int));
+extern char	*dvma_mapin(char *, size_t);
+extern char	*dvma_mapout(char *, size_t);
+extern char	*dvma_alloc(int);
 
 /*
  * duplicates from pmap.c for mapping device on "oldmon" machines.
diff --git a/sys/arch/sparc/stand/installboot/installboot.c b/sys/arch/sparc/stand/installboot/installboot.c
index ced55b9ad39..c8ff310f55e 100644
--- a/sys/arch/sparc/stand/installboot/installboot.c
+++ b/sys/arch/sparc/stand/installboot/installboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: installboot.c,v 1.2 1998/04/17 18:18:06 deraadt Exp $	*/
+/*	$OpenBSD: installboot.c,v 1.3 2002/03/14 01:26:44 millert Exp $	*/
 /*	$NetBSD: installboot.c,v 1.1 1997/06/01 03:39:45 mrg Exp $	*/
 
 /*
@@ -71,11 +71,11 @@ char	cpumodel[130];
 int	isofsblk = 0;
 int	isofseblk = 0;
 
-char		*loadprotoblocks __P((char *, long *));
-int		loadblocknums __P((char *, int));
-static void	devread __P((int, void *, daddr_t, size_t, char *));
-static void	usage __P((void));
-int 		main __P((int, char *[]));
+char		*loadprotoblocks(char *, long *);
+int		loadblocknums(char *, int);
+static void	devread(int, void *, daddr_t, size_t, char *);
+static void	usage(void);
+int 		main(int, char *[]);
 
 
 static void