First round of __P removal in sys

6 files changed, 67 insertions, 67 deletions

diff --git a/sys/arch/vax/qbus/dhu.c b/sys/arch/vax/qbus/dhu.c
index dcdff248727..9b300742c22 100644
--- a/sys/arch/vax/qbus/dhu.c
+++ b/sys/arch/vax/qbus/dhu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dhu.c,v 1.3 2002/02/15 20:45:30 nordin Exp $	*/
+/*	$OpenBSD: dhu.c,v 1.4 2002/03/14 01:26:48 millert Exp $	*/
 /*	$NetBSD: dhu.c,v 1.17 2000/01/24 02:40:28 matt Exp $	*/
 /*
  * Copyright (c) 1996  Ken C. Wellsch.  All rights reserved.
@@ -131,21 +131,21 @@ static struct speedtab dhuspeedtab[] = {
   {      -1,	-1		}
 };
 
-static int	dhu_match __P((struct device *, struct cfdata *, void *));
-static void	dhu_attach __P((struct device *, struct device *, void *));
-static	void	dhurint __P((void *));
-static	void	dhuxint __P((void *));
-static	void	dhustart __P((struct tty *));
-static	int	dhuparam __P((struct tty *, struct termios *));
-static	int	dhuiflow __P((struct tty *, int));
-static unsigned	dhumctl __P((struct dhu_softc *,int, int, int));
-	int	dhuopen __P((dev_t, int, int, struct proc *));
-	int	dhuclose __P((dev_t, int, int, struct proc *));
-	int	dhuread __P((dev_t, struct uio *, int));
-	int	dhuwrite __P((dev_t, struct uio *, int));
-	int	dhuioctl __P((dev_t, u_long, caddr_t, int, struct proc *));
-	void	dhustop __P((struct tty *, int));
-struct tty *	dhutty __P((dev_t));
+static int	dhu_match(struct device *, struct cfdata *, void *);
+static void	dhu_attach(struct device *, struct device *, void *);
+static	void	dhurint(void *);
+static	void	dhuxint(void *);
+static	void	dhustart(struct tty *);
+static	int	dhuparam(struct tty *, struct termios *);
+static	int	dhuiflow(struct tty *, int);
+static unsigned	dhumctl(struct dhu_softc *,int, int, int);
+	int	dhuopen(dev_t, int, int, struct proc *);
+	int	dhuclose(dev_t, int, int, struct proc *);
+	int	dhuread(dev_t, struct uio *, int);
+	int	dhuwrite(dev_t, struct uio *, int);
+	int	dhuioctl(dev_t, u_long, caddr_t, int, struct proc *);
+	void	dhustop(struct tty *, int);
+struct tty *	dhutty(dev_t);
 
 struct	cfattach dhu_ca = {
 	sizeof(struct dhu_softc), (cfmatch_t)dhu_match, dhu_attach
diff --git a/sys/arch/vax/qbus/dl.c b/sys/arch/vax/qbus/dl.c
index 1663a559601..d398c06f17d 100644
--- a/sys/arch/vax/qbus/dl.c
+++ b/sys/arch/vax/qbus/dl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dl.c,v 1.2 2002/01/16 20:50:17 miod Exp $	*/
+/*	$OpenBSD: dl.c,v 1.3 2002/03/14 01:26:48 millert Exp $	*/
 /*	$NetBSD: dl.c,v 1.11 2000/01/24 02:40:29 matt Exp $	*/
 
 /*-
@@ -107,20 +107,20 @@ struct dl_softc {
 	struct tty	*sc_tty;
 };
 
-static	int	dl_match __P((struct device *, struct cfdata *, void *));
-static	void	dl_attach __P((struct device *, struct device *, void *));
-static	void	dlrint __P((void *));
-static	void	dlxint __P((void *));
-static	void	dlstart __P((struct tty *));
-static	int	dlparam __P((struct tty *, struct termios *));
-static	void	dlbrk __P((struct dl_softc *, int));
-struct	tty *	dltty __P((dev_t));
-	int	dlopen __P((dev_t, int, int, struct proc *));
-	int	dlclose __P((dev_t, int, int, struct proc *));
-	int	dlread __P((dev_t, struct uio *, int));
-	int	dlwrite __P((dev_t, struct uio *, int));
-	int	dlioctl __P((dev_t, int, caddr_t, int, struct proc *));
-	void	dlstop __P((struct tty *, int));
+static	int	dl_match(struct device *, struct cfdata *, void *);
+static	void	dl_attach(struct device *, struct device *, void *);
+static	void	dlrint(void *);
+static	void	dlxint(void *);
+static	void	dlstart(struct tty *);
+static	int	dlparam(struct tty *, struct termios *);
+static	void	dlbrk(struct dl_softc *, int);
+struct	tty *	dltty(dev_t);
+	int	dlopen(dev_t, int, int, struct proc *);
+	int	dlclose(dev_t, int, int, struct proc *);
+	int	dlread(dev_t, struct uio *, int);
+	int	dlwrite(dev_t, struct uio *, int);
+	int	dlioctl(dev_t, int, caddr_t, int, struct proc *);
+	void	dlstop(struct tty *, int);
 
 struct cfattach dl_ca = {
 	sizeof(struct dl_softc), (cfmatch_t)dl_match, dl_attach
diff --git a/sys/arch/vax/qbus/dz_uba.c b/sys/arch/vax/qbus/dz_uba.c
index a1869c06f5d..b0b8168a17b 100644
--- a/sys/arch/vax/qbus/dz_uba.c
+++ b/sys/arch/vax/qbus/dz_uba.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dz_uba.c,v 1.3 2002/01/16 20:50:17 miod Exp $	*/
+/*	$OpenBSD: dz_uba.c,v 1.4 2002/03/14 01:26:48 millert Exp $	*/
 /*	$NetBSD: dz_uba.c,v 1.11 2000/06/04 06:17:02 matt Exp $ */
 /*
  * Copyright (c) 1998 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -54,8 +54,8 @@
 #include <arch/vax/qbus/dzreg.h>
 #include <arch/vax/qbus/dzvar.h>
 
-static	int	dz_uba_match __P((struct device *, struct cfdata *, void *));
-static	void	dz_uba_attach __P((struct device *, struct device *, void *));
+static	int	dz_uba_match(struct device *, struct cfdata *, void *);
+static	void	dz_uba_attach(struct device *, struct device *, void *);
 
 struct	cfattach dz_uba_ca = {
 	sizeof(struct dz_softc), (cfmatch_t)dz_uba_match, dz_uba_attach
diff --git a/sys/arch/vax/qbus/qd.c b/sys/arch/vax/qbus/qd.c
index ec0543d173b..993c8332674 100644
--- a/sys/arch/vax/qbus/qd.c
+++ b/sys/arch/vax/qbus/qd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qd.c,v 1.2 2001/11/06 19:53:17 miod Exp $	*/
+/*	$OpenBSD: qd.c,v 1.3 2002/03/14 01:26:48 millert Exp $	*/
 /*	$NetBSD: qd.c,v 1.17 2000/01/24 02:40:29 matt Exp $	*/
 
 /*-
@@ -240,12 +240,12 @@ int QDlast_DMAtype;             /* type of the last DMA operation */
  */
 #define TOY ((time.tv_sec * 100) + (time.tv_usec / 10000))
 
-void qd_attach __P((struct device *, struct device *, void *));
-static int qd_match __P((struct device *, struct cfdata *, void *));
+void qd_attach(struct device *, struct device *, void *);
+static int qd_match(struct device *, struct cfdata *, void *);
 
-static void qddint __P((void *));	/* DMA gate array intrpt service */
-static void qdaint __P((void *));	/* Dragon ADDER intrpt service */
-static void qdiint __P((void *));
+static void qddint(void *);	/* DMA gate array intrpt service */
+static void qdaint(void *);	/* Dragon ADDER intrpt service */
+static void qdiint(void *);
 
 #define QDPRIOR (PZERO-1)		/* must be negative */
 #define FALSE	0
@@ -330,17 +330,17 @@ extern	char *q_special[];
 extern struct cdevsw *consops;
 cons_decl(qd);
 cdev_decl(qd);
-void setup_dragon __P((int));
-void init_shared __P((int));
-void clear_qd_screen __P((int));
-void ldfont __P((int));
-void ldcursor __P((int, short *));
-void setup_input __P((int));
-void blitc __P((int, u_char));
-void scroll_up __P((volatile struct adder *));
-void write_ID __P((volatile struct adder *, short, short));
-int wait_status __P((volatile struct adder *, int));
-void led_control __P((int, int, int));
+void setup_dragon(int);
+void init_shared(int);
+void clear_qd_screen(int);
+void ldfont(int);
+void ldcursor(int, short *);
+void setup_input(int);
+void blitc(int, u_char);
+void scroll_up(volatile struct adder *);
+void write_ID(volatile struct adder *, short, short);
+int wait_status(volatile struct adder *, int);
+void led_control(int, int, int);
 void qdstart(struct tty *);
 void qdearly(void);
 int qdpolling = 0;
diff --git a/sys/arch/vax/qbus/ubavar.h b/sys/arch/vax/qbus/ubavar.h
index 90a086a003d..cc401eb8acd 100644
--- a/sys/arch/vax/qbus/ubavar.h
+++ b/sys/arch/vax/qbus/ubavar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ubavar.h,v 1.2 2001/08/25 13:33:37 hugh Exp $	*/
+/*	$OpenBSD: ubavar.h,v 1.3 2002/03/14 01:26:48 millert Exp $	*/
 /*	$NetBSD: ubavar.h,v 1.29 2000/06/04 06:17:04 matt Exp $	*/
 
 /*
@@ -74,11 +74,11 @@ struct	uba_softc {
 	SIMPLEQ_HEAD(, uba_unit) uh_resq;	/* resource wait chain */
 	SIMPLEQ_HEAD(, uba_reset) uh_resetq;	/* ubareset queue */
 	int	uh_lastiv;		/* last free interrupt vector */
-	int	(*uh_errchk) __P((struct uba_softc *));
-	void	(*uh_beforescan) __P((struct uba_softc *));
-	void	(*uh_afterscan) __P((struct uba_softc *));
-	void	(*uh_ubainit) __P((struct uba_softc *));
-	void	(*uh_ubapurge) __P((struct uba_softc *, int));
+	int	(*uh_errchk)(struct uba_softc *);
+	void	(*uh_beforescan)(struct uba_softc *);
+	void	(*uh_afterscan)(struct uba_softc *);
+	void	(*uh_ubainit)(struct uba_softc *);
+	void	(*uh_ubapurge)(struct uba_softc *, int);
 	short	uh_nr;			/* Unibus sequential number */
 	bus_space_tag_t	uh_iot;		/* Tag for this Unibus */
 	bus_space_handle_t uh_ioh;	/* Handle for I/O space */
@@ -95,7 +95,7 @@ struct	uba_unit {
 	SIMPLEQ_ENTRY(uba_unit) uu_resq;/* Queue while waiting for resources */
 	void	*uu_softc;	/* Pointer to units softc */
 	int	uu_bdp;		/* for controllers that hang on to bdp's */
-	int    (*uu_ready) __P((struct uba_unit *));
+	int    (*uu_ready)(struct uba_unit *);
 	void	*uu_ref;	/* Buffer this is related to */
 	short   uu_xclu;        /* want exclusive use of bdp's */
 	short   uu_keepbdp;     /* hang on to bdp's once allocated */
diff --git a/sys/arch/vax/qbus/uda.c b/sys/arch/vax/qbus/uda.c
index 791e5c03dee..71bc3a648b0 100644
--- a/sys/arch/vax/qbus/uda.c
+++ b/sys/arch/vax/qbus/uda.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uda.c,v 1.2 2001/08/25 13:33:37 hugh Exp $	*/
+/*	$OpenBSD: uda.c,v 1.3 2002/03/14 01:26:48 millert Exp $	*/
 /*	$NetBSD: uda.c,v 1.36 2000/06/04 06:17:05 matt Exp $	*/
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -78,15 +78,15 @@ struct	uda_softc {
 	int	sc_inq;
 };
 
-static	int	udamatch __P((struct device *, struct cfdata *, void *));
-static	void	udaattach __P((struct device *, struct device *, void *));
+static	int	udamatch(struct device *, struct cfdata *, void *);
+static	void	udaattach(struct device *, struct device *, void *);
 static	void	udareset(struct device *);
-static	void	udaintr __P((void *));
-int	udaready __P((struct uba_unit *));
-void	udactlrdone __P((struct device *));
-int	udaprint __P((void *, const char *));
-void	udasaerror __P((struct device *, int));
-void	udago __P((struct device *, struct mscp_xi *));
+static	void	udaintr(void *);
+int	udaready(struct uba_unit *);
+void	udactlrdone(struct device *);
+int	udaprint(void *, const char *);
+void	udasaerror(struct device *, int);
+void	udago(struct device *, struct mscp_xi *);
 
 struct	cfattach mtc_ca = {
 	sizeof(struct uda_softc), (cfmatch_t)udamatch, udaattach