First round of __P removal in sys

25 files changed, 371 insertions, 371 deletions

diff --git a/sys/arch/macppc/dev/abtn.c b/sys/arch/macppc/dev/abtn.c
index f570a9d9c5f..fb6c6837984 100644
--- a/sys/arch/macppc/dev/abtn.c
+++ b/sys/arch/macppc/dev/abtn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: abtn.c,v 1.2 2001/09/01 17:43:08 drahn Exp $	*/
+/*	$OpenBSD: abtn.c,v 1.3 2002/03/14 01:26:36 millert Exp $	*/
 /*	$NetBSD: abtn.c,v 1.1 1999/07/12 17:48:26 tsubai Exp $	*/
 
 /*-
@@ -48,9 +48,9 @@ struct abtn_softc {
 	int volume;		/* speaker volume (not yet) */
 };
 
-static int abtn_match __P((struct device *, void *, void *));
-static void abtn_attach __P((struct device *, struct device *, void *));
-static void abtn_adbcomplete __P((caddr_t, caddr_t, int));
+static int abtn_match(struct device *, void *, void *);
+static void abtn_attach(struct device *, struct device *, void *);
+static void abtn_adbcomplete(caddr_t, caddr_t, int);
 
 struct cfattach abtn_ca = {
 	sizeof(struct abtn_softc), abtn_match, abtn_attach
diff --git a/sys/arch/macppc/dev/adb.c b/sys/arch/macppc/dev/adb.c
index d7ddcc277ab..b79bd37743a 100644
--- a/sys/arch/macppc/dev/adb.c
+++ b/sys/arch/macppc/dev/adb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adb.c,v 1.3 2001/10/03 14:45:37 drahn Exp $	*/
+/*	$OpenBSD: adb.c,v 1.4 2002/03/14 01:26:36 millert Exp $	*/
 /*	$NetBSD: adb.c,v 1.6 1999/08/16 06:28:09 tsubai Exp $	*/
 
 /*-
@@ -52,9 +52,9 @@
 /*
  * Function declarations.
  */
-static int	adbmatch __P((struct device *, void *, void *));
-static void	adbattach __P((struct device *, struct device *, void *));
-static int	adbprint __P((void *, const char *));
+static int	adbmatch(struct device *, void *, void *);
+static void	adbattach(struct device *, struct device *, void *);
+static int	adbprint(void *, const char *);
 
 /*
  * Global variables.
diff --git a/sys/arch/macppc/dev/adb_direct.c b/sys/arch/macppc/dev/adb_direct.c
index 747279f5acb..eb25d2c239a 100644
--- a/sys/arch/macppc/dev/adb_direct.c
+++ b/sys/arch/macppc/dev/adb_direct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adb_direct.c,v 1.2 2001/09/01 17:43:08 drahn Exp $	*/
+/*	$OpenBSD: adb_direct.c,v 1.3 2002/03/14 01:26:36 millert Exp $	*/
 /*	$NetBSD: adb_direct.c,v 1.14 2000/06/08 22:10:45 tsubai Exp $	*/
 
 /* From: adb_direct.c 2.02 4/18/97 jpw */
@@ -165,7 +165,7 @@
  * A structure for storing information about each ADB device.
  */
 struct ADBDevEntry {
-	void	(*ServiceRtPtr) __P((void));
+	void	(*ServiceRtPtr)(void);
 	void	*DataAreaAddr;
 	int	devType;
 	int	origAddr;
@@ -252,48 +252,48 @@ struct	timeout adb_softintr_timeout;
 volatile u_char *Via1Base;
 extern int adb_polling;			/* Are we polling? */
 
-void	pm_setup_adb __P((void));
-void	pm_check_adb_devices __P((int));
-void	pm_intr __P((void));
-int	pm_adb_op __P((u_char *, void *, void *, int));
-void	pm_init_adb_device __P((void));
+void	pm_setup_adb(void);
+void	pm_check_adb_devices(int);
+void	pm_intr(void);
+int	pm_adb_op(u_char *, void *, void *, int);
+void	pm_init_adb_device(void);
 
 /*
  * The following are private routines.
  */
 #ifdef ADB_DEBUG
-void	print_single __P((u_char *));
+void	print_single(u_char *);
 #endif
-void	adb_intr_II __P((void));
-void	adb_intr_IIsi __P((void));
-void	adb_intr_cuda __P((void));
-void	adb_soft_intr __P((void));
-int	send_adb_II __P((u_char *, u_char *, void *, void *, int));
-int	send_adb_IIsi __P((u_char *, u_char *, void *, void *, int));
-int	send_adb_cuda __P((u_char *, u_char *, void *, void *, int));
-void	adb_intr_cuda_test __P((void));
-void	adb_cuda_tickle __P((void));
-void	adb_pass_up __P((struct adbCommand *));
-void	adb_op_comprout __P((caddr_t, caddr_t, int));
-void	adb_reinit __P((void));
-int	count_adbs __P((void));
-int	get_ind_adb_info __P((ADBDataBlock *, int));
-int	get_adb_info __P((ADBDataBlock *, int));
-int	set_adb_info __P((ADBSetInfoBlock *, int));
-void	adb_setup_hw_type __P((void));
-int	adb_op __P((Ptr, Ptr, Ptr, short));
-void	adb_read_II __P((u_char *));
-void	adb_hw_setup __P((void));
-void	adb_hw_setup_IIsi __P((u_char *));
-void	adb_comp_exec __P((void));
-int	adb_cmd_result __P((u_char *));
-int	adb_cmd_extra __P((u_char *));
-int	adb_guess_next_device __P((void));
-int	adb_prog_switch_enable __P((void));
-int	adb_prog_switch_disable __P((void));
+void	adb_intr_II(void);
+void	adb_intr_IIsi(void);
+void	adb_intr_cuda(void);
+void	adb_soft_intr(void);
+int	send_adb_II(u_char *, u_char *, void *, void *, int);
+int	send_adb_IIsi(u_char *, u_char *, void *, void *, int);
+int	send_adb_cuda(u_char *, u_char *, void *, void *, int);
+void	adb_intr_cuda_test(void);
+void	adb_cuda_tickle(void);
+void	adb_pass_up(struct adbCommand *);
+void	adb_op_comprout(caddr_t, caddr_t, int);
+void	adb_reinit(void);
+int	count_adbs(void);
+int	get_ind_adb_info(ADBDataBlock *, int);
+int	get_adb_info(ADBDataBlock *, int);
+int	set_adb_info(ADBSetInfoBlock *, int);
+void	adb_setup_hw_type(void);
+int	adb_op(Ptr, Ptr, Ptr, short);
+void	adb_read_II(u_char *);
+void	adb_hw_setup(void);
+void	adb_hw_setup_IIsi(u_char *);
+void	adb_comp_exec(void);
+int	adb_cmd_result(u_char *);
+int	adb_cmd_extra(u_char *);
+int	adb_guess_next_device(void);
+int	adb_prog_switch_enable(void);
+int	adb_prog_switch_disable(void);
 /* we should create this and it will be the public version */
-int	send_adb __P((u_char *, void *, void *));
-int setsoftadb __P((void));
+int	send_adb(u_char *, void *, void *);
+int setsoftadb(void);
 
 #ifdef ADB_DEBUG
 /*
@@ -1007,7 +1007,7 @@ adb_soft_intr(void)
 
 		/* call default completion routine if it's valid */
 		if (comprout) {
-			((int (*) __P((u_char *, u_char*, int))) comprout)
+			((int (*)(u_char *, u_char*, int)) comprout)
 			    (buffer, compdata, cmd);
 #if 0
 #ifdef __NetBSD__
diff --git a/sys/arch/macppc/dev/adb_direct.h b/sys/arch/macppc/dev/adb_direct.h
index 007d2fc9d61..bc96f0a51e2 100644
--- a/sys/arch/macppc/dev/adb_direct.h
+++ b/sys/arch/macppc/dev/adb_direct.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adb_direct.h,v 1.1 2001/09/01 15:50:00 drahn Exp $	*/
+/*	$OpenBSD: adb_direct.h,v 1.2 2002/03/14 01:26:36 millert Exp $	*/
 /*	$NetBSD: adb_direct.h,v 1.1 1998/05/15 10:15:47 tsubai Exp $	*/
 
 /*
@@ -43,13 +43,13 @@
 #define ADB_HW_PB		0x04	/* PowerBook series */
 #define ADB_HW_CUDA		0x05	/* Machines with a Cuda chip */
 
-int	adb_poweroff __P((void));
-int	CountADBs __P((void));
-void	ADBReInit __P((void));
-int	GetIndADB __P((ADBDataBlock *info, int index));
-int	GetADBInfo __P((ADBDataBlock *info, int adbAddr));
-int	SetADBInfo __P((ADBSetInfoBlock *info, int adbAddr));
-int	ADBOp __P((Ptr buffer, Ptr compRout, Ptr data, short commandNum));
-int	adb_read_date_time __P((unsigned long *));
-int	adb_set_date_time __P((unsigned long));
-int	adb_op_sync __P((Ptr, Ptr, Ptr, short));
+int	adb_poweroff(void);
+int	CountADBs(void);
+void	ADBReInit(void);
+int	GetIndADB(ADBDataBlock *info, int index);
+int	GetADBInfo(ADBDataBlock *info, int adbAddr);
+int	SetADBInfo(ADBSetInfoBlock *info, int adbAddr);
+int	ADBOp(Ptr buffer, Ptr compRout, Ptr data, short commandNum);
+int	adb_read_date_time(unsigned long *);
+int	adb_set_date_time(unsigned long);
+int	adb_op_sync(Ptr, Ptr, Ptr, short);
diff --git a/sys/arch/macppc/dev/adbvar.h b/sys/arch/macppc/dev/adbvar.h
index b84babcc68c..b4997addc41 100644
--- a/sys/arch/macppc/dev/adbvar.h
+++ b/sys/arch/macppc/dev/adbvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adbvar.h,v 1.2 2001/10/03 14:45:37 drahn Exp $	*/
+/*	$OpenBSD: adbvar.h,v 1.3 2002/03/14 01:26:36 millert Exp $	*/
 /*	$NetBSD: adbvar.h,v 1.3 2000/06/08 22:10:46 tsubai Exp $	*/
 
 /*-
@@ -86,25 +86,25 @@ struct adb_softc {
 
 
 /* adb.c */
-void	adb_enqevent __P((adb_event_t *event));
-void	adb_handoff __P((adb_event_t *event));
-void	adb_autorepeat __P((void *keyp));
-void	adb_dokeyupdown __P((adb_event_t *event));
-void	adb_keymaybemouse __P((adb_event_t *event));
-void	adb_processevent __P((adb_event_t *event));
-int	adbopen __P((dev_t dev, int flag, int mode, struct proc *p));
-int	adbclose __P((dev_t dev, int flag, int mode, struct proc *p));
-int	adbread __P((dev_t dev, struct uio *uio, int flag));
-int	adbwrite __P((dev_t dev, struct uio *uio, int flag));
-int	adbioctl __P((dev_t , int , caddr_t , int , struct proc *));
-int	adbpoll __P((dev_t dev, int events, struct proc *p));
+void	adb_enqevent(adb_event_t *event);
+void	adb_handoff(adb_event_t *event);
+void	adb_autorepeat(void *keyp);
+void	adb_dokeyupdown(adb_event_t *event);
+void	adb_keymaybemouse(adb_event_t *event);
+void	adb_processevent(adb_event_t *event);
+int	adbopen(dev_t dev, int flag, int mode, struct proc *p);
+int	adbclose(dev_t dev, int flag, int mode, struct proc *p);
+int	adbread(dev_t dev, struct uio *uio, int flag);
+int	adbwrite(dev_t dev, struct uio *uio, int flag);
+int	adbioctl(dev_t , int , caddr_t , int , struct proc *);
+int	adbpoll(dev_t dev, int events, struct proc *p);
 
 /* adbsys.c */
-void	adb_complete __P((caddr_t buffer, caddr_t data_area, int adb_command));
-void	adb_msa3_complete __P((caddr_t buffer, caddr_t data_area, int adb_command));
-void	adb_mm_nonemp_complete __P((caddr_t buffer, caddr_t data_area, int adb_command));
-void	extdms_init __P((int));
-void	extdms_complete __P((caddr_t, caddr_t, int));
+void	adb_complete(caddr_t buffer, caddr_t data_area, int adb_command);
+void	adb_msa3_complete(caddr_t buffer, caddr_t data_area, int adb_command);
+void	adb_mm_nonemp_complete(caddr_t buffer, caddr_t data_area, int adb_command);
+void	extdms_init(int);
+void	extdms_complete(caddr_t, caddr_t, int);
 
 /* types of adb hardware that we (will eventually) support */
 #define ADB_HW_UNKNOWN		0x01	/* don't know */
@@ -121,14 +121,14 @@ extern int adbHardware;                 /* in adb_direct.c */
 #define ADBTALK(dev, reg)	((((u_int8_t)(dev) & 0x0f) << 4) | 0x0c | (reg))
 
 /* adb_direct.c */
-int	adb_poweroff __P((void));
-int	CountADBs __P((void));
-void	ADBReInit __P((void));
-int	GetIndADB __P((ADBDataBlock * info, int index));
-int	GetADBInfo __P((ADBDataBlock * info, int adbAddr));
-int	SetADBInfo __P((ADBSetInfoBlock * info, int adbAddr));
-int	ADBOp __P((Ptr buffer, Ptr compRout, Ptr data, short commandNum));
-int	adb_read_date_time __P((unsigned long *t));
-int	adb_set_date_time __P((unsigned long t));
-int	adb_intr __P((void *arg));
-void	adb_cuda_autopoll __P((void));
+int	adb_poweroff(void);
+int	CountADBs(void);
+void	ADBReInit(void);
+int	GetIndADB(ADBDataBlock * info, int index);
+int	GetADBInfo(ADBDataBlock * info, int adbAddr);
+int	SetADBInfo(ADBSetInfoBlock * info, int adbAddr);
+int	ADBOp(Ptr buffer, Ptr compRout, Ptr data, short commandNum);
+int	adb_read_date_time(unsigned long *t);
+int	adb_set_date_time(unsigned long t);
+int	adb_intr(void *arg);
+void	adb_cuda_autopoll(void);
diff --git a/sys/arch/macppc/dev/aed.c b/sys/arch/macppc/dev/aed.c
index d5ac8136064..75f56ca69fa 100644
--- a/sys/arch/macppc/dev/aed.c
+++ b/sys/arch/macppc/dev/aed.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aed.c,v 1.2 2001/09/01 17:43:08 drahn Exp $	*/
+/*	$OpenBSD: aed.c,v 1.3 2002/03/14 01:26:36 millert Exp $	*/
 /*	$NetBSD: aed.c,v 1.5 2000/03/23 06:40:33 thorpej Exp $	*/
 
 /*
@@ -54,17 +54,17 @@
  * Function declarations.
  */
 #ifdef __NetBSD__
-static int	aedmatch __P((struct device *, struct cfdata *, void *));
+static int	aedmatch(struct device *, struct cfdata *, void *);
 #endif /* __NetBSD__ */
 #ifdef __OpenBSD__
-static int	aedmatch __P((struct device *, void *, void *));
+static int	aedmatch(struct device *, void *, void *);
 #endif /* __OpenBSD__ */
-static void	aedattach __P((struct device *, struct device *, void *));
-static void	aed_emulate_mouse __P((adb_event_t *event));
-static void	aed_kbdrpt __P((void *kstate));
-static void	aed_dokeyupdown __P((adb_event_t *event));
-static void	aed_handoff __P((adb_event_t *event));
-static void	aed_enqevent __P((adb_event_t *event));
+static void	aedattach(struct device *, struct device *, void *);
+static void	aed_emulate_mouse(adb_event_t *event);
+static void	aed_kbdrpt(void *kstate);
+static void	aed_dokeyupdown(adb_event_t *event);
+static void	aed_handoff(adb_event_t *event);
+static void	aed_enqevent(adb_event_t *event);
 
 /*
  * Global variables.
diff --git a/sys/arch/macppc/dev/aedvar.h b/sys/arch/macppc/dev/aedvar.h
index f53770e0de3..e27f7394a24 100644
--- a/sys/arch/macppc/dev/aedvar.h
+++ b/sys/arch/macppc/dev/aedvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aedvar.h,v 1.1 2001/09/01 15:50:00 drahn Exp $	*/
+/*	$OpenBSD: aedvar.h,v 1.2 2002/03/14 01:26:36 millert Exp $	*/
 /*	$NetBSD: aedvar.h,v 1.2 2000/03/23 06:40:33 thorpej Exp $	*/
 
 /*
@@ -83,10 +83,10 @@ struct aed_softc {
 /* Options */
 #define AED_MSEMUL	0x1		/* emulate mouse buttons */
 
-void	aed_input __P((adb_event_t *event));
-int	aedopen __P((dev_t dev, int flag, int mode, struct proc *p));
-int	aedclose __P((dev_t dev, int flag, int mode, struct proc *p));
-int	aedread __P((dev_t dev, struct uio *uio, int flag));
-int	aedwrite __P((dev_t dev, struct uio *uio, int flag));
-int	aedioctl __P((dev_t , int , caddr_t , int , struct proc *));
-int	aedpoll __P((dev_t dev, int events, struct proc *p));
+void	aed_input(adb_event_t *event);
+int	aedopen(dev_t dev, int flag, int mode, struct proc *p);
+int	aedclose(dev_t dev, int flag, int mode, struct proc *p);
+int	aedread(dev_t dev, struct uio *uio, int flag);
+int	aedwrite(dev_t dev, struct uio *uio, int flag);
+int	aedioctl(dev_t , int , caddr_t , int , struct proc *);
+int	aedpoll(dev_t dev, int events, struct proc *p);
diff --git a/sys/arch/macppc/dev/akbd.c b/sys/arch/macppc/dev/akbd.c
index 2bc7f43ab1c..1d352be0277 100644
--- a/sys/arch/macppc/dev/akbd.c
+++ b/sys/arch/macppc/dev/akbd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: akbd.c,v 1.2 2001/09/01 17:43:08 drahn Exp $	*/
+/*	$OpenBSD: akbd.c,v 1.3 2002/03/14 01:26:36 millert Exp $	*/
 /*	$NetBSD: akbd.c,v 1.13 2001/01/25 14:08:55 tsubai Exp $	*/
 
 /*
@@ -62,14 +62,14 @@
 /*
  * Function declarations.
  */
-static int	akbdmatch __P((struct device *, void *, void *));
-static void	akbdattach __P((struct device *, struct device *, void *));
-void		kbd_adbcomplete __P((caddr_t buffer, caddr_t data_area, int adb_command));
-static void	kbd_processevent __P((adb_event_t *event, struct akbd_softc *));
+static int	akbdmatch(struct device *, void *, void *);
+static void	akbdattach(struct device *, struct device *, void *);
+void		kbd_adbcomplete(caddr_t buffer, caddr_t data_area, int adb_command);
+static void	kbd_processevent(adb_event_t *event, struct akbd_softc *);
 #ifdef notyet
-static u_char	getleds __P((int));
-static int	setleds __P((struct akbd_softc *, u_char));
-static void	blinkleds __P((struct akbd_softc *));
+static u_char	getleds(int);
+static int	setleds(struct akbd_softc *, u_char);
+static void	blinkleds(struct akbd_softc *);
 #endif
 
 /* Driver definition. */
@@ -83,10 +83,10 @@ struct cfdriver akbd_cd = {
 
 extern struct cfdriver akbd_cd;
 
-int akbd_enable __P((void *, int));
-void akbd_set_leds __P((void *, int));
-int akbd_ioctl __P((void *, u_long, caddr_t, int, struct proc *));
-int akbd_intr __P((adb_event_t *event));
+int akbd_enable(void *, int);
+void akbd_set_leds(void *, int);
+int akbd_ioctl(void *, u_long, caddr_t, int, struct proc *);
+int akbd_intr(adb_event_t *event);
 
 struct wskbd_accessops akbd_accessops = {
 	akbd_enable,
@@ -94,8 +94,8 @@ struct wskbd_accessops akbd_accessops = {
 	akbd_ioctl,
 };
 
-void akbd_cngetc __P((void *, u_int *, int *));
-void akbd_cnpollc __P((void *, int));
+void akbd_cngetc(void *, u_int *, int *);
+void akbd_cnpollc(void *, int);
 
 struct wskbd_consops akbd_consops = {
 	akbd_cngetc,
diff --git a/sys/arch/macppc/dev/akbdvar.h b/sys/arch/macppc/dev/akbdvar.h
index ff1a56d5365..50964ec27e4 100644
--- a/sys/arch/macppc/dev/akbdvar.h
+++ b/sys/arch/macppc/dev/akbdvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: akbdvar.h,v 1.1 2001/09/01 15:50:00 drahn Exp $	*/
+/*	$OpenBSD: akbdvar.h,v 1.2 2002/03/14 01:26:36 millert Exp $	*/
 /*	$NetBSD: akbdvar.h,v 1.4 1999/02/17 14:56:56 tsubai Exp $	*/
 
 /*
@@ -56,7 +56,7 @@ struct akbd_softc {
 #define LED_CAPSLOCK	0x2
 #define LED_SCROLL_LOCK	0x4
 
-void kbd_adbcomplete __P((caddr_t buffer, caddr_t data_area, int adb_command));
+void kbd_adbcomplete(caddr_t buffer, caddr_t data_area, int adb_command);
 int akbd_cnattach(void);
 
 #endif /* _MACPPC_KBDVAR_H_ */
diff --git a/sys/arch/macppc/dev/ams.c b/sys/arch/macppc/dev/ams.c
index be431ed5ed0..eef607cdea9 100644
--- a/sys/arch/macppc/dev/ams.c
+++ b/sys/arch/macppc/dev/ams.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ams.c,v 1.2 2001/09/01 17:43:08 drahn Exp $	*/
+/*	$OpenBSD: ams.c,v 1.3 2002/03/14 01:26:36 millert Exp $	*/
 /*	$NetBSD: ams.c,v 1.11 2000/12/19 03:13:40 tsubai Exp $	*/
 
 /*
@@ -55,10 +55,10 @@
 /*
  * Function declarations.
  */
-static int	amsmatch __P((struct device *, void *, void *));
-static void	amsattach __P((struct device *, struct device *, void *));
-static void	ems_init __P((struct ams_softc *));
-static void	ms_processevent __P((adb_event_t *event, struct ams_softc *));
+static int	amsmatch(struct device *, void *, void *);
+static void	amsattach(struct device *, struct device *, void *);
+static void	ems_init(struct ams_softc *);
+static void	ms_processevent(adb_event_t *event, struct ams_softc *);
 
 /* Driver definition. */
 struct cfattach ams_ca = {
@@ -70,9 +70,9 @@ struct cfdriver ams_cd = {
 };
 
 
-int ams_enable __P((void *));
-int ams_ioctl __P((void *, u_long, caddr_t, int, struct proc *));
-void ams_disable __P((void *));
+int ams_enable(void *);
+int ams_ioctl(void *, u_long, caddr_t, int, struct proc *);
+void ams_disable(void *);
 
 const struct wsmouse_accessops ams_accessops = {
 	ams_enable,
diff --git a/sys/arch/macppc/dev/amsvar.h b/sys/arch/macppc/dev/amsvar.h
index 059131689d6..51fe68b6671 100644
--- a/sys/arch/macppc/dev/amsvar.h
+++ b/sys/arch/macppc/dev/amsvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: amsvar.h,v 1.1 2001/09/01 15:50:00 drahn Exp $	*/
+/*	$OpenBSD: amsvar.h,v 1.2 2002/03/14 01:26:36 millert Exp $	*/
 /*	$NetBSD: amsvar.h,v 1.4 1999/06/17 06:59:05 tsubai Exp $	*/
 
 /*
@@ -61,7 +61,7 @@ struct ams_softc {
 #define MSCLASS_TRACKBALL	2
 #define MSCLASS_TRACKPAD	3
 
-void ms_adbcomplete __P((caddr_t buffer, caddr_t data_area, int adb_command));
-void ms_handoff __P((adb_event_t *event, struct ams_softc *));
+void ms_adbcomplete(caddr_t buffer, caddr_t data_area, int adb_command);
+void ms_handoff(adb_event_t *event, struct ams_softc *);
 
 #endif /* _MACPPC_AMSVAR_H_ */
diff --git a/sys/arch/macppc/dev/apm.c b/sys/arch/macppc/dev/apm.c
index 7cb4450ff52..49952497b99 100644
--- a/sys/arch/macppc/dev/apm.c
+++ b/sys/arch/macppc/dev/apm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apm.c,v 1.2 2001/10/03 20:06:00 drahn Exp $	*/
+/*	$OpenBSD: apm.c,v 1.3 2002/03/14 01:26:36 millert Exp $	*/
 
 /*-
  * Copyright (c) 2001 Alexander Guy.  All rights reserved.
@@ -69,16 +69,16 @@ struct apm_softc {
 	int    sc_flags;
 };
 
-int apmmatch __P((struct device *, void *, void *));
-void apmattach __P((struct device *, struct device *, void *));
+int apmmatch(struct device *, void *, void *);
+void apmattach(struct device *, struct device *, void *);
 
 struct cfattach apm_ca = {
 	sizeof(struct apm_softc), apmmatch, apmattach
 };
 
-int apmopen __P((dev_t dev, int flag, int mode, struct proc *p));
-int apmclose __P((dev_t dev, int flag, int mode, struct proc *p));
-int apmioctl __P((dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p));
+int apmopen(dev_t dev, int flag, int mode, struct proc *p);
+int apmclose(dev_t dev, int flag, int mode, struct proc *p);
+int apmioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p);
 
 struct cfdriver apm_cd = {
 	NULL, "apm", DV_DULL
@@ -89,9 +89,9 @@ struct cfdriver apm_cd = {
 #define APMDEV_NORMAL	0
 #define APMDEV_CTL	8
 
-void filt_apmrdetach __P((struct knote *kn));
-int filt_apmread __P((struct knote *kn, long hint));
-int apmkqfilter __P((dev_t dev, struct knote *kn));
+void filt_apmrdetach(struct knote *kn);
+int filt_apmread(struct knote *kn, long hint);
+int apmkqfilter(dev_t dev, struct knote *kn);
 
 struct filterops apmread_filtops =
 	{ 1, NULL, filt_apmrdetach, filt_apmread};
diff --git a/sys/arch/macppc/dev/awacs.c b/sys/arch/macppc/dev/awacs.c
index 40b4524e133..6dde84af2de 100644
--- a/sys/arch/macppc/dev/awacs.c
+++ b/sys/arch/macppc/dev/awacs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: awacs.c,v 1.8 2002/01/30 06:53:56 drahn Exp $	*/
+/*	$OpenBSD: awacs.c,v 1.9 2002/03/14 01:26:36 millert Exp $	*/
 /*	$NetBSD: awacs.c,v 1.4 2001/02/26 21:07:51 wiz Exp $	*/
 
 /*-
@@ -114,7 +114,7 @@ int awacs_query_devinfo(void *, mixer_devinfo_t *);
 size_t awacs_round_buffersize(void *, int, size_t);
 paddr_t awacs_mappage(void *, void *, off_t, int);
 int awacs_get_props(void *);
-void *awacs_allocm __P((void *, int, size_t, int, int));
+void *awacs_allocm(void *, int, size_t, int, int);
 
 static inline u_int awacs_read_reg(struct awacs_softc *, int);
 static inline void awacs_write_reg(struct awacs_softc *, int, int);
@@ -122,7 +122,7 @@ void awacs_write_codec(struct awacs_softc *, int);
 void awacs_set_speaker_volume(struct awacs_softc *, int, int);
 void awacs_set_ext_volume(struct awacs_softc *, int, int);
 int awacs_set_rate(struct awacs_softc *, int);
-void awacs_mono16_to_stereo16 __P((void *v, u_char *p, int cc));
+void awacs_mono16_to_stereo16(void *v, u_char *p, int cc);
 
 struct cfattach awacs_ca = {
 	sizeof(struct awacs_softc), awacs_match, awacs_attach
diff --git a/sys/arch/macppc/dev/if_bm.c b/sys/arch/macppc/dev/if_bm.c
index bbc11040fbc..1997e6f8bf0 100644
--- a/sys/arch/macppc/dev/if_bm.c
+++ b/sys/arch/macppc/dev/if_bm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bm.c,v 1.6 2002/03/12 09:51:20 kjc Exp $	*/
+/*	$OpenBSD: if_bm.c,v 1.7 2002/03/14 01:26:36 millert Exp $	*/
 /*	$NetBSD: if_bm.c,v 1.1 1999/01/01 01:27:52 tsubai Exp $	*/
 
 /*-
@@ -100,39 +100,39 @@ struct bmac_softc {
 
 extern u_int *heathrow_FCR;
 
-static __inline int bmac_read_reg __P((struct bmac_softc *, int));
-static __inline void bmac_write_reg __P((struct bmac_softc *, int, int));
-static __inline void bmac_set_bits __P((struct bmac_softc *, int, int));
-static __inline void bmac_reset_bits __P((struct bmac_softc *, int, int));
-
-static int bmac_match __P((struct device *, void *, void *));
-static void bmac_attach __P((struct device *, struct device *, void *));
-static void bmac_reset_chip __P((struct bmac_softc *));
-static void bmac_init __P((struct bmac_softc *));
-static void bmac_init_dma __P((struct bmac_softc *));
-static int bmac_intr __P((void *));
+static __inline int bmac_read_reg(struct bmac_softc *, int);
+static __inline void bmac_write_reg(struct bmac_softc *, int, int);
+static __inline void bmac_set_bits(struct bmac_softc *, int, int);
+static __inline void bmac_reset_bits(struct bmac_softc *, int, int);
+
+static int bmac_match(struct device *, void *, void *);
+static void bmac_attach(struct device *, struct device *, void *);
+static void bmac_reset_chip(struct bmac_softc *);
+static void bmac_init(struct bmac_softc *);
+static void bmac_init_dma(struct bmac_softc *);
+static int bmac_intr(void *);
 #ifdef WHY_IS_THIS_XXXX
-static int bmac_tx_intr __P((void *));
+static int bmac_tx_intr(void *);
 #endif /* WHY_IS_THIS_XXXX */
-static int bmac_rint __P((void *));
-static void bmac_reset __P((struct bmac_softc *));
-static void bmac_stop __P((struct bmac_softc *));
-static void bmac_start __P((struct ifnet *));
-static void bmac_transmit_packet __P((struct bmac_softc *, void *, int));
-static int bmac_put __P((struct bmac_softc *, caddr_t, struct mbuf *));
-static struct mbuf *bmac_get __P((struct bmac_softc *, caddr_t, int));
-static void bmac_watchdog __P((struct ifnet *));
-static int bmac_ioctl __P((struct ifnet *, u_long, caddr_t));
-static int bmac_mediachange __P((struct ifnet *));
-static void bmac_mediastatus __P((struct ifnet *, struct ifmediareq *));
-static void bmac_setladrf __P((struct bmac_softc *));
-
-int bmac_mii_readreg __P((struct device *, int, int));
-void bmac_mii_writereg __P((struct device *, int, int, int));
-void bmac_mii_statchg __P((struct device *));
-void bmac_mii_tick __P((void *));
-u_int32_t bmac_mbo_read __P((struct device *));
-void bmac_mbo_write __P((struct device *, u_int32_t));
+static int bmac_rint(void *);
+static void bmac_reset(struct bmac_softc *);
+static void bmac_stop(struct bmac_softc *);
+static void bmac_start(struct ifnet *);
+static void bmac_transmit_packet(struct bmac_softc *, void *, int);
+static int bmac_put(struct bmac_softc *, caddr_t, struct mbuf *);
+static struct mbuf *bmac_get(struct bmac_softc *, caddr_t, int);
+static void bmac_watchdog(struct ifnet *);
+static int bmac_ioctl(struct ifnet *, u_long, caddr_t);
+static int bmac_mediachange(struct ifnet *);
+static void bmac_mediastatus(struct ifnet *, struct ifmediareq *);
+static void bmac_setladrf(struct bmac_softc *);
+
+int bmac_mii_readreg(struct device *, int, int);
+void bmac_mii_writereg(struct device *, int, int, int);
+void bmac_mii_statchg(struct device *);
+void bmac_mii_tick(void *);
+u_int32_t bmac_mbo_read(struct device *);
+void bmac_mbo_write(struct device *, u_int32_t);
 
 struct cfattach bm_ca = {
 	sizeof(struct bmac_softc), bmac_match, bmac_attach
diff --git a/sys/arch/macppc/dev/if_gm.c b/sys/arch/macppc/dev/if_gm.c
index 655509c56b0..437a558e1d1 100644
--- a/sys/arch/macppc/dev/if_gm.c
+++ b/sys/arch/macppc/dev/if_gm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_gm.c,v 1.5 2002/03/12 09:51:20 kjc Exp $	*/
+/*	$OpenBSD: if_gm.c,v 1.6 2002/03/14 01:26:36 millert Exp $	*/
 /*	$NetBSD: if_gm.c,v 1.14 2001/07/22 11:29:46 wiz Exp $	*/
 
 /*-
@@ -104,40 +104,40 @@ struct gmac_softc {
 };
 
 
-int gmac_match __P((struct device *, void *, void *));
-void gmac_attach __P((struct device *, struct device *, void *));
-
-static __inline u_int gmac_read_reg __P((struct gmac_softc *, int));
-static __inline void gmac_write_reg __P((struct gmac_softc *, int, u_int));
-
-static __inline void gmac_start_txdma __P((struct gmac_softc *));
-static __inline void gmac_start_rxdma __P((struct gmac_softc *));
-static __inline void gmac_stop_txdma __P((struct gmac_softc *));
-static __inline void gmac_stop_rxdma __P((struct gmac_softc *));
-
-int gmac_intr __P((void *));
-void gmac_tint __P((struct gmac_softc *));
-void gmac_rint __P((struct gmac_softc *));
-struct mbuf * gmac_get __P((struct gmac_softc *, caddr_t, int));
-void gmac_start __P((struct ifnet *));
-int gmac_put __P((struct gmac_softc *, caddr_t, struct mbuf *));
-
-void gmac_stop __P((struct gmac_softc *));
-void gmac_reset __P((struct gmac_softc *));
-void gmac_init __P((struct gmac_softc *));
-void gmac_init_mac __P((struct gmac_softc *));
-void gmac_setladrf __P((struct gmac_softc *));
-
-int gmac_ioctl __P((struct ifnet *, u_long, caddr_t));
-void gmac_watchdog __P((struct ifnet *));
-void gmac_enable_hack __P((void));
-
-int gmac_mediachange __P((struct ifnet *));
-void gmac_mediastatus __P((struct ifnet *, struct ifmediareq *));
-int gmac_mii_readreg __P((struct device *, int, int));
-void gmac_mii_writereg __P((struct device *, int, int, int));
-void gmac_mii_statchg __P((struct device *));
-void gmac_mii_tick __P((void *));
+int gmac_match(struct device *, void *, void *);
+void gmac_attach(struct device *, struct device *, void *);
+
+static __inline u_int gmac_read_reg(struct gmac_softc *, int);
+static __inline void gmac_write_reg(struct gmac_softc *, int, u_int);
+
+static __inline void gmac_start_txdma(struct gmac_softc *);
+static __inline void gmac_start_rxdma(struct gmac_softc *);
+static __inline void gmac_stop_txdma(struct gmac_softc *);
+static __inline void gmac_stop_rxdma(struct gmac_softc *);
+
+int gmac_intr(void *);
+void gmac_tint(struct gmac_softc *);
+void gmac_rint(struct gmac_softc *);
+struct mbuf * gmac_get(struct gmac_softc *, caddr_t, int);
+void gmac_start(struct ifnet *);
+int gmac_put(struct gmac_softc *, caddr_t, struct mbuf *);
+
+void gmac_stop(struct gmac_softc *);
+void gmac_reset(struct gmac_softc *);
+void gmac_init(struct gmac_softc *);
+void gmac_init_mac(struct gmac_softc *);
+void gmac_setladrf(struct gmac_softc *);
+
+int gmac_ioctl(struct ifnet *, u_long, caddr_t);
+void gmac_watchdog(struct ifnet *);
+void gmac_enable_hack(void);
+
+int gmac_mediachange(struct ifnet *);
+void gmac_mediastatus(struct ifnet *, struct ifmediareq *);
+int gmac_mii_readreg(struct device *, int, int);
+void gmac_mii_writereg(struct device *, int, int, int);
+void gmac_mii_statchg(struct device *);
+void gmac_mii_tick(void *);
 
 u_int32_t ether_crc32_le(const u_int8_t *buf, size_t len);
 
diff --git a/sys/arch/macppc/dev/if_wi_obio.c b/sys/arch/macppc/dev/if_wi_obio.c
index bbf516c25d4..f1a71aabe67 100644
--- a/sys/arch/macppc/dev/if_wi_obio.c
+++ b/sys/arch/macppc/dev/if_wi_obio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi_obio.c,v 1.3 2001/09/19 20:18:57 miod Exp $	*/
+/*	$OpenBSD: if_wi_obio.c,v 1.4 2002/03/14 01:26:36 millert Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -69,19 +69,19 @@
 #include <dev/ic/if_wi_ieee.h>
 #include <dev/ic/if_wivar.h>
 
-int	wi_obio_match		__P((struct device *, void *, void *));
-void	wi_obio_attach	__P((struct device *, struct device *, void *));
-int	wi_obio_detach	__P((struct device *, int));
-int	wi_obio_activate	__P((struct device *, enum devact));
-void	wi_obio_attach	__P((struct device *, struct device *, void *));
+int	wi_obio_match(struct device *, void *, void *);
+void	wi_obio_attach(struct device *, struct device *, void *);
+int	wi_obio_detach(struct device *, int);
+int	wi_obio_activate(struct device *, enum devact);
+void	wi_obio_attach(struct device *, struct device *, void *);
 int	wi_obio_enable(struct wi_softc *sc);
 void	wi_obio_disable(struct wi_softc *sc);
 
 
-int	wi_intr			__P((void *));
-int	wi_attach		__P((struct wi_softc *));
-void	wi_init			__P((void *));
-void	wi_stop			__P((struct wi_softc *));
+int	wi_intr(void *);
+int	wi_attach(struct wi_softc *);
+void	wi_init(void *);
+void	wi_stop(struct wi_softc *);
 
 struct wi_obio_softc {
 	struct wi_softc sc_wi;
diff --git a/sys/arch/macppc/dev/macintr.c b/sys/arch/macppc/dev/macintr.c
index 76daa1ecdf8..7175a8b85bd 100644
--- a/sys/arch/macppc/dev/macintr.c
+++ b/sys/arch/macppc/dev/macintr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macintr.c,v 1.12 2002/03/08 20:33:43 drahn Exp $	*/
+/*	$OpenBSD: macintr.c,v 1.13 2002/03/14 01:26:36 millert Exp $	*/
 
 /*-
  * Copyright (c) 1995 Per Fogelstrom
@@ -69,14 +69,14 @@ int m_virq_max = 0;
 
 struct evcnt evirq[ICU_LEN*2];
 
-static int fakeintr __P((void *));
-static char *intr_typename __P((int type));
-static void intr_calculatemasks __P((void));
-static void enable_irq __P((int x));
-static __inline int cntlzw __P((int x));
-static int mapirq __P((int irq));
-static int read_irq __P((void));
-static void mac_intr_do_pending_int __P((void));
+static int fakeintr(void *);
+static char *intr_typename(int type);
+static void intr_calculatemasks(void);
+static void enable_irq(int x);
+static __inline int cntlzw(int x);
+static int mapirq(int irq);
+static int read_irq(void);
+static void mac_intr_do_pending_int(void);
 
 extern u_int32_t *heathrow_FCR;
 
@@ -96,10 +96,10 @@ struct macintr_softc {
 	struct device sc_dev;
 };
 
-int	macintr_match __P((struct device *parent, void *cf, void *aux));
-void	macintr_attach __P((struct device *, struct device *, void *));
-void	mac_do_pending_int __P((void));
-void	mac_ext_intr __P((void));
+int	macintr_match(struct device *parent, void *cf, void *aux);
+void	macintr_attach(struct device *, struct device *, void *);
+void	mac_do_pending_int(void);
+void	mac_ext_intr(void);
 
 struct cfattach macintr_ca = { 
 	sizeof(struct macintr_softc),
@@ -150,7 +150,7 @@ intr_establish_t macintr_establish;
 intr_disestablish_t macintr_disestablish;
 extern intr_establish_t *mac_intr_establish_func;
 extern intr_disestablish_t *mac_intr_disestablish_func;
-void macintr_collect_preconf_intr __P((void));
+void macintr_collect_preconf_intr(void);
 
 void
 macintr_attach(parent, self, aux)
@@ -237,7 +237,7 @@ macintr_establish(lcv, irq, type, level, ih_fun, ih_arg, name)
 	int irq;
 	int type;
 	int level;
-	int (*ih_fun) __P((void *));
+	int (*ih_fun)(void *);
 	void *ih_arg;
 	char *name;
 {
diff --git a/sys/arch/macppc/dev/mesh.c b/sys/arch/macppc/dev/mesh.c
index f846159524a..d49c29503b2 100644
--- a/sys/arch/macppc/dev/mesh.c
+++ b/sys/arch/macppc/dev/mesh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mesh.c,v 1.3 2001/11/06 19:53:15 miod Exp $	*/
+/*	$OpenBSD: mesh.c,v 1.4 2002/03/14 01:26:36 millert Exp $	*/
 /*	$NetBSD: mesh.c,v 1.1 1999/02/19 13:06:03 tsubai Exp $	*/
 
 /*-
@@ -142,35 +142,35 @@ struct mesh_softc {
 #define scsipi_done 	  scsi_done
 #endif
 
-static __inline int mesh_read_reg __P((struct mesh_softc *, int));
-static __inline void mesh_set_reg __P((struct mesh_softc *, int, int));
-
-int mesh_match __P((struct device *, struct cfdata *, void *));
-void mesh_attach __P((struct device *, struct device *, void *));
-void mesh_shutdownhook __P((void *));
-int mesh_intr __P((void *));
-void mesh_error __P((struct mesh_softc *, struct mesh_scb *, int, int));
-void mesh_select __P((struct mesh_softc *, struct mesh_scb *));
-void mesh_identify __P((struct mesh_softc *, struct mesh_scb *));
-void mesh_command __P((struct mesh_softc *, struct mesh_scb *));
-int mesh_dma_setup __P((struct mesh_softc *, struct mesh_scb *));
-int mesh_dataio __P((struct mesh_softc *, struct mesh_scb *));
-void mesh_status __P((struct mesh_softc *, struct mesh_scb *));
-void mesh_msgin __P((struct mesh_softc *, struct mesh_scb *));
-void mesh_msgout __P((struct mesh_softc *, int));
-void mesh_bus_reset __P((struct mesh_softc *));
-void mesh_reset __P((struct mesh_softc *));
-int mesh_stp __P((struct mesh_softc *, int));
-void mesh_setsync __P((struct mesh_softc *, struct mesh_tinfo *));
-struct mesh_scb *mesh_get_scb __P((struct mesh_softc *));
-void mesh_free_scb __P((struct mesh_softc *, struct mesh_scb *));
-int mesh_scsi_cmd __P((struct scsi_xfer *));
-void mesh_sched __P((struct mesh_softc *));
-int mesh_poll __P((struct mesh_softc *, struct scsi_xfer *));
-void mesh_done __P((struct mesh_softc *, struct mesh_scb *));
-void mesh_timeout __P((void *));
-void mesh_sense __P((struct mesh_softc *, struct mesh_scb *));
-void mesh_minphys __P((struct buf *));
+static __inline int mesh_read_reg(struct mesh_softc *, int);
+static __inline void mesh_set_reg(struct mesh_softc *, int, int);
+
+int mesh_match(struct device *, struct cfdata *, void *);
+void mesh_attach(struct device *, struct device *, void *);
+void mesh_shutdownhook(void *);
+int mesh_intr(void *);
+void mesh_error(struct mesh_softc *, struct mesh_scb *, int, int);
+void mesh_select(struct mesh_softc *, struct mesh_scb *);
+void mesh_identify(struct mesh_softc *, struct mesh_scb *);
+void mesh_command(struct mesh_softc *, struct mesh_scb *);
+int mesh_dma_setup(struct mesh_softc *, struct mesh_scb *);
+int mesh_dataio(struct mesh_softc *, struct mesh_scb *);
+void mesh_status(struct mesh_softc *, struct mesh_scb *);
+void mesh_msgin(struct mesh_softc *, struct mesh_scb *);
+void mesh_msgout(struct mesh_softc *, int);
+void mesh_bus_reset(struct mesh_softc *);
+void mesh_reset(struct mesh_softc *);
+int mesh_stp(struct mesh_softc *, int);
+void mesh_setsync(struct mesh_softc *, struct mesh_tinfo *);
+struct mesh_scb *mesh_get_scb(struct mesh_softc *);
+void mesh_free_scb(struct mesh_softc *, struct mesh_scb *);
+int mesh_scsi_cmd(struct scsi_xfer *);
+void mesh_sched(struct mesh_softc *);
+int mesh_poll(struct mesh_softc *, struct scsi_xfer *);
+void mesh_done(struct mesh_softc *, struct mesh_scb *);
+void mesh_timeout(void *);
+void mesh_sense(struct mesh_softc *, struct mesh_scb *);
+void mesh_minphys(struct buf *);
 
 
 #define MESH_DATAOUT	0
diff --git a/sys/arch/macppc/dev/openpic.c b/sys/arch/macppc/dev/openpic.c
index 38e226a6a0b..fff9bda75c1 100644
--- a/sys/arch/macppc/dev/openpic.c
+++ b/sys/arch/macppc/dev/openpic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: openpic.c,v 1.14 2002/03/08 20:33:43 drahn Exp $	*/
+/*	$OpenBSD: openpic.c,v 1.15 2002/03/14 01:26:36 millert Exp $	*/
 
 /*-
  * Copyright (c) 1995 Per Fogelstrom
@@ -69,35 +69,35 @@ int o_virq_max;
 
 struct evcnt evirq[ICU_LEN];
 
-static int fakeintr __P((void *));
-static char *intr_typename __P((int type));
-static void intr_calculatemasks __P((void));
-static __inline int cntlzw __P((int x));
-static int mapirq __P((int irq));
-int openpic_prog_button __P((void *arg));
-void openpic_enable_irq_mask __P((int irq_mask));
+static int fakeintr(void *);
+static char *intr_typename(int type);
+static void intr_calculatemasks(void);
+static __inline int cntlzw(int x);
+static int mapirq(int irq);
+int openpic_prog_button(void *arg);
+void openpic_enable_irq_mask(int irq_mask);
 
 #define HWIRQ_MAX 27
 #define HWIRQ_MASK 0x0fffffff
 
-static __inline u_int openpic_read __P((int));
-static __inline void openpic_write __P((int, u_int));
-void openpic_enable_irq __P((int, int));
-void openpic_disable_irq __P((int));
-void openpic_init __P((void));
-void openpic_set_priority __P((int, int));
-static __inline int openpic_read_irq __P((int));
-static __inline void openpic_eoi __P((int));
+static __inline u_int openpic_read(int);
+static __inline void openpic_write(int, u_int);
+void openpic_enable_irq(int, int);
+void openpic_disable_irq(int);
+void openpic_init(void);
+void openpic_set_priority(int, int);
+static __inline int openpic_read_irq(int);
+static __inline void openpic_eoi(int);
 
 struct openpic_softc {
 	struct device sc_dev;
 };
 
-int	openpic_match __P((struct device *parent, void *cf, void *aux));
-void	openpic_attach __P((struct device *, struct device *, void *));
-void	openpic_do_pending_int __P((void));
-void	openpic_collect_preconf_intr __P((void));
-void	ext_intr_openpic __P((void));
+int	openpic_match(struct device *parent, void *cf, void *aux);
+void	openpic_attach(struct device *, struct device *, void *);
+void	openpic_do_pending_int(void);
+void	openpic_collect_preconf_intr(void);
+void	ext_intr_openpic(void);
 
 struct cfattach openpic_ca = { 
 	sizeof(struct openpic_softc),
@@ -134,9 +134,9 @@ extern void_f *pending_int_f;
 
 vaddr_t openpic_base;
 void * openpic_intr_establish( void * lcv, int irq, int type, int level,
-	int (*ih_fun) __P((void *)), void *ih_arg, char *name);
+	int (*ih_fun)(void *), void *ih_arg, char *name);
 void openpic_intr_disestablish( void *lcp, void *arg);
-void openpic_collect_preconf_intr __P((void));
+void openpic_collect_preconf_intr(void);
 
 void
 openpic_attach(parent, self, aux)
@@ -214,7 +214,7 @@ openpic_intr_establish(lcv, irq, type, level, ih_fun, ih_arg, name)
 	int irq;
 	int type;
 	int level;
-	int (*ih_fun) __P((void *));
+	int (*ih_fun)(void *);
 	void *ih_arg;
 	char *name;
 {
diff --git a/sys/arch/macppc/dev/pm_direct.c b/sys/arch/macppc/dev/pm_direct.c
index 45612b48cb9..58c22669d34 100644
--- a/sys/arch/macppc/dev/pm_direct.c
+++ b/sys/arch/macppc/dev/pm_direct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pm_direct.c,v 1.4 2001/10/03 14:45:37 drahn Exp $	*/
+/*	$OpenBSD: pm_direct.c,v 1.5 2002/03/14 01:26:36 millert Exp $	*/
 /*	$NetBSD: pm_direct.c,v 1.9 2000/06/08 22:10:46 tsubai Exp $	*/
 
 /*
@@ -168,37 +168,37 @@ signed char pm_receive_cmd_type[] = {
 
 /* for debugging */
 #ifdef ADB_DEBUG
-void	pm_printerr __P((char *, int, int, char *));
+void	pm_printerr(char *, int, int, char *);
 #endif
 
-int	pm_wait_busy __P((int));
-int	pm_wait_free __P((int));
+int	pm_wait_busy(int);
+int	pm_wait_free(int);
 
 /* these functions are for the PB1XX series */
-int	pm_receive_pm1 __P((u_char *));
-int	pm_send_pm1 __P((u_char,int));
-int	pm_pmgrop_pm1 __P((PMData *));
-void	pm_intr_pm1 __P((void));
+int	pm_receive_pm1(u_char *);
+int	pm_send_pm1(u_char,int);
+int	pm_pmgrop_pm1(PMData *);
+void	pm_intr_pm1(void);
 
 /* these functions are for the PB Duo series and the PB 5XX series */
-int	pm_receive_pm2 __P((u_char *));
-int	pm_send_pm2 __P((u_char));
-int	pm_pmgrop_pm2 __P((PMData *));
-void	pm_intr_pm2 __P((void));
+int	pm_receive_pm2(u_char *);
+int	pm_send_pm2(u_char);
+int	pm_pmgrop_pm2(PMData *);
+void	pm_intr_pm2(void);
 
 /* this function is MRG-Based (for testing) */
-int	pm_pmgrop_mrg __P((PMData *));
+int	pm_pmgrop_mrg(PMData *);
 
 /* these functions are called from adb_direct.c */
-void	pm_setup_adb __P((void));
-void	pm_check_adb_devices __P((int));
-void	pm_intr __P((void));
-int	pm_adb_op __P((u_char *, void *, void *, int));
+void	pm_setup_adb(void);
+void	pm_check_adb_devices(int);
+void	pm_intr(void);
+int	pm_adb_op(u_char *, void *, void *, int);
 
 /* these functions also use the variables of adb_direct.c */
-void	pm_adb_get_TALK_result __P((PMData *));
-void	pm_adb_get_ADB_data __P((PMData *));
-void	pm_adb_poll_next_device_pm1 __P((PMData *));
+void	pm_adb_get_TALK_result(PMData *);
+void	pm_adb_get_ADB_data(PMData *);
+void	pm_adb_poll_next_device_pm1(PMData *);
 
 
 /*
@@ -223,13 +223,13 @@ struct adbCommand {
 	u_int	unsol;		/* 1 if packet was unsolicited */
 	u_int	ack_only;	/* 1 for no special processing */
 };
-extern	void	adb_pass_up __P((struct adbCommand *));
+extern	void	adb_pass_up(struct adbCommand *);
 
 #if 0
 /*
  * Define the external functions
  */
-extern int	zshard __P((int));		/* from zs.c */
+extern int	zshard(int);		/* from zs.c */
 #endif
 
 #ifdef ADB_DEBUG
diff --git a/sys/arch/macppc/dev/pm_direct.h b/sys/arch/macppc/dev/pm_direct.h
index b77edff5300..c43745ca5d6 100644
--- a/sys/arch/macppc/dev/pm_direct.h
+++ b/sys/arch/macppc/dev/pm_direct.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pm_direct.h,v 1.2 2001/10/03 14:45:37 drahn Exp $	*/
+/*	$OpenBSD: pm_direct.h,v 1.3 2002/03/14 01:26:36 millert Exp $	*/
 /*	$NetBSD: pm_direct.h,v 1.5 1999/07/12 15:54:55 tsubai Exp $	*/
 
 /*
@@ -47,11 +47,11 @@ typedef	struct	{
 	char	data[32];	/* data buffer (is it too much?)	*/
 }	PMData;
 
-int pmgrop __P((PMData *));
-void pm_adb_restart __P((void));
-void pm_adb_poweroff __P((void));
-void pm_read_date_time __P((u_long *));
-void pm_set_date_time __P((u_long));
+int pmgrop(PMData *);
+void pm_adb_restart(void);
+void pm_adb_poweroff(void);
+void pm_read_date_time(u_long *);
+void pm_set_date_time(u_long);
 
 struct pmu_battery_info
 {
@@ -62,14 +62,14 @@ struct pmu_battery_info
 	unsigned int voltage;
 };
 
-int pm_battery_info __P((int, struct pmu_battery_info *));
+int pm_battery_info(int, struct pmu_battery_info *);
 
-int pm_read_nvram __P((int));
-void pm_write_nvram __P((int, int));
-int pm_read_brightness __P((void));
-void pm_set_brightness __P((int));
-void pm_init_brightness __P((void));
-void pm_eject_pcmcia __P((int));
+int pm_read_nvram(int);
+void pm_write_nvram(int, int);
+int pm_read_brightness(void);
+void pm_set_brightness(int);
+void pm_init_brightness(void);
+void pm_eject_pcmcia(int);
 
 /* PMU commands */
 #define PMU_POWER_OFF		0x7e	/* Turn Power off */
diff --git a/sys/arch/macppc/dev/uni_n.c b/sys/arch/macppc/dev/uni_n.c
index 5802866ec4f..8c8d8fd6022 100644
--- a/sys/arch/macppc/dev/uni_n.c
+++ b/sys/arch/macppc/dev/uni_n.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uni_n.c,v 1.2 2001/12/07 00:49:06 miod Exp $	*/
+/*	$OpenBSD: uni_n.c,v 1.3 2002/03/14 01:26:36 millert Exp $	*/
 
 /*
  * Copyright (c) 1998-2001 Dale Rahn. All rights reserved.
@@ -39,8 +39,8 @@
 
 #include <dev/ofw/openfirm.h>
 
-static int	memcmatch __P((struct device *, void *, void *));
-static void	memcattach __P((struct device *, struct device *, void *));
+static int	memcmatch(struct device *, void *, void *);
+static void	memcattach(struct device *, struct device *, void *);
 
 struct memc_softc {
 	struct device sc_dev;
diff --git a/sys/arch/macppc/dev/viareg.h b/sys/arch/macppc/dev/viareg.h
index c034f7fb990..43bd20ccbac 100644
--- a/sys/arch/macppc/dev/viareg.h
+++ b/sys/arch/macppc/dev/viareg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: viareg.h,v 1.1 2001/09/01 15:50:00 drahn Exp $	*/
+/*	$OpenBSD: viareg.h,v 1.2 2002/03/14 01:26:36 millert Exp $	*/
 /*	$NetBSD: viareg.h,v 1.2 1998/10/20 14:56:30 tsubai Exp $	*/
 
 /*-
@@ -231,14 +231,14 @@ write_via_reg(int ign, int reg, int val)
 
 #define vDirA_ADBState	0x30
 
-void	via_init __P((void));
-int	rbv_vidstatus __P((void));
-void	via_shutdown __P((void));
-void	via_set_modem __P((int));
-int	add_nubus_intr   __P((int, void (*) __P((void *, int)), void *));
-void	enable_nubus_intr __P((void));
+void	via_init(void);
+int	rbv_vidstatus(void);
+void	via_shutdown(void);
+void	via_set_modem(int);
+int	add_nubus_intr   __P((int, void (*)(void *, int), void *));
+void	enable_nubus_intr(void);
 void	via1_register_irq __P((int, void (*)(void *), void *));
 void	via2_register_irq __P((int, void (*)(void *), void *));
 
-extern void	(*via1itab[7]) __P((void *));
-extern void	(*via2itab[7]) __P((void *));
+extern void	(*via1itab[7])(void *);
+extern void	(*via2itab[7])(void *);
diff --git a/sys/arch/macppc/dev/wdc_obio.c b/sys/arch/macppc/dev/wdc_obio.c
index 7fa3316321f..c1b046b63ae 100644
--- a/sys/arch/macppc/dev/wdc_obio.c
+++ b/sys/arch/macppc/dev/wdc_obio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wdc_obio.c,v 1.4 2001/11/06 19:53:15 miod Exp $	*/
+/*	$OpenBSD: wdc_obio.c,v 1.5 2002/03/14 01:26:36 millert Exp $	*/
 /*	$NetBSD: wdc_obio.c,v 1.15 2001/07/25 20:26:33 bouyer Exp $	*/
 
 /*-
@@ -75,16 +75,16 @@ struct wdc_obio_softc {
 	dbdma_t sc_dbdma;
 };
 
-u_int8_t wdc_obio_read_reg __P((struct channel_softc *, enum wdc_regs));
-void wdc_obio_write_reg __P((struct channel_softc *, enum wdc_regs, u_int8_t));
-void wdc_default_read_raw_multi_2 __P((struct channel_softc *,
-    void *, unsigned int));
-void wdc_default_write_raw_multi_2 __P((struct channel_softc *,
-    void *, unsigned int));
-void wdc_default_read_raw_multi_4 __P((struct channel_softc *,
-    void *, unsigned int));
-void wdc_default_write_raw_multi_4 __P((struct channel_softc *,
-    void *, unsigned int));
+u_int8_t wdc_obio_read_reg(struct channel_softc *, enum wdc_regs);
+void wdc_obio_write_reg(struct channel_softc *, enum wdc_regs, u_int8_t);
+void wdc_default_read_raw_multi_2(struct channel_softc *,
+    void *, unsigned int);
+void wdc_default_write_raw_multi_2(struct channel_softc *,
+    void *, unsigned int);
+void wdc_default_read_raw_multi_4(struct channel_softc *,
+    void *, unsigned int);
+void wdc_default_write_raw_multi_4(struct channel_softc *,
+    void *, unsigned int);
 struct channel_softc_vtbl wdc_obio_vtbl = {
 	wdc_obio_read_reg,
 	wdc_obio_write_reg,
@@ -94,18 +94,18 @@ struct channel_softc_vtbl wdc_obio_vtbl = {
 	wdc_default_write_raw_multi_4
 };
 
-int	wdc_obio_probe	__P((struct device *, void *, void *));
-void	wdc_obio_attach	__P((struct device *, struct device *, void *));
+int	wdc_obio_probe(struct device *, void *, void *);
+void	wdc_obio_attach(struct device *, struct device *, void *);
 
 struct cfattach wdc_obio_ca = {
 	sizeof(struct wdc_obio_softc), wdc_obio_probe, wdc_obio_attach
 };
 
-int	wdc_obio_dma_init __P((void *, int, int, void *, size_t, int));
-void	wdc_obio_dma_start __P((void *, int, int));
-int	wdc_obio_dma_finish __P((void *, int, int));
-void	wdc_obio_adjust_timing __P((struct channel_softc *));
-void	wdc_obio_ata4_adjust_timing __P((struct channel_softc *));
+int	wdc_obio_dma_init(void *, int, int, void *, size_t, int);
+void	wdc_obio_dma_start(void *, int, int);
+int	wdc_obio_dma_finish(void *, int, int);
+void	wdc_obio_adjust_timing(struct channel_softc *);
+void	wdc_obio_ata4_adjust_timing(struct channel_softc *);
 
 int
 wdc_obio_probe(parent, match, aux)
diff --git a/sys/arch/macppc/dev/zs.c b/sys/arch/macppc/dev/zs.c
index 1d2ba22505e..4d7cfebdee6 100644
--- a/sys/arch/macppc/dev/zs.c
+++ b/sys/arch/macppc/dev/zs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zs.c,v 1.5 2002/02/25 16:15:04 drahn Exp $	*/
+/*	$OpenBSD: zs.c,v 1.6 2002/03/14 01:26:36 millert Exp $	*/
 /*	$NetBSD: zs.c,v 1.17 2001/06/19 13:42:15 wiz Exp $	*/
 
 /*
@@ -128,7 +128,7 @@ int	zs_cons_canabort = 0;
 /* device to which the console is attached--if serial. */
 /* Mac stuff */
 
-static int zs_get_speed __P((struct zs_chanstate *));
+static int zs_get_speed(struct zs_chanstate *);
 
 /*
  * Even though zsparam will set up the clock multiples, etc., we
@@ -165,9 +165,9 @@ struct cfdriver zsc_cd = {
 };
 
 /* Definition of the driver for autoconfig. */
-int	zsc_match __P((struct device *, void *, void *));
-void	zsc_attach __P((struct device *, struct device *, void *));
-int	zsc_print __P((void *, const char *name));
+int	zsc_match(struct device *, void *, void *);
+void	zsc_attach(struct device *, struct device *, void *);
+int	zsc_print(void *, const char *name);
 
 struct cfattach zsc_ca = {
 	sizeof(struct zsc_softc), zsc_match, zsc_attach
@@ -175,17 +175,17 @@ struct cfattach zsc_ca = {
 
 extern struct cfdriver zsc_cd;
 
-int zshard __P((void *));
-int zssoft __P((void *));
+int zshard(void *);
+int zssoft(void *);
 #ifdef ZS_TXDMA
-static int zs_txdma_int __P((void *));
+static int zs_txdma_int(void *);
 #endif
 
-void zscnprobe __P((struct consdev *));
-void zscninit __P((struct consdev *));
-int  zscngetc __P((dev_t));
-void zscnputc __P((dev_t, int));
-void zscnpollc __P((dev_t, int));
+void zscnprobe(struct consdev *);
+void zscninit(struct consdev *);
+int  zscngetc(dev_t);
+void zscnputc(dev_t, int);
+void zscnpollc(dev_t, int);
 
 /*
  * Is the zs chip present?
@@ -638,9 +638,9 @@ void  zs_write_data(cs, val)
 #define zscnpollc	nullcnpollc
 cons_decl(zs);
 
-static void	zs_putc __P((register volatile struct zschan *, int));
-static int	zs_getc __P((register volatile struct zschan *));
-extern int	zsopen __P(( dev_t dev, int flags, int mode, struct proc *p));
+static void	zs_putc(register volatile struct zschan *, int);
+static int	zs_getc(register volatile struct zschan *);
+extern int	zsopen( dev_t dev, int flags, int mode, struct proc *p);
 
 static int stdin, stdout;
 
@@ -753,8 +753,8 @@ zscnputc(dev, c)
 	}
 }
 
-extern int ofccngetc __P((dev_t));
-extern void ofccnputc __P((dev_t, int));
+extern int ofccngetc(dev_t);
+extern void ofccnputc(dev_t, int);
 
 struct consdev consdev_zs = {
 	zscnprobe,