First round of __P removal in sys

7 files changed, 64 insertions, 64 deletions

diff --git a/sys/arch/mvmeppc/stand/installboot/installboot.c b/sys/arch/mvmeppc/stand/installboot/installboot.c
index ffc76cde913..f7edc6a8277 100644
--- a/sys/arch/mvmeppc/stand/installboot/installboot.c
+++ b/sys/arch/mvmeppc/stand/installboot/installboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: installboot.c,v 1.2 2001/07/04 08:31:34 niklas Exp $ */
+/*	$OpenBSD: installboot.c,v 1.3 2002/03/14 01:26:41 millert Exp $ */
 /*	$NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */
 
 /*
@@ -69,12 +69,12 @@ daddr_t	*block_table;	/* block number array in prototype image */
 int	maxblocknum;		/* size of this array */
 
 
-char		*loadprotoblocks __P((char *, long *));
-int		loadblocknums __P((char *, int));
-static void	devread __P((int, void *, daddr_t, size_t, char *));
-static void	usage __P((void));
-int 		main __P((int, char *[]));
-static void     vid_to_disklabel __P((char *, char*));
+char		*loadprotoblocks(char *, long *);
+int		loadblocknums(char *, int);
+static void	devread(int, void *, daddr_t, size_t, char *);
+static void	usage(void);
+int 		main(int, char *[]);
+static void     vid_to_disklabel(char *, char*);
 
 
 static void
diff --git a/sys/arch/mvmeppc/stand/libbug/libbug.h b/sys/arch/mvmeppc/stand/libbug/libbug.h
index c282cfaac9e..fb2148fa7a5 100644
--- a/sys/arch/mvmeppc/stand/libbug/libbug.h
+++ b/sys/arch/mvmeppc/stand/libbug/libbug.h
@@ -1,24 +1,24 @@
-/*	$OpenBSD: libbug.h,v 1.1 2001/06/26 21:58:04 smurph Exp $ */
+/*	$OpenBSD: libbug.h,v 1.2 2002/03/14 01:26:41 millert Exp $ */
 
 /*
  * prototypes and such.   note that get/put char are in stand.h
  */
 
-void	mvmeprom_delay __P((int));
-int	mvmeprom_diskrd __P((struct mvmeprom_dskio *));
-int	mvmeprom_diskwr __P((struct mvmeprom_dskio *));
-struct	mvmeprom_brdid *mvmeprom_getbrdid __P((void));
-int	peekchar __P((void));
-void	mvmeprom_outln __P((char *, char *));
-void	mvmeprom_outstr __P((char *, char *));
-void	mvmeprom_rtc_rd __P((struct mvmeprom_time *));
-int	mvmeprom_netctrl __P((struct mvmeprom_netctrl *));
-int     mvmeprom_netctrl_init __P((u_char, u_char));
-int	mvmeprom_netctrl_hwa __P((u_char, u_char, void *, u_long *));
-int	mvmeprom_netctrl_tx __P((u_char, u_char, void *, u_long *));
-int	mvmeprom_netctrl_rx __P((u_char, u_char, void *, u_long *));
-int	mvmeprom_netctrl_flush_rx __P((u_char, u_char));
-int	mvmeprom_netctrl_reset __P((u_char, u_char));
+void	mvmeprom_delay(int);
+int	mvmeprom_diskrd(struct mvmeprom_dskio *);
+int	mvmeprom_diskwr(struct mvmeprom_dskio *);
+struct	mvmeprom_brdid *mvmeprom_getbrdid(void);
+int	peekchar(void);
+void	mvmeprom_outln(char *, char *);
+void	mvmeprom_outstr(char *, char *);
+void	mvmeprom_rtc_rd(struct mvmeprom_time *);
+int	mvmeprom_netctrl(struct mvmeprom_netctrl *);
+int     mvmeprom_netctrl_init(u_char, u_char);
+int	mvmeprom_netctrl_hwa(u_char, u_char, void *, u_long *);
+int	mvmeprom_netctrl_tx(u_char, u_char, void *, u_long *);
+int	mvmeprom_netctrl_rx(u_char, u_char, void *, u_long *);
+int	mvmeprom_netctrl_flush_rx(u_char, u_char);
+int	mvmeprom_netctrl_reset(u_char, u_char);
 
 /*
  * bugcrt stuff 
diff --git a/sys/arch/mvmeppc/stand/libsa/libsa.h b/sys/arch/mvmeppc/stand/libsa/libsa.h
index dcb9fbe441c..153583cb967 100644
--- a/sys/arch/mvmeppc/stand/libsa/libsa.h
+++ b/sys/arch/mvmeppc/stand/libsa/libsa.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: libsa.h,v 1.2 2001/07/04 08:31:38 niklas Exp $	*/
+/*	$OpenBSD: libsa.h,v 1.3 2002/03/14 01:26:41 millert Exp $	*/
 
 /*
  * libsa prototypes 
@@ -7,24 +7,24 @@
 #include "libbug.h"
 
 /* bugdev.c */
-int dsk_open __P((struct open_file *, ...));
-int dsk_close __P((struct open_file *));
-int dsk_ioctl __P((struct open_file *, u_long, void *));
-int dsk_strategy __P((void *, int, daddr_t, size_t, void *, size_t *));
-int net_open __P((struct open_file *, ...));
-int net_close __P((struct open_file *));
-int net_ioctl __P((struct open_file *, u_long, void *));
-int net_strategy __P((void *, int, daddr_t, size_t, void *, size_t *));
-int tape_open __P((struct open_file *, ...));
-int tape_close __P((struct open_file *));
-int tape_ioctl __P((struct open_file *, u_long, void *));
-int tape_strategy __P((void *, int, daddr_t, size_t, void *, size_t *));
+int dsk_open(struct open_file *, ...);
+int dsk_close(struct open_file *);
+int dsk_ioctl(struct open_file *, u_long, void *);
+int dsk_strategy(void *, int, daddr_t, size_t, void *, size_t *);
+int net_open(struct open_file *, ...);
+int net_close(struct open_file *);
+int net_ioctl(struct open_file *, u_long, void *);
+int net_strategy(void *, int, daddr_t, size_t, void *, size_t *);
+int tape_open(struct open_file *, ...);
+int tape_close(struct open_file *);
+int tape_ioctl(struct open_file *, u_long, void *);
+int tape_strategy(void *, int, daddr_t, size_t, void *, size_t *);
 
 /* exec_mvme.c */
-void exec_mvme __P((char *, int));
+void exec_mvme(char *, int);
 
 /* parse_args.c */
-int parse_args __P((char **, int *));
+int parse_args(char **, int *);
 
 #define BUGDEV_DISK	0
 #define BUGDEV_NET	1
diff --git a/sys/arch/mvmeppc/stand/libsa/rawfs.c b/sys/arch/mvmeppc/stand/libsa/rawfs.c
index 3784175b92d..3682697b0be 100644
--- a/sys/arch/mvmeppc/stand/libsa/rawfs.c
+++ b/sys/arch/mvmeppc/stand/libsa/rawfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rawfs.c,v 1.1 2001/06/26 21:58:08 smurph Exp $ */
+/*	$OpenBSD: rawfs.c,v 1.2 2002/03/14 01:26:41 millert Exp $ */
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -55,7 +55,7 @@ struct cfile {
 };
 
 static int
-rawfs_get_block __P((struct open_file *));
+rawfs_get_block(struct open_file *);
 
 int	rawfs_open(path, f)
 	char *path;
diff --git a/sys/arch/mvmeppc/stand/libsa/rawfs.h b/sys/arch/mvmeppc/stand/libsa/rawfs.h
index cf29be5800b..e84ce28b373 100644
--- a/sys/arch/mvmeppc/stand/libsa/rawfs.h
+++ b/sys/arch/mvmeppc/stand/libsa/rawfs.h
@@ -1,15 +1,15 @@
-/*	$OpenBSD: rawfs.h,v 1.1 2001/06/26 21:58:08 smurph Exp $	*/
+/*	$OpenBSD: rawfs.h,v 1.2 2002/03/14 01:26:41 millert Exp $	*/
 
 /*
  * Raw file system - for stream devices like tapes.
  * No random access, only sequential read allowed.
  */
 
-int	rawfs_open __P((char *path, struct open_file *f));
-int	rawfs_close __P((struct open_file *f));
-int	rawfs_read __P((struct open_file *f, void *buf,
-		u_int size, u_int *resid));
-int	rawfs_write __P((struct open_file *f, void *buf,
-		u_int size, u_int *resid));
-off_t	rawfs_seek __P((struct open_file *f, off_t offset, int where));
-int	rawfs_stat __P((struct open_file *f, struct stat *sb));
+int	rawfs_open(char *path, struct open_file *f);
+int	rawfs_close(struct open_file *f);
+int	rawfs_read(struct open_file *f, void *buf,
+		u_int size, u_int *resid);
+int	rawfs_write(struct open_file *f, void *buf,
+		u_int size, u_int *resid);
+off_t	rawfs_seek(struct open_file *f, off_t offset, int where);
+int	rawfs_stat(struct open_file *f, struct stat *sb);
diff --git a/sys/arch/mvmeppc/stand/libsa/tftpfs.c b/sys/arch/mvmeppc/stand/libsa/tftpfs.c
index 0b2e90759b1..9e6a3c9e8e2 100644
--- a/sys/arch/mvmeppc/stand/libsa/tftpfs.c
+++ b/sys/arch/mvmeppc/stand/libsa/tftpfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tftpfs.c,v 1.1 2001/06/26 21:58:08 smurph Exp $	*/
+/*	$OpenBSD: tftpfs.c,v 1.2 2002/03/14 01:26:41 millert Exp $	*/
 
 /*-
  * Copyright (c) 2001 Steve Murphree, Jr.
@@ -59,11 +59,11 @@ struct tftp_file {
 #define TFTP_BLOCK_NO(x)	((x >> TFTP_BLOCK_SHIFT) + 1)
 #define TFTP_BLOCK_OFF(x)	(x % TFTP_BLOCK_SIZE)
 
-static int	read_inode __P((ino_t, struct open_file *));
-static int	block_map __P((struct open_file *, daddr_t, daddr_t *));
-static int	tftp_read_file __P((struct open_file *, char **, size_t *));
+static int	read_inode(ino_t, struct open_file *);
+static int	block_map(struct open_file *, daddr_t, daddr_t *);
+static int	tftp_read_file(struct open_file *, char **, size_t *);
 #ifdef COMPAT_UFS
-static void	ffs_oldfscompat __P((struct fs *));
+static void	ffs_oldfscompat(struct fs *);
 #endif
 
 /*
diff --git a/sys/arch/mvmeppc/stand/libsa/tftpfs.h b/sys/arch/mvmeppc/stand/libsa/tftpfs.h
index f8ea6c53c0a..1f8da6441e2 100644
--- a/sys/arch/mvmeppc/stand/libsa/tftpfs.h
+++ b/sys/arch/mvmeppc/stand/libsa/tftpfs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tftpfs.h,v 1.1 2001/06/26 21:58:08 smurph Exp $	*/
+/*	$OpenBSD: tftpfs.h,v 1.2 2002/03/14 01:26:41 millert Exp $	*/
 
 /*-
  * Copyright (c) 2001 Steve Murphree, Jr.
@@ -30,14 +30,14 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-int	tftpfs_open __P((char *path, struct open_file *f));
-int	tftpfs_close __P((struct open_file *f));
-int	tftpfs_read __P((struct open_file *f, void *buf,
-			size_t size, size_t *resid));
-int	tftpfs_write __P((struct open_file *f, void *buf,
-			size_t size, size_t *resid));
-off_t	tftpfs_seek __P((struct open_file *f, off_t offset, int where));
-int	tftpfs_stat __P((struct open_file *f, struct stat *sb));
+int	tftpfs_open(char *path, struct open_file *f);
+int	tftpfs_close(struct open_file *f);
+int	tftpfs_read(struct open_file *f, void *buf,
+			size_t size, size_t *resid);
+int	tftpfs_write(struct open_file *f, void *buf,
+			size_t size, size_t *resid);
+off_t	tftpfs_seek(struct open_file *f, off_t offset, int where);
+int	tftpfs_stat(struct open_file *f, struct stat *sb);
 #ifndef NO_READDIR
-int	tftpfs_readdir __P((struct open_file *f, char *name));
+int	tftpfs_readdir(struct open_file *f, char *name);
 #endif