First round of __P removal in sys

116 files changed, 1268 insertions, 1270 deletions

diff --git a/sys/arch/alpha/alpha/api_up1000.c b/sys/arch/alpha/alpha/api_up1000.c
index 6afe874496e..d56195ffe75 100644
--- a/sys/arch/alpha/alpha/api_up1000.c
+++ b/sys/arch/alpha/alpha/api_up1000.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: api_up1000.c,v 1.4 2001/12/14 00:44:59 nate Exp $	*/
+/*	$OpenBSD: api_up1000.c,v 1.5 2002/03/14 01:26:26 millert Exp $	*/
 /* $NetBSD: api_up1000.c,v 1.4 2000/06/20 03:48:53 matt Exp $ */
 
 /*
@@ -74,9 +74,9 @@ int bootdev_debug;
 #define DPRINTF(x)
 #endif
 
-void api_up1000_init __P((void));
-static void api_up1000_cons_init __P((void));
-static void api_up1000_device_register __P((struct device *, void *));
+void api_up1000_init(void);
+static void api_up1000_cons_init(void);
+static void api_up1000_device_register(struct device *, void *);
 
 void
 api_up1000_init()
diff --git a/sys/arch/alpha/alpha/autoconf.c b/sys/arch/alpha/alpha/autoconf.c
index be86d9a1a43..8720aff8677 100644
--- a/sys/arch/alpha/alpha/autoconf.c
+++ b/sys/arch/alpha/alpha/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.18 2002/01/22 21:47:38 ericj Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.19 2002/03/14 01:26:26 millert Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.16 1996/11/13 21:13:04 cgd Exp $	*/
 
 /*
@@ -68,18 +68,18 @@ int			booted_partition;
 struct bootdev_data	*bootdev_data;
 char			boot_dev[128];
 
-void	parse_prom_bootdev __P((void));
-int	atoi __P((char *));
-void	setroot __P((void));
-void	swapconf __P((void));
-
-static struct device *parsedisk __P((char *str, int len, int defpart,
-				     dev_t *devp));
-static struct device *getdisk __P((char *str, int len, int defpart,
-				   dev_t *devp));
-int findblkmajor __P((struct device *dv));
-char *findblkname __P((int));
-static int getstr __P((char *cp, int size));
+void	parse_prom_bootdev(void);
+int	atoi(char *);
+void	setroot(void);
+void	swapconf(void);
+
+static struct device *parsedisk(char *str, int len, int defpart,
+				     dev_t *devp);
+static struct device *getdisk(char *str, int len, int defpart,
+				   dev_t *devp);
+int findblkmajor(struct device *dv);
+char *findblkname(int);
+static int getstr(char *cp, int size);
 
 /*
  * cpu_configure:
diff --git a/sys/arch/alpha/alpha/clockvar.h b/sys/arch/alpha/alpha/clockvar.h
index bdf66e16909..be31826a80f 100644
--- a/sys/arch/alpha/alpha/clockvar.h
+++ b/sys/arch/alpha/alpha/clockvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clockvar.h,v 1.4 1996/10/30 22:37:59 niklas Exp $	*/
+/*	$OpenBSD: clockvar.h,v 1.5 2002/03/14 01:26:26 millert Exp $	*/
 /*	$NetBSD: clockvar.h,v 1.2 1996/04/17 22:01:21 cgd Exp $	*/
 
 /*
@@ -55,9 +55,9 @@ struct clocktime {
  * chip-dependent routines.
  */
 struct clockfns {
-	void	(*cf_init) __P((struct device *));
-	void	(*cf_get) __P((struct device *, time_t, struct clocktime *));
-	void	(*cf_set) __P((struct device *, struct clocktime *));
+	void	(*cf_init)(struct device *);
+	void	(*cf_get)(struct device *, time_t, struct clocktime *);
+	void	(*cf_set)(struct device *, struct clocktime *);
 };
 
-void clockattach __P((struct device *, const struct clockfns *));
+void clockattach(struct device *, const struct clockfns *);
diff --git a/sys/arch/alpha/alpha/cpu.c b/sys/arch/alpha/alpha/cpu.c
index 727d6f19a02..1f25ced4856 100644
--- a/sys/arch/alpha/alpha/cpu.c
+++ b/sys/arch/alpha/alpha/cpu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.c,v 1.11 2001/11/06 19:53:13 miod Exp $ */
+/* $OpenBSD: cpu.c,v 1.12 2002/03/14 01:26:26 millert Exp $ */
 /* $NetBSD: cpu.c,v 1.44 2000/05/23 05:12:53 thorpej Exp $ */
 
 /*-
@@ -93,7 +93,7 @@ struct cpu_info cpu_info[ALPHA_MAXPROCS];
 /* Bitmask of CPUs currently running. */
 __volatile u_long cpus_running;
 
-void	cpu_boot_secondary __P((struct cpu_info *));
+void	cpu_boot_secondary(struct cpu_info *);
 #else /* MULTIPROCESSOR */
 struct cpu_info cpu_info_store;
 #endif /* MULTIPROCESSOR */
diff --git a/sys/arch/alpha/alpha/cpuconf.c b/sys/arch/alpha/alpha/cpuconf.c
index 57b7fa1639c..040b04d4985 100644
--- a/sys/arch/alpha/alpha/cpuconf.c
+++ b/sys/arch/alpha/alpha/cpuconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpuconf.c,v 1.6 2002/01/24 19:45:03 miod Exp $ */
+/* $OpenBSD: cpuconf.c,v 1.7 2002/03/14 01:26:26 millert Exp $ */
 /* $NetBSD: cpuconf.c,v 1.27 2000/06/26 02:42:04 enami Exp $ */
 
 /*-
@@ -74,67 +74,67 @@
 #include <machine/rpb.h>
 
 #ifdef DEC_3000_500
-extern void dec_3000_500_init __P((void));
+extern void dec_3000_500_init(void);
 #else
 #define	dec_3000_500_init	platform_not_configured
 #endif
 
 #ifdef DEC_3000_300
-extern void dec_3000_300_init __P((void));
+extern void dec_3000_300_init(void);
 #else
 #define	dec_3000_300_init	platform_not_configured
 #endif
 
 #ifdef DEC_AXPPCI_33
-extern void dec_axppci_33_init __P((void));
+extern void dec_axppci_33_init(void);
 #else
 #define	dec_axppci_33_init	platform_not_configured
 #endif
 
 #ifdef DEC_2100_A50
-extern void dec_2100_a50_init __P((void));
+extern void dec_2100_a50_init(void);
 #else
 #define	dec_2100_a50_init	platform_not_configured
 #endif
 
 #ifdef DEC_KN20AA
-extern void dec_kn20aa_init __P((void));
+extern void dec_kn20aa_init(void);
 #else
 #define	dec_kn20aa_init		platform_not_configured
 #endif
 
 #ifdef DEC_EB164
-extern void dec_eb164_init __P((void));
+extern void dec_eb164_init(void);
 #else
 #define	dec_eb164_init		platform_not_configured
 #endif
 
 #ifdef DEC_EB64PLUS
-extern void dec_eb64plus_init __P((void));
+extern void dec_eb64plus_init(void);
 #else
 #define dec_eb64plus_init	platform_not_configured
 #endif
 
 #ifdef	DEC_KN300
-extern void dec_kn300_init __P((void));
+extern void dec_kn300_init(void);
 #else
 #define	dec_kn300_init		platform_not_configured
 #endif
 
 #ifdef DEC_550
-extern void dec_550_init __P((void));
+extern void dec_550_init(void);
 #else
 #define	dec_550_init		platform_not_configured
 #endif
 
 #ifdef DEC_6600
-extern void dec_6600_init __P((void));
+extern void dec_6600_init(void);
 #else
 #define	dec_6600_init		platform_not_configured
 #endif
 
 #ifdef API_UP1000
-extern void api_up1000_init __P((void));
+extern void api_up1000_init(void);
 #else
 #define	api_up1000_init		platform_not_configured
 #endif
diff --git a/sys/arch/alpha/alpha/db_disasm.c b/sys/arch/alpha/alpha/db_disasm.c
index 27346df86c3..21abd8d3639 100644
--- a/sys/arch/alpha/alpha/db_disasm.c
+++ b/sys/arch/alpha/alpha/db_disasm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_disasm.c,v 1.14 2000/11/08 19:16:58 ericj Exp $ */
+/* $OpenBSD: db_disasm.c,v 1.15 2002/03/14 01:26:26 millert Exp $ */
 /* $NetBSD: db_disasm.c,v 1.8 2000/05/25 19:57:30 jhawk Exp $ */
 
 /* 
@@ -186,7 +186,7 @@ static const struct tbl pal_op_tbl[] = {
 	{ NULL,			-1 },
 };
 
-static const char *pal_opname __P((int));
+static const char *pal_opname(int);
 
 static const char *
 pal_opname(op)
@@ -242,7 +242,7 @@ static const char **arit_opname[8] = {
 	arit_c0, arit_c2, 0, 0, arit_c9, arit_cB, arit_cD, arit_cF
 };
 
-static __inline const char *arit_name __P((int));
+static __inline const char *arit_name(int);
 static __inline const char *
 arit_name(op)
 	int op;
@@ -283,7 +283,7 @@ static const char *logical_c8[4] = {
 	"andnot", "ornot", "xornot", 0
 };
 
-static __inline const char *logical_name __P((int));
+static __inline const char *logical_name(int);
 static __inline const char *
 logical_name(op)
 	int op;
@@ -332,7 +332,7 @@ static const char *bitop_c67ab[4][4] = {
 /* 7 */	{ 0, "inswh", "inslh", "insqh" },
 };
 
-static __inline const char *bitop_name __P((int));
+static __inline const char *bitop_name(int);
 static __inline const char *
 bitop_name(op)
 	int op;
@@ -362,7 +362,7 @@ static const char *mul_opname[4] = {
 	"mull", "mulq", "mull/v", "mulq/v"
 };
 
-static __inline const char *mul_name __P((int));
+static __inline const char *mul_name(int);
 static __inline const char *
 mul_name(op)
 	int op;
@@ -388,7 +388,7 @@ static const char *special_opname[8] = {
 	"trapb", 0, "mb", 0, "fetch", "fetch_m", "rpcc", "rc"
 };
 
-static __inline const char *special_name __P((int));
+static __inline const char *special_name(int);
 static __inline const char *
 special_name(op)
 	int op;
@@ -431,7 +431,7 @@ static const char *intmisc_opname_3x[16] = {
 	"maxuw4", "maxsb8", "maxsw4",
 };
 
-static __inline const char *intmisc_name __P((int));
+static __inline const char *intmisc_name(int);
 static __inline const char *
 intmisc_name(op)
 	int op;
@@ -452,7 +452,7 @@ intmisc_name(op)
 	return (unk);
 }
 
-static const char *float_name __P((const struct tbl[], int, const char *type));
+static const char *float_name(const struct tbl[], int, const char *type);
 
 static const char *
 float_name(tbl, op, type)
@@ -802,7 +802,7 @@ static const char *name_of_register[32] = {
 static int regcount;		/* how many regs used in this inst */
 static int regnum[3];		/* which regs used in this inst */
 
-static const char *register_name __P((int));
+static const char *register_name(int);
 
 static const char *
 register_name (ireg)
@@ -823,7 +823,7 @@ register_name (ireg)
  * (optional) alternate format.  Return address of start of
  * next instruction.
  */
-int	alpha_print_instruction __P((db_addr_t, alpha_instruction, boolean_t));
+int	alpha_print_instruction(db_addr_t, alpha_instruction, boolean_t);
 
 db_addr_t
 db_disasm(loc, altfmt)
diff --git a/sys/arch/alpha/alpha/db_interface.c b/sys/arch/alpha/alpha/db_interface.c
index e154d286dc4..8056c1f83d1 100644
--- a/sys/arch/alpha/alpha/db_interface.c
+++ b/sys/arch/alpha/alpha/db_interface.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_interface.c,v 1.13 2001/11/06 19:53:13 miod Exp $ */
+/* $OpenBSD: db_interface.c,v 1.14 2002/03/14 01:26:26 millert Exp $ */
 /* $NetBSD: db_interface.c,v 1.8 1999/10/12 17:08:57 jdolecek Exp $ */
 
 /* 
@@ -81,8 +81,8 @@ extern int trap_types;
 
 int	db_active = 0;
 
-void	db_mach_halt __P((db_expr_t, int, db_expr_t, char *));
-void	db_mach_reboot __P((db_expr_t, int, db_expr_t, char *));
+void	db_mach_halt(db_expr_t, int, db_expr_t, char *);
+void	db_mach_reboot(db_expr_t, int, db_expr_t, char *);
 
 struct db_command db_machine_cmds[] = {
 	{ "halt",	db_mach_halt,	0,	0 },
diff --git a/sys/arch/alpha/alpha/db_trace.c b/sys/arch/alpha/alpha/db_trace.c
index 1be316ba40c..b0ecd7a2d9c 100644
--- a/sys/arch/alpha/alpha/db_trace.c
+++ b/sys/arch/alpha/alpha/db_trace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_trace.c,v 1.8 2001/11/06 19:53:13 miod Exp $	*/
+/*	$OpenBSD: db_trace.c,v 1.9 2002/03/14 01:26:26 millert Exp $	*/
 
 /*
  * Copyright (c) 1997 Niklas Hallqvist.  All rights reserverd.
@@ -117,11 +117,11 @@ struct opcode opcode[] = {
 	{ OPC_BR, "bgt", 1 },		/* 3F */
 };
 
-static __inline int sext __P((u_int));
-static __inline int rega __P((u_int));
-static __inline int regb __P((u_int));
-static __inline int regc __P((u_int));
-static __inline int disp __P((u_int));
+static __inline int sext(u_int);
+static __inline int rega(u_int);
+static __inline int regb(u_int);
+static __inline int regc(u_int);
+static __inline int disp(u_int);
 
 static __inline int
 sext(x)
diff --git a/sys/arch/alpha/alpha/dec_2100_a50.c b/sys/arch/alpha/alpha/dec_2100_a50.c
index 08fbafb4586..369ecec0dad 100644
--- a/sys/arch/alpha/alpha/dec_2100_a50.c
+++ b/sys/arch/alpha/alpha/dec_2100_a50.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dec_2100_a50.c,v 1.14 2001/12/14 00:44:59 nate Exp $ */
+/* $OpenBSD: dec_2100_a50.c,v 1.15 2002/03/14 01:26:26 millert Exp $ */
 /* $NetBSD: dec_2100_a50.c,v 1.43 2000/05/22 20:13:31 thorpej Exp $ */
 
 /*
@@ -66,9 +66,9 @@
 #endif
 static int comcnrate = CONSPEED;
 
-void dec_2100_a50_init __P((void));
-static void dec_2100_a50_cons_init __P((void));
-static void dec_2100_a50_device_register __P((struct device *, void *));
+void dec_2100_a50_init(void);
+static void dec_2100_a50_cons_init(void);
+static void dec_2100_a50_device_register(struct device *, void *);
 
 const struct alpha_variation_table dec_2100_a50_variations[] = {
 	{ SV_ST_AVANTI,	"AlphaStation 400 4/233 (\"Avanti\")" },
diff --git a/sys/arch/alpha/alpha/dec_3000_300.c b/sys/arch/alpha/alpha/dec_3000_300.c
index c04d8ce7381..e223ee20dc5 100644
--- a/sys/arch/alpha/alpha/dec_3000_300.c
+++ b/sys/arch/alpha/alpha/dec_3000_300.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dec_3000_300.c,v 1.8 2000/11/08 21:48:43 art Exp $ */
+/* $OpenBSD: dec_3000_300.c,v 1.9 2002/03/14 01:26:26 millert Exp $ */
 /* $NetBSD: dec_3000_300.c,v 1.30 2000/05/22 20:13:32 thorpej Exp $ */
 
 /*
@@ -60,9 +60,9 @@
 
 #include "wsdisplay.h"
 
-void dec_3000_300_init __P((void));
-static void dec_3000_300_cons_init __P((void));
-static void dec_3000_300_device_register __P((struct device *, void *));
+void dec_3000_300_init(void);
+static void dec_3000_300_cons_init(void);
+static void dec_3000_300_device_register(struct device *, void *);
 
 const struct alpha_variation_table dec_3000_300_variations[] = {
 	{ SV_ST_PELICAN, "DEC 3000/300 (\"Pelican\")" },
diff --git a/sys/arch/alpha/alpha/dec_3000_500.c b/sys/arch/alpha/alpha/dec_3000_500.c
index fe0cf650b7c..06236b957d3 100644
--- a/sys/arch/alpha/alpha/dec_3000_500.c
+++ b/sys/arch/alpha/alpha/dec_3000_500.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dec_3000_500.c,v 1.8 2000/11/08 21:48:43 art Exp $ */
+/* $OpenBSD: dec_3000_500.c,v 1.9 2002/03/14 01:26:26 millert Exp $ */
 /* $NetBSD: dec_3000_500.c,v 1.29 2000/05/22 20:13:32 thorpej Exp $ */
 
 /*
@@ -59,9 +59,9 @@
 
 #include "wsdisplay.h"
 
-void dec_3000_500_init __P((void));
-static void dec_3000_500_cons_init __P((void));
-static void dec_3000_500_device_register __P((struct device *, void *));
+void dec_3000_500_init(void);
+static void dec_3000_500_cons_init(void);
+static void dec_3000_500_device_register(struct device *, void *);
 
 static const char dec_3000_500_sp[] = "DEC 3000/400 (\"Sandpiper\")";
 static const char dec_3000_500_sf[] = "DEC 3000/500 (\"Flamingo\")";
diff --git a/sys/arch/alpha/alpha/dec_550.c b/sys/arch/alpha/alpha/dec_550.c
index 5f65ee2e9b7..817c69ef29a 100644
--- a/sys/arch/alpha/alpha/dec_550.c
+++ b/sys/arch/alpha/alpha/dec_550.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dec_550.c,v 1.6 2001/12/14 00:44:59 nate Exp $ */
+/* $OpenBSD: dec_550.c,v 1.7 2002/03/14 01:26:26 millert Exp $ */
 /* $NetBSD: dec_550.c,v 1.10 2000/06/20 03:48:53 matt Exp $ */
 
 /*
@@ -73,10 +73,10 @@ static int comcnrate = CONSPEED;
 
 #define	DR_VERBOSE(f) while (0)
 
-void dec_550_init __P((void));
-static void dec_550_cons_init __P((void));
-static void dec_550_device_register __P((struct device *, void *));
-static void dec_550_powerdown __P((void));
+void dec_550_init(void);
+static void dec_550_cons_init(void);
+static void dec_550_device_register(struct device *, void *);
+static void dec_550_powerdown(void);
 
 void
 dec_550_init()
diff --git a/sys/arch/alpha/alpha/dec_6600.c b/sys/arch/alpha/alpha/dec_6600.c
index 5f975523b68..22a433b3e21 100644
--- a/sys/arch/alpha/alpha/dec_6600.c
+++ b/sys/arch/alpha/alpha/dec_6600.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dec_6600.c,v 1.4 2001/12/14 00:44:59 nate Exp $ */
+/* $OpenBSD: dec_6600.c,v 1.5 2002/03/14 01:26:26 millert Exp $ */
 /* $NetBSD: dec_6600.c,v 1.7 2000/06/20 03:48:54 matt Exp $ */
 
 /*
@@ -66,9 +66,9 @@
 
 static int comcnrate __attribute__((unused)) = CONSPEED;
 
-void dec_6600_init __P((void));
-static void dec_6600_cons_init __P((void));
-static void dec_6600_device_register __P((struct device *, void *));
+void dec_6600_init(void);
+static void dec_6600_cons_init(void);
+static void dec_6600_device_register(struct device *, void *);
 
 void
 dec_6600_init()
diff --git a/sys/arch/alpha/alpha/dec_axppci_33.c b/sys/arch/alpha/alpha/dec_axppci_33.c
index f9306372f72..71cc1aa20dc 100644
--- a/sys/arch/alpha/alpha/dec_axppci_33.c
+++ b/sys/arch/alpha/alpha/dec_axppci_33.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dec_axppci_33.c,v 1.15 2001/12/14 00:44:59 nate Exp $ */
+/* $OpenBSD: dec_axppci_33.c,v 1.16 2002/03/14 01:26:26 millert Exp $ */
 /* $NetBSD: dec_axppci_33.c,v 1.44 2000/05/22 20:13:32 thorpej Exp $ */
 
 /*
@@ -65,16 +65,16 @@
 #endif
 static int comcnrate = CONSPEED;
 
-void dec_axppci_33_init __P((void));
-static void dec_axppci_33_cons_init __P((void));
-static void dec_axppci_33_device_register __P((struct device *, void *));
+void dec_axppci_33_init(void);
+static void dec_axppci_33_cons_init(void);
+static void dec_axppci_33_device_register(struct device *, void *);
 
 const struct alpha_variation_table dec_axppci_33_variations[] = {
 	{ 0, "Alpha PC AXPpci33 (\"NoName\")" },
 	{ 0, NULL },
 };
 
-static struct lca_config *lca_preinit __P((void));
+static struct lca_config *lca_preinit(void);
 
 static struct lca_config *
 lca_preinit()
diff --git a/sys/arch/alpha/alpha/dec_eb164.c b/sys/arch/alpha/alpha/dec_eb164.c
index 35f2a937967..6220f4af8d7 100644
--- a/sys/arch/alpha/alpha/dec_eb164.c
+++ b/sys/arch/alpha/alpha/dec_eb164.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dec_eb164.c,v 1.9 2001/12/14 00:44:59 nate Exp $ */
+/* $OpenBSD: dec_eb164.c,v 1.10 2002/03/14 01:26:26 millert Exp $ */
 /* $NetBSD: dec_eb164.c,v 1.33 2000/05/22 20:13:32 thorpej Exp $ */
 
 /*
@@ -69,9 +69,9 @@ static int comcnrate = CONSPEED;
 
 #define	DR_VERBOSE(f) while (0)
 
-void dec_eb164_init __P((void));
-static void dec_eb164_cons_init __P((void));
-static void dec_eb164_device_register __P((struct device *, void *));
+void dec_eb164_init(void);
+static void dec_eb164_cons_init(void);
+static void dec_eb164_device_register(struct device *, void *);
 
 void
 dec_eb164_init()
diff --git a/sys/arch/alpha/alpha/dec_eb64plus.c b/sys/arch/alpha/alpha/dec_eb64plus.c
index 74597673351..d29f1d6f579 100644
--- a/sys/arch/alpha/alpha/dec_eb64plus.c
+++ b/sys/arch/alpha/alpha/dec_eb64plus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dec_eb64plus.c,v 1.1 2002/01/23 03:20:41 ericj Exp $ */
+/* $OpenBSD: dec_eb64plus.c,v 1.2 2002/03/14 01:26:26 millert Exp $ */
 /* $NetBSD: dec_eb64plus.c,v 1.25 2001/06/05 04:53:11 thorpej Exp $ */
 
 /*
@@ -68,9 +68,9 @@
 #endif
 static int comcnrate = CONSPEED;
 
-void dec_eb64plus_init __P((void));
-static void dec_eb64plus_cons_init __P((void));
-static void dec_eb64plus_device_register __P((struct device *, void *));
+void dec_eb64plus_init(void);
+static void dec_eb64plus_cons_init(void);
+static void dec_eb64plus_device_register(struct device *, void *);
 
 const struct alpha_variation_table dec_eb64plus_variations[] = {
 	{ 0, "DEC EB64+" },
diff --git a/sys/arch/alpha/alpha/dec_kn20aa.c b/sys/arch/alpha/alpha/dec_kn20aa.c
index f303babcce4..986790957f0 100644
--- a/sys/arch/alpha/alpha/dec_kn20aa.c
+++ b/sys/arch/alpha/alpha/dec_kn20aa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dec_kn20aa.c,v 1.13 2001/12/14 00:44:59 nate Exp $ */
+/* $OpenBSD: dec_kn20aa.c,v 1.14 2002/03/14 01:26:26 millert Exp $ */
 /* $NetBSD: dec_kn20aa.c,v 1.42 2000/05/22 20:13:32 thorpej Exp $ */
 
 /*
@@ -66,9 +66,9 @@
 #endif
 static int comcnrate = CONSPEED;
 
-void dec_kn20aa_init __P((void));
-static void dec_kn20aa_cons_init __P((void));
-static void dec_kn20aa_device_register __P((struct device *, void *));
+void dec_kn20aa_init(void);
+static void dec_kn20aa_cons_init(void);
+static void dec_kn20aa_device_register(struct device *, void *);
 
 const struct alpha_variation_table dec_kn20aa_variations[] = {
 	{ 0, "AlphaStation 500 or 600 (KN20AA)" },
diff --git a/sys/arch/alpha/alpha/disksubr.c b/sys/arch/alpha/alpha/disksubr.c
index 18e3958058d..ff4d99210e3 100644
--- a/sys/arch/alpha/alpha/disksubr.c
+++ b/sys/arch/alpha/alpha/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.33 2002/02/19 02:46:39 deraadt Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.34 2002/03/14 01:26:26 millert Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -67,16 +67,16 @@
 #endif
 
 #if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL)
-void	swapdisklabel __P((struct disklabel *d));
-char   *readbsdlabel __P((struct buf *, void (*) __P((struct buf *)), int, int,
+void	swapdisklabel(struct disklabel *d);
+char   *readbsdlabel __P((struct buf *, void (*)(struct buf *), int, int,
     int, int, struct disklabel *, int));
 #endif
 #if defined(DISKLABEL_I386) || defined(DISKLABEL_ALL)
-char   *readdoslabel __P((struct buf *, void (*) __P((struct buf *)),
+char   *readdoslabel __P((struct buf *, void (*)(struct buf *),
     struct disklabel *, struct cpu_disklabel *, int *, int *, int));
 #endif
 #if defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL)
-char   *readamigalabel __P((struct buf *, void (*) __P((struct buf *)),
+char   *readamigalabel __P((struct buf *, void (*)(struct buf *),
     struct disklabel *, struct cpu_disklabel *, int));
 #endif
 
@@ -144,7 +144,7 @@ swapdisklabel(dlp)
 char *
 readbsdlabel(bp, strat, cyl, sec, off, endian, lp, spoofonly)
 	struct buf *bp;
-	void (*strat) __P((struct buf *));
+	void (*strat)(struct buf *);
 	int cyl, sec, off, endian;
 	struct disklabel *lp;
 	int spoofonly;
@@ -228,7 +228,7 @@ readbsdlabel(bp, strat, cyl, sec, off, endian, lp, spoofonly)
 char *
 readdisklabel(dev, strat, lp, osdep, spoofonly)
 	dev_t dev;
-	void (*strat) __P((struct buf *));
+	void (*strat)(struct buf *);
 	struct disklabel *lp;
 	struct cpu_disklabel *osdep;
 	int spoofonly;
@@ -330,7 +330,7 @@ done:
 char *
 readdoslabel(bp, strat, lp, osdep, partoffp, cylp, spoofonly)
 	struct buf *bp;
-	void (*strat) __P((struct buf *));
+	void (*strat)(struct buf *);
 	struct disklabel *lp;
 	struct cpu_disklabel *osdep;
 	int *partoffp;
@@ -560,7 +560,7 @@ donot:
 char *
 readamigalabel(bp, strat, lp, osdep, spoofonly)
 	struct buf *bp;
-	void (*strat) __P((struct buf *));
+	void (*strat)(struct buf *);
 	struct disklabel *lp;
 	struct cpu_disklabel *osdep;
 	int spoofonly;
@@ -644,7 +644,7 @@ setdisklabel(olp, nlp, openmask, osdep)
 int
 writedisklabel(dev, strat, lp, osdep)
 	dev_t dev;
-	void (*strat) __P((struct buf *));
+	void (*strat)(struct buf *);
 	struct disklabel *lp;
 	struct cpu_disklabel *osdep;
 {
diff --git a/sys/arch/alpha/alpha/in_cksum.c b/sys/arch/alpha/alpha/in_cksum.c
index 7faa6826301..c87f08f39af 100644
--- a/sys/arch/alpha/alpha/in_cksum.c
+++ b/sys/arch/alpha/alpha/in_cksum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_cksum.c,v 1.4 1997/01/24 19:56:33 niklas Exp $	*/
+/*	$OpenBSD: in_cksum.c,v 1.5 2002/03/14 01:26:26 millert Exp $	*/
 /*	$NetBSD: in_cksum.c,v 1.4 1996/11/13 21:13:06 cgd Exp $	*/
 
 /*
@@ -43,7 +43,7 @@
 #include <sys/systm.h>
 #include <netinet/in.h>
 
-u_int64_t in_cksumdata __P((caddr_t, int));
+u_int64_t in_cksumdata(caddr_t, int);
 
 /*
  * Checksum routine for Internet Protocol family headers
@@ -85,7 +85,7 @@ union q_util {
 	u_int64_t q;
 };
 
-u_int64_t	in_cksumdata __P((caddr_t buf, int len));
+u_int64_t	in_cksumdata(caddr_t buf, int len);
 
 u_int64_t
 in_cksumdata(buf, len)
diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index bc4a3584e7e..fca42b84f94 100644
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.67 2002/02/17 23:38:16 jason Exp $ */
+/* $OpenBSD: machdep.c,v 1.68 2002/03/14 01:26:26 millert Exp $ */
 /* $NetBSD: machdep.c,v 1.210 2000/06/01 17:12:38 thorpej Exp $ */
 
 /*-
@@ -125,14 +125,14 @@
 
 #include "le_ioasic.h"			/* for le_iomem creation */
 
-int	cpu_dump __P((void));
-int	cpu_dumpsize __P((void));
-u_long	cpu_dump_mempagecnt __P((void));
-void	dumpsys __P((void));
-caddr_t allocsys __P((caddr_t));
-void	identifycpu __P((void));
-void	regdump __P((struct trapframe *framep));
-void	printregs __P((struct reg *));
+int	cpu_dump(void);
+int	cpu_dumpsize(void);
+u_long	cpu_dump_mempagecnt(void);
+void	dumpsys(void);
+caddr_t allocsys(caddr_t);
+void	identifycpu(void);
+void	regdump(struct trapframe *framep);
+void	printregs(struct reg *);
 
 /*
  * Declare these as initialized data so we can patch them.
@@ -1201,7 +1201,7 @@ cpu_dump_mempagecnt()
 int
 cpu_dump()
 {
-	int (*dump) __P((dev_t, daddr_t, caddr_t, size_t));
+	int (*dump)(dev_t, daddr_t, caddr_t, size_t);
 	char buf[dbtob(1)];
 	kcore_seg_t *segp;
 	cpu_kcore_hdr_t *cpuhdrp;
@@ -1297,7 +1297,7 @@ dumpsys()
 	u_long maddr;
 	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;
 	extern int msgbufmapped;
 
@@ -1951,8 +1951,8 @@ delay(n)
 }
 
 #if defined(COMPAT_OSF1) || 1		/* XXX */
-void	cpu_exec_ecoff_setregs __P((struct proc *, struct exec_package *,
-	    u_long, register_t *));
+void	cpu_exec_ecoff_setregs(struct proc *, struct exec_package *,
+	    u_long, register_t *);
 
 void
 cpu_exec_ecoff_setregs(p, epp, stack, retval)
diff --git a/sys/arch/alpha/alpha/mainbus.c b/sys/arch/alpha/alpha/mainbus.c
index 496cb5da06b..ed2715f4487 100644
--- a/sys/arch/alpha/alpha/mainbus.c
+++ b/sys/arch/alpha/alpha/mainbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mainbus.c,v 1.10 2000/11/08 19:16:59 ericj Exp $ */
+/* $OpenBSD: mainbus.c,v 1.11 2002/03/14 01:26:26 millert Exp $ */
 /* $NetBSD: mainbus.c,v 1.27 1998/06/24 01:10:35 ross Exp $ */
 
 /*
@@ -39,9 +39,9 @@
 #include <machine/cpuconf.h>
 
 /* Definition of the mainbus driver. */
-static int	mbmatch __P((struct device *, void *, void *));
-static void	mbattach __P((struct device *, struct device *, void *));
-static int	mbprint __P((void *, const char *));
+static int	mbmatch(struct device *, void *, void *);
+static void	mbattach(struct device *, struct device *, void *);
+static int	mbprint(void *, const char *);
 
 struct cfattach mainbus_ca = {
 	sizeof(struct device), mbmatch, mbattach
diff --git a/sys/arch/alpha/alpha/mcclock.c b/sys/arch/alpha/alpha/mcclock.c
index 01a90f48a87..96eaf3f0b74 100644
--- a/sys/arch/alpha/alpha/mcclock.c
+++ b/sys/arch/alpha/alpha/mcclock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mcclock.c,v 1.4 2001/04/14 22:18:03 mjacob Exp $	*/
+/*	$OpenBSD: mcclock.c,v 1.5 2002/03/14 01:26:26 millert Exp $	*/
 /*	$NetBSD: mcclock.c,v 1.4 1996/10/13 02:59:41 christos Exp $	*/
 
 /*
@@ -41,9 +41,9 @@ struct cfdriver mcclock_cd = {
 	NULL, "mcclock", DV_DULL,
 };
 
-void	mcclock_init __P((struct device *));
-void	mcclock_get __P((struct device *, time_t, struct clocktime *));
-void	mcclock_set __P((struct device *, struct clocktime *));
+void	mcclock_init(struct device *);
+void	mcclock_get(struct device *, time_t, struct clocktime *);
+void	mcclock_set(struct device *, struct clocktime *);
 
 const struct clockfns mcclock_clockfns = {
 	mcclock_init, mcclock_get, mcclock_set,
diff --git a/sys/arch/alpha/alpha/mcclockvar.h b/sys/arch/alpha/alpha/mcclockvar.h
index f1064251092..974d7cc8d49 100644
--- a/sys/arch/alpha/alpha/mcclockvar.h
+++ b/sys/arch/alpha/alpha/mcclockvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mcclockvar.h,v 1.3 1996/10/30 22:38:17 niklas Exp $	*/
+/*	$OpenBSD: mcclockvar.h,v 1.4 2002/03/14 01:26:26 millert Exp $	*/
 /*	$NetBSD: mcclockvar.h,v 1.2 1996/04/17 22:22:38 cgd Exp $	*/
 
 /*
@@ -34,9 +34,9 @@ struct mcclock_softc {
 };
 
 struct mcclock_busfns {
-	void    (*mc_bf_write) __P((struct mcclock_softc *, u_int, u_int));
-	u_int   (*mc_bf_read) __P((struct mcclock_softc *, u_int));
+	void    (*mc_bf_write)(struct mcclock_softc *, u_int, u_int);
+	u_int   (*mc_bf_read)(struct mcclock_softc *, u_int);
 };
 
-void	mcclock_attach __P((struct mcclock_softc *,
-	    const struct mcclock_busfns *));
+void	mcclock_attach(struct mcclock_softc *,
+	    const struct mcclock_busfns *);
diff --git a/sys/arch/alpha/alpha/netbsd_machdep.c b/sys/arch/alpha/alpha/netbsd_machdep.c
index 116218bb1ec..13fee57ba65 100644
--- a/sys/arch/alpha/alpha/netbsd_machdep.c
+++ b/sys/arch/alpha/alpha/netbsd_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netbsd_machdep.c,v 1.6 2001/11/06 19:53:13 miod Exp $	*/
+/*	$OpenBSD: netbsd_machdep.c,v 1.7 2002/03/14 01:26:26 millert Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -56,11 +56,11 @@ extern int sigpid;
 #define SDB_KSTACK      0x02
 #endif
 
-static void netbsd_to_openbsd_sigcontext __P ((struct netbsd_sigcontext *,
-	struct sigcontext *));
+static void netbsd_to_openbsd_sigcontext(struct netbsd_sigcontext *,
+	struct sigcontext *);
 
-static void openbsd_to_netbsd_sigcontext __P ((struct sigcontext *,
-	struct netbsd_sigcontext *));
+static void openbsd_to_netbsd_sigcontext(struct sigcontext *,
+	struct netbsd_sigcontext *);
 
 static void
 netbsd_to_openbsd_sigcontext(nbsc, obsc)
diff --git a/sys/arch/alpha/alpha/prom.c b/sys/arch/alpha/alpha/prom.c
index 2df5ed675c4..32a7d8e4e6f 100644
--- a/sys/arch/alpha/alpha/prom.c
+++ b/sys/arch/alpha/alpha/prom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: prom.c,v 1.12 2001/11/06 19:53:13 miod Exp $ */
+/* $OpenBSD: prom.c,v 1.13 2002/03/14 01:26:26 millert Exp $ */
 /* $NetBSD: prom.c,v 1.39 2000/03/06 21:36:05 thorpej Exp $ */
 
 /* 
@@ -55,7 +55,7 @@ struct simplelock prom_slock;
 int		prom_mapped = 1;	/* Is PROM still mapped? */
 
 pt_entry_t	prom_pte, saved_pte[1];	/* XXX */
-static pt_entry_t *prom_lev1map __P((void));
+static pt_entry_t *prom_lev1map(void);
 
 static pt_entry_t *
 prom_lev1map()
@@ -100,7 +100,7 @@ init_bootstrap_console()
 }
 
 #ifdef _PMAP_MAY_USE_PROM_CONSOLE
-static void prom_cache_sync __P((void));
+static void prom_cache_sync(void);
 #endif
 
 int
@@ -160,7 +160,7 @@ prom_leave(s)
 
 #ifdef _PMAP_MAY_USE_PROM_CONSOLE
 static void
-prom_cache_sync __P((void))
+prom_cache_sync(void)
 {
 	ALPHA_TBIA();
 	alpha_pal_imb();
diff --git a/sys/arch/alpha/alpha/promcons.c b/sys/arch/alpha/alpha/promcons.c
index 4a0b09f1792..c787f39e92c 100644
--- a/sys/arch/alpha/alpha/promcons.c
+++ b/sys/arch/alpha/alpha/promcons.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: promcons.c,v 1.6 2001/02/03 12:10:40 art Exp $	*/
+/*	$OpenBSD: promcons.c,v 1.7 2002/03/14 01:26:26 millert Exp $	*/
 /*	$NetBSD: promcons.c,v 1.5 1996/11/13 22:20:55 cgd Exp $	*/
 
 /*
@@ -52,9 +52,9 @@
 static struct  tty *prom_tty[1];
 static struct  timeout prom_to;
 
-void promstart __P((struct tty *));
-void promtimeout __P((void *));
-int promparam __P((struct tty *, struct termios *));
+void promstart(struct tty *);
+void promtimeout(void *);
+int promparam(struct tty *, struct termios *);
 cdev_decl(prom);
 cons_decl(prom);
 
diff --git a/sys/arch/alpha/alpha/swapgeneric.c b/sys/arch/alpha/alpha/swapgeneric.c
index a3e20846ae6..cb7e58d54a2 100644
--- a/sys/arch/alpha/alpha/swapgeneric.c
+++ b/sys/arch/alpha/alpha/swapgeneric.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: swapgeneric.c,v 1.5 1996/11/06 02:00:59 deraadt Exp $	*/
+/*	$OpenBSD: swapgeneric.c,v 1.6 2002/03/14 01:26:26 millert Exp $	*/
 /*	$NetBSD: swapgeneric.c,v 1.5 1996/06/12 01:26:37 cgd 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/alpha/alpha/trap.c b/sys/arch/alpha/alpha/trap.c
index fdc15020ce5..9209869fccc 100644
--- a/sys/arch/alpha/alpha/trap.c
+++ b/sys/arch/alpha/alpha/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.30 2002/03/12 11:58:14 art Exp $ */
+/* $OpenBSD: trap.c,v 1.31 2002/03/14 01:26:26 millert Exp $ */
 /* $NetBSD: trap.c,v 1.52 2000/05/24 16:48:33 thorpej Exp $ */
 
 /*-
@@ -120,23 +120,23 @@
 #include <compat/osf1/osf1_syscall.h>
 #endif
 
-void		userret __P((struct proc *, u_int64_t, u_quad_t));
+void		userret(struct proc *, u_int64_t, u_quad_t);
 
-unsigned long	Sfloat_to_reg __P((unsigned int));
-unsigned int	reg_to_Sfloat __P((unsigned long));
-unsigned long	Tfloat_reg_cvt __P((unsigned long));
+unsigned long	Sfloat_to_reg(unsigned int);
+unsigned int	reg_to_Sfloat(unsigned long);
+unsigned long	Tfloat_reg_cvt(unsigned long);
 #ifdef FIX_UNALIGNED_VAX_FP
-unsigned long	Ffloat_to_reg __P((unsigned int));
-unsigned int	reg_to_Ffloat __P((unsigned long));
-unsigned long	Gfloat_reg_cvt __P((unsigned long));
+unsigned long	Ffloat_to_reg(unsigned int);
+unsigned int	reg_to_Ffloat(unsigned long);
+unsigned long	Gfloat_reg_cvt(unsigned long);
 #endif
 
-int		unaligned_fixup __P((unsigned long, unsigned long,
-		    unsigned long, struct proc *));
+int		unaligned_fixup(unsigned long, unsigned long,
+		    unsigned long, struct proc *);
 int		handle_opdec(struct proc *p, u_int64_t *ucodep);
 
-static void printtrap __P((const unsigned long, const unsigned long,
-      const unsigned long, const unsigned long, struct trapframe *, int, int));
+static void printtrap(const unsigned long, const unsigned long,
+      const unsigned long, const unsigned long, struct trapframe *, int, int);
 
 /*
  * Initialize the trap vectors for the current processor.
diff --git a/sys/arch/alpha/dev/bus_dma.c b/sys/arch/alpha/dev/bus_dma.c
index ad2ef1b2bff..37843f61be2 100644
--- a/sys/arch/alpha/dev/bus_dma.c
+++ b/sys/arch/alpha/dev/bus_dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus_dma.c,v 1.8 2001/12/08 02:24:05 art Exp $ */
+/* $OpenBSD: bus_dma.c,v 1.9 2002/03/14 01:26:26 millert Exp $ */
 /* $NetBSD: bus_dma.c,v 1.40 2000/07/17 04:47:56 thorpej Exp $ */
 
 /*-
@@ -52,9 +52,9 @@
 #include <machine/bus.h>
 #include <machine/intr.h>
 
-int	_bus_dmamap_load_buffer_direct_common __P((bus_dma_tag_t,
+int	_bus_dmamap_load_buffer_direct_common(bus_dma_tag_t,
 	    bus_dmamap_t, void *, bus_size_t, struct proc *, int,
-	    paddr_t *, int *, int));
+	    paddr_t *, int *, int);
 
 extern paddr_t avail_start, avail_end;	/* from pmap.c */
 
diff --git a/sys/arch/alpha/dev/sgmap_typedep.h b/sys/arch/alpha/dev/sgmap_typedep.h
index 692ec524ff0..2368cc75c10 100644
--- a/sys/arch/alpha/dev/sgmap_typedep.h
+++ b/sys/arch/alpha/dev/sgmap_typedep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sgmap_typedep.h,v 1.1 2001/03/21 17:26:38 art Exp $ */
+/* $OpenBSD: sgmap_typedep.h,v 1.2 2002/03/14 01:26:26 millert Exp $ */
 /* $NetBSD: sgmap_typedep.h,v 1.4 1998/06/04 01:22:52 thorpej Exp $ */
 
 /*-
@@ -46,14 +46,14 @@
 
 extern	SGMAP_PTE_TYPE	__C(SGMAP_TYPE,_prefetch_spill_page_pte);
 
-void	__C(SGMAP_TYPE,_init_spill_page_pte) __P((void));
-int	__C(SGMAP_TYPE,_load) __P((bus_dma_tag_t, bus_dmamap_t,
-	    void *, bus_size_t, struct proc *, int, struct alpha_sgmap *));
-int	__C(SGMAP_TYPE,_load_mbuf) __P((bus_dma_tag_t, bus_dmamap_t,
-	    struct mbuf *, int, struct alpha_sgmap *));
-int	__C(SGMAP_TYPE,_load_uio) __P((bus_dma_tag_t, bus_dmamap_t,
-	    struct uio *, int, struct alpha_sgmap *));
-int	__C(SGMAP_TYPE,_load_raw) __P((bus_dma_tag_t, bus_dmamap_t,
-	    bus_dma_segment_t *, int, bus_size_t, int, struct alpha_sgmap *));
-void	__C(SGMAP_TYPE,_unload) __P((bus_dma_tag_t, bus_dmamap_t,
-	    struct alpha_sgmap *));
+void	__C(SGMAP_TYPE,_init_spill_page_pte)(void);
+int	__C(SGMAP_TYPE,_load)(bus_dma_tag_t, bus_dmamap_t,
+	    void *, bus_size_t, struct proc *, int, struct alpha_sgmap *);
+int	__C(SGMAP_TYPE,_load_mbuf)(bus_dma_tag_t, bus_dmamap_t,
+	    struct mbuf *, int, struct alpha_sgmap *);
+int	__C(SGMAP_TYPE,_load_uio)(bus_dma_tag_t, bus_dmamap_t,
+	    struct uio *, int, struct alpha_sgmap *);
+int	__C(SGMAP_TYPE,_load_raw)(bus_dma_tag_t, bus_dmamap_t,
+	    bus_dma_segment_t *, int, bus_size_t, int, struct alpha_sgmap *);
+void	__C(SGMAP_TYPE,_unload)(bus_dma_tag_t, bus_dmamap_t,
+	    struct alpha_sgmap *);
diff --git a/sys/arch/alpha/dev/sgmapvar.h b/sys/arch/alpha/dev/sgmapvar.h
index ebdc972a6ea..c8c150fd5ac 100644
--- a/sys/arch/alpha/dev/sgmapvar.h
+++ b/sys/arch/alpha/dev/sgmapvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sgmapvar.h,v 1.1 2001/03/21 17:26:38 art Exp $ */
+/* $OpenBSD: sgmapvar.h,v 1.2 2002/03/14 01:26:26 millert Exp $ */
 /* $NetBSD: sgmapvar.h,v 1.10 1998/08/14 16:50:02 thorpej Exp $ */
 
 /*-
@@ -85,12 +85,12 @@ struct sgmap_log_entry {
 extern	vaddr_t alpha_sgmap_prefetch_spill_page_va;
 extern	bus_addr_t alpha_sgmap_prefetch_spill_page_pa;
 
-void	alpha_sgmap_init __P((bus_dma_tag_t, struct alpha_sgmap *,
+void	alpha_sgmap_init(bus_dma_tag_t, struct alpha_sgmap *,
 	    const char *, bus_addr_t, bus_addr_t, bus_size_t, size_t, void *,
-	    bus_size_t));
+	    bus_size_t);
 
-int	alpha_sgmap_alloc __P((bus_dmamap_t, bus_size_t,
-	    struct alpha_sgmap *, int));
-void	alpha_sgmap_free __P((bus_dmamap_t, struct alpha_sgmap *));
+int	alpha_sgmap_alloc(bus_dmamap_t, bus_size_t,
+	    struct alpha_sgmap *, int);
+void	alpha_sgmap_free(bus_dmamap_t, struct alpha_sgmap *);
 
 #endif	/* _ALPHA_COMMON_SGMAPVAR_H */
diff --git a/sys/arch/alpha/dev/shared_intr.c b/sys/arch/alpha/dev/shared_intr.c
index d5348dbf9e0..90c0c6bb4e4 100644
--- a/sys/arch/alpha/dev/shared_intr.c
+++ b/sys/arch/alpha/dev/shared_intr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: shared_intr.c,v 1.10 2001/06/25 00:43:07 mickey Exp $ */
+/* $OpenBSD: shared_intr.c,v 1.11 2002/03/14 01:26:26 millert Exp $ */
 /* $NetBSD: shared_intr.c,v 1.13 2000/03/19 01:46:18 thorpej Exp $ */
 
 /*
@@ -41,7 +41,7 @@
 
 #include <machine/intr.h>
 
-static const char *intr_typename __P((int));
+static const char *intr_typename(int);
 
 static const char *
 intr_typename(type)
@@ -120,7 +120,7 @@ alpha_shared_intr_establish(intr, num, type, level, fn, arg, basename)
 	struct alpha_shared_intr *intr;
 	unsigned int num;
 	int type, level;
-	int (*fn) __P((void *));
+	int (*fn)(void *);
 	void *arg;
 	const char *basename;
 {
diff --git a/sys/arch/alpha/eisa/eisa_machdep.h b/sys/arch/alpha/eisa/eisa_machdep.h
index 589f705592c..52ac240c6c5 100644
--- a/sys/arch/alpha/eisa/eisa_machdep.h
+++ b/sys/arch/alpha/eisa/eisa_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eisa_machdep.h,v 1.3 1996/10/30 22:38:47 niklas Exp $	*/
+/*	$OpenBSD: eisa_machdep.h,v 1.4 2002/03/14 01:26:26 millert Exp $	*/
 /*	$NetBSD: eisa_machdep.h,v 1.1 1996/04/12 05:39:51 cgd Exp $	*/
 
 /*
@@ -37,15 +37,15 @@ typedef int eisa_intr_handle_t;
 struct alpha_eisa_chipset {
 	void	*ec_v;
 
-	void	(*ec_attach_hook) __P((struct device *, struct device *,
-		    struct eisabus_attach_args *));
-	int	(*ec_maxslots) __P((void *));
-	int	(*ec_intr_map) __P((void *, u_int,
-		    eisa_intr_handle_t *));
-	const char *(*ec_intr_string) __P((void *, eisa_intr_handle_t));
+	void	(*ec_attach_hook)(struct device *, struct device *,
+		    struct eisabus_attach_args *);
+	int	(*ec_maxslots)(void *);
+	int	(*ec_intr_map)(void *, u_int,
+		    eisa_intr_handle_t *);
+	const char *(*ec_intr_string)(void *, eisa_intr_handle_t);
 	void	*(*ec_intr_establish) __P((void *, eisa_intr_handle_t,
 		    int, int, int (*)(void *), void *, char *));
-	void	(*ec_intr_disestablish) __P((void *, void *));
+	void	(*ec_intr_disestablish)(void *, void *);
 };
 
 /*
diff --git a/sys/arch/alpha/include/bus.h b/sys/arch/alpha/include/bus.h
index 3fd5bdc6724..a8fec105751 100644
--- a/sys/arch/alpha/include/bus.h
+++ b/sys/arch/alpha/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.16 2002/03/07 18:08:08 jason Exp $	*/
+/*	$OpenBSD: bus.h,v 1.17 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: bus.h,v 1.10 1996/12/02 22:19:32 cgd Exp $	*/
 
 /*
@@ -347,9 +347,9 @@ struct alpha_bus_space {
 
 
 /*
- *	void bus_space_write_raw_region_N __P((bus_space_tag_t tag,
+ *	void bus_space_write_raw_region_N(bus_space_tag_t tag,
  *	    bus_space_handle_t bsh, bus_size_t offset,
- *	    const u_int8_t *addr, size_t count));
+ *	    const u_int8_t *addr, size_t count);
  *
  * Write `count' bytes in 2, 4 or 8 byte wide quantities to bus space
  * described by tag/handle and starting at `offset' from the
diff --git a/sys/arch/alpha/include/db_machdep.h b/sys/arch/alpha/include/db_machdep.h
index 5c980173461..7d6941f3287 100644
--- a/sys/arch/alpha/include/db_machdep.h
+++ b/sys/arch/alpha/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.12 2001/11/06 19:53:13 miod Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.13 2002/03/14 01:26:27 millert Exp $	*/
 
 /*
  * Copyright (c) 1997 Niklas Hallqvist.  All rights reserverd.
@@ -82,22 +82,22 @@ db_regs_t		ddb_regs;
 #define	inst_trap_return(ins)	((ins) & 0)		/* XXX */
 #define	inst_return(ins)	(((ins) & 0xfc000000) == 0x68000000)
 
-int	alpha_debug __P((unsigned long, unsigned long, unsigned long,
-    unsigned long, struct trapframe *));
-db_addr_t db_branch_taken __P((int, db_addr_t, db_regs_t *));
-boolean_t db_inst_branch __P((int));
-boolean_t db_inst_call __P((int));
-boolean_t db_inst_load __P((int));
-boolean_t db_inst_return __P((int));
-boolean_t db_inst_store __P((int));
-boolean_t db_inst_trap_return __P((int));
-boolean_t db_inst_unconditional_flow_transfer __P((int));
-u_long	db_register_value  __P((db_regs_t *, int));
-int	db_valid_breakpoint __P((db_addr_t));
-int	ddb_trap __P((unsigned long, unsigned long, unsigned long,
-    unsigned long, struct trapframe *));
-int	kdb_trap __P((int, int, db_regs_t *));
-db_addr_t next_instr_address __P((db_addr_t, int));
+int	alpha_debug(unsigned long, unsigned long, unsigned long,
+    unsigned long, struct trapframe *);
+db_addr_t db_branch_taken(int, db_addr_t, db_regs_t *);
+boolean_t db_inst_branch(int);
+boolean_t db_inst_call(int);
+boolean_t db_inst_load(int);
+boolean_t db_inst_return(int);
+boolean_t db_inst_store(int);
+boolean_t db_inst_trap_return(int);
+boolean_t db_inst_unconditional_flow_transfer(int);
+u_long	db_register_value(db_regs_t *, int);
+int	db_valid_breakpoint(db_addr_t);
+int	ddb_trap(unsigned long, unsigned long, unsigned long,
+    unsigned long, struct trapframe *);
+int	kdb_trap(int, int, db_regs_t *);
+db_addr_t next_instr_address(db_addr_t, int);
 
 #if 1
 /* Backwards compatibility until we switch all archs to use the db_ prefix */
diff --git a/sys/arch/alpha/include/ecoff_machdep.h b/sys/arch/alpha/include/ecoff_machdep.h
index ccc5b080e29..3dc79a1e043 100644
--- a/sys/arch/alpha/include/ecoff_machdep.h
+++ b/sys/arch/alpha/include/ecoff_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ecoff_machdep.h,v 1.2 2000/08/31 14:49:06 ericj Exp $	*/
+/*	$OpenBSD: ecoff_machdep.h,v 1.3 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: ecoff_machdep.h,v 1.3 1996/05/09 23:47:25 cgd Exp $	*/
 
 /*
@@ -100,6 +100,5 @@ struct ecoff_extsym {
 };
 
 #ifdef _KERNEL
-void cpu_exec_ecoff_setregs
-     __P((struct proc *, struct exec_package *, u_long, register_t *));
+void cpu_exec_ecoff_setregs(struct proc *, struct exec_package *, u_long, register_t *);
 #endif
diff --git a/sys/arch/alpha/include/float.h b/sys/arch/alpha/include/float.h
index 8de58003b23..be1aa9d9b6c 100644
--- a/sys/arch/alpha/include/float.h
+++ b/sys/arch/alpha/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.4 1997/08/01 21:35:25 deraadt Exp $	*/
+/*	$OpenBSD: float.h,v 1.5 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: float.h,v 1.4 1995/06/20 20:45:22 jtc Exp $	*/
 
 /*
@@ -40,7 +40,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/alpha/include/intr.h b/sys/arch/alpha/include/intr.h
index 9c8f150b151..2bc797a9b03 100644
--- a/sys/arch/alpha/include/intr.h
+++ b/sys/arch/alpha/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.12 2001/09/30 13:08:45 art Exp $ */
+/* $OpenBSD: intr.h,v 1.13 2002/03/14 01:26:27 millert Exp $ */
 /* $NetBSD: intr.h,v 1.26 2000/06/03 20:47:41 thorpej Exp $ */
 
 /*-
@@ -113,7 +113,7 @@
 #define	spllowersoftclock()	alpha_pal_swpipl(ALPHA_PSL_IPL_SOFT)
 
 /* IPL-raising functions/macros */
-static __inline int _splraise __P((int));
+static __inline int _splraise(int);
 static __inline int
 _splraise(s)
 	int s;
@@ -149,11 +149,11 @@ _splraise(s)
 
 #define	ALPHA_NIPIS		6	/* must not exceed 64 */
 
-typedef void (*ipifunc_t) __P((void));
+typedef void (*ipifunc_t)(void);
 extern	ipifunc_t ipifuncs[ALPHA_NIPIS];
 
-void	alpha_send_ipi __P((unsigned long, unsigned long));
-void	alpha_broadcast_ipi __P((unsigned long));
+void	alpha_send_ipi(unsigned long, unsigned long);
+void	alpha_broadcast_ipi(unsigned long);
 
 /*
  * Alpha shared-interrupt-line common code.
@@ -163,7 +163,7 @@ struct alpha_shared_intrhand {
 	TAILQ_ENTRY(alpha_shared_intrhand)
 		ih_q;
 	struct alpha_shared_intr *ih_intrhead;
-	int	(*ih_fn) __P((void *));
+	int	(*ih_fn)(void *);
 	void	*ih_arg;
 	int	ih_level;
 	unsigned int ih_num;
@@ -195,7 +195,7 @@ struct alpha_soft_intrhand {
 	LIST_ENTRY(alpha_soft_intrhand)
 		sih_q;
 	struct alpha_soft_intr *sih_intrhead;
-	void	(*sih_fn) __P((void *));
+	void	(*sih_fn)(void *);
 	void	*sih_arg;
 	int	sih_pending;
 };
@@ -208,9 +208,9 @@ struct alpha_soft_intr {
 };
 
 void	*softintr_establish __P((int, void (*)(void *), void *));
-void	softintr_disestablish __P((void *));
-void	softintr_init __P((void));
-void	softintr_dispatch __P((void));
+void	softintr_disestablish(void *);
+void	softintr_init(void);
+void	softintr_dispatch(void);
 
 #define	softintr_schedule(arg)						\
 do {									\
@@ -226,27 +226,27 @@ extern struct alpha_soft_intrhand *softclock_intrhand;
 #define	setsoftnet()	softintr_schedule(softnet_intrhand)
 #define	setsoftclock()	softintr_schedule(softclock_intrhand)
 
-struct alpha_shared_intr *alpha_shared_intr_alloc __P((unsigned int));
-int	alpha_shared_intr_dispatch __P((struct alpha_shared_intr *,
-	    unsigned int));
+struct alpha_shared_intr *alpha_shared_intr_alloc(unsigned int);
+int	alpha_shared_intr_dispatch(struct alpha_shared_intr *,
+	    unsigned int);
 void	*alpha_shared_intr_establish __P((struct alpha_shared_intr *,
 	    unsigned int, int, int, int (*)(void *), void *, const char *));
-void	alpha_shared_intr_disestablish __P((struct alpha_shared_intr *,
-	    void *, const char *));
-int	alpha_shared_intr_get_sharetype __P((struct alpha_shared_intr *,
-	    unsigned int));
-int	alpha_shared_intr_isactive __P((struct alpha_shared_intr *,
-	    unsigned int));
-void	alpha_shared_intr_set_dfltsharetype __P((struct alpha_shared_intr *,
-	    unsigned int, int));
-void	alpha_shared_intr_set_maxstrays __P((struct alpha_shared_intr *,
-	    unsigned int, int));
-void	alpha_shared_intr_stray __P((struct alpha_shared_intr *, unsigned int,
-	    const char *));
-void	alpha_shared_intr_set_private __P((struct alpha_shared_intr *,
-	    unsigned int, void *));
-void	*alpha_shared_intr_get_private __P((struct alpha_shared_intr *,
-	    unsigned int));
+void	alpha_shared_intr_disestablish(struct alpha_shared_intr *,
+	    void *, const char *);
+int	alpha_shared_intr_get_sharetype(struct alpha_shared_intr *,
+	    unsigned int);
+int	alpha_shared_intr_isactive(struct alpha_shared_intr *,
+	    unsigned int);
+void	alpha_shared_intr_set_dfltsharetype(struct alpha_shared_intr *,
+	    unsigned int, int);
+void	alpha_shared_intr_set_maxstrays(struct alpha_shared_intr *,
+	    unsigned int, int);
+void	alpha_shared_intr_stray(struct alpha_shared_intr *, unsigned int,
+	    const char *);
+void	alpha_shared_intr_set_private(struct alpha_shared_intr *,
+	    unsigned int, void *);
+void	*alpha_shared_intr_get_private(struct alpha_shared_intr *,
+	    unsigned int);
 
 void	set_iointr(void (*)(void *, unsigned long));
 
diff --git a/sys/arch/alpha/include/netbsd_machdep.h b/sys/arch/alpha/include/netbsd_machdep.h
index 9c053b01357..cccaa2f7310 100644
--- a/sys/arch/alpha/include/netbsd_machdep.h
+++ b/sys/arch/alpha/include/netbsd_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netbsd_machdep.h,v 1.3 2001/01/15 12:02:36 art Exp $	*/
+/*	$OpenBSD: netbsd_machdep.h,v 1.4 2002/03/14 01:26:27 millert Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -51,7 +51,7 @@ struct netbsd_sigcontext {
 };
 
 #ifdef _KERNEL
-void netbsd_sendsig __P((sig_t, int, int, u_long, int, union sigval));
+void netbsd_sendsig(sig_t, int, int, u_long, int, union sigval);
 #endif
 
 #endif /* _NETBSD_MACHDEP_H */
diff --git a/sys/arch/alpha/include/param.h b/sys/arch/alpha/include/param.h
index d291e572cbb..a8a4fd7b901 100644
--- a/sys/arch/alpha/include/param.h
+++ b/sys/arch/alpha/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.21 2001/12/05 01:57:14 provos Exp $ */
+/* $OpenBSD: param.h,v 1.22 2002/03/14 01:26:27 millert Exp $ */
 /* $NetBSD: param.h,v 1.30 2000/06/09 16:03:04 thorpej Exp $ */
 
 /*
@@ -165,7 +165,7 @@ void	delay(unsigned long);
 #define	DELAY(n)	delay(n)
 
 /* XXX THE FOLLOWING PROTOTYPE BELONGS IN INTR.H */
-int spl0 __P((void));			/* drop ipl to zero */
+int spl0(void);			/* drop ipl to zero */
 /* XXX END INTR.H */
 
 /* XXX THE FOLLOWING PROTOTYPE SHOULD BE A BUS.H INTERFACE */
diff --git a/sys/arch/alpha/include/pcb.h b/sys/arch/alpha/include/pcb.h
index 13062ee998c..f7eb89491af 100644
--- a/sys/arch/alpha/include/pcb.h
+++ b/sys/arch/alpha/include/pcb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcb.h,v 1.4 1997/01/24 19:57:15 niklas Exp $	*/
+/*	$OpenBSD: pcb.h,v 1.5 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: pcb.h,v 1.5 1996/11/13 22:21:00 cgd Exp $	*/
 
 /*
@@ -65,5 +65,5 @@ struct md_coredump {
 };
 
 #ifdef _KERNEL
-void savectx __P((struct pcb *));
+void savectx(struct pcb *);
 #endif
diff --git a/sys/arch/alpha/include/proc.h b/sys/arch/alpha/include/proc.h
index 8caaad0c739..fd698f6f9e1 100644
--- a/sys/arch/alpha/include/proc.h
+++ b/sys/arch/alpha/include/proc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.h,v 1.6 2002/03/12 11:58:14 art Exp $	*/
+/*	$OpenBSD: proc.h,v 1.7 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: proc.h,v 1.2 1995/03/24 15:01:36 cgd Exp $	*/
 
 /*
@@ -50,5 +50,5 @@ struct mdproc {
 #define MDP_STEP2	0x0003		/* Single step branch */
 
 #ifdef _KERNEL
-void switch_exit __P((struct proc *));
+void switch_exit(struct proc *);
 #endif
diff --git a/sys/arch/alpha/include/reg.h b/sys/arch/alpha/include/reg.h
index 4f0896553c0..23d0902cca4 100644
--- a/sys/arch/alpha/include/reg.h
+++ b/sys/arch/alpha/include/reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: reg.h,v 1.4 2001/07/09 18:55:22 millert Exp $	*/
+/*	$OpenBSD: reg.h,v 1.5 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: reg.h,v 1.2 1995/03/28 18:14:07 jtc Exp $	*/
 
 /*
@@ -92,10 +92,10 @@ struct fpreg {
 };
 
 #ifdef _KERNEL
-void	restorefpstate __P((struct fpreg *));
-void	savefpstate __P((struct fpreg *));
-void	frametoreg __P((struct trapframe *, struct reg *));
-void	regtoframe __P((struct reg *, struct trapframe *));
+void	restorefpstate(struct fpreg *);
+void	savefpstate(struct fpreg *);
+void	frametoreg(struct trapframe *, struct reg *);
+void	regtoframe(struct reg *, struct trapframe *);
 #endif
 
 #endif /* _ALPHA_REG_H_ */
diff --git a/sys/arch/alpha/isa/isa_machdep.c b/sys/arch/alpha/isa/isa_machdep.c
index fd585354e7b..a522c2f12fb 100644
--- a/sys/arch/alpha/isa/isa_machdep.c
+++ b/sys/arch/alpha/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isa_machdep.c,v 1.11 2002/01/24 19:52:48 miod Exp $ */
+/* $OpenBSD: isa_machdep.c,v 1.12 2002/03/14 01:26:27 millert Exp $ */
 /* $NetBSD: isa_machdep.c,v 1.12 1998/08/07 10:26:39 drochner Exp $ */
 
 /*
@@ -54,9 +54,9 @@
 #if (NPCPPI > 0)
 #include <dev/isa/pcppivar.h>
 
-int isabeepmatch __P((struct device *, void *, void *));
-void isabeepattach __P((struct device *, struct device *, void *));
-void isabeep __P((int, int));
+int isabeepmatch(struct device *, void *, void *);
+void isabeepattach(struct device *, struct device *, void *);
+void isabeep(int, int);
 
 struct cfattach isabeep_ca = {
 	sizeof(struct device), isabeepmatch, isabeepattach
diff --git a/sys/arch/alpha/isa/isa_machdep.h b/sys/arch/alpha/isa/isa_machdep.h
index 2c9f75f5a07..a2921e45875 100644
--- a/sys/arch/alpha/isa/isa_machdep.h
+++ b/sys/arch/alpha/isa/isa_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isa_machdep.h,v 1.10 2001/11/05 17:25:57 art Exp $	*/
+/*	$OpenBSD: isa_machdep.h,v 1.11 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: isa_machdep.h,v 1.3 1996/11/19 04:53:07 cgd Exp $	*/
 
 /*
@@ -36,12 +36,12 @@ typedef struct alpha_isa_chipset *isa_chipset_tag_t;
 struct alpha_isa_chipset {
 	void	*ic_v;
 
-	void	(*ic_attach_hook) __P((struct device *, struct device *,
-		    struct isabus_attach_args *));
+	void	(*ic_attach_hook)(struct device *, struct device *,
+		    struct isabus_attach_args *);
 	void	*(*ic_intr_establish) __P((void *, int, int, int,
 		    int (*)(void *), void *, char *));
-	void	(*ic_intr_disestablish) __P((void *, void *));
-	int	(*ic_intr_alloc) __P((isa_chipset_tag_t *, int, int, int *));
+	void	(*ic_intr_disestablish)(void *, void *);
+	int	(*ic_intr_alloc)(isa_chipset_tag_t *, int, int, int *);
 };
 
 /*
@@ -62,7 +62,7 @@ struct alpha_isa_chipset {
  * alpha-specific ISA functions.
  * NOT TO BE USED DIRECTLY BY MACHINE INDEPENDENT CODE.
  */ 
-int	isa_display_console __P((bus_space_tag_t, bus_space_tag_t));
+int	isa_display_console(bus_space_tag_t, bus_space_tag_t);
 
 #ifdef _ALPHA_BUS_DMA_PRIVATE
 int	isadma_bounce_dmamap_create(bus_dma_tag_t, bus_size_t, int,
diff --git a/sys/arch/alpha/isa/isadma_bounce.c b/sys/arch/alpha/isa/isadma_bounce.c
index b6dd4e893f8..50da003a4bd 100644
--- a/sys/arch/alpha/isa/isadma_bounce.c
+++ b/sys/arch/alpha/isa/isadma_bounce.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isadma_bounce.c,v 1.3 2001/11/06 19:53:13 miod Exp $	*/
+/*	$OpenBSD: isadma_bounce.c,v 1.4 2002/03/14 01:26:27 millert Exp $	*/
 /* $NetBSD: isadma_bounce.c,v 1.3 2000/06/29 09:02:57 mrg Exp $ */
 
 /*-
@@ -97,9 +97,9 @@ struct isadma_bounce_cookie {
 #define	ID_BUFTYPE_UIO		3
 #define	ID_BUFTYPE_RAW		4
 
-int	isadma_bounce_alloc_bouncebuf __P((bus_dma_tag_t, bus_dmamap_t,
-	    bus_size_t, int));
-void	isadma_bounce_free_bouncebuf __P((bus_dma_tag_t, bus_dmamap_t));
+int	isadma_bounce_alloc_bouncebuf(bus_dma_tag_t, bus_dmamap_t,
+	    bus_size_t, int);
+void	isadma_bounce_free_bouncebuf(bus_dma_tag_t, bus_dmamap_t);
 
 /*
  * Create an ISA DMA map.
diff --git a/sys/arch/alpha/isa/isafcns_jensen.c b/sys/arch/alpha/isa/isafcns_jensen.c
index 0588d41d7a1..58efaef8d86 100644
--- a/sys/arch/alpha/isa/isafcns_jensen.c
+++ b/sys/arch/alpha/isa/isafcns_jensen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isafcns_jensen.c,v 1.5 1999/01/11 05:11:02 millert Exp $	*/
+/*	$OpenBSD: isafcns_jensen.c,v 1.6 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: isafcns_jensen.c,v 1.4 1996/10/13 02:59:54 christos Exp $	*/
 
 /*
@@ -32,19 +32,19 @@
 #include <machine/pio.h>
 #include <machine/pte.h>
 
-static u_int8_t		jensen_inb __P((int port));
-/* static void		jensen_insb __P((int port, void *addr, int cnt)); */
-static u_int16_t	jensen_inw __P((int port));
-/* static void		jensen_insw __P((int port, void *addr, int cnt)); */
-u_int32_t		jensen_inl __P((int port));
-/* static void		jensen_insl __P((int port, void *addr, int cnt)); */
-
-static void		jensen_outb __P((int port, u_int8_t datum));
-/* static void		jensen_outsb __P((int port, void *addr, int cnt)); */
-static void		jensen_outw __P((int port, u_int16_t datum));
-/* static void		jensen_outsw __P((int port, void *addr, int cnt)); */
-static void		jensen_outl __P((int port, u_int32_t datum));
-/* static void		jensen_outsl __P((int port, void *addr, int cnt)); */
+static u_int8_t		jensen_inb(int port);
+/* static void		jensen_insb(int port, void *addr, int cnt); */
+static u_int16_t	jensen_inw(int port);
+/* static void		jensen_insw(int port, void *addr, int cnt); */
+u_int32_t		jensen_inl(int port);
+/* static void		jensen_insl(int port, void *addr, int cnt); */
+
+static void		jensen_outb(int port, u_int8_t datum);
+/* static void		jensen_outsb(int port, void *addr, int cnt); */
+static void		jensen_outw(int port, u_int16_t datum);
+/* static void		jensen_outsw(int port, void *addr, int cnt); */
+static void		jensen_outl(int port, u_int32_t datum);
+/* static void		jensen_outsl(int port, void *addr, int cnt); */
 
 struct alpha_isafcndesc jensen_isafcns = {
 	jensen_inb,	0 /* jensen_insb */,
diff --git a/sys/arch/alpha/isa/mcclock_isa.c b/sys/arch/alpha/isa/mcclock_isa.c
index 392a63842b6..5f6273a1856 100644
--- a/sys/arch/alpha/isa/mcclock_isa.c
+++ b/sys/arch/alpha/isa/mcclock_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mcclock_isa.c,v 1.6 1997/01/24 19:57:24 niklas Exp $	*/
+/*	$OpenBSD: mcclock_isa.c,v 1.7 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: mcclock_isa.c,v 1.5 1996/12/05 01:39:29 cgd Exp $	*/
 
 /*
@@ -48,19 +48,19 @@ struct mcclock_isa_softc {
 };
 
 #ifdef __BROKEN_INDIRECT_CONFIG
-int	mcclock_isa_match __P((struct device *, void *, void *));
+int	mcclock_isa_match(struct device *, void *, void *);
 #else
-int	mcclock_isa_match __P((struct device *, struct cfdata *, void *));
+int	mcclock_isa_match(struct device *, struct cfdata *, void *);
 #endif
-void	mcclock_isa_attach __P((struct device *, struct device *, void *));
+void	mcclock_isa_attach(struct device *, struct device *, void *);
 
 struct cfattach mcclock_isa_ca = {
 	sizeof (struct mcclock_isa_softc), mcclock_isa_match,
 	    mcclock_isa_attach, 
 };
 
-void	mcclock_isa_write __P((struct mcclock_softc *, u_int, u_int));
-u_int	mcclock_isa_read __P((struct mcclock_softc *, u_int));
+void	mcclock_isa_write(struct mcclock_softc *, u_int, u_int);
+u_int	mcclock_isa_read(struct mcclock_softc *, u_int);
 
 const struct mcclock_busfns mcclock_isa_busfns = {
 	mcclock_isa_write, mcclock_isa_read,
diff --git a/sys/arch/alpha/pci/apecs.c b/sys/arch/alpha/pci/apecs.c
index 5c94e3e01cd..f3d2966a7af 100644
--- a/sys/arch/alpha/pci/apecs.c
+++ b/sys/arch/alpha/pci/apecs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apecs.c,v 1.16 2001/12/14 00:44:59 nate Exp $	*/
+/*	$OpenBSD: apecs.c,v 1.17 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: apecs.c,v 1.16 1996/12/05 01:39:34 cgd Exp $	*/
 
 /*-
@@ -94,8 +94,8 @@
 #include <alpha/pci/pci_1000.h>
 #endif
 
-int	apecsmatch __P((struct device *, void *, void *));
-void	apecsattach __P((struct device *, struct device *, void *));
+int	apecsmatch(struct device *, void *, void *);
+void	apecsattach(struct device *, struct device *, void *);
 
 struct cfattach apecs_ca = {
 	sizeof(struct apecs_softc), apecsmatch, apecsattach,
@@ -105,7 +105,7 @@ struct cfdriver apecs_cd = {
 	NULL, "apecs", DV_DULL,
 };
 
-int	apecsprint __P((void *, const char *pnp));
+int	apecsprint(void *, const char *pnp);
 
 /* There can be only one. */
 int apecsfound;
diff --git a/sys/arch/alpha/pci/apecs_dma.c b/sys/arch/alpha/pci/apecs_dma.c
index 886e1c3b2c1..3442f194e73 100644
--- a/sys/arch/alpha/pci/apecs_dma.c
+++ b/sys/arch/alpha/pci/apecs_dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apecs_dma.c,v 1.2 2001/11/06 19:53:13 miod Exp $ */
+/* $OpenBSD: apecs_dma.c,v 1.3 2002/03/14 01:26:27 millert Exp $ */
 /* $NetBSD: apecs_dma.c,v 1.13 2000/06/29 08:58:45 mrg Exp $ */
 
 /*-
@@ -59,26 +59,26 @@
 #include <alpha/pci/apecsreg.h>
 #include <alpha/pci/apecsvar.h>
 
-bus_dma_tag_t apecs_dma_get_tag __P((bus_dma_tag_t, alpha_bus_t));
+bus_dma_tag_t apecs_dma_get_tag(bus_dma_tag_t, alpha_bus_t);
 
-int	apecs_bus_dmamap_create_sgmap __P((bus_dma_tag_t, bus_size_t, int,
-	    bus_size_t, bus_size_t, int, bus_dmamap_t *));
+int	apecs_bus_dmamap_create_sgmap(bus_dma_tag_t, bus_size_t, int,
+	    bus_size_t, bus_size_t, int, bus_dmamap_t *);
 
-void	apecs_bus_dmamap_destroy_sgmap __P((bus_dma_tag_t, bus_dmamap_t));
+void	apecs_bus_dmamap_destroy_sgmap(bus_dma_tag_t, bus_dmamap_t);
 
-int	apecs_bus_dmamap_load_sgmap __P((bus_dma_tag_t, bus_dmamap_t, void *,
-	    bus_size_t, struct proc *, int));
+int	apecs_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t, void *,
+	    bus_size_t, struct proc *, int);
 
-int	apecs_bus_dmamap_load_mbuf_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
-	    struct mbuf *, int));
+int	apecs_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t,
+	    struct mbuf *, int);
 
-int	apecs_bus_dmamap_load_uio_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
-	    struct uio *, int));
+int	apecs_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t,
+	    struct uio *, int);
 
-int	apecs_bus_dmamap_load_raw_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
-	    bus_dma_segment_t *, int, bus_size_t, int));
+int	apecs_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t,
+	    bus_dma_segment_t *, int, bus_size_t, int);
 
-void	apecs_bus_dmamap_unload_sgmap __P((bus_dma_tag_t, bus_dmamap_t));
+void	apecs_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t);
 
 /*
  * Direct-mapped window: 1G at 1G
diff --git a/sys/arch/alpha/pci/apecs_pci.c b/sys/arch/alpha/pci/apecs_pci.c
index 802fea7e2f4..f943d899692 100644
--- a/sys/arch/alpha/pci/apecs_pci.c
+++ b/sys/arch/alpha/pci/apecs_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apecs_pci.c,v 1.8 2001/11/06 19:53:13 miod Exp $	*/
+/*	$OpenBSD: apecs_pci.c,v 1.9 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: apecs_pci.c,v 1.10 1996/11/13 21:13:25 cgd Exp $	*/
 
 /*
@@ -42,14 +42,14 @@
 #include <alpha/pci/apecsreg.h>
 #include <alpha/pci/apecsvar.h>
 
-void		apecs_attach_hook __P((struct device *, struct device *,
-		    struct pcibus_attach_args *));
-int		apecs_bus_maxdevs __P((void *, int));
-pcitag_t	apecs_make_tag __P((void *, int, int, int));
-void		apecs_decompose_tag __P((void *, pcitag_t, int *, int *,
-		    int *));
-pcireg_t	apecs_conf_read __P((void *, pcitag_t, int));
-void		apecs_conf_write __P((void *, pcitag_t, int, pcireg_t));
+void		apecs_attach_hook(struct device *, struct device *,
+		    struct pcibus_attach_args *);
+int		apecs_bus_maxdevs(void *, int);
+pcitag_t	apecs_make_tag(void *, int, int, int);
+void		apecs_decompose_tag(void *, pcitag_t, int *, int *,
+		    int *);
+pcireg_t	apecs_conf_read(void *, pcitag_t, int);
+void		apecs_conf_write(void *, pcitag_t, int, pcireg_t);
 
 void
 apecs_pci_init(pc, v)
diff --git a/sys/arch/alpha/pci/apecsvar.h b/sys/arch/alpha/pci/apecsvar.h
index 1b37e90d354..ef512550fd4 100644
--- a/sys/arch/alpha/pci/apecsvar.h
+++ b/sys/arch/alpha/pci/apecsvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apecsvar.h,v 1.8 2001/12/14 00:44:59 nate Exp $	*/
+/*	$OpenBSD: apecsvar.h,v 1.9 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: apecsvar.h,v 1.5 1996/11/25 03:49:36 cgd Exp $	*/
 
 /*
@@ -65,9 +65,9 @@ struct apecs_softc {
 	struct	apecs_config *sc_acp;
 };
 
-void	apecs_init __P((struct apecs_config *, int));
-void	apecs_pci_init __P((pci_chipset_tag_t, void *));
-void	apecs_dma_init __P((struct apecs_config *));
+void	apecs_init(struct apecs_config *, int);
+void	apecs_pci_init(pci_chipset_tag_t, void *);
+void	apecs_dma_init(struct apecs_config *);
 
-void apecs_bus_io_init __P((bus_space_tag_t, void *));
-void apecs_bus_mem_init __P((bus_space_tag_t, void *));
+void apecs_bus_io_init(bus_space_tag_t, void *);
+void apecs_bus_mem_init(bus_space_tag_t, void *);
diff --git a/sys/arch/alpha/pci/cia.c b/sys/arch/alpha/pci/cia.c
index bff533f5d38..91faa80af0e 100644
--- a/sys/arch/alpha/pci/cia.c
+++ b/sys/arch/alpha/pci/cia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cia.c,v 1.17 2001/12/14 00:44:59 nate Exp $ */
+/* $OpenBSD: cia.c,v 1.18 2002/03/14 01:26:27 millert Exp $ */
 /* $NetBSD: cia.c,v 1.56 2000/06/29 08:58:45 mrg Exp $ */
 
 /*-
@@ -99,8 +99,8 @@
 #include <alpha/pci/pci_1000.h>
 #endif
 
-int	ciamatch __P((struct device *, void *, void *));
-void	ciaattach __P((struct device *, struct device *, void *));
+int	ciamatch(struct device *, void *, void *);
+void	ciaattach(struct device *, struct device *, void *);
 
 struct cfattach cia_ca = {
 	sizeof(struct cia_softc), ciamatch, ciaattach,
@@ -110,7 +110,7 @@ struct cfdriver cia_cd = {
 	NULL, "cia", DV_DULL,
 };
 
-static int	ciaprint __P((void *, const char *pnp));
+static int	ciaprint(void *, const char *pnp);
 
 /* There can be only one. */
 int ciafound;
diff --git a/sys/arch/alpha/pci/cia_dma.c b/sys/arch/alpha/pci/cia_dma.c
index 534b4743714..77545551338 100644
--- a/sys/arch/alpha/pci/cia_dma.c
+++ b/sys/arch/alpha/pci/cia_dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cia_dma.c,v 1.3 2001/11/06 19:53:13 miod Exp $ */
+/* $OpenBSD: cia_dma.c,v 1.4 2002/03/14 01:26:27 millert Exp $ */
 /* $NetBSD: cia_dma.c,v 1.16 2000/06/29 08:58:46 mrg Exp $ */
 
 /*-
@@ -59,29 +59,29 @@
 #include <alpha/pci/ciareg.h>
 #include <alpha/pci/ciavar.h>
 
-bus_dma_tag_t cia_dma_get_tag __P((bus_dma_tag_t, alpha_bus_t));
+bus_dma_tag_t cia_dma_get_tag(bus_dma_tag_t, alpha_bus_t);
 
-int	cia_bus_dmamap_create_direct __P((bus_dma_tag_t, bus_size_t, int,
-	    bus_size_t, bus_size_t, int, bus_dmamap_t *));
+int	cia_bus_dmamap_create_direct(bus_dma_tag_t, bus_size_t, int,
+	    bus_size_t, bus_size_t, int, bus_dmamap_t *);
 
-int	cia_bus_dmamap_create_sgmap __P((bus_dma_tag_t, bus_size_t, int,
-	    bus_size_t, bus_size_t, int, bus_dmamap_t *));
+int	cia_bus_dmamap_create_sgmap(bus_dma_tag_t, bus_size_t, int,
+	    bus_size_t, bus_size_t, int, bus_dmamap_t *);
 
-void	cia_bus_dmamap_destroy_sgmap __P((bus_dma_tag_t, bus_dmamap_t));
+void	cia_bus_dmamap_destroy_sgmap(bus_dma_tag_t, bus_dmamap_t);
 
-int	cia_bus_dmamap_load_sgmap __P((bus_dma_tag_t, bus_dmamap_t, void *,
-	    bus_size_t, struct proc *, int));
+int	cia_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t, void *,
+	    bus_size_t, struct proc *, int);
 
-int	cia_bus_dmamap_load_mbuf_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
-	    struct mbuf *, int));
+int	cia_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t,
+	    struct mbuf *, int);
 
-int	cia_bus_dmamap_load_uio_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
-	    struct uio *, int));
+int	cia_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t,
+	    struct uio *, int);
 
-int	cia_bus_dmamap_load_raw_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
-	    bus_dma_segment_t *, int, bus_size_t, int));
+int	cia_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t,
+	    bus_dma_segment_t *, int, bus_size_t, int);
 
-void	cia_bus_dmamap_unload_sgmap __P((bus_dma_tag_t, bus_dmamap_t));
+void	cia_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t);
 
 /*
  * Direct-mapped window: 1G at 1G
@@ -95,10 +95,10 @@ void	cia_bus_dmamap_unload_sgmap __P((bus_dma_tag_t, bus_dmamap_t));
 #define	CIA_SGMAP_MAPPED_BASE	(8*1024*1024)
 #define	CIA_SGMAP_MAPPED_SIZE	(8*1024*1024)
 
-void	cia_tlb_invalidate __P((void));
-void	cia_broken_pyxis_tlb_invalidate __P((void));
+void	cia_tlb_invalidate(void);
+void	cia_broken_pyxis_tlb_invalidate(void);
 
-void	(*cia_tlb_invalidate_fn) __P((void));
+void	(*cia_tlb_invalidate_fn)(void);
 
 #define	CIA_TLB_INVALIDATE()	(*cia_tlb_invalidate_fn)()
 
diff --git a/sys/arch/alpha/pci/cia_pci.c b/sys/arch/alpha/pci/cia_pci.c
index e219e620297..67f41dd0d43 100644
--- a/sys/arch/alpha/pci/cia_pci.c
+++ b/sys/arch/alpha/pci/cia_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cia_pci.c,v 1.8 2001/11/06 19:53:13 miod Exp $ */
+/* $OpenBSD: cia_pci.c,v 1.9 2002/03/14 01:26:27 millert Exp $ */
 /* $NetBSD: cia_pci.c,v 1.25 2000/06/29 08:58:46 mrg Exp $ */
 
 /*
@@ -40,14 +40,14 @@
 #include <alpha/pci/ciareg.h>
 #include <alpha/pci/ciavar.h>
 
-void		cia_attach_hook __P((struct device *, struct device *,
-		    struct pcibus_attach_args *));
-int		cia_bus_maxdevs __P((void *, int));
-pcitag_t	cia_make_tag __P((void *, int, int, int));
-void		cia_decompose_tag __P((void *, pcitag_t, int *, int *,
-		    int *));
-pcireg_t	cia_conf_read __P((void *, pcitag_t, int));
-void		cia_conf_write __P((void *, pcitag_t, int, pcireg_t));
+void		cia_attach_hook(struct device *, struct device *,
+		    struct pcibus_attach_args *);
+int		cia_bus_maxdevs(void *, int);
+pcitag_t	cia_make_tag(void *, int, int, int);
+void		cia_decompose_tag(void *, pcitag_t, int *, int *,
+		    int *);
+pcireg_t	cia_conf_read(void *, pcitag_t, int);
+void		cia_conf_write(void *, pcitag_t, int, pcireg_t);
 
 void
 cia_pci_init(pc, v)
diff --git a/sys/arch/alpha/pci/ciavar.h b/sys/arch/alpha/pci/ciavar.h
index bc9c2861fba..419bc4d8d06 100644
--- a/sys/arch/alpha/pci/ciavar.h
+++ b/sys/arch/alpha/pci/ciavar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ciavar.h,v 1.11 2001/12/14 00:44:59 nate Exp $ */
+/* $OpenBSD: ciavar.h,v 1.12 2002/03/14 01:26:27 millert Exp $ */
 /* $NetBSD: ciavar.h,v 1.17 2000/03/19 01:43:25 thorpej Exp $ */
 
 /*
@@ -72,14 +72,14 @@ struct cia_softc {
 	struct	cia_config *sc_ccp;
 };
 
-void	cia_init __P((struct cia_config *, int));
-void	cia_pci_init __P((pci_chipset_tag_t, void *));
-void	cia_dma_init __P((struct cia_config *));
+void	cia_init(struct cia_config *, int);
+void	cia_pci_init(pci_chipset_tag_t, void *);
+void	cia_dma_init(struct cia_config *);
 
-void	cia_bwx_bus_io_init __P((bus_space_tag_t, void *));
-void	cia_bwx_bus_mem_init __P((bus_space_tag_t, void *));
+void	cia_bwx_bus_io_init(bus_space_tag_t, void *);
+void	cia_bwx_bus_mem_init(bus_space_tag_t, void *);
 
-void	cia_bus_io_init __P((bus_space_tag_t, void *));
-void	cia_bus_mem_init __P((bus_space_tag_t, void *));
+void	cia_bus_io_init(bus_space_tag_t, void *);
+void	cia_bus_mem_init(bus_space_tag_t, void *);
 
-void	cia_pyxis_intr_enable __P((int, int));
+void	cia_pyxis_intr_enable(int, int);
diff --git a/sys/arch/alpha/pci/irongate_pci.c b/sys/arch/alpha/pci/irongate_pci.c
index f75f2189a92..68447e008aa 100644
--- a/sys/arch/alpha/pci/irongate_pci.c
+++ b/sys/arch/alpha/pci/irongate_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: irongate_pci.c,v 1.3 2001/11/06 19:53:13 miod Exp $	*/
+/*	$OpenBSD: irongate_pci.c,v 1.4 2002/03/14 01:26:27 millert Exp $	*/
 /* $NetBSD: irongate_pci.c,v 1.2 2000/06/29 08:58:47 mrg Exp $ */
 
 /*-
@@ -54,14 +54,14 @@
 #include <alpha/pci/irongatereg.h>
 #include <alpha/pci/irongatevar.h>
 
-void		irongate_attach_hook __P((struct device *, struct device *,
-		    struct pcibus_attach_args *));
-int		irongate_bus_maxdevs __P((void *, int));
-pcitag_t	irongate_make_tag __P((void *, int, int, int));
-void		irongate_decompose_tag __P((void *, pcitag_t, int *, int *,
-		    int *));
-pcireg_t	irongate_conf_read __P((void *, pcitag_t, int));
-void		irongate_conf_write __P((void *, pcitag_t, int, pcireg_t));
+void		irongate_attach_hook(struct device *, struct device *,
+		    struct pcibus_attach_args *);
+int		irongate_bus_maxdevs(void *, int);
+pcitag_t	irongate_make_tag(void *, int, int, int);
+void		irongate_decompose_tag(void *, pcitag_t, int *, int *,
+		    int *);
+pcireg_t	irongate_conf_read(void *, pcitag_t, int);
+void		irongate_conf_write(void *, pcitag_t, int, pcireg_t);
 
 /* AMD 751 systems are always single-processor, so this is easy. */
 #define	PCI_CONF_LOCK(s)	(s) = splhigh()
diff --git a/sys/arch/alpha/pci/lca.c b/sys/arch/alpha/pci/lca.c
index 4f4cd66c92a..859e1f9e9d7 100644
--- a/sys/arch/alpha/pci/lca.c
+++ b/sys/arch/alpha/pci/lca.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lca.c,v 1.15 2001/12/14 00:44:59 nate Exp $	*/
+/*	$OpenBSD: lca.c,v 1.16 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: lca.c,v 1.14 1996/12/05 01:39:35 cgd Exp $	*/
 
 /*-
@@ -92,8 +92,8 @@
 #include <alpha/pci/pci_eb66.h>
 #endif
 
-int	lcamatch __P((struct device *, void *, void *));
-void	lcaattach __P((struct device *, struct device *, void *));
+int	lcamatch(struct device *, void *, void *);
+void	lcaattach(struct device *, struct device *, void *);
 
 struct cfattach lca_ca = {
 	sizeof(struct lca_softc), lcamatch, lcaattach,
@@ -103,11 +103,11 @@ struct cfdriver lca_cd = {
 	NULL, "lca", DV_DULL,
 };
 
-int	lcaprint __P((void *, const char *pnp));
+int	lcaprint(void *, const char *pnp);
 
 #if 0
-int	lca_bus_get_window __P((int, int,
-	    struct alpha_bus_space_translation *));
+int	lca_bus_get_window(int, int,
+	    struct alpha_bus_space_translation *);
 #endif
 
 /* There can be only one. */
diff --git a/sys/arch/alpha/pci/lca_dma.c b/sys/arch/alpha/pci/lca_dma.c
index a2ef7daa8ea..4909f10a0eb 100644
--- a/sys/arch/alpha/pci/lca_dma.c
+++ b/sys/arch/alpha/pci/lca_dma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lca_dma.c,v 1.3 2001/11/06 19:53:13 miod Exp $	*/
+/*	$OpenBSD: lca_dma.c,v 1.4 2002/03/14 01:26:27 millert Exp $	*/
 /* $NetBSD: lca_dma.c,v 1.13 2000/06/29 08:58:47 mrg Exp $ */
 
 /*-
@@ -59,26 +59,26 @@
 #include <alpha/pci/lcareg.h>
 #include <alpha/pci/lcavar.h>
 
-bus_dma_tag_t lca_dma_get_tag __P((bus_dma_tag_t, alpha_bus_t));
+bus_dma_tag_t lca_dma_get_tag(bus_dma_tag_t, alpha_bus_t);
 
-int	lca_bus_dmamap_create_sgmap __P((bus_dma_tag_t, bus_size_t, int,
-	    bus_size_t, bus_size_t, int, bus_dmamap_t *));
+int	lca_bus_dmamap_create_sgmap(bus_dma_tag_t, bus_size_t, int,
+	    bus_size_t, bus_size_t, int, bus_dmamap_t *);
 
-void	lca_bus_dmamap_destroy_sgmap __P((bus_dma_tag_t, bus_dmamap_t));
+void	lca_bus_dmamap_destroy_sgmap(bus_dma_tag_t, bus_dmamap_t);
 
-int	lca_bus_dmamap_load_sgmap __P((bus_dma_tag_t, bus_dmamap_t, void *,
-	    bus_size_t, struct proc *, int));
+int	lca_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t, void *,
+	    bus_size_t, struct proc *, int);
 
-int	lca_bus_dmamap_load_mbuf_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
-	    struct mbuf *, int));
+int	lca_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t,
+	    struct mbuf *, int);
 
-int	lca_bus_dmamap_load_uio_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
-	    struct uio *, int));
+int	lca_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t,
+	    struct uio *, int);
 
-int	lca_bus_dmamap_load_raw_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
-	    bus_dma_segment_t *, int, bus_size_t, int));
+int	lca_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t,
+	    bus_dma_segment_t *, int, bus_size_t, int);
 
-void	lca_bus_dmamap_unload_sgmap __P((bus_dma_tag_t, bus_dmamap_t));
+void	lca_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t);
 
 /*
  * Direct-mapped window: 1G at 1G
diff --git a/sys/arch/alpha/pci/lca_pci.c b/sys/arch/alpha/pci/lca_pci.c
index 10e5fa3a8f7..697619e294f 100644
--- a/sys/arch/alpha/pci/lca_pci.c
+++ b/sys/arch/alpha/pci/lca_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lca_pci.c,v 1.7 2001/11/06 19:53:13 miod Exp $	*/
+/*	$OpenBSD: lca_pci.c,v 1.8 2002/03/14 01:26:27 millert Exp $	*/
 /* $NetBSD: lca_pci.c,v 1.13 1997/09/02 13:19:35 thorpej Exp $ */
 
 /*
@@ -42,14 +42,14 @@
 #include <alpha/pci/lcareg.h>
 #include <alpha/pci/lcavar.h>
 
-void		lca_attach_hook __P((struct device *, struct device *,
-		    struct pcibus_attach_args *));
-int		lca_bus_maxdevs __P((void *, int));
-pcitag_t	lca_make_tag __P((void *, int, int, int));
-void		lca_decompose_tag __P((void *, pcitag_t, int *, int *,
-		    int *));
-pcireg_t	lca_conf_read __P((void *, pcitag_t, int));
-void		lca_conf_write __P((void *, pcitag_t, int, pcireg_t));
+void		lca_attach_hook(struct device *, struct device *,
+		    struct pcibus_attach_args *);
+int		lca_bus_maxdevs(void *, int);
+pcitag_t	lca_make_tag(void *, int, int, int);
+void		lca_decompose_tag(void *, pcitag_t, int *, int *,
+		    int *);
+pcireg_t	lca_conf_read(void *, pcitag_t, int);
+void		lca_conf_write(void *, pcitag_t, int, pcireg_t);
 
 void
 lca_pci_init(pc, v)
diff --git a/sys/arch/alpha/pci/lcavar.h b/sys/arch/alpha/pci/lcavar.h
index 001ba6314ae..8a25348d6b9 100644
--- a/sys/arch/alpha/pci/lcavar.h
+++ b/sys/arch/alpha/pci/lcavar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lcavar.h,v 1.9 2001/12/14 00:44:59 nate Exp $	*/
+/*	$OpenBSD: lcavar.h,v 1.10 2002/03/14 01:26:27 millert Exp $	*/
 /* $NetBSD: lcavar.h,v 1.7 1997/06/06 23:54:32 thorpej Exp $ */
 
 /*
@@ -61,9 +61,9 @@ struct lca_softc {
 	struct	lca_config *sc_lcp;
 };
 
-void	lca_init __P((struct lca_config *, int));
-void	lca_pci_init __P((pci_chipset_tag_t, void *));
-void	lca_dma_init __P((struct lca_config *));
+void	lca_init(struct lca_config *, int);
+void	lca_pci_init(pci_chipset_tag_t, void *);
+void	lca_dma_init(struct lca_config *);
 
-void	lca_bus_io_init __P((bus_space_tag_t, void *));
-void	lca_bus_mem_init __P((bus_space_tag_t, void *));
+void	lca_bus_io_init(bus_space_tag_t, void *);
+void	lca_bus_mem_init(bus_space_tag_t, void *);
diff --git a/sys/arch/alpha/pci/pci_2100_a50.c b/sys/arch/alpha/pci/pci_2100_a50.c
index 78645296abe..0da6944a7b1 100644
--- a/sys/arch/alpha/pci/pci_2100_a50.c
+++ b/sys/arch/alpha/pci/pci_2100_a50.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_2100_a50.c,v 1.17 2001/12/14 00:44:59 nate Exp $	*/
+/*	$OpenBSD: pci_2100_a50.c,v 1.18 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: pci_2100_a50.c,v 1.12 1996/11/13 21:13:29 cgd Exp $	*/
 
 /*
@@ -52,13 +52,13 @@
 
 #include "sio.h"
 
-int	dec_2100_a50_intr_map __P((void *, pcitag_t, int, int,
-	    pci_intr_handle_t *));
-const char *dec_2100_a50_intr_string __P((void *, pci_intr_handle_t));
-int	 dec_2100_a50_intr_line __P((void *, pci_intr_handle_t));
+int	dec_2100_a50_intr_map(void *, pcitag_t, int, int,
+	    pci_intr_handle_t *);
+const char *dec_2100_a50_intr_string(void *, pci_intr_handle_t);
+int	 dec_2100_a50_intr_line(void *, pci_intr_handle_t);
 void    *dec_2100_a50_intr_establish __P((void *, pci_intr_handle_t,
 	    int, int (*func)(void *), void *, char *));
-void    dec_2100_a50_intr_disestablish __P((void *, void *));
+void    dec_2100_a50_intr_disestablish(void *, void *);
 
 #define	APECS_SIO_DEVICE	7	/* XXX */
 
@@ -235,7 +235,7 @@ dec_2100_a50_intr_establish(acv, ih, level, func, arg, name)
 	void *acv, *arg;
 	pci_intr_handle_t ih;
 	int level;
-	int (*func) __P((void *));
+	int (*func)(void *);
 	char *name;
 {
 	return sio_intr_establish(NULL /*XXX*/, ih, IST_LEVEL, level, func,
diff --git a/sys/arch/alpha/pci/pci_2100_a50.h b/sys/arch/alpha/pci/pci_2100_a50.h
index adee2d737cb..252ecf75f4a 100644
--- a/sys/arch/alpha/pci/pci_2100_a50.h
+++ b/sys/arch/alpha/pci/pci_2100_a50.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_2100_a50.h,v 1.4 1996/10/30 22:40:04 niklas Exp $	*/
+/*	$OpenBSD: pci_2100_a50.h,v 1.5 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: pci_2100_a50.h,v 1.3 1996/04/12 06:08:42 cgd Exp $	*/
 
 /*
@@ -28,4 +28,4 @@
  * rights to redistribute these changes.
  */
 
-void	pci_2100_a50_pickintr __P((struct apecs_config *));
+void	pci_2100_a50_pickintr(struct apecs_config *);
diff --git a/sys/arch/alpha/pci/pci_550.c b/sys/arch/alpha/pci/pci_550.c
index c0dd63e23f0..c237901f380 100644
--- a/sys/arch/alpha/pci/pci_550.c
+++ b/sys/arch/alpha/pci/pci_550.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_550.c,v 1.7 2001/12/14 00:44:59 nate Exp $ */
+/* $OpenBSD: pci_550.c,v 1.8 2002/03/14 01:26:27 millert Exp $ */
 /* $NetBSD: pci_550.c,v 1.18 2000/06/29 08:58:48 mrg Exp $ */
 
 /*-
@@ -94,18 +94,18 @@
 #include <alpha/pci/siovar.h>
 #endif
 
-int	dec_550_intr_map __P((void *, pcitag_t, int, int,
-	    pci_intr_handle_t *));
-const char *dec_550_intr_string __P((void *, pci_intr_handle_t));
-int	dec_550_intr_line __P((void *, pci_intr_handle_t));
-const struct evcnt *dec_550_intr_evcnt __P((void *, pci_intr_handle_t));
+int	dec_550_intr_map(void *, pcitag_t, int, int,
+	    pci_intr_handle_t *);
+const char *dec_550_intr_string(void *, pci_intr_handle_t);
+int	dec_550_intr_line(void *, pci_intr_handle_t);
+const struct evcnt *dec_550_intr_evcnt(void *, pci_intr_handle_t);
 void	*dec_550_intr_establish __P((void *, pci_intr_handle_t,
 	    int, int (*func)(void *), void *, char *));
-void	dec_550_intr_disestablish __P((void *, void *));
+void	dec_550_intr_disestablish(void *, void *);
 
 void	*dec_550_pciide_compat_intr_establish __P((void *, struct device *,
 	    struct pci_attach_args *, int, int (*)(void *), void *));
-void    dec_550_pciide_compat_intr_disestablish __P((void *, void *));
+void    dec_550_pciide_compat_intr_disestablish(void *, void *);
 
 #define	DEC_550_PCI_IRQ_BEGIN	8
 #define	DEC_550_MAX_IRQ		(64 - DEC_550_PCI_IRQ_BEGIN)
@@ -128,9 +128,9 @@ void    dec_550_pciide_compat_intr_disestablish __P((void *, void *));
 
 struct alpha_shared_intr *dec_550_pci_intr;
 
-void	dec_550_iointr __P((void *framep, unsigned long vec));
-void	dec_550_intr_enable __P((int irq));
-void	dec_550_intr_disable __P((int irq));
+void	dec_550_iointr(void *framep, unsigned long vec);
+void	dec_550_intr_enable(int irq);
+void	dec_550_intr_disable(int irq);
 
 void
 pci_550_pickintr(ccp)
@@ -331,7 +331,7 @@ dec_550_intr_establish(ccv, ih, level, func, arg, name)
 	void *ccv, *arg;
 	pci_intr_handle_t ih;
 	int level;
-	int (*func) __P((void *));
+	int (*func)(void *);
 	char *name;
 {
 #if 0
@@ -398,7 +398,7 @@ dec_550_pciide_compat_intr_establish(v, dev, pa, chan, func, arg)
 	struct device *dev;
 	struct pci_attach_args *pa;
 	int chan;
-	int (*func) __P((void *));
+	int (*func)(void *);
 	void *arg;
 {
 	pci_chipset_tag_t pc = pa->pa_pc;
diff --git a/sys/arch/alpha/pci/pci_550.h b/sys/arch/alpha/pci/pci_550.h
index f5b87a452c1..918a9f1a89d 100644
--- a/sys/arch/alpha/pci/pci_550.h
+++ b/sys/arch/alpha/pci/pci_550.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_550.h,v 1.2 2000/11/08 20:59:25 ericj Exp $ */
+/* $OpenBSD: pci_550.h,v 1.3 2002/03/14 01:26:27 millert Exp $ */
 /* $NetBSD: pci_550.h,v 1.4 2000/06/05 21:47:23 thorpej Exp $ */
 
 /*
@@ -28,4 +28,4 @@
  * rights to redistribute these changes.
  */
 
-void	pci_550_pickintr __P((struct cia_config *));
+void	pci_550_pickintr(struct cia_config *);
diff --git a/sys/arch/alpha/pci/pci_6600.c b/sys/arch/alpha/pci/pci_6600.c
index ad119bbb63d..1fe9051da1f 100644
--- a/sys/arch/alpha/pci/pci_6600.c
+++ b/sys/arch/alpha/pci/pci_6600.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_6600.c,v 1.7 2001/12/14 00:44:59 nate Exp $ */
+/* $OpenBSD: pci_6600.c,v 1.8 2002/03/14 01:26:27 millert Exp $ */
 /* $NetBSD: pci_6600.c,v 1.5 2000/06/06 00:50:15 thorpej Exp $ */
 
 /*-
@@ -76,22 +76,22 @@
 static char *irqtype = "6600 irq";
 static struct tsp_config *sioprimary;
 
-void dec_6600_intr_disestablish __P((void *, void *));
+void dec_6600_intr_disestablish(void *, void *);
 void *dec_6600_intr_establish __P((
     void *, pci_intr_handle_t, int, int (*func)(void *), void *, char *));
-const char *dec_6600_intr_string __P((void *, pci_intr_handle_t));
-int dec_6600_intr_line __P((void *, pci_intr_handle_t));
-const struct evcnt *dec_6600_intr_evcnt __P((void *, pci_intr_handle_t));
-int dec_6600_intr_map __P((void *, pcitag_t, int, int, pci_intr_handle_t *));
+const char *dec_6600_intr_string(void *, pci_intr_handle_t);
+int dec_6600_intr_line(void *, pci_intr_handle_t);
+const struct evcnt *dec_6600_intr_evcnt(void *, pci_intr_handle_t);
+int dec_6600_intr_map(void *, pcitag_t, int, int, pci_intr_handle_t *);
 void *dec_6600_pciide_compat_intr_establish __P((void *, struct device *,
     struct pci_attach_args *, int, int (*)(void *), void *));
-void  dec_6600_pciide_compat_intr_disestablish __P((void *, void *));
+void  dec_6600_pciide_compat_intr_disestablish(void *, void *);
 
 struct alpha_shared_intr *dec_6600_pci_intr;
 
-void dec_6600_iointr __P((void *framep, unsigned long vec));
-extern void dec_6600_intr_enable __P((int irq));
-extern void dec_6600_intr_disable __P((int irq));
+void dec_6600_iointr(void *framep, unsigned long vec);
+extern void dec_6600_intr_enable(int irq);
+extern void dec_6600_intr_disable(int irq);
 
 void
 pci_6600_pickintr(pcp)
@@ -249,7 +249,7 @@ dec_6600_intr_establish(acv, ih, level, func, arg, name)
         void *acv, *arg;
         pci_intr_handle_t ih;
         int level;
-        int (*func) __P((void *));
+        int (*func)(void *);
 	char *name;
 {
 	void *cookie;
@@ -360,7 +360,7 @@ dec_6600_pciide_compat_intr_establish(v, dev, pa, chan, func, arg)
 	struct device *dev;
 	struct pci_attach_args *pa;
 	int chan;
-	int (*func) __P((void *));
+	int (*func)(void *);
 	void *arg;
 {
 	pci_chipset_tag_t pc = pa->pa_pc;
diff --git a/sys/arch/alpha/pci/pci_6600.h b/sys/arch/alpha/pci/pci_6600.h
index 756ba27accd..beed4401c23 100644
--- a/sys/arch/alpha/pci/pci_6600.h
+++ b/sys/arch/alpha/pci/pci_6600.h
@@ -1,6 +1,6 @@
-/* $OpenBSD: pci_6600.h,v 1.1 2000/11/16 04:50:18 ericj Exp $ */
+/* $OpenBSD: pci_6600.h,v 1.2 2002/03/14 01:26:27 millert Exp $ */
 /* $NetBSD$ */
 
 /* Public Domain */
 
-void pci_6600_pickintr __P((struct tsp_config *));
+void pci_6600_pickintr(struct tsp_config *);
diff --git a/sys/arch/alpha/pci/pci_axppci_33.c b/sys/arch/alpha/pci/pci_axppci_33.c
index 08c12249f27..a9886b4e497 100644
--- a/sys/arch/alpha/pci/pci_axppci_33.c
+++ b/sys/arch/alpha/pci/pci_axppci_33.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_axppci_33.c,v 1.15 2001/12/14 00:44:59 nate Exp $	*/
+/*	$OpenBSD: pci_axppci_33.c,v 1.16 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: pci_axppci_33.c,v 1.10 1996/11/13 21:13:29 cgd Exp $	*/
 
 /*
@@ -52,13 +52,13 @@
 
 #include "sio.h"
 
-int     dec_axppci_33_intr_map __P((void *, pcitag_t, int, int,
-	    pci_intr_handle_t *));
-const char *dec_axppci_33_intr_string __P((void *, pci_intr_handle_t));
-int	dec_axppci_33_intr_line __P((void *, pci_intr_handle_t));
+int     dec_axppci_33_intr_map(void *, pcitag_t, int, int,
+	    pci_intr_handle_t *);
+const char *dec_axppci_33_intr_string(void *, pci_intr_handle_t);
+int	dec_axppci_33_intr_line(void *, pci_intr_handle_t);
 void    *dec_axppci_33_intr_establish __P((void *, pci_intr_handle_t,
 	    int, int (*func)(void *), void *, char *));
-void    dec_axppci_33_intr_disestablish __P((void *, void *));
+void    dec_axppci_33_intr_disestablish(void *, void *);
 
 #define	LCA_SIO_DEVICE	7	/* XXX */
 
@@ -234,7 +234,7 @@ dec_axppci_33_intr_establish(lcv, ih, level, func, arg, name)
 	void *lcv, *arg;
 	pci_intr_handle_t ih;
 	int level;
-	int (*func) __P((void *));
+	int (*func)(void *);
 	char *name;
 {
 	return sio_intr_establish(NULL /*XXX*/, ih, IST_LEVEL, level, func,
diff --git a/sys/arch/alpha/pci/pci_axppci_33.h b/sys/arch/alpha/pci/pci_axppci_33.h
index ef9a3856111..e7695b7ede2 100644
--- a/sys/arch/alpha/pci/pci_axppci_33.h
+++ b/sys/arch/alpha/pci/pci_axppci_33.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_axppci_33.h,v 1.4 1996/10/30 22:40:05 niklas Exp $	*/
+/*	$OpenBSD: pci_axppci_33.h,v 1.5 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: pci_axppci_33.h,v 1.3 1996/04/12 06:08:47 cgd Exp $	*/
 
 /*
@@ -28,4 +28,4 @@
  * rights to redistribute these changes.
  */
 
-void	pci_axppci_33_pickintr __P((struct lca_config *));
+void	pci_axppci_33_pickintr(struct lca_config *);
diff --git a/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c b/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c
index d9d338d1e10..fb73a422d16 100644
--- a/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c
+++ b/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_bwx_bus_io_chipdep.c,v 1.3 2001/12/14 00:44:59 nate Exp $ */
+/* $OpenBSD: pci_bwx_bus_io_chipdep.c,v 1.4 2002/03/14 01:26:27 millert Exp $ */
 /* $NetBSD: pcs_bus_io_common.c,v 1.14 1996/12/02 22:19:35 cgd Exp $ */
 
 /*
@@ -45,132 +45,132 @@
 #define	__S(S)		__STRING(S)
 
 /* mapping/unmapping */
-int		__C(CHIP,_io_map) __P((void *, bus_addr_t, bus_size_t, int,
-		    bus_space_handle_t *));
-void		__C(CHIP,_io_unmap) __P((void *, bus_space_handle_t,
-		    bus_size_t));
-int		__C(CHIP,_io_subregion) __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_size_t, bus_space_handle_t *));
+int		__C(CHIP,_io_map)(void *, bus_addr_t, bus_size_t, int,
+		    bus_space_handle_t *);
+void		__C(CHIP,_io_unmap)(void *, bus_space_handle_t,
+		    bus_size_t);
+int		__C(CHIP,_io_subregion)(void *, bus_space_handle_t,
+		    bus_size_t, bus_size_t, bus_space_handle_t *);
 
 /* allocation/deallocation */
-int		__C(CHIP,_io_alloc) __P((void *, bus_addr_t, bus_addr_t,
+int		__C(CHIP,_io_alloc)(void *, bus_addr_t, bus_addr_t,
 		    bus_size_t, bus_size_t, bus_addr_t, int, bus_addr_t *,
-                    bus_space_handle_t *));
-void		__C(CHIP,_io_free) __P((void *, bus_space_handle_t,
-		    bus_size_t));
+                    bus_space_handle_t *);
+void		__C(CHIP,_io_free)(void *, bus_space_handle_t,
+		    bus_size_t);
 
 /* barrier */
-inline void	__C(CHIP,_io_barrier) __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_size_t, int));
+inline void	__C(CHIP,_io_barrier)(void *, bus_space_handle_t,
+		    bus_size_t, bus_size_t, int);
 
 /* read (single) */
-inline u_int8_t	__C(CHIP,_io_read_1) __P((void *, bus_space_handle_t,
-		    bus_size_t));
-inline u_int16_t __C(CHIP,_io_read_2) __P((void *, bus_space_handle_t,
-		    bus_size_t));
-inline u_int32_t __C(CHIP,_io_read_4) __P((void *, bus_space_handle_t,
-		    bus_size_t));
-inline u_int64_t __C(CHIP,_io_read_8) __P((void *, bus_space_handle_t,
-		    bus_size_t));
+inline u_int8_t	__C(CHIP,_io_read_1)(void *, bus_space_handle_t,
+		    bus_size_t);
+inline u_int16_t __C(CHIP,_io_read_2)(void *, bus_space_handle_t,
+		    bus_size_t);
+inline u_int32_t __C(CHIP,_io_read_4)(void *, bus_space_handle_t,
+		    bus_size_t);
+inline u_int64_t __C(CHIP,_io_read_8)(void *, bus_space_handle_t,
+		    bus_size_t);
 
 /* read multiple */
-void		__C(CHIP,_io_read_multi_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t *, bus_size_t));
-void		__C(CHIP,_io_read_multi_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int16_t *, bus_size_t));
-void		__C(CHIP,_io_read_multi_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int32_t *, bus_size_t));
-void		__C(CHIP,_io_read_multi_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int64_t *, bus_size_t));
+void		__C(CHIP,_io_read_multi_1)(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t *, bus_size_t);
+void		__C(CHIP,_io_read_multi_2)(void *, bus_space_handle_t,
+		    bus_size_t, u_int16_t *, bus_size_t);
+void		__C(CHIP,_io_read_multi_4)(void *, bus_space_handle_t,
+		    bus_size_t, u_int32_t *, bus_size_t);
+void		__C(CHIP,_io_read_multi_8)(void *, bus_space_handle_t,
+		    bus_size_t, u_int64_t *, bus_size_t);
 
 /* read region */
-void		__C(CHIP,_io_read_region_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t *, bus_size_t));
-void		__C(CHIP,_io_read_region_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int16_t *, bus_size_t));
-void		__C(CHIP,_io_read_region_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int32_t *, bus_size_t));
-void		__C(CHIP,_io_read_region_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int64_t *, bus_size_t));
+void		__C(CHIP,_io_read_region_1)(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t *, bus_size_t);
+void		__C(CHIP,_io_read_region_2)(void *, bus_space_handle_t,
+		    bus_size_t, u_int16_t *, bus_size_t);
+void		__C(CHIP,_io_read_region_4)(void *, bus_space_handle_t,
+		    bus_size_t, u_int32_t *, bus_size_t);
+void		__C(CHIP,_io_read_region_8)(void *, bus_space_handle_t,
+		    bus_size_t, u_int64_t *, bus_size_t);
 
 /* write (single) */
-inline void	__C(CHIP,_io_write_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t));
-inline void	__C(CHIP,_io_write_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int16_t));
-inline void	__C(CHIP,_io_write_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int32_t));
-inline void	__C(CHIP,_io_write_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int64_t));
+inline void	__C(CHIP,_io_write_1)(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t);
+inline void	__C(CHIP,_io_write_2)(void *, bus_space_handle_t,
+		    bus_size_t, u_int16_t);
+inline void	__C(CHIP,_io_write_4)(void *, bus_space_handle_t,
+		    bus_size_t, u_int32_t);
+inline void	__C(CHIP,_io_write_8)(void *, bus_space_handle_t,
+		    bus_size_t, u_int64_t);
 
 /* write multiple */
-void		__C(CHIP,_io_write_multi_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int8_t *, bus_size_t));
-void		__C(CHIP,_io_write_multi_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int16_t *, bus_size_t));
-void		__C(CHIP,_io_write_multi_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int32_t *, bus_size_t));
-void		__C(CHIP,_io_write_multi_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int64_t *, bus_size_t));
+void		__C(CHIP,_io_write_multi_1)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int8_t *, bus_size_t);
+void		__C(CHIP,_io_write_multi_2)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int16_t *, bus_size_t);
+void		__C(CHIP,_io_write_multi_4)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int32_t *, bus_size_t);
+void		__C(CHIP,_io_write_multi_8)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int64_t *, bus_size_t);
 
 /* write region */
-void		__C(CHIP,_io_write_region_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int8_t *, bus_size_t));
-void		__C(CHIP,_io_write_region_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int16_t *, bus_size_t));
-void		__C(CHIP,_io_write_region_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int32_t *, bus_size_t));
-void		__C(CHIP,_io_write_region_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int64_t *, bus_size_t));
+void		__C(CHIP,_io_write_region_1)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int8_t *, bus_size_t);
+void		__C(CHIP,_io_write_region_2)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int16_t *, bus_size_t);
+void		__C(CHIP,_io_write_region_4)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int32_t *, bus_size_t);
+void		__C(CHIP,_io_write_region_8)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int64_t *, bus_size_t);
 
 /* set multiple */
-void		__C(CHIP,_io_set_multi_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t, bus_size_t));
-void		__C(CHIP,_io_set_multi_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int16_t, bus_size_t));
-void		__C(CHIP,_io_set_multi_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int32_t, bus_size_t));
-void		__C(CHIP,_io_set_multi_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int64_t, bus_size_t));
+void		__C(CHIP,_io_set_multi_1)(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t, bus_size_t);
+void		__C(CHIP,_io_set_multi_2)(void *, bus_space_handle_t,
+		    bus_size_t, u_int16_t, bus_size_t);
+void		__C(CHIP,_io_set_multi_4)(void *, bus_space_handle_t,
+		    bus_size_t, u_int32_t, bus_size_t);
+void		__C(CHIP,_io_set_multi_8)(void *, bus_space_handle_t,
+		    bus_size_t, u_int64_t, bus_size_t);
 
 /* set region */
-void		__C(CHIP,_io_set_region_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t, bus_size_t));
-void		__C(CHIP,_io_set_region_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int16_t, bus_size_t));
-void		__C(CHIP,_io_set_region_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int32_t, bus_size_t));
-void		__C(CHIP,_io_set_region_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int64_t, bus_size_t));
+void		__C(CHIP,_io_set_region_1)(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t, bus_size_t);
+void		__C(CHIP,_io_set_region_2)(void *, bus_space_handle_t,
+		    bus_size_t, u_int16_t, bus_size_t);
+void		__C(CHIP,_io_set_region_4)(void *, bus_space_handle_t,
+		    bus_size_t, u_int32_t, bus_size_t);
+void		__C(CHIP,_io_set_region_8)(void *, bus_space_handle_t,
+		    bus_size_t, u_int64_t, bus_size_t);
 
 /* copy */
-void		__C(CHIP,_io_copy_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void		__C(CHIP,_io_copy_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void		__C(CHIP,_io_copy_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void		__C(CHIP,_io_copy_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
+void		__C(CHIP,_io_copy_1)(void *, bus_space_handle_t,
+		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void		__C(CHIP,_io_copy_2)(void *, bus_space_handle_t,
+		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void		__C(CHIP,_io_copy_4)(void *, bus_space_handle_t,
+		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void		__C(CHIP,_io_copy_8)(void *, bus_space_handle_t,
+		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
 
 /* read multiple raw */
-void		__C(CHIP,_io_read_raw_multi_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t *, bus_size_t));
-void		__C(CHIP,_io_read_raw_multi_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t *, bus_size_t));
-void		__C(CHIP,_io_read_raw_multi_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t *, bus_size_t));
+void		__C(CHIP,_io_read_raw_multi_2)(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t *, bus_size_t);
+void		__C(CHIP,_io_read_raw_multi_4)(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t *, bus_size_t);
+void		__C(CHIP,_io_read_raw_multi_8)(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t *, bus_size_t);
 
 /* write multiple raw */
-void		__C(CHIP,_io_write_raw_multi_2) __P((void *,
+void		__C(CHIP,_io_write_raw_multi_2)(void *,
 		    bus_space_handle_t, bus_size_t, const u_int8_t *,
-		    bus_size_t));
-void		__C(CHIP,_io_write_raw_multi_4) __P((void *,
+		    bus_size_t);
+void		__C(CHIP,_io_write_raw_multi_4)(void *,
 		    bus_space_handle_t, bus_size_t, const u_int8_t *,
-		    bus_size_t));
-void		__C(CHIP,_io_write_raw_multi_8) __P((void *,
+		    bus_size_t);
+void		__C(CHIP,_io_write_raw_multi_8)(void *,
 		    bus_space_handle_t, bus_size_t, const u_int8_t *,
-		    bus_size_t));
+		    bus_size_t);
 
 static long
     __C(CHIP,_io_ex_storage)[EXTENT_FIXED_STORAGE_SIZE(8) / sizeof(long)];
diff --git a/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c b/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c
index c4b5d2e5675..472c4be0a35 100644
--- a/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c
+++ b/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_bwx_bus_mem_chipdep.c,v 1.4 2001/12/14 00:44:59 nate Exp $ */
+/* $OpenBSD: pci_bwx_bus_mem_chipdep.c,v 1.5 2002/03/14 01:26:27 millert Exp $ */
 /* $NetBSD: pcs_bus_mem_common.c,v 1.15 1996/12/02 22:19:36 cgd Exp $ */
 
 /*
@@ -53,132 +53,132 @@
 #define	__S(S)		__STRING(S)
 
 /* mapping/unmapping */
-int		__C(CHIP,_mem_map) __P((void *, bus_addr_t, bus_size_t, int,
-		    bus_space_handle_t *));
-void		__C(CHIP,_mem_unmap) __P((void *, bus_space_handle_t,
-		    bus_size_t));
-int		__C(CHIP,_mem_subregion) __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_size_t, bus_space_handle_t *));
+int		__C(CHIP,_mem_map)(void *, bus_addr_t, bus_size_t, int,
+		    bus_space_handle_t *);
+void		__C(CHIP,_mem_unmap)(void *, bus_space_handle_t,
+		    bus_size_t);
+int		__C(CHIP,_mem_subregion)(void *, bus_space_handle_t,
+		    bus_size_t, bus_size_t, bus_space_handle_t *);
 
 /* allocation/deallocation */
-int		__C(CHIP,_mem_alloc) __P((void *, bus_addr_t, bus_addr_t,
+int		__C(CHIP,_mem_alloc)(void *, bus_addr_t, bus_addr_t,
 		    bus_size_t, bus_size_t, bus_addr_t, int, bus_addr_t *,
-                    bus_space_handle_t *));
-void		__C(CHIP,_mem_free) __P((void *, bus_space_handle_t,
-		    bus_size_t));
+                    bus_space_handle_t *);
+void		__C(CHIP,_mem_free)(void *, bus_space_handle_t,
+		    bus_size_t);
 
 /* barrier */
-inline void	__C(CHIP,_mem_barrier) __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_size_t, int));
+inline void	__C(CHIP,_mem_barrier)(void *, bus_space_handle_t,
+		    bus_size_t, bus_size_t, int);
 
 /* read (single) */
-inline u_int8_t	__C(CHIP,_mem_read_1) __P((void *, bus_space_handle_t,
-		    bus_size_t));
-inline u_int16_t __C(CHIP,_mem_read_2) __P((void *, bus_space_handle_t,
-		    bus_size_t));
-inline u_int32_t __C(CHIP,_mem_read_4) __P((void *, bus_space_handle_t,
-		    bus_size_t));
-inline u_int64_t __C(CHIP,_mem_read_8) __P((void *, bus_space_handle_t,
-		    bus_size_t));
+inline u_int8_t	__C(CHIP,_mem_read_1)(void *, bus_space_handle_t,
+		    bus_size_t);
+inline u_int16_t __C(CHIP,_mem_read_2)(void *, bus_space_handle_t,
+		    bus_size_t);
+inline u_int32_t __C(CHIP,_mem_read_4)(void *, bus_space_handle_t,
+		    bus_size_t);
+inline u_int64_t __C(CHIP,_mem_read_8)(void *, bus_space_handle_t,
+		    bus_size_t);
 
 /* read multiple */
-void		__C(CHIP,_mem_read_multi_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t *, bus_size_t));
-void		__C(CHIP,_mem_read_multi_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int16_t *, bus_size_t));
-void		__C(CHIP,_mem_read_multi_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int32_t *, bus_size_t));
-void		__C(CHIP,_mem_read_multi_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int64_t *, bus_size_t));
+void		__C(CHIP,_mem_read_multi_1)(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t *, bus_size_t);
+void		__C(CHIP,_mem_read_multi_2)(void *, bus_space_handle_t,
+		    bus_size_t, u_int16_t *, bus_size_t);
+void		__C(CHIP,_mem_read_multi_4)(void *, bus_space_handle_t,
+		    bus_size_t, u_int32_t *, bus_size_t);
+void		__C(CHIP,_mem_read_multi_8)(void *, bus_space_handle_t,
+		    bus_size_t, u_int64_t *, bus_size_t);
 
 /* read region */
-void		__C(CHIP,_mem_read_region_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t *, bus_size_t));
-void		__C(CHIP,_mem_read_region_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int16_t *, bus_size_t));
-void		__C(CHIP,_mem_read_region_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int32_t *, bus_size_t));
-void		__C(CHIP,_mem_read_region_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int64_t *, bus_size_t));
+void		__C(CHIP,_mem_read_region_1)(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t *, bus_size_t);
+void		__C(CHIP,_mem_read_region_2)(void *, bus_space_handle_t,
+		    bus_size_t, u_int16_t *, bus_size_t);
+void		__C(CHIP,_mem_read_region_4)(void *, bus_space_handle_t,
+		    bus_size_t, u_int32_t *, bus_size_t);
+void		__C(CHIP,_mem_read_region_8)(void *, bus_space_handle_t,
+		    bus_size_t, u_int64_t *, bus_size_t);
 
 /* write (single) */
-inline void	__C(CHIP,_mem_write_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t));
-inline void	__C(CHIP,_mem_write_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int16_t));
-inline void	__C(CHIP,_mem_write_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int32_t));
-inline void	__C(CHIP,_mem_write_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int64_t));
+inline void	__C(CHIP,_mem_write_1)(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t);
+inline void	__C(CHIP,_mem_write_2)(void *, bus_space_handle_t,
+		    bus_size_t, u_int16_t);
+inline void	__C(CHIP,_mem_write_4)(void *, bus_space_handle_t,
+		    bus_size_t, u_int32_t);
+inline void	__C(CHIP,_mem_write_8)(void *, bus_space_handle_t,
+		    bus_size_t, u_int64_t);
 
 /* write multiple */
-void		__C(CHIP,_mem_write_multi_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int8_t *, bus_size_t));
-void		__C(CHIP,_mem_write_multi_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int16_t *, bus_size_t));
-void		__C(CHIP,_mem_write_multi_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int32_t *, bus_size_t));
-void		__C(CHIP,_mem_write_multi_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int64_t *, bus_size_t));
+void		__C(CHIP,_mem_write_multi_1)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int8_t *, bus_size_t);
+void		__C(CHIP,_mem_write_multi_2)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int16_t *, bus_size_t);
+void		__C(CHIP,_mem_write_multi_4)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int32_t *, bus_size_t);
+void		__C(CHIP,_mem_write_multi_8)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int64_t *, bus_size_t);
 
 /* write region */
-void		__C(CHIP,_mem_write_region_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int8_t *, bus_size_t));
-void		__C(CHIP,_mem_write_region_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int16_t *, bus_size_t));
-void		__C(CHIP,_mem_write_region_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int32_t *, bus_size_t));
-void		__C(CHIP,_mem_write_region_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int64_t *, bus_size_t));
+void		__C(CHIP,_mem_write_region_1)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int8_t *, bus_size_t);
+void		__C(CHIP,_mem_write_region_2)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int16_t *, bus_size_t);
+void		__C(CHIP,_mem_write_region_4)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int32_t *, bus_size_t);
+void		__C(CHIP,_mem_write_region_8)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int64_t *, bus_size_t);
 
 /* set multiple */
-void		__C(CHIP,_mem_set_multi_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t, bus_size_t));
-void		__C(CHIP,_mem_set_multi_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int16_t, bus_size_t));
-void		__C(CHIP,_mem_set_multi_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int32_t, bus_size_t));
-void		__C(CHIP,_mem_set_multi_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int64_t, bus_size_t));
+void		__C(CHIP,_mem_set_multi_1)(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t, bus_size_t);
+void		__C(CHIP,_mem_set_multi_2)(void *, bus_space_handle_t,
+		    bus_size_t, u_int16_t, bus_size_t);
+void		__C(CHIP,_mem_set_multi_4)(void *, bus_space_handle_t,
+		    bus_size_t, u_int32_t, bus_size_t);
+void		__C(CHIP,_mem_set_multi_8)(void *, bus_space_handle_t,
+		    bus_size_t, u_int64_t, bus_size_t);
 
 /* set region */
-void		__C(CHIP,_mem_set_region_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t, bus_size_t));
-void		__C(CHIP,_mem_set_region_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int16_t, bus_size_t));
-void		__C(CHIP,_mem_set_region_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int32_t, bus_size_t));
-void		__C(CHIP,_mem_set_region_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int64_t, bus_size_t));
+void		__C(CHIP,_mem_set_region_1)(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t, bus_size_t);
+void		__C(CHIP,_mem_set_region_2)(void *, bus_space_handle_t,
+		    bus_size_t, u_int16_t, bus_size_t);
+void		__C(CHIP,_mem_set_region_4)(void *, bus_space_handle_t,
+		    bus_size_t, u_int32_t, bus_size_t);
+void		__C(CHIP,_mem_set_region_8)(void *, bus_space_handle_t,
+		    bus_size_t, u_int64_t, bus_size_t);
 
 /* copy */
-void		__C(CHIP,_mem_copy_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void		__C(CHIP,_mem_copy_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void		__C(CHIP,_mem_copy_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void		__C(CHIP,_mem_copy_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
+void		__C(CHIP,_mem_copy_1)(void *, bus_space_handle_t,
+		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void		__C(CHIP,_mem_copy_2)(void *, bus_space_handle_t,
+		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void		__C(CHIP,_mem_copy_4)(void *, bus_space_handle_t,
+		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void		__C(CHIP,_mem_copy_8)(void *, bus_space_handle_t,
+		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
 
 /* read multiple raw */
-void		__C(CHIP,_mem_read_raw_multi_2) __P((void *,
-		    bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t));
-void		__C(CHIP,_mem_read_raw_multi_4) __P((void *,
-		    bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t));
-void		__C(CHIP,_mem_read_raw_multi_8) __P((void *,
-		    bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t));
+void		__C(CHIP,_mem_read_raw_multi_2)(void *,
+		    bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t);
+void		__C(CHIP,_mem_read_raw_multi_4)(void *,
+		    bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t);
+void		__C(CHIP,_mem_read_raw_multi_8)(void *,
+		    bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t);
 
 /* write multiple raw */
-void		__C(CHIP,_mem_write_raw_multi_2) __P((void *,
+void		__C(CHIP,_mem_write_raw_multi_2)(void *,
 		    bus_space_handle_t, bus_size_t, const u_int8_t *,
-		    bus_size_t));
-void		__C(CHIP,_mem_write_raw_multi_4) __P((void *,
+		    bus_size_t);
+void		__C(CHIP,_mem_write_raw_multi_4)(void *,
 		    bus_space_handle_t, bus_size_t, const u_int8_t *,
-		    bus_size_t));
-void		__C(CHIP,_mem_write_raw_multi_8) __P((void *,
+		    bus_size_t);
+void		__C(CHIP,_mem_write_raw_multi_8)(void *,
 		    bus_space_handle_t, bus_size_t, const u_int8_t *,
-		    bus_size_t));
+		    bus_size_t);
 
 static long
     __C(CHIP,_mem_ex_storage)[EXTENT_FIXED_STORAGE_SIZE(8) / sizeof(long)];
diff --git a/sys/arch/alpha/pci/pci_eb164.c b/sys/arch/alpha/pci/pci_eb164.c
index f77641ac0ab..6b49fb3de66 100644
--- a/sys/arch/alpha/pci/pci_eb164.c
+++ b/sys/arch/alpha/pci/pci_eb164.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_eb164.c,v 1.12 2001/12/14 00:44:59 nate Exp $ */
+/* $OpenBSD: pci_eb164.c,v 1.13 2002/03/14 01:26:27 millert Exp $ */
 /* $NetBSD: pci_eb164.c,v 1.27 2000/06/06 00:50:15 thorpej Exp $ */
 
 /*-
@@ -94,18 +94,18 @@
 #include <alpha/pci/siovar.h>
 #endif
 
-int	dec_eb164_intr_map __P((void *, pcitag_t, int, int,
-	    pci_intr_handle_t *));
-const char *dec_eb164_intr_string __P((void *, pci_intr_handle_t));
-int	dec_eb164_intr_line __P((void *, pci_intr_handle_t));
-const struct evcnt *dec_eb164_intr_evcnt __P((void *, pci_intr_handle_t));
+int	dec_eb164_intr_map(void *, pcitag_t, int, int,
+	    pci_intr_handle_t *);
+const char *dec_eb164_intr_string(void *, pci_intr_handle_t);
+int	dec_eb164_intr_line(void *, pci_intr_handle_t);
+const struct evcnt *dec_eb164_intr_evcnt(void *, pci_intr_handle_t);
 void	*dec_eb164_intr_establish __P((void *, pci_intr_handle_t,
 	    int, int (*func)(void *), void *, char *));
-void	dec_eb164_intr_disestablish __P((void *, void *));
+void	dec_eb164_intr_disestablish(void *, void *);
 
 void	*dec_eb164_pciide_compat_intr_establish __P((void *, struct device *,
 	    struct pci_attach_args *, int, int (*)(void *), void *));
-void    dec_eb164_pciide_compat_intr_disestablish __P((void *, void *));
+void    dec_eb164_pciide_compat_intr_disestablish(void *, void *);
 
 #define	EB164_SIO_IRQ	4  
 #define	EB164_MAX_IRQ	24
@@ -116,9 +116,9 @@ struct alpha_shared_intr *eb164_pci_intr;
 bus_space_tag_t eb164_intrgate_iot;
 bus_space_handle_t eb164_intrgate_ioh;
 
-void	eb164_iointr __P((void *framep, unsigned long vec));
-extern void	eb164_intr_enable __P((int irq));	/* pci_eb164_intr.S */
-extern void	eb164_intr_disable __P((int irq));	/* pci_eb164_intr.S */
+void	eb164_iointr(void *framep, unsigned long vec);
+extern void	eb164_intr_enable(int irq);	/* pci_eb164_intr.S */
+extern void	eb164_intr_disable(int irq);	/* pci_eb164_intr.S */
 
 void
 pci_eb164_pickintr(ccp)
@@ -270,7 +270,7 @@ dec_eb164_intr_establish(ccv, ih, level, func, arg, name)
         void *ccv, *arg;
         pci_intr_handle_t ih;
         int level;
-        int (*func) __P((void *));
+        int (*func)(void *);
 	char *name;
 {
 #if 0
@@ -319,7 +319,7 @@ dec_eb164_pciide_compat_intr_establish(v, dev, pa, chan, func, arg)
 	struct device *dev;
 	struct pci_attach_args *pa;
 	int chan;
-	int (*func) __P((void *));
+	int (*func)(void *);
 	void *arg;
 {
 	pci_chipset_tag_t pc = pa->pa_pc;
diff --git a/sys/arch/alpha/pci/pci_eb164.h b/sys/arch/alpha/pci/pci_eb164.h
index 3f75ae406b4..71521177906 100644
--- a/sys/arch/alpha/pci/pci_eb164.h
+++ b/sys/arch/alpha/pci/pci_eb164.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_eb164.h,v 1.2 1997/11/10 15:53:12 niklas Exp $	*/
+/*	$OpenBSD: pci_eb164.h,v 1.3 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: pci_eb164.h,v 1.1 1996/11/11 21:08:13 cgd Exp $	*/
 
 /*
@@ -28,7 +28,7 @@
  * rights to redistribute these changes.
  */
 
-void	pci_eb164_pickintr __P((struct cia_config *));
+void	pci_eb164_pickintr(struct cia_config *);
 
 #ifdef EVCNT_COUNTERS
 extern struct evcnt eb164_intr_evcnt;
diff --git a/sys/arch/alpha/pci/pci_eb64plus.c b/sys/arch/alpha/pci/pci_eb64plus.c
index 54bac7181fa..fef0dcc99b8 100644
--- a/sys/arch/alpha/pci/pci_eb64plus.c
+++ b/sys/arch/alpha/pci/pci_eb64plus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_eb64plus.c,v 1.1 2002/01/23 03:20:41 ericj Exp $ */
+/* $OpenBSD: pci_eb64plus.c,v 1.2 2002/03/14 01:26:27 millert Exp $ */
 /* $NetBSD: pci_eb64plus.c,v 1.10 2001/07/27 00:25:20 thorpej Exp $ */
 
 /*-
@@ -91,13 +91,13 @@
 #include <alpha/pci/siovar.h>
 #endif
 
-int	dec_eb64plus_intr_map __P((void *, pcitag_t, int, int,
-	    pci_intr_handle_t *));
-const char *dec_eb64plus_intr_string __P((void *, pci_intr_handle_t));
-const struct evcnt *dec_eb64plus_intr_evcnt __P((void *, pci_intr_handle_t));
+int	dec_eb64plus_intr_map(void *, pcitag_t, int, int,
+	    pci_intr_handle_t *);
+const char *dec_eb64plus_intr_string(void *, pci_intr_handle_t);
+const struct evcnt *dec_eb64plus_intr_evcnt(void *, pci_intr_handle_t);
 void	*dec_eb64plus_intr_establish __P((void *, pci_intr_handle_t,
 	    int, int (*func)(void *), void *, char *));
-void	dec_eb64plus_intr_disestablish __P((void *, void *));
+void	dec_eb64plus_intr_disestablish(void *, void *);
 
 #define	EB64PLUS_MAX_IRQ	32
 #define	PCI_STRAY_MAX		5
@@ -107,9 +107,9 @@ struct alpha_shared_intr *eb64plus_pci_intr;
 bus_space_tag_t eb64plus_intrgate_iot;
 bus_space_handle_t eb64plus_intrgate_ioh;
 
-void	eb64plus_iointr __P((void *arg, unsigned long vec));
-extern void	eb64plus_intr_enable __P((int irq));  /* pci_eb64plus_intr.S */
-extern void	eb64plus_intr_disable __P((int irq)); /* pci_eb64plus_intr.S */
+void	eb64plus_iointr(void *arg, unsigned long vec);
+extern void	eb64plus_intr_enable(int irq);  /* pci_eb64plus_intr.S */
+extern void	eb64plus_intr_disable(int irq); /* pci_eb64plus_intr.S */
 
 void
 pci_eb64plus_pickintr(acp)
@@ -205,7 +205,7 @@ dec_eb64plus_intr_establish(acv, ih, level, func, arg, name)
         void *acv;
         pci_intr_handle_t ih;
         int level;
-        int (*func) __P((void *));
+        int (*func)(void *);
 	void *arg;
 	char *name;
 {
diff --git a/sys/arch/alpha/pci/pci_eb64plus.h b/sys/arch/alpha/pci/pci_eb64plus.h
index d720089b8c2..84ebe2b62cc 100644
--- a/sys/arch/alpha/pci/pci_eb64plus.h
+++ b/sys/arch/alpha/pci/pci_eb64plus.h
@@ -28,4 +28,4 @@
  * rights to redistribute these changes.
  */
 
-void	pci_eb64plus_pickintr __P((struct apecs_config *));
+void	pci_eb64plus_pickintr(struct apecs_config *);
diff --git a/sys/arch/alpha/pci/pci_kn20aa.c b/sys/arch/alpha/pci/pci_kn20aa.c
index 2df7083d2b0..de876552622 100644
--- a/sys/arch/alpha/pci/pci_kn20aa.c
+++ b/sys/arch/alpha/pci/pci_kn20aa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_kn20aa.c,v 1.16 2001/12/14 00:44:59 nate Exp $	*/
+/*	$OpenBSD: pci_kn20aa.c,v 1.17 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: pci_kn20aa.c,v 1.21 1996/11/17 02:05:27 cgd Exp $	*/
 
 /*
@@ -58,13 +58,13 @@
 #include <alpha/pci/siovar.h>
 #endif
 
-int	dec_kn20aa_intr_map __P((void *, pcitag_t, int, int,
-	    pci_intr_handle_t *));
-const char *dec_kn20aa_intr_string __P((void *, pci_intr_handle_t));
-int	dec_kn20aa_intr_line __P((void *, pci_intr_handle_t));
+int	dec_kn20aa_intr_map(void *, pcitag_t, int, int,
+	    pci_intr_handle_t *);
+const char *dec_kn20aa_intr_string(void *, pci_intr_handle_t);
+int	dec_kn20aa_intr_line(void *, pci_intr_handle_t);
 void	*dec_kn20aa_intr_establish __P((void *, pci_intr_handle_t,
 	    int, int (*func)(void *), void *, char *));
-void	dec_kn20aa_intr_disestablish __P((void *, void *));
+void	dec_kn20aa_intr_disestablish(void *, void *);
 
 #define	KN20AA_PCEB_IRQ	31
 #define	KN20AA_MAX_IRQ	32
@@ -75,9 +75,9 @@ struct alpha_shared_intr *kn20aa_pci_intr;
 struct evcnt kn20aa_intr_evcnt;
 #endif
 
-void	kn20aa_iointr __P((void *framep, unsigned long vec));
-void	kn20aa_enable_intr __P((int irq));
-void	kn20aa_disable_intr __P((int irq));
+void	kn20aa_iointr(void *framep, unsigned long vec);
+void	kn20aa_enable_intr(int irq);
+void	kn20aa_disable_intr(int irq);
 
 void
 pci_kn20aa_pickintr(ccp)
@@ -204,7 +204,7 @@ dec_kn20aa_intr_establish(ccv, ih, level, func, arg, name)
         void *ccv, *arg;
         pci_intr_handle_t ih;
         int level;
-        int (*func) __P((void *));
+        int (*func)(void *);
 	char *name;
 {           
 	void *cookie;
diff --git a/sys/arch/alpha/pci/pci_kn20aa.h b/sys/arch/alpha/pci/pci_kn20aa.h
index f4abae0c91a..8f656d4406e 100644
--- a/sys/arch/alpha/pci/pci_kn20aa.h
+++ b/sys/arch/alpha/pci/pci_kn20aa.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_kn20aa.h,v 1.4 1996/10/30 22:40:07 niklas Exp $	*/
+/*	$OpenBSD: pci_kn20aa.h,v 1.5 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: pci_kn20aa.h,v 1.2 1996/04/13 00:24:35 cgd Exp $	*/
 
 /*
@@ -28,7 +28,7 @@
  * rights to redistribute these changes.
  */
 
-void	pci_kn20aa_pickintr __P((struct cia_config *));
+void	pci_kn20aa_pickintr(struct cia_config *);
 
 #ifdef EVCNT_COUNTERS
 extern struct evcnt kn20aa_intr_evcnt;
diff --git a/sys/arch/alpha/pci/pci_machdep.c b/sys/arch/alpha/pci/pci_machdep.c
index 00e3d4868da..1ee73b71cab 100644
--- a/sys/arch/alpha/pci/pci_machdep.c
+++ b/sys/arch/alpha/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.c,v 1.15 2001/11/06 19:53:13 miod Exp $	*/
+/*	$OpenBSD: pci_machdep.c,v 1.16 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: pci_machdep.c,v 1.7 1996/11/19 04:57:32 cgd Exp $	*/
 
 /*
@@ -71,8 +71,8 @@ pci_display_console(iot, memt, pc, bus, device, function)
 #if NVGA_PCI || NTGA
 	int nmatch;
 #endif
-	int (*fn) __P((bus_space_tag_t, bus_space_tag_t, pci_chipset_tag_t,
-	    int, int, int));
+	int (*fn)(bus_space_tag_t, bus_space_tag_t, pci_chipset_tag_t,
+	    int, int, int);
 
 	tag = pci_make_tag(pc, bus, device, function);
 	id = pci_conf_read(pc, tag, PCI_ID_REG);
diff --git a/sys/arch/alpha/pci/pci_machdep.h b/sys/arch/alpha/pci/pci_machdep.h
index d5462235c0e..e2ac0b6ed45 100644
--- a/sys/arch/alpha/pci/pci_machdep.h
+++ b/sys/arch/alpha/pci/pci_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.h,v 1.17 2001/11/04 23:12:46 art Exp $	*/
+/*	$OpenBSD: pci_machdep.h,v 1.18 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: pci_machdep.h,v 1.6 1996/11/19 04:49:21 cgd Exp $	*/
 
 /*
@@ -50,30 +50,30 @@ struct pci_attach_args;
  */
 struct alpha_pci_chipset {
 	void		*pc_conf_v;
-	void		(*pc_attach_hook) __P((struct device *,
-			    struct device *, struct pcibus_attach_args *));
-	int		(*pc_bus_maxdevs) __P((void *, int));
-	pcitag_t	(*pc_make_tag) __P((void *, int, int, int));
-	void		(*pc_decompose_tag) __P((void *, pcitag_t, int *,
-			    int *, int *));
-	pcireg_t	(*pc_conf_read) __P((void *, pcitag_t, int));
-	void		(*pc_conf_write) __P((void *, pcitag_t, int, pcireg_t));
+	void		(*pc_attach_hook)(struct device *,
+			    struct device *, struct pcibus_attach_args *);
+	int		(*pc_bus_maxdevs)(void *, int);
+	pcitag_t	(*pc_make_tag)(void *, int, int, int);
+	void		(*pc_decompose_tag)(void *, pcitag_t, int *,
+			    int *, int *);
+	pcireg_t	(*pc_conf_read)(void *, pcitag_t, int);
+	void		(*pc_conf_write)(void *, pcitag_t, int, pcireg_t);
 
 	void		*pc_intr_v;
-	int		(*pc_intr_map) __P((void *, pcitag_t, int, int,
-			    pci_intr_handle_t *));
-	const char	*(*pc_intr_string) __P((void *, pci_intr_handle_t));
-	int		(*pc_intr_line) __P((void *, pci_intr_handle_t));
+	int		(*pc_intr_map)(void *, pcitag_t, int, int,
+			    pci_intr_handle_t *);
+	const char	*(*pc_intr_string)(void *, pci_intr_handle_t);
+	int		(*pc_intr_line)(void *, pci_intr_handle_t);
 	void		*(*pc_intr_establish) __P((void *, pci_intr_handle_t,
 			    int, int (*)(void *), void *, char *));
-	void		(*pc_intr_disestablish) __P((void *, void *));
+	void		(*pc_intr_disestablish)(void *, void *);
 
         /* alpha-specific */
         void            *(*pc_pciide_compat_intr_establish) __P((void *,
                             struct device *, struct pci_attach_args *, int,
                             int (*)(void *), void *));
-	void            (*pc_pciide_compat_intr_disestablish) __P((void *,
-			    void *));
+	void            (*pc_pciide_compat_intr_disestablish)(void *,
+			    void *);
 	char 		*pc_name;	/* PCI chipset name */
 	vaddr_t		pc_mem;		/* PCI memory address */
 	vaddr_t		pc_dense;	/* PCI dense memory address */
@@ -116,8 +116,8 @@ int alpha_sysctl_chipset(int *, u_int, char *, size_t *);
  * alpha-specific PCI functions.
  * NOT TO BE USED DIRECTLY BY MACHINE INDEPENDENT CODE.
  */
-void	pci_display_console __P((bus_space_tag_t, bus_space_tag_t,
-	    pci_chipset_tag_t, int, int, int));
+void	pci_display_console(bus_space_tag_t, bus_space_tag_t,
+	    pci_chipset_tag_t, int, int, int);
 #define alpha_pci_decompose_tag(c, t, bp, dp, fp)			\
     (*(c)->pc_decompose_tag)((c)->pc_conf_v, (t), (bp), (dp), (fp))
 #define alpha_pciide_compat_intr_establish(c, d, p, ch, f, a)		\
@@ -131,6 +131,5 @@ void	pci_display_console __P((bus_space_tag_t, bus_space_tag_t,
             (cookie)); } while (0)
 
 #ifdef _KERNEL
-void pci_display_console
-    __P((bus_space_tag_t, bus_space_tag_t, pci_chipset_tag_t, int, int, int));
+void pci_display_console(bus_space_tag_t, bus_space_tag_t, pci_chipset_tag_t, int, int, int);
 #endif /* _KERNEL */
diff --git a/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c b/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c
index eb642b303dc..d5de92e3233 100644
--- a/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c
+++ b/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_swiz_bus_io_chipdep.c,v 1.2 2001/12/14 00:44:59 nate Exp $	*/
+/*	$OpenBSD: pci_swiz_bus_io_chipdep.c,v 1.3 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: pcs_bus_io_common.c,v 1.14 1996/12/02 22:19:35 cgd Exp $	*/
 
 /*
@@ -43,132 +43,132 @@
 #define	__S(S)		__STRING(S)
 
 /* mapping/unmapping */
-int		__C(CHIP,_io_map) __P((void *, bus_addr_t, bus_size_t, int,
-		    bus_space_handle_t *));
-void		__C(CHIP,_io_unmap) __P((void *, bus_space_handle_t,
-		    bus_size_t));
-int		__C(CHIP,_io_subregion) __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_size_t, bus_space_handle_t *));
+int		__C(CHIP,_io_map)(void *, bus_addr_t, bus_size_t, int,
+		    bus_space_handle_t *);
+void		__C(CHIP,_io_unmap)(void *, bus_space_handle_t,
+		    bus_size_t);
+int		__C(CHIP,_io_subregion)(void *, bus_space_handle_t,
+		    bus_size_t, bus_size_t, bus_space_handle_t *);
 
 /* allocation/deallocation */
-int		__C(CHIP,_io_alloc) __P((void *, bus_addr_t, bus_addr_t,
+int		__C(CHIP,_io_alloc)(void *, bus_addr_t, bus_addr_t,
 		    bus_size_t, bus_size_t, bus_addr_t, int, bus_addr_t *,
-                    bus_space_handle_t *));
-void		__C(CHIP,_io_free) __P((void *, bus_space_handle_t,
-		    bus_size_t));
+                    bus_space_handle_t *);
+void		__C(CHIP,_io_free)(void *, bus_space_handle_t,
+		    bus_size_t);
 
 /* barrier */
-inline void	__C(CHIP,_io_barrier) __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_size_t, int));
+inline void	__C(CHIP,_io_barrier)(void *, bus_space_handle_t,
+		    bus_size_t, bus_size_t, int);
 
 /* read (single) */
-inline u_int8_t	__C(CHIP,_io_read_1) __P((void *, bus_space_handle_t,
-		    bus_size_t));
-inline u_int16_t __C(CHIP,_io_read_2) __P((void *, bus_space_handle_t,
-		    bus_size_t));
-inline u_int32_t __C(CHIP,_io_read_4) __P((void *, bus_space_handle_t,
-		    bus_size_t));
-inline u_int64_t __C(CHIP,_io_read_8) __P((void *, bus_space_handle_t,
-		    bus_size_t));
+inline u_int8_t	__C(CHIP,_io_read_1)(void *, bus_space_handle_t,
+		    bus_size_t);
+inline u_int16_t __C(CHIP,_io_read_2)(void *, bus_space_handle_t,
+		    bus_size_t);
+inline u_int32_t __C(CHIP,_io_read_4)(void *, bus_space_handle_t,
+		    bus_size_t);
+inline u_int64_t __C(CHIP,_io_read_8)(void *, bus_space_handle_t,
+		    bus_size_t);
 
 /* read multiple */
-void		__C(CHIP,_io_read_multi_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t *, bus_size_t));
-void		__C(CHIP,_io_read_multi_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int16_t *, bus_size_t));
-void		__C(CHIP,_io_read_multi_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int32_t *, bus_size_t));
-void		__C(CHIP,_io_read_multi_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int64_t *, bus_size_t));
+void		__C(CHIP,_io_read_multi_1)(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t *, bus_size_t);
+void		__C(CHIP,_io_read_multi_2)(void *, bus_space_handle_t,
+		    bus_size_t, u_int16_t *, bus_size_t);
+void		__C(CHIP,_io_read_multi_4)(void *, bus_space_handle_t,
+		    bus_size_t, u_int32_t *, bus_size_t);
+void		__C(CHIP,_io_read_multi_8)(void *, bus_space_handle_t,
+		    bus_size_t, u_int64_t *, bus_size_t);
 
 /* read region */
-void		__C(CHIP,_io_read_region_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t *, bus_size_t));
-void		__C(CHIP,_io_read_region_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int16_t *, bus_size_t));
-void		__C(CHIP,_io_read_region_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int32_t *, bus_size_t));
-void		__C(CHIP,_io_read_region_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int64_t *, bus_size_t));
+void		__C(CHIP,_io_read_region_1)(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t *, bus_size_t);
+void		__C(CHIP,_io_read_region_2)(void *, bus_space_handle_t,
+		    bus_size_t, u_int16_t *, bus_size_t);
+void		__C(CHIP,_io_read_region_4)(void *, bus_space_handle_t,
+		    bus_size_t, u_int32_t *, bus_size_t);
+void		__C(CHIP,_io_read_region_8)(void *, bus_space_handle_t,
+		    bus_size_t, u_int64_t *, bus_size_t);
 
 /* write (single) */
-inline void	__C(CHIP,_io_write_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t));
-inline void	__C(CHIP,_io_write_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int16_t));
-inline void	__C(CHIP,_io_write_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int32_t));
-inline void	__C(CHIP,_io_write_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int64_t));
+inline void	__C(CHIP,_io_write_1)(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t);
+inline void	__C(CHIP,_io_write_2)(void *, bus_space_handle_t,
+		    bus_size_t, u_int16_t);
+inline void	__C(CHIP,_io_write_4)(void *, bus_space_handle_t,
+		    bus_size_t, u_int32_t);
+inline void	__C(CHIP,_io_write_8)(void *, bus_space_handle_t,
+		    bus_size_t, u_int64_t);
 
 /* write multiple */
-void		__C(CHIP,_io_write_multi_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int8_t *, bus_size_t));
-void		__C(CHIP,_io_write_multi_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int16_t *, bus_size_t));
-void		__C(CHIP,_io_write_multi_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int32_t *, bus_size_t));
-void		__C(CHIP,_io_write_multi_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int64_t *, bus_size_t));
+void		__C(CHIP,_io_write_multi_1)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int8_t *, bus_size_t);
+void		__C(CHIP,_io_write_multi_2)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int16_t *, bus_size_t);
+void		__C(CHIP,_io_write_multi_4)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int32_t *, bus_size_t);
+void		__C(CHIP,_io_write_multi_8)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int64_t *, bus_size_t);
 
 /* write region */
-void		__C(CHIP,_io_write_region_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int8_t *, bus_size_t));
-void		__C(CHIP,_io_write_region_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int16_t *, bus_size_t));
-void		__C(CHIP,_io_write_region_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int32_t *, bus_size_t));
-void		__C(CHIP,_io_write_region_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int64_t *, bus_size_t));
+void		__C(CHIP,_io_write_region_1)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int8_t *, bus_size_t);
+void		__C(CHIP,_io_write_region_2)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int16_t *, bus_size_t);
+void		__C(CHIP,_io_write_region_4)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int32_t *, bus_size_t);
+void		__C(CHIP,_io_write_region_8)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int64_t *, bus_size_t);
 
 /* set multiple */
-void		__C(CHIP,_io_set_multi_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t, bus_size_t));
-void		__C(CHIP,_io_set_multi_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int16_t, bus_size_t));
-void		__C(CHIP,_io_set_multi_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int32_t, bus_size_t));
-void		__C(CHIP,_io_set_multi_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int64_t, bus_size_t));
+void		__C(CHIP,_io_set_multi_1)(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t, bus_size_t);
+void		__C(CHIP,_io_set_multi_2)(void *, bus_space_handle_t,
+		    bus_size_t, u_int16_t, bus_size_t);
+void		__C(CHIP,_io_set_multi_4)(void *, bus_space_handle_t,
+		    bus_size_t, u_int32_t, bus_size_t);
+void		__C(CHIP,_io_set_multi_8)(void *, bus_space_handle_t,
+		    bus_size_t, u_int64_t, bus_size_t);
 
 /* set region */
-void		__C(CHIP,_io_set_region_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t, bus_size_t));
-void		__C(CHIP,_io_set_region_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int16_t, bus_size_t));
-void		__C(CHIP,_io_set_region_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int32_t, bus_size_t));
-void		__C(CHIP,_io_set_region_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int64_t, bus_size_t));
+void		__C(CHIP,_io_set_region_1)(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t, bus_size_t);
+void		__C(CHIP,_io_set_region_2)(void *, bus_space_handle_t,
+		    bus_size_t, u_int16_t, bus_size_t);
+void		__C(CHIP,_io_set_region_4)(void *, bus_space_handle_t,
+		    bus_size_t, u_int32_t, bus_size_t);
+void		__C(CHIP,_io_set_region_8)(void *, bus_space_handle_t,
+		    bus_size_t, u_int64_t, bus_size_t);
 
 /* copy */
-void		__C(CHIP,_io_copy_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void		__C(CHIP,_io_copy_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void		__C(CHIP,_io_copy_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void		__C(CHIP,_io_copy_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
+void		__C(CHIP,_io_copy_1)(void *, bus_space_handle_t,
+		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void		__C(CHIP,_io_copy_2)(void *, bus_space_handle_t,
+		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void		__C(CHIP,_io_copy_4)(void *, bus_space_handle_t,
+		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void		__C(CHIP,_io_copy_8)(void *, bus_space_handle_t,
+		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
 
 /* read multiple raw */
-void		__C(CHIP,_io_read_raw_multi_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t *, bus_size_t));
-void		__C(CHIP,_io_read_raw_multi_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t *, bus_size_t));
-void		__C(CHIP,_io_read_raw_multi_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t *, bus_size_t));
+void		__C(CHIP,_io_read_raw_multi_2)(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t *, bus_size_t);
+void		__C(CHIP,_io_read_raw_multi_4)(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t *, bus_size_t);
+void		__C(CHIP,_io_read_raw_multi_8)(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t *, bus_size_t);
 
 /* write multiple raw */
-void		__C(CHIP,_io_write_raw_multi_2) __P((void *,
+void		__C(CHIP,_io_write_raw_multi_2)(void *,
 		    bus_space_handle_t, bus_size_t, const u_int8_t *,
-		    bus_size_t));
-void		__C(CHIP,_io_write_raw_multi_4) __P((void *,
+		    bus_size_t);
+void		__C(CHIP,_io_write_raw_multi_4)(void *,
 		    bus_space_handle_t, bus_size_t, const u_int8_t *,
-		    bus_size_t));
-void		__C(CHIP,_io_write_raw_multi_8) __P((void *,
+		    bus_size_t);
+void		__C(CHIP,_io_write_raw_multi_8)(void *,
 		    bus_space_handle_t, bus_size_t, const u_int8_t *,
-		    bus_size_t));
+		    bus_size_t);
 
 static long
     __C(CHIP,_io_ex_storage)[EXTENT_FIXED_STORAGE_SIZE(8) / sizeof(long)];
diff --git a/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c b/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c
index 0803038c973..2f7cd2376a3 100644
--- a/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c
+++ b/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_swiz_bus_mem_chipdep.c,v 1.2 2001/12/14 00:44:59 nate Exp $	*/
+/*	$OpenBSD: pci_swiz_bus_mem_chipdep.c,v 1.3 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: pcs_bus_mem_common.c,v 1.15 1996/12/02 22:19:36 cgd Exp $	*/
 
 /*
@@ -44,132 +44,132 @@
 #define	__S(S)		__STRING(S)
 
 /* mapping/unmapping */
-int		__C(CHIP,_mem_map) __P((void *, bus_addr_t, bus_size_t, int,
-		    bus_space_handle_t *));
-void		__C(CHIP,_mem_unmap) __P((void *, bus_space_handle_t,
-		    bus_size_t));
-int		__C(CHIP,_mem_subregion) __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_size_t, bus_space_handle_t *));
+int		__C(CHIP,_mem_map)(void *, bus_addr_t, bus_size_t, int,
+		    bus_space_handle_t *);
+void		__C(CHIP,_mem_unmap)(void *, bus_space_handle_t,
+		    bus_size_t);
+int		__C(CHIP,_mem_subregion)(void *, bus_space_handle_t,
+		    bus_size_t, bus_size_t, bus_space_handle_t *);
 
 /* allocation/deallocation */
-int		__C(CHIP,_mem_alloc) __P((void *, bus_addr_t, bus_addr_t,
+int		__C(CHIP,_mem_alloc)(void *, bus_addr_t, bus_addr_t,
 		    bus_size_t, bus_size_t, bus_addr_t, int, bus_addr_t *,
-                    bus_space_handle_t *));
-void		__C(CHIP,_mem_free) __P((void *, bus_space_handle_t,
-		    bus_size_t));
+                    bus_space_handle_t *);
+void		__C(CHIP,_mem_free)(void *, bus_space_handle_t,
+		    bus_size_t);
 
 /* barrier */
-inline void	__C(CHIP,_mem_barrier) __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_size_t, int));
+inline void	__C(CHIP,_mem_barrier)(void *, bus_space_handle_t,
+		    bus_size_t, bus_size_t, int);
 
 /* read (single) */
-inline u_int8_t	__C(CHIP,_mem_read_1) __P((void *, bus_space_handle_t,
-		    bus_size_t));
-inline u_int16_t __C(CHIP,_mem_read_2) __P((void *, bus_space_handle_t,
-		    bus_size_t));
-inline u_int32_t __C(CHIP,_mem_read_4) __P((void *, bus_space_handle_t,
-		    bus_size_t));
-inline u_int64_t __C(CHIP,_mem_read_8) __P((void *, bus_space_handle_t,
-		    bus_size_t));
+inline u_int8_t	__C(CHIP,_mem_read_1)(void *, bus_space_handle_t,
+		    bus_size_t);
+inline u_int16_t __C(CHIP,_mem_read_2)(void *, bus_space_handle_t,
+		    bus_size_t);
+inline u_int32_t __C(CHIP,_mem_read_4)(void *, bus_space_handle_t,
+		    bus_size_t);
+inline u_int64_t __C(CHIP,_mem_read_8)(void *, bus_space_handle_t,
+		    bus_size_t);
 
 /* read multiple */
-void		__C(CHIP,_mem_read_multi_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t *, bus_size_t));
-void		__C(CHIP,_mem_read_multi_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int16_t *, bus_size_t));
-void		__C(CHIP,_mem_read_multi_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int32_t *, bus_size_t));
-void		__C(CHIP,_mem_read_multi_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int64_t *, bus_size_t));
+void		__C(CHIP,_mem_read_multi_1)(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t *, bus_size_t);
+void		__C(CHIP,_mem_read_multi_2)(void *, bus_space_handle_t,
+		    bus_size_t, u_int16_t *, bus_size_t);
+void		__C(CHIP,_mem_read_multi_4)(void *, bus_space_handle_t,
+		    bus_size_t, u_int32_t *, bus_size_t);
+void		__C(CHIP,_mem_read_multi_8)(void *, bus_space_handle_t,
+		    bus_size_t, u_int64_t *, bus_size_t);
 
 /* read region */
-void		__C(CHIP,_mem_read_region_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t *, bus_size_t));
-void		__C(CHIP,_mem_read_region_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int16_t *, bus_size_t));
-void		__C(CHIP,_mem_read_region_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int32_t *, bus_size_t));
-void		__C(CHIP,_mem_read_region_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int64_t *, bus_size_t));
+void		__C(CHIP,_mem_read_region_1)(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t *, bus_size_t);
+void		__C(CHIP,_mem_read_region_2)(void *, bus_space_handle_t,
+		    bus_size_t, u_int16_t *, bus_size_t);
+void		__C(CHIP,_mem_read_region_4)(void *, bus_space_handle_t,
+		    bus_size_t, u_int32_t *, bus_size_t);
+void		__C(CHIP,_mem_read_region_8)(void *, bus_space_handle_t,
+		    bus_size_t, u_int64_t *, bus_size_t);
 
 /* write (single) */
-inline void	__C(CHIP,_mem_write_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t));
-inline void	__C(CHIP,_mem_write_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int16_t));
-inline void	__C(CHIP,_mem_write_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int32_t));
-inline void	__C(CHIP,_mem_write_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int64_t));
+inline void	__C(CHIP,_mem_write_1)(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t);
+inline void	__C(CHIP,_mem_write_2)(void *, bus_space_handle_t,
+		    bus_size_t, u_int16_t);
+inline void	__C(CHIP,_mem_write_4)(void *, bus_space_handle_t,
+		    bus_size_t, u_int32_t);
+inline void	__C(CHIP,_mem_write_8)(void *, bus_space_handle_t,
+		    bus_size_t, u_int64_t);
 
 /* write multiple */
-void		__C(CHIP,_mem_write_multi_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int8_t *, bus_size_t));
-void		__C(CHIP,_mem_write_multi_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int16_t *, bus_size_t));
-void		__C(CHIP,_mem_write_multi_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int32_t *, bus_size_t));
-void		__C(CHIP,_mem_write_multi_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int64_t *, bus_size_t));
+void		__C(CHIP,_mem_write_multi_1)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int8_t *, bus_size_t);
+void		__C(CHIP,_mem_write_multi_2)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int16_t *, bus_size_t);
+void		__C(CHIP,_mem_write_multi_4)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int32_t *, bus_size_t);
+void		__C(CHIP,_mem_write_multi_8)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int64_t *, bus_size_t);
 
 /* write region */
-void		__C(CHIP,_mem_write_region_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int8_t *, bus_size_t));
-void		__C(CHIP,_mem_write_region_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int16_t *, bus_size_t));
-void		__C(CHIP,_mem_write_region_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int32_t *, bus_size_t));
-void		__C(CHIP,_mem_write_region_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int64_t *, bus_size_t));
+void		__C(CHIP,_mem_write_region_1)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int8_t *, bus_size_t);
+void		__C(CHIP,_mem_write_region_2)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int16_t *, bus_size_t);
+void		__C(CHIP,_mem_write_region_4)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int32_t *, bus_size_t);
+void		__C(CHIP,_mem_write_region_8)(void *, bus_space_handle_t,
+		    bus_size_t, const u_int64_t *, bus_size_t);
 
 /* set multiple */
-void		__C(CHIP,_mem_set_multi_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t, bus_size_t));
-void		__C(CHIP,_mem_set_multi_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int16_t, bus_size_t));
-void		__C(CHIP,_mem_set_multi_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int32_t, bus_size_t));
-void		__C(CHIP,_mem_set_multi_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int64_t, bus_size_t));
+void		__C(CHIP,_mem_set_multi_1)(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t, bus_size_t);
+void		__C(CHIP,_mem_set_multi_2)(void *, bus_space_handle_t,
+		    bus_size_t, u_int16_t, bus_size_t);
+void		__C(CHIP,_mem_set_multi_4)(void *, bus_space_handle_t,
+		    bus_size_t, u_int32_t, bus_size_t);
+void		__C(CHIP,_mem_set_multi_8)(void *, bus_space_handle_t,
+		    bus_size_t, u_int64_t, bus_size_t);
 
 /* set region */
-void		__C(CHIP,_mem_set_region_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t, bus_size_t));
-void		__C(CHIP,_mem_set_region_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int16_t, bus_size_t));
-void		__C(CHIP,_mem_set_region_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int32_t, bus_size_t));
-void		__C(CHIP,_mem_set_region_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int64_t, bus_size_t));
+void		__C(CHIP,_mem_set_region_1)(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t, bus_size_t);
+void		__C(CHIP,_mem_set_region_2)(void *, bus_space_handle_t,
+		    bus_size_t, u_int16_t, bus_size_t);
+void		__C(CHIP,_mem_set_region_4)(void *, bus_space_handle_t,
+		    bus_size_t, u_int32_t, bus_size_t);
+void		__C(CHIP,_mem_set_region_8)(void *, bus_space_handle_t,
+		    bus_size_t, u_int64_t, bus_size_t);
 
 /* copy */
-void		__C(CHIP,_mem_copy_1) __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void		__C(CHIP,_mem_copy_2) __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void		__C(CHIP,_mem_copy_4) __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void		__C(CHIP,_mem_copy_8) __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
+void		__C(CHIP,_mem_copy_1)(void *, bus_space_handle_t,
+		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void		__C(CHIP,_mem_copy_2)(void *, bus_space_handle_t,
+		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void		__C(CHIP,_mem_copy_4)(void *, bus_space_handle_t,
+		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void		__C(CHIP,_mem_copy_8)(void *, bus_space_handle_t,
+		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
 
 /* read multiple raw */
-void		__C(CHIP,_mem_read_raw_multi_2) __P((void *,
-		    bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t));
-void		__C(CHIP,_mem_read_raw_multi_4) __P((void *,
-		    bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t));
-void		__C(CHIP,_mem_read_raw_multi_8) __P((void *,
-		    bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t));
+void		__C(CHIP,_mem_read_raw_multi_2)(void *,
+		    bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t);
+void		__C(CHIP,_mem_read_raw_multi_4)(void *,
+		    bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t);
+void		__C(CHIP,_mem_read_raw_multi_8)(void *,
+		    bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t);
 
 /* write multiple raw */
-void		__C(CHIP,_mem_write_raw_multi_2) __P((void *,
+void		__C(CHIP,_mem_write_raw_multi_2)(void *,
 		    bus_space_handle_t, bus_size_t, const u_int8_t *,
-		    bus_size_t));
-void		__C(CHIP,_mem_write_raw_multi_4) __P((void *,
+		    bus_size_t);
+void		__C(CHIP,_mem_write_raw_multi_4)(void *,
 		    bus_space_handle_t, bus_size_t, const u_int8_t *,
-		    bus_size_t));
-void		__C(CHIP,_mem_write_raw_multi_8) __P((void *,
+		    bus_size_t);
+void		__C(CHIP,_mem_write_raw_multi_8)(void *,
 		    bus_space_handle_t, bus_size_t, const u_int8_t *,
-		    bus_size_t));
+		    bus_size_t);
 
 static long
     __C(CHIP,_dmem_ex_storage)[EXTENT_FIXED_STORAGE_SIZE(8) / sizeof(long)];
@@ -344,14 +344,14 @@ __C(CHIP,_bus_mem_init)(t, v)
         CHIP_S_MEM_EXTENT(v) = sex;
 }
 
-static int	__C(CHIP,_xlate_addr_to_dense_handle) __P((void *,
-		    bus_addr_t, bus_space_handle_t *));
-static int	__C(CHIP,_xlate_dense_handle_to_addr) __P((void *,
-		    bus_space_handle_t, bus_addr_t *));
-static int	__C(CHIP,_xlate_addr_to_sparse_handle) __P((void *,
-		    bus_addr_t, bus_space_handle_t *));
-static int	__C(CHIP,_xlate_sparse_handle_to_addr) __P((void *,
-		    bus_space_handle_t, bus_addr_t *));
+static int	__C(CHIP,_xlate_addr_to_dense_handle)(void *,
+		    bus_addr_t, bus_space_handle_t *);
+static int	__C(CHIP,_xlate_dense_handle_to_addr)(void *,
+		    bus_space_handle_t, bus_addr_t *);
+static int	__C(CHIP,_xlate_addr_to_sparse_handle)(void *,
+		    bus_addr_t, bus_space_handle_t *);
+static int	__C(CHIP,_xlate_sparse_handle_to_addr)(void *,
+		    bus_space_handle_t, bus_addr_t *);
 
 static int
 __C(CHIP,_xlate_addr_to_dense_handle)(v, memaddr, memhp)
diff --git a/sys/arch/alpha/pci/pci_up1000.h b/sys/arch/alpha/pci/pci_up1000.h
index 189a8c65d0b..736c645a9b6 100644
--- a/sys/arch/alpha/pci/pci_up1000.h
+++ b/sys/arch/alpha/pci/pci_up1000.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_up1000.h,v 1.2 2001/04/17 14:53:34 art Exp $	*/
+/*	$OpenBSD: pci_up1000.h,v 1.3 2002/03/14 01:26:27 millert Exp $	*/
 /* $NetBSD: pci_up1000.h,v 1.1 2000/06/01 20:30:31 thorpej Exp $ */
 
 /*-
@@ -37,4 +37,4 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-void	pci_up1000_pickintr __P((struct irongate_config *));
+void	pci_up1000_pickintr(struct irongate_config *);
diff --git a/sys/arch/alpha/pci/pciide_machdep.c b/sys/arch/alpha/pci/pciide_machdep.c
index 030ef727c0b..9ab736eea7d 100644
--- a/sys/arch/alpha/pci/pciide_machdep.c
+++ b/sys/arch/alpha/pci/pciide_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pciide_machdep.c,v 1.3 2001/06/25 22:53:19 art Exp $ */
+/* $OpenBSD: pciide_machdep.c,v 1.4 2002/03/14 01:26:27 millert Exp $ */
 /* $NetBSD: pciide_machdep.c,v 1.2 1998/04/18 01:09:20 thorpej Exp $ */
 
 /*
@@ -60,7 +60,7 @@ pciide_machdep_compat_intr_establish(dev, pa, chan, func, arg)
 	struct device *dev;
 	struct pci_attach_args *pa;
 	int chan;
-	int (*func) __P((void *));
+	int (*func)(void *);
 	void *arg;
 {
 	pci_chipset_tag_t pc = pa->pa_pc;
diff --git a/sys/arch/alpha/pci/sio.c b/sys/arch/alpha/pci/sio.c
index ad86481302c..dcacd7049ca 100644
--- a/sys/arch/alpha/pci/sio.c
+++ b/sys/arch/alpha/pci/sio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sio.c,v 1.26 2001/10/26 11:14:09 art Exp $	*/
+/*	$OpenBSD: sio.c,v 1.27 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: sio.c,v 1.15 1996/12/05 01:39:36 cgd Exp $	*/
 
 /*
@@ -56,13 +56,13 @@ struct sio_softc {
 };
 
 #ifdef __BROKEN_INDIRECT_CONFIG
-int	siomatch __P((struct device *, void *, void *));
+int	siomatch(struct device *, void *, void *);
 #else
-int	siomatch __P((struct device *, struct cfdata *, void *));
+int	siomatch(struct device *, struct cfdata *, void *);
 #endif
-void	sioattach __P((struct device *, struct device *, void *));
+void	sioattach(struct device *, struct device *, void *);
 
-extern int sio_intr_alloc __P((isa_chipset_tag_t *, int, int, int *));
+extern int sio_intr_alloc(isa_chipset_tag_t *, int, int, int *);
 
 
 struct cfattach sio_ca = {
@@ -74,9 +74,9 @@ struct cfdriver sio_cd = {
 };
 
 #ifdef __BROKEN_INDIRECT_CONFIG
-int	pcebmatch __P((struct device *, void *, void *));
+int	pcebmatch(struct device *, void *, void *);
 #else
-int	pcebmatch __P((struct device *, struct cfdata *, void *));
+int	pcebmatch(struct device *, struct cfdata *, void *);
 #endif
 
 struct cfattach pceb_ca = {
@@ -93,14 +93,14 @@ union sio_attach_args {
 	struct eisabus_attach_args sa_eba;
 };
 
-int	sioprint __P((void *, const char *pnp));
-void	sio_isa_attach_hook __P((struct device *, struct device *,
-	    struct isabus_attach_args *));
-void	sio_eisa_attach_hook __P((struct device *, struct device *,
-	    struct eisabus_attach_args *));
-int	sio_eisa_maxslots __P((void *));
-int	sio_eisa_intr_map __P((void *, u_int, eisa_intr_handle_t *));
-void	sio_bridge_callback __P((void *));
+int	sioprint(void *, const char *pnp);
+void	sio_isa_attach_hook(struct device *, struct device *,
+	    struct isabus_attach_args *);
+void	sio_eisa_attach_hook(struct device *, struct device *,
+	    struct eisabus_attach_args *);
+int	sio_eisa_maxslots(void *);
+int	sio_eisa_intr_map(void *, u_int, eisa_intr_handle_t *);
+void	sio_bridge_callback(void *);
 
 int
 siomatch(parent, match, aux)
diff --git a/sys/arch/alpha/pci/sio_pic.c b/sys/arch/alpha/pci/sio_pic.c
index 4fb58f64ddc..f62441381a7 100644
--- a/sys/arch/alpha/pci/sio_pic.c
+++ b/sys/arch/alpha/pci/sio_pic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sio_pic.c,v 1.19 2001/10/26 01:28:06 nate Exp $	*/
+/*	$OpenBSD: sio_pic.c,v 1.20 2002/03/14 01:26:27 millert Exp $	*/
 /* $NetBSD: sio_pic.c,v 1.28 2000/06/06 03:10:13 thorpej Exp $ */
 
 /*-
@@ -122,21 +122,21 @@ u_int8_t initial_ocw1[2];
 u_int8_t initial_elcr[2];
 #endif
 
-void		sio_setirqstat __P((int, int, int));
-int		sio_intr_alloc __P((void *, int, int, int *));
+void		sio_setirqstat(int, int, int);
+int		sio_intr_alloc(void *, int, int, int *);
 
-u_int8_t	(*sio_read_elcr) __P((int));
-void		(*sio_write_elcr) __P((int, u_int8_t));
-static void	specific_eoi __P((int));
+u_int8_t	(*sio_read_elcr)(int);
+void		(*sio_write_elcr)(int, u_int8_t);
+static void	specific_eoi(int);
 #ifdef BROKEN_PROM_CONSOLE
-void		sio_intr_shutdown __P((void *));
+void		sio_intr_shutdown(void *);
 #endif
 
 /******************** i82378 SIO ELCR functions ********************/
 
-int		i82378_setup_elcr __P((void));
-u_int8_t	i82378_read_elcr __P((int));
-void		i82378_write_elcr __P((int, u_int8_t));
+int		i82378_setup_elcr(void);
+u_int8_t	i82378_read_elcr(int);
+void		i82378_write_elcr(int, u_int8_t);
 
 bus_space_handle_t sio_ioh_elcr;
 
@@ -180,9 +180,9 @@ i82378_write_elcr(elcr, val)
 
 /******************** Cypress CY82C693 ELCR functions ********************/
 
-int		cy82c693_setup_elcr __P((void));
-u_int8_t	cy82c693_read_elcr __P((int));
-void		cy82c693_write_elcr __P((int, u_int8_t));
+int		cy82c693_setup_elcr(void);
+u_int8_t	cy82c693_read_elcr(int);
+void		cy82c693_write_elcr(int, u_int8_t);
 
 const struct cy82c693_handle *sio_cy82c693_handle;
 
@@ -270,7 +270,7 @@ cy82c693_write_elcr(elcr, val)
  * they should panic.
  */
 
-int (*sio_elcr_setup_funcs[]) __P((void)) = {
+int (*sio_elcr_setup_funcs[])(void) = {
 	cy82c693_setup_elcr,
 	i82378_setup_elcr,
 	NULL,
diff --git a/sys/arch/alpha/pci/siovar.h b/sys/arch/alpha/pci/siovar.h
index 30575c0c6db..4cd708d8111 100644
--- a/sys/arch/alpha/pci/siovar.h
+++ b/sys/arch/alpha/pci/siovar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: siovar.h,v 1.9 2001/08/17 22:26:58 mickey Exp $	*/
+/*	$OpenBSD: siovar.h,v 1.10 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: siovar.h,v 1.5 1996/10/23 04:12:34 cgd Exp $	*/
 
 /*
@@ -28,14 +28,14 @@
  * rights to redistribute these changes.
  */
 
-void	sio_intr_setup __P((pci_chipset_tag_t, bus_space_tag_t));
-void	sio_iointr __P((void *framep, unsigned long vec));
+void	sio_intr_setup(pci_chipset_tag_t, bus_space_tag_t);
+void	sio_iointr(void *framep, unsigned long vec);
 
-const char *sio_intr_string __P((void *, int));
-int	sio_intr_line __P((void *, int));
+const char *sio_intr_string(void *, int);
+int	sio_intr_line(void *, int);
 void	*sio_intr_establish __P((void *, int, int, int, int (*)(void *),
 	    void *, char *));
-void	sio_intr_disestablish __P((void *, void *));
+void	sio_intr_disestablish(void *, void *);
 
 #ifdef EVCNT_COUNTERS
 extern struct evcnt sio_intr_evcnt;
diff --git a/sys/arch/alpha/pci/tsc.c b/sys/arch/alpha/pci/tsc.c
index f2f9dd14335..1c7d2cfe6f4 100644
--- a/sys/arch/alpha/pci/tsc.c
+++ b/sys/arch/alpha/pci/tsc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tsc.c,v 1.6 2001/12/14 00:44:59 nate Exp $ */
+/* $OpenBSD: tsc.c,v 1.7 2002/03/14 01:26:27 millert Exp $ */
 /* $NetBSD: tsc.c,v 1.3 2000/06/25 19:17:40 thorpej Exp $ */
 
 /*-
@@ -53,8 +53,8 @@
 
 #define tsc() { Generate ctags(1) key. }
 
-int	tscmatch __P((struct device *, void *, void *));
-void	tscattach __P((struct device *, struct device *, void *));
+int	tscmatch(struct device *, void *, void *);
+void	tscattach(struct device *, struct device *, void *);
 
 struct cfattach tsc_ca = {
 	sizeof(struct tsc_softc), tscmatch, tscattach,
@@ -66,10 +66,10 @@ struct cfdriver tsc_cd = {
 
 struct tsp_config tsp_configuration[2];
 
-static int tscprint __P((void *, const char *pnp));
+static int tscprint(void *, const char *pnp);
 
-int	tspmatch __P((struct device *, void *, void *));
-void	tspattach __P((struct device *, struct device *, void *));
+int	tspmatch(struct device *, void *, void *);
+void	tspattach(struct device *, struct device *, void *);
 
 struct cfattach tsp_ca = {
 	sizeof(struct tsp_softc), tspmatch, tspattach,
@@ -80,11 +80,11 @@ struct cfdriver tsp_cd = {
 };
 
 
-static int tspprint __P((void *, const char *pnp));
+static int tspprint(void *, const char *pnp);
 
 #if	0
-static int tsp_bus_get_window __P((int, int,
-	struct alpha_bus_space_translation *));
+static int tsp_bus_get_window(int, int,
+	struct alpha_bus_space_translation *);
 #endif
 
 /* There can be only one */
diff --git a/sys/arch/alpha/pci/tsp_dma.c b/sys/arch/alpha/pci/tsp_dma.c
index 6935e16b905..5dcab88356f 100644
--- a/sys/arch/alpha/pci/tsp_dma.c
+++ b/sys/arch/alpha/pci/tsp_dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tsp_dma.c,v 1.2 2001/11/06 19:53:13 miod Exp $ */
+/* $OpenBSD: tsp_dma.c,v 1.3 2002/03/14 01:26:27 millert Exp $ */
 /* $NetBSD: tsp_dma.c,v 1.1 1999/06/29 06:46:47 ross Exp $ */
 
 /*-
@@ -93,28 +93,28 @@
 
 #define	EDIFF(a, b) (((a) | WSBA_ENA | WSBA_SG)	!= ((b) | WSBA_ENA | WSBA_SG))
 
-bus_dma_tag_t tsp_dma_get_tag __P((bus_dma_tag_t, alpha_bus_t));
+bus_dma_tag_t tsp_dma_get_tag(bus_dma_tag_t, alpha_bus_t);
 
-int	tsp_bus_dmamap_create_sgmap __P((bus_dma_tag_t, bus_size_t, int,
-	    bus_size_t, bus_size_t, int, bus_dmamap_t *));
+int	tsp_bus_dmamap_create_sgmap(bus_dma_tag_t, bus_size_t, int,
+	    bus_size_t, bus_size_t, int, bus_dmamap_t *);
 
-void	tsp_bus_dmamap_destroy_sgmap __P((bus_dma_tag_t, bus_dmamap_t));
+void	tsp_bus_dmamap_destroy_sgmap(bus_dma_tag_t, bus_dmamap_t);
 
-int	tsp_bus_dmamap_load_sgmap __P((bus_dma_tag_t, bus_dmamap_t, void *,
-	    bus_size_t, struct proc *, int));
+int	tsp_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t, void *,
+	    bus_size_t, struct proc *, int);
 
-int	tsp_bus_dmamap_load_mbuf_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
-	    struct mbuf *, int));
+int	tsp_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t,
+	    struct mbuf *, int);
 
-int	tsp_bus_dmamap_load_uio_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
-	    struct uio *, int));
+int	tsp_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t,
+	    struct uio *, int);
 
-int	tsp_bus_dmamap_load_raw_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
-	    bus_dma_segment_t *, int, bus_size_t, int));
+int	tsp_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t,
+	    bus_dma_segment_t *, int, bus_size_t, int);
 
-void	tsp_bus_dmamap_unload_sgmap __P((bus_dma_tag_t, bus_dmamap_t));
+void	tsp_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t);
 
-void	tsp_tlb_invalidate __P((struct tsp_config *));
+void	tsp_tlb_invalidate(struct tsp_config *);
 
 void
 tsp_dma_init(pcp)
diff --git a/sys/arch/alpha/pci/tsp_pci.c b/sys/arch/alpha/pci/tsp_pci.c
index 1c785a58df4..6abcbc7936f 100644
--- a/sys/arch/alpha/pci/tsp_pci.c
+++ b/sys/arch/alpha/pci/tsp_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tsp_pci.c,v 1.2 2001/11/06 19:53:13 miod Exp $ */
+/* $OpenBSD: tsp_pci.c,v 1.3 2002/03/14 01:26:27 millert Exp $ */
 /* $NetBSD: tsp_pci.c,v 1.1 1999/06/29 06:46:47 ross Exp $ */
 
 /*-
@@ -50,14 +50,14 @@
 
 #define tsp_pci() { Generate ctags(1) key. }
 
-void		tsp_attach_hook __P((struct device *, struct device *,
-		    struct pcibus_attach_args *));
-int		tsp_bus_maxdevs __P((void *, int));
-pcitag_t	tsp_make_tag __P((void *, int, int, int));
-void		tsp_decompose_tag __P((void *, pcitag_t, int *, int *,
-		    int *));
-pcireg_t	tsp_conf_read __P((void *, pcitag_t, int));
-void		tsp_conf_write __P((void *, pcitag_t, int, pcireg_t));
+void		tsp_attach_hook(struct device *, struct device *,
+		    struct pcibus_attach_args *);
+int		tsp_bus_maxdevs(void *, int);
+pcitag_t	tsp_make_tag(void *, int, int, int);
+void		tsp_decompose_tag(void *, pcitag_t, int *, int *,
+		    int *);
+pcireg_t	tsp_conf_read(void *, pcitag_t, int);
+void		tsp_conf_write(void *, pcitag_t, int, pcireg_t);
 
 void
 tsp_pci_init(pc, v)
diff --git a/sys/arch/alpha/pci/tsvar.h b/sys/arch/alpha/pci/tsvar.h
index 30046cc6720..de3d3ee8603 100644
--- a/sys/arch/alpha/pci/tsvar.h
+++ b/sys/arch/alpha/pci/tsvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tsvar.h,v 1.3 2001/12/14 00:44:59 nate Exp $ */
+/* $OpenBSD: tsvar.h,v 1.4 2002/03/14 01:26:27 millert Exp $ */
 /* $NetBSD: tsvar.h,v 1.1 1999/06/29 06:46:47 ross Exp $ */
 
 /*-
@@ -75,11 +75,11 @@ struct tsp_attach_args {
 
 extern int tsp_console_hose;
 
-struct	tsp_config *tsp_init __P((int, int));
-void	tsp_pci_init __P((pci_chipset_tag_t, void *));
-void	tsp_dma_init __P((struct tsp_config *));
+struct	tsp_config *tsp_init(int, int);
+void	tsp_pci_init(pci_chipset_tag_t, void *);
+void	tsp_dma_init(struct tsp_config *);
 
-void	tsp_bus_io_init __P((bus_space_tag_t, void *));
-void	tsp_bus_mem_init __P((bus_space_tag_t, void *));
+void	tsp_bus_io_init(bus_space_tag_t, void *);
+void	tsp_bus_mem_init(bus_space_tag_t, void *);
 
-void tsp_bus_mem_init2 __P((void *));
+void tsp_bus_mem_init2(void *);
diff --git a/sys/arch/alpha/stand/boot/boot.c b/sys/arch/alpha/stand/boot/boot.c
index 5210fadcd7b..612d2ce60e4 100644
--- a/sys/arch/alpha/stand/boot/boot.c
+++ b/sys/arch/alpha/stand/boot/boot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: boot.c,v 1.13 2001/05/16 00:38:16 deraadt Exp $	*/
+/*	$OpenBSD: boot.c,v 1.14 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: boot.c,v 1.10 1997/01/18 01:58:33 cgd Exp $	*/
 
 /*
@@ -53,7 +53,7 @@
 #define _KERNEL
 #include "include/pte.h"
 
-int loadfile __P((char *, u_int64_t *));
+int loadfile(char *, u_int64_t *);
 
 char boot_file[128];
 char boot_flags[128];
diff --git a/sys/arch/alpha/stand/boot/conf.c b/sys/arch/alpha/stand/boot/conf.c
index 3883551a738..84063c8dfc0 100644
--- a/sys/arch/alpha/stand/boot/conf.c
+++ b/sys/arch/alpha/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.4 1996/10/30 22:40:40 niklas Exp $	*/
+/*	$OpenBSD: conf.c,v 1.5 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: conf.c,v 1.3 1995/11/23 02:39:31 cgd Exp $	*/
 
 /*
@@ -44,7 +44,7 @@
 
 #include "disk.h"
 
-int	diskopen __P((struct open_file *, ...));	/* XXX */
+int	diskopen(struct open_file *, ...);	/* XXX */
 
 int	errno;
 
diff --git a/sys/arch/alpha/stand/boot/disk.h b/sys/arch/alpha/stand/boot/disk.h
index 264c773ceea..68ff7bda459 100644
--- a/sys/arch/alpha/stand/boot/disk.h
+++ b/sys/arch/alpha/stand/boot/disk.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: disk.h,v 1.3 1996/10/30 22:40:42 niklas Exp $	*/
+/*	$OpenBSD: disk.h,v 1.4 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: disk.h,v 1.1 1995/11/23 02:39:42 cgd Exp $	*/
 
-int	diskstrategy __P((void *, int, daddr_t, size_t, void *, size_t *));
-/* int     diskopen __P((struct open_file *, int, int, int)); */
-int     diskclose __P((struct open_file *));
+int	diskstrategy(void *, int, daddr_t, size_t, void *, size_t *);
+/* int     diskopen(struct open_file *, int, int, int); */
+int     diskclose(struct open_file *);
 
 #define	diskioctl	noioctl
diff --git a/sys/arch/alpha/stand/bootxx.c b/sys/arch/alpha/stand/bootxx.c
index 34ee4ef9e1e..0dcf15ee611 100644
--- a/sys/arch/alpha/stand/bootxx.c
+++ b/sys/arch/alpha/stand/bootxx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bootxx.c,v 1.8 1998/03/06 05:17:19 millert Exp $	*/
+/*	$OpenBSD: bootxx.c,v 1.9 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: bootxx.c,v 1.4 1997/01/18 00:28:59 cgd Exp $	*/
 
 /*
@@ -133,7 +133,7 @@ main()
 {
 	struct bbinfo *bbinfop;
 	char *loadaddr;
-	void (*entry) __P((void));
+	void (*entry)(void);
 
 	/* Init prom callback vector. */
 	init_prom_calls();
diff --git a/sys/arch/alpha/stand/installboot.c b/sys/arch/alpha/stand/installboot.c
index 13ab38bda97..b154692528e 100644
--- a/sys/arch/alpha/stand/installboot.c
+++ b/sys/arch/alpha/stand/installboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: installboot.c,v 1.10 1997/10/27 16:52:03 millert Exp $	*/
+/*	$OpenBSD: installboot.c,v 1.11 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: installboot.c,v 1.2 1997/04/06 08:41:12 cgd Exp $	*/
 
 /*
@@ -66,11 +66,11 @@ struct bbinfo *bbinfop;
 int	max_block_count;
 
 
-char		*loadprotoblocks __P((char *, long *));
-int		loadblocknums __P((char *, int, unsigned long));
-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, unsigned long);
+static void	devread(int, void *, daddr_t, size_t, char *);
+static void	usage(void);
+int 		main(int, char *[]);
 
 int	isofsblk = 0;
 int	isofseblk = 0;
diff --git a/sys/arch/alpha/stand/loadfile.c b/sys/arch/alpha/stand/loadfile.c
index 4e46eb872a4..661d8e6dd78 100644
--- a/sys/arch/alpha/stand/loadfile.c
+++ b/sys/arch/alpha/stand/loadfile.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loadfile.c,v 1.11 2001/05/16 00:38:15 deraadt Exp $	*/
+/*	$OpenBSD: loadfile.c,v 1.12 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: loadfile.c,v 1.3 1997/04/06 08:40:59 cgd Exp $	*/
 
 /*
@@ -58,12 +58,12 @@
 #include "include/pte.h"
 
 #ifdef ALPHA_BOOT_ECOFF
-static int coff_exec __P((int, struct ecoff_exechdr *, u_int64_t *));
+static int coff_exec(int, struct ecoff_exechdr *, u_int64_t *);
 #endif
 #ifdef ALPHA_BOOT_ELF
-static int elf_exec __P((int, Elf64_Ehdr *, u_int64_t *));
+static int elf_exec(int, Elf64_Ehdr *, u_int64_t *);
 #endif
-int loadfile __P((char *, u_int64_t *));
+int loadfile(char *, u_int64_t *);
 
 paddr_t ffp_save, ptbr_save;
 vaddr_t ssym, esym;
diff --git a/sys/arch/alpha/stand/netboot/dev_net.h b/sys/arch/alpha/stand/netboot/dev_net.h
index 3e3d4b091d6..447c71b34b6 100644
--- a/sys/arch/alpha/stand/netboot/dev_net.h
+++ b/sys/arch/alpha/stand/netboot/dev_net.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: dev_net.h,v 1.1 1996/10/30 22:40:53 niklas Exp $	*/
+/*	$OpenBSD: dev_net.h,v 1.2 2002/03/14 01:26:27 millert Exp $	*/
 
 
-int	net_open __P((struct open_file *, ...));
-int	net_close __P((struct open_file *));
+int	net_open(struct open_file *, ...);
+int	net_close(struct open_file *);
 int	net_ioctl();
 int	net_strategy();
 
diff --git a/sys/arch/alpha/stand/netboot/netboot.c b/sys/arch/alpha/stand/netboot/netboot.c
index 9f240bda3ca..164212c36bb 100644
--- a/sys/arch/alpha/stand/netboot/netboot.c
+++ b/sys/arch/alpha/stand/netboot/netboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netboot.c,v 1.3 1996/11/27 19:54:56 niklas Exp $	*/
+/*	$OpenBSD: netboot.c,v 1.4 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: netboot.c,v 1.1 1996/09/18 20:03:12 cgd Exp $	*/
 
 /*
@@ -52,7 +52,7 @@
 #define _KERNEL
 #include "include/pte.h"
 
-int loadfile __P((char *, u_int64_t *));
+int loadfile(char *, u_int64_t *);
 
 char boot_file[128];
 char boot_flags[128];
diff --git a/sys/arch/alpha/tc/asc.c b/sys/arch/alpha/tc/asc.c
index 3a5df7269c0..5b8b4418d8c 100644
--- a/sys/arch/alpha/tc/asc.c
+++ b/sys/arch/alpha/tc/asc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asc.c,v 1.2 2001/02/03 19:40:41 art Exp $	*/
+/*	$OpenBSD: asc.c,v 1.3 2002/03/14 01:26:27 millert Exp $	*/
 /*	$NetBSD: esp.c,v 1.26 1996/12/05 01:39:40 cgd Exp $	*/
 
 #ifdef __sparc__
@@ -108,39 +108,39 @@
 
 int esp_debug = 0; /*ESP_SHOWPHASE|ESP_SHOWMISC|ESP_SHOWTRAC|ESP_SHOWCMDS;*/
 
-/*static*/ void	espattach	__P((struct device *, struct device *,
-				    void *));
-/*static*/ int	espprint	__P((void *, const char *));
+/*static*/ void	espattach(struct device *, struct device *,
+				    void *);
+/*static*/ int	espprint(void *, const char *);
 #ifdef __BROKEN_INDIRECT_CONFIG
-/*static*/ int	espmatch	__P((struct device *, void *, void *));
+/*static*/ int	espmatch(struct device *, void *, void *);
 #else
-/*static*/ int	espmatch	__P((struct device *, struct cfdata *,
-				    void *));
+/*static*/ int	espmatch(struct device *, struct cfdata *,
+				    void *);
 #endif
-/*static*/ u_int	esp_adapter_info __P((struct esp_softc *));
-/*static*/ void	espreadregs	__P((struct esp_softc *));
-/*static*/ void	esp_select	__P((struct esp_softc *, struct esp_ecb *));
-/*static*/ int esp_reselect	__P((struct esp_softc *, int));
-/*static*/ void	esp_scsi_reset	__P((struct esp_softc *));
-/*static*/ void	esp_reset	__P((struct esp_softc *));
-/*static*/ void	espinit	__P((struct esp_softc *, int));
-/*static*/ int	esp_scsi_cmd	__P((struct scsi_xfer *));
-/*static*/ int	esp_poll	__P((struct esp_softc *, struct scsi_xfer *,
-				    int));
-/*static*/ void	esp_sched	__P((struct esp_softc *));
-/*static*/ void	esp_done	__P((struct esp_softc *, struct esp_ecb *));
-/*static*/ void	esp_msgin	__P((struct esp_softc *));
-/*static*/ void	esp_msgout	__P((struct esp_softc *));
-/*static*/ int	espintr		__P((struct esp_softc *));
-/*static*/ void	esp_timeout	__P((void *arg));
-/*static*/ void	esp_abort	__P((struct esp_softc *, struct esp_ecb *));
-/*static*/ void esp_dequeue	__P((struct esp_softc *, struct esp_ecb *));
-void esp_sense __P((struct esp_softc *, struct esp_ecb *));
-void esp_free_ecb __P((struct esp_softc *, struct esp_ecb *, int));
-struct esp_ecb *esp_get_ecb __P((struct esp_softc *, int));
-static inline int esp_stp2cpb __P((struct esp_softc *, int));
-static inline int esp_cpb2stp __P((struct esp_softc *, int));
-static inline void esp_setsync __P((struct esp_softc *, struct esp_tinfo *));
+/*static*/ u_int	esp_adapter_info(struct esp_softc *);
+/*static*/ void	espreadregs(struct esp_softc *);
+/*static*/ void	esp_select(struct esp_softc *, struct esp_ecb *);
+/*static*/ int esp_reselect(struct esp_softc *, int);
+/*static*/ void	esp_scsi_reset(struct esp_softc *);
+/*static*/ void	esp_reset(struct esp_softc *);
+/*static*/ void	espinit(struct esp_softc *, int);
+/*static*/ int	esp_scsi_cmd(struct scsi_xfer *);
+/*static*/ int	esp_poll(struct esp_softc *, struct scsi_xfer *,
+				    int);
+/*static*/ void	esp_sched(struct esp_softc *);
+/*static*/ void	esp_done(struct esp_softc *, struct esp_ecb *);
+/*static*/ void	esp_msgin(struct esp_softc *);
+/*static*/ void	esp_msgout(struct esp_softc *);
+/*static*/ int	espintr(struct esp_softc *);
+/*static*/ void	esp_timeout(void *arg);
+/*static*/ void	esp_abort(struct esp_softc *, struct esp_ecb *);
+/*static*/ void esp_dequeue(struct esp_softc *, struct esp_ecb *);
+void esp_sense(struct esp_softc *, struct esp_ecb *);
+void esp_free_ecb(struct esp_softc *, struct esp_ecb *, int);
+struct esp_ecb *esp_get_ecb(struct esp_softc *, int);
+static inline int esp_stp2cpb(struct esp_softc *, int);
+static inline int esp_cpb2stp(struct esp_softc *, int);
+static inline void esp_setsync(struct esp_softc *, struct esp_tinfo *);
 
 /* Linkup to the rest of the kernel */
 struct cfattach asc_ca = {
diff --git a/sys/arch/alpha/tc/ascvar.h b/sys/arch/alpha/tc/ascvar.h
index c5499bc7880..7d6b140f7a4 100644
--- a/sys/arch/alpha/tc/ascvar.h
+++ b/sys/arch/alpha/tc/ascvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ascvar.h,v 1.1 2000/07/05 21:50:38 ericj Exp $	*/
+/*	$OpenBSD: ascvar.h,v 1.2 2002/03/14 01:26:28 millert Exp $	*/
 /*	$NetBSD: espvar.h,v 1.12 1996/11/24 04:21:30 cgd Exp $	*/
 
 #if defined(__sparc__) && !defined(SPARC_DRIVER)
@@ -287,7 +287,7 @@ struct esp_softc {
 	} while (0)
 #else /* ! SPARC_DRIVER */
 #if 1
-static __inline u_char ESP_READ_REG __P((struct esp_softc *, int));
+static __inline u_char ESP_READ_REG(struct esp_softc *, int);
 
 static __inline u_char
 ESP_READ_REG(sc, reg)
diff --git a/sys/arch/alpha/tc/cfb.c b/sys/arch/alpha/tc/cfb.c
index f2d978ed6a2..54e90367a86 100644
--- a/sys/arch/alpha/tc/cfb.c
+++ b/sys/arch/alpha/tc/cfb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cfb.c,v 1.12 2001/02/01 18:05:30 art Exp $	*/
+/*	$OpenBSD: cfb.c,v 1.13 2002/03/14 01:26:28 millert Exp $	*/
 /*	$NetBSD: cfb.c,v 1.7 1996/12/05 01:39:39 cgd Exp $	*/
 
 /*
@@ -53,11 +53,11 @@
 #include <machine/pte.h>
 
 #ifdef __BROKEN_INDIRECT_CONFIG
-int	cfbmatch __P((struct device *, void *, void *));
+int	cfbmatch(struct device *, void *, void *);
 #else
-int	cfbmatch __P((struct device *, struct cfdata *, void *));
+int	cfbmatch(struct device *, struct cfdata *, void *);
 #endif
-void	cfbattach __P((struct device *, struct device *, void *));
+void	cfbattach(struct device *, struct device *, void *);
 
 struct cfattach cfb_ca = {
 	sizeof(struct cfb_softc), cfbmatch, cfbattach,
@@ -67,7 +67,7 @@ struct cfdriver cfb_cd = {
 	NULL, "cfb", DV_DULL,
 };
 
-void	cfb_getdevconfig __P((tc_addr_t dense_addr, struct cfb_devconfig *dc));
+void	cfb_getdevconfig(tc_addr_t dense_addr, struct cfb_devconfig *dc);
 struct cfb_devconfig cfb_console_dc;
 tc_addr_t cfb_consaddr;
 
@@ -98,13 +98,13 @@ struct wsscreen_list cfb_screenlist = {
         sizeof(_cfb_scrlist) / sizeof(struct wsscreen_descr *), _cfb_scrlist
 };
 
-int	cfbioctl __P((void *, u_long, caddr_t, int, struct proc *));
-paddr_t	cfbmmap __P((void *, off_t, int));
+int	cfbioctl(void *, u_long, caddr_t, int, struct proc *);
+paddr_t	cfbmmap(void *, off_t, int);
 
-int	cfbintr __P((void *));
-static int      cfb_alloc_screen __P((void *, const struct wsscreen_descr *,
-		          void **, int *, int *, long *));
-static void     cfb_free_screen __P((void *, void *));
+int	cfbintr(void *);
+static int      cfb_alloc_screen(void *, const struct wsscreen_descr *,
+		          void **, int *, int *, long *);
+static void     cfb_free_screen(void *, void *);
 static int      cfb_show_screen __P((void *, void *, int,
                                      void (*) (void *, int, int), void *));
 
@@ -369,7 +369,7 @@ cfb_show_screen(v, cookie, waitok, cb, cbarg)
 	void *v;
 	void *cookie;
 	int waitok;
-	void (*cb) __P((void *, int, int));
+	void (*cb)(void *, int, int);
 	void *cbarg;
 {
 	return (0);
diff --git a/sys/arch/alpha/tc/cfbvar.h b/sys/arch/alpha/tc/cfbvar.h
index 1eada4d768e..05081b2f8be 100644
--- a/sys/arch/alpha/tc/cfbvar.h
+++ b/sys/arch/alpha/tc/cfbvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cfbvar.h,v 1.5 2000/08/04 16:45:47 ericj Exp $	*/
+/*	$OpenBSD: cfbvar.h,v 1.6 2002/03/14 01:26:28 millert Exp $	*/
 /*	$NetBSD: cfbvar.h,v 1.1 1996/05/01 23:25:04 cgd Exp $	*/
 
 /*
@@ -64,5 +64,5 @@ struct cfb_softc {
 };
 
 #if 0
-int cfb_cnattach __P((tc_addr_t));
+int cfb_cnattach(tc_addr_t);
 #endif
diff --git a/sys/arch/alpha/tc/ioasic.c b/sys/arch/alpha/tc/ioasic.c
index b8eb6dff7f2..d95660442b6 100644
--- a/sys/arch/alpha/tc/ioasic.c
+++ b/sys/arch/alpha/tc/ioasic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ioasic.c,v 1.7 1999/01/11 05:11:04 millert Exp $	*/
+/*	$OpenBSD: ioasic.c,v 1.8 2002/03/14 01:26:28 millert Exp $	*/
 /*	$NetBSD: ioasic.c,v 1.10 1996/12/05 01:39:41 cgd Exp $	*/
 
 /*
@@ -53,11 +53,11 @@ struct ioasic_softc {
 
 /* Definition of the driver for autoconfig. */
 #ifdef __BROKEN_INDIRECT_CONFIG
-int	ioasicmatch __P((struct device *, void *, void *));
+int	ioasicmatch(struct device *, void *, void *);
 #else
-int	ioasicmatch __P((struct device *, struct cfdata *, void *));
+int	ioasicmatch(struct device *, struct cfdata *, void *);
 #endif
-void	ioasicattach __P((struct device *, struct device *, void *));
+void	ioasicattach(struct device *, struct device *, void *);
 int     ioasicprint(void *, const char *);
 
 struct cfattach ioasic_ca = {
@@ -68,8 +68,8 @@ struct cfdriver ioasic_cd = {
 	NULL, "ioasic", DV_DULL,
 };
 
-int	ioasic_intr __P((void *));
-int	ioasic_intrnull __P((void *));
+int	ioasic_intr(void *);
+int	ioasic_intrnull(void *);
 
 #define	C(x)	((void *)(x))
 
@@ -98,7 +98,7 @@ struct ioasic_dev {
 int ioasic_ndevs = sizeof(ioasic_devs) / sizeof(ioasic_devs[0]);
 
 struct ioasicintr {
-	int	(*iai_func) __P((void *));
+	int	(*iai_func)(void *);
 	void	*iai_arg;
 } ioasicintrs[IOASIC_NCOOKIES];
 
@@ -223,7 +223,7 @@ ioasic_intr_establish(ioa, cookie, level, func, arg)
 	struct device *ioa;
 	void *cookie, *arg;
 	tc_intrlevel_t level;
-	int (*func) __P((void *));
+	int (*func)(void *);
 {
 	u_long dev, i;
 
diff --git a/sys/arch/alpha/tc/mcclock_ioasic.c b/sys/arch/alpha/tc/mcclock_ioasic.c
index 2a5582895fb..2709092949d 100644
--- a/sys/arch/alpha/tc/mcclock_ioasic.c
+++ b/sys/arch/alpha/tc/mcclock_ioasic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mcclock_ioasic.c,v 1.4 1997/01/24 19:58:14 niklas Exp $	*/
+/*	$OpenBSD: mcclock_ioasic.c,v 1.5 2002/03/14 01:26:28 millert Exp $	*/
 /*	$NetBSD: mcclock_ioasic.c,v 1.3 1996/12/05 01:39:42 cgd Exp $	*/
 
 /*
@@ -52,19 +52,19 @@ struct mcclock_ioasic_softc {
 };
 
 #ifdef __BROKEN_INDIRECT_CONFIG
-int	mcclock_ioasic_match __P((struct device *, void *, void *));
+int	mcclock_ioasic_match(struct device *, void *, void *);
 #else
-int	mcclock_ioasic_match __P((struct device *, struct cfdata *, void *));
+int	mcclock_ioasic_match(struct device *, struct cfdata *, void *);
 #endif
-void	mcclock_ioasic_attach __P((struct device *, struct device *, void *));
+void	mcclock_ioasic_attach(struct device *, struct device *, void *);
 
 struct cfattach mcclock_ioasic_ca = {
 	sizeof (struct mcclock_ioasic_softc), mcclock_ioasic_match,
 	    mcclock_ioasic_attach, 
 };
 
-void	mcclock_ioasic_write __P((struct mcclock_softc *, u_int, u_int));
-u_int	mcclock_ioasic_read __P((struct mcclock_softc *, u_int));
+void	mcclock_ioasic_write(struct mcclock_softc *, u_int, u_int);
+u_int	mcclock_ioasic_read(struct mcclock_softc *, u_int);
 
 const struct mcclock_busfns mcclock_ioasic_busfns = {
 	mcclock_ioasic_write, mcclock_ioasic_read,
diff --git a/sys/arch/alpha/tc/scc.c b/sys/arch/alpha/tc/scc.c
index 6ff87cdddd3..b458a76d0ac 100644
--- a/sys/arch/alpha/tc/scc.c
+++ b/sys/arch/alpha/tc/scc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scc.c,v 1.12 2002/02/15 20:45:29 nordin Exp $	*/
+/*	$OpenBSD: scc.c,v 1.13 2002/03/14 01:26:28 millert Exp $	*/
 /*	$NetBSD: scc.c,v 1.28 1996/12/05 01:39:43 cgd Exp $	*/
 
 /*
@@ -115,9 +115,9 @@
 #define	SCCLINE(dev)	(minor(dev) & 0x1)
 
 /* QVSS-compatible in-kernel X input event parser, pointer tracker */
-void	(*sccDivertXInput) __P((int cc)); /* X windows keyboard input routine */
-void	(*sccMouseEvent) __P((int));	/* X windows mouse motion event routine */
-void	(*sccMouseButtons) __P((int));	/* X windows mouse buttons event routine */
+void	(*sccDivertXInput)(int cc); /* X windows keyboard input routine */
+void	(*sccMouseEvent)(int);	/* X windows mouse motion event routine */
+void	(*sccMouseButtons)(int);	/* X windows mouse buttons event routine */
 #ifdef DEBUG
 int	debugChar;
 #endif
@@ -127,7 +127,7 @@ struct pdma {
 	char	*p_mem;
 	char	*p_end;
 	int	p_arg;
-	void	(*p_fcn) __P((struct tty *tp));
+	void	(*p_fcn)(struct tty *tp);
 };
 
 struct scc_softc {
@@ -193,11 +193,11 @@ struct speedtab sccspeedtab[] = {
 
 /* Definition of the driver for autoconfig. */
 #ifdef __BROKEN_INDIRECT_CONFIG
-int	sccmatch  __P((struct device *, void *, void *));
+int	sccmatch(struct device *, void *, void *);
 #else
-int	sccmatch  __P((struct device *, struct cfdata *, void *));
+int	sccmatch(struct device *, struct cfdata *, void *);
 #endif
-void	sccattach __P((struct device *, struct device *, void *));
+void	sccattach(struct device *, struct device *, void *);
 
 struct cfattach scc_ca = {
 	sizeof (struct scc_softc), sccmatch, sccattach,
@@ -209,20 +209,20 @@ struct cfdriver scc_cd = {
 
 cdev_decl(scc);
 
-int	cold_sccparam __P((struct tty *, struct termios *,
-		    struct scc_softc *sc));
-int	sccGetc __P((dev_t));
-void	sccPollc __P((dev_t, int));
-void	sccPutc __P((dev_t, int));
-int	sccintr __P((void *));
-int	sccmctl __P((dev_t, int, int));
-int	sccparam __P((struct tty *, struct termios *));
-void	sccreset __P((struct scc_softc *));
-void	sccstart __P((struct tty *));
-void	scc_alphaintr __P((int));
-void	scc_modem_intr __P((dev_t));
+int	cold_sccparam(struct tty *, struct termios *,
+		    struct scc_softc *sc);
+int	sccGetc(dev_t);
+void	sccPollc(dev_t, int);
+void	sccPutc(dev_t, int);
+int	sccintr(void *);
+int	sccmctl(dev_t, int, int);
+int	sccparam(struct tty *, struct termios *);
+void	sccreset(struct scc_softc *);
+void	sccstart(struct tty *);
+void	scc_alphaintr(int);
+void	scc_modem_intr(dev_t);
 #ifdef SCC_DEBUG
-void	scc_rr __P((char *, scc_regmap_t *));
+void	scc_rr(char *, scc_regmap_t *);
 #endif
 
 /*
@@ -234,8 +234,8 @@ static struct scc_softc coldcons_softc;
 static struct consdev scccons = {
 	NULL, NULL, sccGetc, sccPutc, sccPollc, NULL, NODEV, 0
 };
-void	scc_consinit __P((dev_t dev, scc_regmap_t *sccaddr));
-void	scc_oconsinit __P((struct scc_softc *, dev_t));
+void	scc_consinit(dev_t dev, scc_regmap_t *sccaddr);
+void	scc_oconsinit(struct scc_softc *, dev_t);
 
 
 /*
@@ -413,7 +413,7 @@ sccattach(parent, self, aux)
 		if (cntr == 0)
 			tty_attach(tp);
 		pdp->p_arg = (long)tp;
-		pdp->p_fcn = (void (*)__P((struct tty*)))0;
+		pdp->p_fcn = (void (*)(struct tty*))0;
 		tp->t_dev = (dev_t)((sc->sc_dv.dv_unit << 1) | cntr);
 		pdp++;
 	}
diff --git a/sys/arch/alpha/tc/sfb.c b/sys/arch/alpha/tc/sfb.c
index 3d06f9165ff..e4498562ff2 100644
--- a/sys/arch/alpha/tc/sfb.c
+++ b/sys/arch/alpha/tc/sfb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sfb.c,v 1.12 2001/02/01 18:05:30 art Exp $	*/
+/*	$OpenBSD: sfb.c,v 1.13 2002/03/14 01:26:28 millert Exp $	*/
 /*	$NetBSD: sfb.c,v 1.7 1996/12/05 01:39:44 cgd Exp $	*/
 
 /*
@@ -53,11 +53,11 @@
 #include <machine/pte.h>
 
 #ifdef __BROKEN_INDIRECT_CONFIG
-int	sfbmatch __P((struct device *, void *, void *));
+int	sfbmatch(struct device *, void *, void *);
 #else
-int	sfbmatch __P((struct device *, struct cfdata *, void *));
+int	sfbmatch(struct device *, struct cfdata *, void *);
 #endif
-void	sfbattach __P((struct device *, struct device *, void *));
+void	sfbattach(struct device *, struct device *, void *);
 
 struct cfattach sfb_ca = {
 	sizeof(struct sfb_softc), sfbmatch, sfbattach,
@@ -67,7 +67,7 @@ struct cfdriver sfb_cd = {
 	NULL, "sfb", DV_DULL,
 };
 
-void	sfb_getdevconfig __P((tc_addr_t dense_addr, struct sfb_devconfig *dc));
+void	sfb_getdevconfig(tc_addr_t dense_addr, struct sfb_devconfig *dc);
 struct sfb_devconfig sfb_console_dc;
 tc_addr_t sfb_consaddr;
 
@@ -97,18 +97,18 @@ struct wsscreen_list sfb_screenlist = {
         sizeof(_sfb_scrlist) / sizeof(struct wsscreen_descr *), _sfb_scrlist
 };
 
-int	sfbioctl __P((void *, u_long, caddr_t, int, struct proc *));
-paddr_t	sfbmmap __P((void *, off_t, int));
+int	sfbioctl(void *, u_long, caddr_t, int, struct proc *);
+paddr_t	sfbmmap(void *, off_t, int);
 
-static int      sfb_alloc_screen __P((void *, const struct wsscreen_descr *,
-                                      void **, int *, int *, long *));
-static void     sfb_free_screen __P((void *, void *));
+static int      sfb_alloc_screen(void *, const struct wsscreen_descr *,
+                                      void **, int *, int *, long *);
+static void     sfb_free_screen(void *, void *);
 static int      sfb_show_screen __P((void *, void *, int,
                                      void (*) (void *, int, int), void *));
 
 #if 0
-void	sfb_blank __P((struct sfb_devconfig *));
-void	sfb_unblank __P((struct sfb_devconfig *));
+void	sfb_blank(struct sfb_devconfig *);
+void	sfb_unblank(struct sfb_devconfig *);
 #endif
 
 struct wsdisplay_accessops sfb_accessops = {
@@ -403,7 +403,7 @@ sfb_show_screen(v, cookie, waitok, cb, cbarg)
         void *v;
         void *cookie;
         int waitok;
-        void (*cb) __P((void *, int, int));
+        void (*cb)(void *, int, int);
         void *cbarg;
 {
 
diff --git a/sys/arch/alpha/tc/sfbvar.h b/sys/arch/alpha/tc/sfbvar.h
index 1eaefccb89e..f30a3da9b00 100644
--- a/sys/arch/alpha/tc/sfbvar.h
+++ b/sys/arch/alpha/tc/sfbvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sfbvar.h,v 1.5 2000/08/04 16:45:47 ericj Exp $	*/
+/*	$OpenBSD: sfbvar.h,v 1.6 2002/03/14 01:26:28 millert Exp $	*/
 /*	$NetBSD: sfbvar.h,v 1.1 1996/05/01 21:15:51 cgd Exp $	*/
 
 /*
@@ -64,5 +64,5 @@ struct sfb_softc {
 };
 
 #if 0
-int sfb_cnattach __P((tc_addr_t));
+int sfb_cnattach(tc_addr_t);
 #endif
diff --git a/sys/arch/alpha/tc/tc_3000_300.c b/sys/arch/alpha/tc/tc_3000_300.c
index e5eaf6be79b..abf79b63b3f 100644
--- a/sys/arch/alpha/tc/tc_3000_300.c
+++ b/sys/arch/alpha/tc/tc_3000_300.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tc_3000_300.c,v 1.6 1999/01/11 05:11:04 millert Exp $	*/
+/*	$OpenBSD: tc_3000_300.c,v 1.7 2002/03/14 01:26:28 millert Exp $	*/
 /*	$NetBSD: tc_3000_300.c,v 1.12 1996/10/13 03:00:37 christos Exp $	*/
 
 /*
@@ -43,13 +43,13 @@
 #include <alpha/tc/tc_3000_300.h>
 #include <alpha/tc/ioasicreg.h>
 
-void	tc_3000_300_intr_setup __P((void));
+void	tc_3000_300_intr_setup(void);
 void	tc_3000_300_intr_establish __P((struct device *, void *,
 	    tc_intrlevel_t, int (*)(void *), void *));
-void	tc_3000_300_intr_disestablish __P((struct device *, void *));
-void	tc_3000_300_iointr __P((void *, unsigned long));
+void	tc_3000_300_intr_disestablish(struct device *, void *);
+void	tc_3000_300_iointr(void *, unsigned long);
 
-int	tc_3000_300_intrnull __P((void *));
+int	tc_3000_300_intrnull(void *);
 
 #define	C(x)	((void *)(u_long)x)
 #define	KV(x)	(ALPHA_PHYS_TO_K0SEG(x))
@@ -81,7 +81,7 @@ int tc_3000_300_nbuiltins =
     sizeof(tc_3000_300_builtins) / sizeof(tc_3000_300_builtins[0]);
 
 struct tcintr {
-	int	(*tci_func) __P((void *));
+	int	(*tci_func)(void *);
 	void	*tci_arg;
 } tc_3000_300_intr[TC_3000_300_NCOOKIES];
 
@@ -111,7 +111,7 @@ tc_3000_300_intr_establish(tcadev, cookie, level, func, arg)
 	struct device *tcadev;
 	void *cookie, *arg;
 	tc_intrlevel_t level;
-	int (*func) __P((void *));
+	int (*func)(void *);
 {
 	volatile u_int32_t *imskp;
 	u_long dev = (u_long)cookie;
diff --git a/sys/arch/alpha/tc/tc_3000_500.c b/sys/arch/alpha/tc/tc_3000_500.c
index 68a38f6a848..7e1dce6116f 100644
--- a/sys/arch/alpha/tc/tc_3000_500.c
+++ b/sys/arch/alpha/tc/tc_3000_500.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tc_3000_500.c,v 1.7 1999/01/11 05:11:04 millert Exp $	*/
+/*	$OpenBSD: tc_3000_500.c,v 1.8 2002/03/14 01:26:28 millert Exp $	*/
 /*	$NetBSD: tc_3000_500.c,v 1.12 1996/11/15 23:59:00 cgd Exp $	*/
 
 /*
@@ -42,13 +42,13 @@
 #include <alpha/tc/tc_conf.h>
 #include <alpha/tc/tc_3000_500.h>
 
-void	tc_3000_500_intr_setup __P((void));
+void	tc_3000_500_intr_setup(void);
 void	tc_3000_500_intr_establish __P((struct device *, void *,
 	    tc_intrlevel_t, int (*)(void *), void *));
-void	tc_3000_500_intr_disestablish __P((struct device *, void *));
-void	tc_3000_500_iointr __P((void *, unsigned long));
+void	tc_3000_500_intr_disestablish(struct device *, void *);
+void	tc_3000_500_iointr(void *, unsigned long);
 
-int	tc_3000_500_intrnull __P((void *));
+int	tc_3000_500_intrnull(void *);
 
 #define C(x)	((void *)(u_long)x)
 #define	KV(x)	(ALPHA_PHYS_TO_K0SEG(x))
@@ -94,7 +94,7 @@ u_int32_t tc_3000_500_intrbits[TC_3000_500_NCOOKIES] = {
 };
 
 struct tcintr {
-	int	(*tci_func) __P((void *));
+	int	(*tci_func)(void *);
 	void	*tci_arg;
 } tc_3000_500_intr[TC_3000_500_NCOOKIES];
 
@@ -129,7 +129,7 @@ tc_3000_500_intr_establish(tcadev, cookie, level, func, arg)
 	struct device *tcadev;
 	void *cookie, *arg;
 	tc_intrlevel_t level;
-	int (*func) __P((void *));
+	int (*func)(void *);
 {
 	u_long dev = (u_long)cookie;
 
diff --git a/sys/arch/alpha/tc/tc_bus_mem.c b/sys/arch/alpha/tc/tc_bus_mem.c
index 43a765b273c..951990eaf44 100644
--- a/sys/arch/alpha/tc/tc_bus_mem.c
+++ b/sys/arch/alpha/tc/tc_bus_mem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tc_bus_mem.c,v 1.11 2001/11/06 19:53:13 miod Exp $	*/
+/*	$OpenBSD: tc_bus_mem.c,v 1.12 2002/03/14 01:26:28 millert Exp $	*/
 /*	$NetBSD: tc_bus_mem.c,v 1.13 1996/12/02 22:19:34 cgd Exp $	*/
 
 /*
@@ -43,123 +43,123 @@
 #include <dev/tc/tcvar.h>
 
 /* mapping/unmapping */
-int		tc_mem_map __P((void *, bus_addr_t, bus_size_t, int,
-		    bus_space_handle_t *));
-void		tc_mem_unmap __P((void *, bus_space_handle_t, bus_size_t));
-int		tc_mem_subregion __P((void *, bus_space_handle_t, bus_size_t,
-		    bus_size_t, bus_space_handle_t *));
+int		tc_mem_map(void *, bus_addr_t, bus_size_t, int,
+		    bus_space_handle_t *);
+void		tc_mem_unmap(void *, bus_space_handle_t, bus_size_t);
+int		tc_mem_subregion(void *, bus_space_handle_t, bus_size_t,
+		    bus_size_t, bus_space_handle_t *);
 
 /* allocation/deallocation */
-int		tc_mem_alloc __P((void *, bus_addr_t, bus_addr_t, bus_size_t,
+int		tc_mem_alloc(void *, bus_addr_t, bus_addr_t, bus_size_t,
 		    bus_size_t, bus_addr_t, int, bus_addr_t *,
-		    bus_space_handle_t *));
-void		tc_mem_free __P((void *, bus_space_handle_t, bus_size_t));
+		    bus_space_handle_t *);
+void		tc_mem_free(void *, bus_space_handle_t, bus_size_t);
 
 /* barrier */
-inline void	tc_mem_barrier __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_size_t, int));
+inline void	tc_mem_barrier(void *, bus_space_handle_t,
+		    bus_size_t, bus_size_t, int);
 
 /* read (single) */
-inline u_int8_t	tc_mem_read_1 __P((void *, bus_space_handle_t, bus_size_t));
-inline u_int16_t tc_mem_read_2 __P((void *, bus_space_handle_t, bus_size_t));
-inline u_int32_t tc_mem_read_4 __P((void *, bus_space_handle_t, bus_size_t));
-inline u_int64_t tc_mem_read_8 __P((void *, bus_space_handle_t, bus_size_t));
+inline u_int8_t	tc_mem_read_1(void *, bus_space_handle_t, bus_size_t);
+inline u_int16_t tc_mem_read_2(void *, bus_space_handle_t, bus_size_t);
+inline u_int32_t tc_mem_read_4(void *, bus_space_handle_t, bus_size_t);
+inline u_int64_t tc_mem_read_8(void *, bus_space_handle_t, bus_size_t);
 
 /* read multiple */
-void		tc_mem_read_multi_1 __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t *, bus_size_t));
-void		tc_mem_read_multi_2 __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int16_t *, bus_size_t));
-void		tc_mem_read_multi_4 __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int32_t *, bus_size_t));
-void		tc_mem_read_multi_8 __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int64_t *, bus_size_t));
+void		tc_mem_read_multi_1(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t *, bus_size_t);
+void		tc_mem_read_multi_2(void *, bus_space_handle_t,
+		    bus_size_t, u_int16_t *, bus_size_t);
+void		tc_mem_read_multi_4(void *, bus_space_handle_t,
+		    bus_size_t, u_int32_t *, bus_size_t);
+void		tc_mem_read_multi_8(void *, bus_space_handle_t,
+		    bus_size_t, u_int64_t *, bus_size_t);
 
 /* read region */
-void		tc_mem_read_region_1 __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t *, bus_size_t));
-void		tc_mem_read_region_2 __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int16_t *, bus_size_t));
-void		tc_mem_read_region_4 __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int32_t *, bus_size_t));
-void		tc_mem_read_region_8 __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int64_t *, bus_size_t));
+void		tc_mem_read_region_1(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t *, bus_size_t);
+void		tc_mem_read_region_2(void *, bus_space_handle_t,
+		    bus_size_t, u_int16_t *, bus_size_t);
+void		tc_mem_read_region_4(void *, bus_space_handle_t,
+		    bus_size_t, u_int32_t *, bus_size_t);
+void		tc_mem_read_region_8(void *, bus_space_handle_t,
+		    bus_size_t, u_int64_t *, bus_size_t);
 
 /* write (single) */
-inline void	tc_mem_write_1 __P((void *, bus_space_handle_t, bus_size_t,
-		    u_int8_t));
-inline void	tc_mem_write_2 __P((void *, bus_space_handle_t, bus_size_t,
-		    u_int16_t));
-inline void	tc_mem_write_4 __P((void *, bus_space_handle_t, bus_size_t,
-		    u_int32_t));
-inline void	tc_mem_write_8 __P((void *, bus_space_handle_t, bus_size_t,
-		    u_int64_t));
+inline void	tc_mem_write_1(void *, bus_space_handle_t, bus_size_t,
+		    u_int8_t);
+inline void	tc_mem_write_2(void *, bus_space_handle_t, bus_size_t,
+		    u_int16_t);
+inline void	tc_mem_write_4(void *, bus_space_handle_t, bus_size_t,
+		    u_int32_t);
+inline void	tc_mem_write_8(void *, bus_space_handle_t, bus_size_t,
+		    u_int64_t);
 
 /* write multiple */
-void		tc_mem_write_multi_1 __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int8_t *, bus_size_t));
-void		tc_mem_write_multi_2 __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int16_t *, bus_size_t));
-void		tc_mem_write_multi_4 __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int32_t *, bus_size_t));
-void		tc_mem_write_multi_8 __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int64_t *, bus_size_t));
+void		tc_mem_write_multi_1(void *, bus_space_handle_t,
+		    bus_size_t, const u_int8_t *, bus_size_t);
+void		tc_mem_write_multi_2(void *, bus_space_handle_t,
+		    bus_size_t, const u_int16_t *, bus_size_t);
+void		tc_mem_write_multi_4(void *, bus_space_handle_t,
+		    bus_size_t, const u_int32_t *, bus_size_t);
+void		tc_mem_write_multi_8(void *, bus_space_handle_t,
+		    bus_size_t, const u_int64_t *, bus_size_t);
 
 /* write region */
-void		tc_mem_write_region_1 __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int8_t *, bus_size_t));
-void		tc_mem_write_region_2 __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int16_t *, bus_size_t));
-void		tc_mem_write_region_4 __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int32_t *, bus_size_t));
-void		tc_mem_write_region_8 __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int64_t *, bus_size_t));
+void		tc_mem_write_region_1(void *, bus_space_handle_t,
+		    bus_size_t, const u_int8_t *, bus_size_t);
+void		tc_mem_write_region_2(void *, bus_space_handle_t,
+		    bus_size_t, const u_int16_t *, bus_size_t);
+void		tc_mem_write_region_4(void *, bus_space_handle_t,
+		    bus_size_t, const u_int32_t *, bus_size_t);
+void		tc_mem_write_region_8(void *, bus_space_handle_t,
+		    bus_size_t, const u_int64_t *, bus_size_t);
 
 /* set multiple */
-void		tc_mem_set_multi_1 __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t, bus_size_t));
-void		tc_mem_set_multi_2 __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int16_t, bus_size_t));
-void		tc_mem_set_multi_4 __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int32_t, bus_size_t));
-void		tc_mem_set_multi_8 __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int64_t, bus_size_t));
+void		tc_mem_set_multi_1(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t, bus_size_t);
+void		tc_mem_set_multi_2(void *, bus_space_handle_t,
+		    bus_size_t, u_int16_t, bus_size_t);
+void		tc_mem_set_multi_4(void *, bus_space_handle_t,
+		    bus_size_t, u_int32_t, bus_size_t);
+void		tc_mem_set_multi_8(void *, bus_space_handle_t,
+		    bus_size_t, u_int64_t, bus_size_t);
 
 /* set region */
-void		tc_mem_set_region_1 __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t, bus_size_t));
-void		tc_mem_set_region_2 __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int16_t, bus_size_t));
-void		tc_mem_set_region_4 __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int32_t, bus_size_t));
-void		tc_mem_set_region_8 __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int64_t, bus_size_t));
+void		tc_mem_set_region_1(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t, bus_size_t);
+void		tc_mem_set_region_2(void *, bus_space_handle_t,
+		    bus_size_t, u_int16_t, bus_size_t);
+void		tc_mem_set_region_4(void *, bus_space_handle_t,
+		    bus_size_t, u_int32_t, bus_size_t);
+void		tc_mem_set_region_8(void *, bus_space_handle_t,
+		    bus_size_t, u_int64_t, bus_size_t);
 
 /* copy */
-void		tc_mem_copy_1 __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void		tc_mem_copy_2 __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void		tc_mem_copy_4 __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void		tc_mem_copy_8 __P((void *, bus_space_handle_t,
-		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
+void		tc_mem_copy_1(void *, bus_space_handle_t,
+		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void		tc_mem_copy_2(void *, bus_space_handle_t,
+		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void		tc_mem_copy_4(void *, bus_space_handle_t,
+		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void		tc_mem_copy_8(void *, bus_space_handle_t,
+		    bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
 
 /* read multiple raw */
-void		tc_mem_read_raw_multi_2 __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t *, bus_size_t));
-void		tc_mem_read_raw_multi_4 __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t *, bus_size_t));
-void		tc_mem_read_raw_multi_8 __P((void *, bus_space_handle_t,
-		    bus_size_t, u_int8_t *, bus_size_t));
+void		tc_mem_read_raw_multi_2(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t *, bus_size_t);
+void		tc_mem_read_raw_multi_4(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t *, bus_size_t);
+void		tc_mem_read_raw_multi_8(void *, bus_space_handle_t,
+		    bus_size_t, u_int8_t *, bus_size_t);
 
 /* write multiple raw */
-void		tc_mem_write_raw_multi_2 __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int8_t *, bus_size_t));
-void		tc_mem_write_raw_multi_4 __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int8_t *, bus_size_t));
-void		tc_mem_write_raw_multi_8 __P((void *, bus_space_handle_t,
-		    bus_size_t, const u_int8_t *, bus_size_t));
+void		tc_mem_write_raw_multi_2(void *, bus_space_handle_t,
+		    bus_size_t, const u_int8_t *, bus_size_t);
+void		tc_mem_write_raw_multi_4(void *, bus_space_handle_t,
+		    bus_size_t, const u_int8_t *, bus_size_t);
+void		tc_mem_write_raw_multi_8(void *, bus_space_handle_t,
+		    bus_size_t, const u_int8_t *, bus_size_t);
 
 static struct alpha_bus_space tc_mem_space = {
 	/* cookie */
diff --git a/sys/arch/alpha/tc/tc_conf.h b/sys/arch/alpha/tc/tc_conf.h
index 28f7a11c045..cb5eb0a89dd 100644
--- a/sys/arch/alpha/tc/tc_conf.h
+++ b/sys/arch/alpha/tc/tc_conf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tc_conf.h,v 1.4 1997/01/24 19:58:20 niklas Exp $	*/
+/*	$OpenBSD: tc_conf.h,v 1.5 2002/03/14 01:26:28 millert Exp $	*/
 /*	$NetBSD: tc_conf.h,v 1.3 1996/11/15 23:59:01 cgd Exp $	*/
 
 /*
@@ -33,12 +33,12 @@
  */
 
 #ifdef DEC_3000_500
-extern void	tc_3000_500_intr_setup __P((void));
-extern void	tc_3000_500_iointr __P((void *, unsigned long));
+extern void	tc_3000_500_intr_setup(void);
+extern void	tc_3000_500_iointr(void *, unsigned long);
 
 extern void	tc_3000_500_intr_establish __P((struct device *, void *,
 		    tc_intrlevel_t, int (*)(void *), void *));
-extern void	tc_3000_500_intr_disestablish __P((struct device *, void *));
+extern void	tc_3000_500_intr_disestablish(struct device *, void *);
 
 extern int	tc_3000_500_nslots;
 extern struct tc_slotdesc tc_3000_500_slots[];
@@ -49,12 +49,12 @@ extern struct tc_builtin tc_3000_500_nographics_builtins[];
 #endif /* DEC_3000_500 */
 
 #ifdef DEC_3000_300
-extern void	tc_3000_300_intr_setup __P((void));
-extern void	tc_3000_300_iointr __P((void *, unsigned long));
+extern void	tc_3000_300_intr_setup(void);
+extern void	tc_3000_300_iointr(void *, unsigned long);
 
 extern void	tc_3000_300_intr_establish __P((struct device *, void *,
 		    tc_intrlevel_t, int (*)(void *), void *));
-extern void	tc_3000_300_intr_disestablish __P((struct device *, void *));
+extern void	tc_3000_300_intr_disestablish(struct device *, void *);
 
 extern int	tc_3000_300_nslots;
 extern struct tc_slotdesc tc_3000_300_slots[];
diff --git a/sys/arch/alpha/tc/tc_machdep.h b/sys/arch/alpha/tc/tc_machdep.h
index 529d5ec2567..3c26c5c8f85 100644
--- a/sys/arch/alpha/tc/tc_machdep.h
+++ b/sys/arch/alpha/tc/tc_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tc_machdep.h,v 1.4 1996/12/08 00:20:59 niklas Exp $	*/
+/*	$OpenBSD: tc_machdep.h,v 1.5 2002/03/14 01:26:28 millert Exp $	*/
 /*	$NetBSD: tc_machdep.h,v 1.3 1996/10/22 21:34:22 cgd Exp $	*/
 
 /*
@@ -92,4 +92,4 @@ typedef int32_t		tc_offset_t;
 #define	TC_PHYS_TO_UNCACHED(addr)					\
     (addr)
 
-bus_space_tag_t tc_bus_mem_init __P((void *memv));;
+bus_space_tag_t tc_bus_mem_init(void *memv);;
diff --git a/sys/arch/alpha/tc/tcasic.c b/sys/arch/alpha/tc/tcasic.c
index 90106977613..fe63afca03f 100644
--- a/sys/arch/alpha/tc/tcasic.c
+++ b/sys/arch/alpha/tc/tcasic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcasic.c,v 1.8 2000/11/08 16:01:26 art Exp $	*/
+/*	$OpenBSD: tcasic.c,v 1.9 2002/03/14 01:26:28 millert Exp $	*/
 /*	$NetBSD: tcasic.c,v 1.14 1996/12/05 01:39:45 cgd Exp $	*/
 
 /*
@@ -54,7 +54,7 @@ struct cfdriver tcasic_cd = {
 	NULL, "tcasic", DV_DULL,
 };
 
-int	tcasicprint __P((void *, const char *));
+int	tcasicprint(void *, const char *);
 
 extern int cputype;
 
@@ -94,8 +94,8 @@ tcasicattach(parent, self, aux)
 	void *aux;
 {
 	struct tcbus_attach_args tba;
-	void (*intr_setup) __P((void));
-	void (*iointr) __P((void *, unsigned long));
+	void (*intr_setup)(void);
+	void (*iointr)(void *, unsigned long);
 
 	printf("\n");
 	tcasicfound = 1;
diff --git a/sys/arch/alpha/tc/tcds.c b/sys/arch/alpha/tc/tcds.c
index 015d82da5c7..1f3f2f815cd 100644
--- a/sys/arch/alpha/tc/tcds.c
+++ b/sys/arch/alpha/tc/tcds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcds.c,v 1.8 1999/01/11 05:11:05 millert Exp $	*/
+/*	$OpenBSD: tcds.c,v 1.9 2002/03/14 01:26:28 millert Exp $	*/
 /*	$NetBSD: tcds.c,v 1.16 1996/12/05 01:39:45 cgd Exp $	*/
 
 /*
@@ -57,12 +57,12 @@ struct tcds_softc {
 
 /* Definition of the driver for autoconfig. */
 #ifdef __BROKEN_INDIRECT_CONFIG
-int	tcdsmatch __P((struct device *, void *, void *));
+int	tcdsmatch(struct device *, void *, void *);
 #else
-int	tcdsmatch __P((struct device *, struct cfdata *, void *));
+int	tcdsmatch(struct device *, struct cfdata *, void *);
 #endif
-void	tcdsattach __P((struct device *, struct device *, void *));
-int     tcdsprint __P((void *, const char *));
+void	tcdsattach(struct device *, struct device *, void *);
+int     tcdsprint(void *, const char *);
 
 struct cfattach tcds_ca = {
 	sizeof(struct tcds_softc), tcdsmatch, tcdsattach,
@@ -72,8 +72,8 @@ struct cfdriver tcds_cd = {
 	NULL, "tcds", DV_DULL,
 };
 
-/*static*/ int	tcds_intr __P((void *));
-/*static*/ int	tcds_intrnull __P((void *));
+/*static*/ int	tcds_intr(void *);
+/*static*/ int	tcds_intrnull(void *);
 
 int
 tcdsmatch(parent, cfdata, aux)
@@ -227,7 +227,7 @@ tcds_intr_establish(tcds, cookie, level, func, arg)
 	struct device *tcds;
 	void *cookie, *arg;
 	tc_intrlevel_t level;
-	int (*func) __P((void *));
+	int (*func)(void *);
 {
 	struct tcds_softc *sc = (struct tcds_softc *)tcds;
 	u_long slot;
diff --git a/sys/arch/alpha/tc/tcdsreg.h b/sys/arch/alpha/tc/tcdsreg.h
index c8839b8cf7c..02cfdba2102 100644
--- a/sys/arch/alpha/tc/tcdsreg.h
+++ b/sys/arch/alpha/tc/tcdsreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcdsreg.h,v 1.3 1996/10/30 22:41:29 niklas Exp $	*/
+/*	$OpenBSD: tcdsreg.h,v 1.4 2002/03/14 01:26:28 millert Exp $	*/
 /*	$NetBSD: tcdsreg.h,v 1.2 1996/07/09 00:55:42 cgd Exp $	*/
 
 /*
@@ -121,14 +121,14 @@
 #define	TCDS_DUD_BYTE11		0xff000000	/* byte 11 mask */
 
 #if 0
-int  tcds_scsi_iserr __P((struct dma_softc *));
-int  tcds_scsi_isintr __P((int, int));
-void tcds_dma_disable __P((int));
-void tcds_dma_enable __P((int));
-void tcds_dma_init __P((struct dma_softc *, int));
-void tcds_scsi_disable __P((int));
-void tcds_scsi_enable __P((int));
-void tcds_scsi_reset __P((int));
+int  tcds_scsi_iserr(struct dma_softc *);
+int  tcds_scsi_isintr(int, int);
+void tcds_dma_disable(int);
+void tcds_dma_enable(int);
+void tcds_dma_init(struct dma_softc *, int);
+void tcds_scsi_disable(int);
+void tcds_scsi_enable(int);
+void tcds_scsi_reset(int);
 
 /*
  * XXX
diff --git a/sys/arch/alpha/tc/tcdsvar.h b/sys/arch/alpha/tc/tcdsvar.h
index 13d2b9c8378..e22a50099ea 100644
--- a/sys/arch/alpha/tc/tcdsvar.h
+++ b/sys/arch/alpha/tc/tcdsvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcdsvar.h,v 1.5 1997/01/24 19:58:24 niklas Exp $	*/
+/*	$OpenBSD: tcdsvar.h,v 1.6 2002/03/14 01:26:28 millert Exp $	*/
 /*	$NetBSD: tcdsvar.h,v 1.5 1996/11/13 21:13:38 cgd Exp $	*/
 
 /*
@@ -35,7 +35,7 @@ struct tcds_slotconfig {
 	int	sc_slot;
 	struct tcds_softc *sc_tcds;		/* to frob TCDS regs */
 	struct esp_softc *sc_esp;		/* to frob child's regs */
-	int	(*sc_intrhand) __P((void *));	/* intr. handler */
+	int	(*sc_intrhand)(void *);	/* intr. handler */
 	void	*sc_intrarg;			/* intr. handler arg. */
 
 	/*
@@ -86,24 +86,24 @@ struct tcdsdev_attach_args {
  */
 void	tcds_intr_establish __P((struct device *, void *, tc_intrlevel_t,
 	    int (*)(void *), void *));
-void	tcds_intr_disestablish __P((struct device *, void *));
-void	tcds_dma_enable __P((struct tcds_slotconfig *, int));
-void	tcds_scsi_enable __P((struct tcds_slotconfig *, int));
-int	tcds_scsi_iserr __P((struct tcds_slotconfig *));
-int	tcds_scsi_isintr __P((struct tcds_slotconfig *, int));
-void	tcds_scsi_reset __P((struct tcds_slotconfig *));
-int	tcds_scsi_iserr __P((struct tcds_slotconfig *));
+void	tcds_intr_disestablish(struct device *, void *);
+void	tcds_dma_enable(struct tcds_slotconfig *, int);
+void	tcds_scsi_enable(struct tcds_slotconfig *, int);
+int	tcds_scsi_iserr(struct tcds_slotconfig *);
+int	tcds_scsi_isintr(struct tcds_slotconfig *, int);
+void	tcds_scsi_reset(struct tcds_slotconfig *);
+int	tcds_scsi_iserr(struct tcds_slotconfig *);
 
 /*
  * TCDS DMA functions (used the the 53c94 driver)
  */
-int	tcds_dma_isintr	__P((struct tcds_slotconfig *));
-void	tcds_dma_reset __P((struct tcds_slotconfig *));
-int	tcds_dma_intr __P((struct tcds_slotconfig *));
-int	tcds_dma_setup __P((struct tcds_slotconfig *, caddr_t *, size_t *,
-	    int, size_t *));
-void	tcds_dma_go __P((struct tcds_slotconfig *));
-int	tcds_dma_isactive __P((struct tcds_slotconfig *));
+int	tcds_dma_isintr(struct tcds_slotconfig *);
+void	tcds_dma_reset(struct tcds_slotconfig *);
+int	tcds_dma_intr(struct tcds_slotconfig *);
+int	tcds_dma_setup(struct tcds_slotconfig *, caddr_t *, size_t *,
+	    int, size_t *);
+void	tcds_dma_go(struct tcds_slotconfig *);
+int	tcds_dma_isactive(struct tcds_slotconfig *);
 
 /*
  * The TCDS (bus) cfdriver, so that subdevices can more