summaryrefslogtreecommitdiff
path: root/sys/arch/mvme68k/stand
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2002-03-14 01:27:20 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2002-03-14 01:27:20 +0000
commit8327d0774703553db5e1a41a04bfdf4b1797c2ce (patch)
treeac9a52bace179e17769651fb9f805070d78abe5f /sys/arch/mvme68k/stand
parent7b2c79b5895287d37f0c4e3adfc396eb7a6c03fb (diff)
First round of __P removal in sys
Diffstat (limited to 'sys/arch/mvme68k/stand')
-rw-r--r--sys/arch/mvme68k/stand/bootst/dev_tape.h8
-rw-r--r--sys/arch/mvme68k/stand/bootst/rawfs.c4
-rw-r--r--sys/arch/mvme68k/stand/bootst/rawfs.h18
-rw-r--r--sys/arch/mvme68k/stand/installboot/installboot.c14
-rw-r--r--sys/arch/mvme68k/stand/libbug/libbug.h18
-rw-r--r--sys/arch/mvme68k/stand/libsa/bugdev.c4
-rw-r--r--sys/arch/mvme68k/stand/libsa/libsa.h14
-rw-r--r--sys/arch/mvme68k/stand/netboot/dev_net.h6
-rw-r--r--sys/arch/mvme68k/stand/netboot/if_ie.c22
-rw-r--r--sys/arch/mvme68k/stand/netboot/if_le.c20
-rw-r--r--sys/arch/mvme68k/stand/sboot/sboot.h34
11 files changed, 81 insertions, 81 deletions
diff --git a/sys/arch/mvme68k/stand/bootst/dev_tape.h b/sys/arch/mvme68k/stand/bootst/dev_tape.h
index 409e56ccae8..9404db80701 100644
--- a/sys/arch/mvme68k/stand/bootst/dev_tape.h
+++ b/sys/arch/mvme68k/stand/bootst/dev_tape.h
@@ -1,8 +1,8 @@
-/* $OpenBSD: dev_tape.h,v 1.2 2001/07/04 08:06:54 niklas Exp $ */
+/* $OpenBSD: dev_tape.h,v 1.3 2002/03/14 01:26:38 millert Exp $ */
-int tape_open __P((struct open_file *, ...));
-int tape_close __P((struct open_file *));
-int tape_strategy __P((void *, int, daddr_t, size_t, void *, size_t *));
+int tape_open(struct open_file *, ...);
+int tape_close(struct open_file *);
+int tape_strategy(void *, int, daddr_t, size_t, void *, size_t *);
int tape_ioctl();
diff --git a/sys/arch/mvme68k/stand/bootst/rawfs.c b/sys/arch/mvme68k/stand/bootst/rawfs.c
index 91d572fa04b..a7033027829 100644
--- a/sys/arch/mvme68k/stand/bootst/rawfs.c
+++ b/sys/arch/mvme68k/stand/bootst/rawfs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rawfs.c,v 1.2 2001/07/04 08:06:54 niklas Exp $ */
+/* $OpenBSD: rawfs.c,v 1.3 2002/03/14 01:26:38 millert Exp $ */
/* $NetBSD: rawfs.c,v 1.1 1995/10/17 22:58:27 gwr Exp $ */
/*
@@ -58,7 +58,7 @@ struct file {
};
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/mvme68k/stand/bootst/rawfs.h b/sys/arch/mvme68k/stand/bootst/rawfs.h
index bca3a3fb0d2..daac3710be3 100644
--- a/sys/arch/mvme68k/stand/bootst/rawfs.h
+++ b/sys/arch/mvme68k/stand/bootst/rawfs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rawfs.h,v 1.2 2001/07/04 08:06:54 niklas Exp $ */
+/* $OpenBSD: rawfs.h,v 1.3 2002/03/14 01:26:38 millert Exp $ */
/* $NetBSD: rawfs.h,v 1.1 1995/10/17 22:58:29 gwr Exp $ */
/*
@@ -6,11 +6,11 @@
* 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/mvme68k/stand/installboot/installboot.c b/sys/arch/mvme68k/stand/installboot/installboot.c
index 27234a21ed3..c6850974557 100644
--- a/sys/arch/mvme68k/stand/installboot/installboot.c
+++ b/sys/arch/mvme68k/stand/installboot/installboot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: installboot.c,v 1.5 2001/07/04 08:06:55 niklas Exp $ */
+/* $OpenBSD: installboot.c,v 1.6 2002/03/14 01:26:38 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/mvme68k/stand/libbug/libbug.h b/sys/arch/mvme68k/stand/libbug/libbug.h
index e57de84104e..f0a65a6a1ec 100644
--- a/sys/arch/mvme68k/stand/libbug/libbug.h
+++ b/sys/arch/mvme68k/stand/libbug/libbug.h
@@ -1,18 +1,18 @@
-/* $OpenBSD: libbug.h,v 1.1 1996/05/16 02:25:39 chuck Exp $ */
+/* $OpenBSD: libbug.h,v 1.2 2002/03/14 01:26:38 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 *));
+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 *);
/*
* bugcrt stuff
diff --git a/sys/arch/mvme68k/stand/libsa/bugdev.c b/sys/arch/mvme68k/stand/libsa/bugdev.c
index 3fe8cf36f51..0c0b9ec13db 100644
--- a/sys/arch/mvme68k/stand/libsa/bugdev.c
+++ b/sys/arch/mvme68k/stand/libsa/bugdev.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bugdev.c,v 1.1 1996/05/16 02:30:36 chuck Exp $ */
+/* $OpenBSD: bugdev.c,v 1.2 2002/03/14 01:26:38 millert Exp $ */
/*
* Copyright (c) 1993 Paul Kranenburg
@@ -37,7 +37,7 @@
#include "stand.h"
#include "libsa.h"
-void cputobsdlabel __P((struct disklabel *lp, struct cpu_disklabel *clp));
+void cputobsdlabel(struct disklabel *lp, struct cpu_disklabel *clp);
int errno;
diff --git a/sys/arch/mvme68k/stand/libsa/libsa.h b/sys/arch/mvme68k/stand/libsa/libsa.h
index fa95d205194..da15e3a0ac5 100644
--- a/sys/arch/mvme68k/stand/libsa/libsa.h
+++ b/sys/arch/mvme68k/stand/libsa/libsa.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: libsa.h,v 1.4 2001/07/04 08:06:56 niklas Exp $ */
+/* $OpenBSD: libsa.h,v 1.5 2002/03/14 01:26:38 millert Exp $ */
/*
* libsa prototypes
@@ -7,14 +7,14 @@
#include "libbug.h"
/* bugdev.c */
-int bugscopen __P((struct open_file *, ...));
-int bugscclose __P((struct open_file *));
-int bugscioctl __P((struct open_file *, u_long, void *));
-int bugscstrategy __P((void *, int, daddr_t, size_t, void *, size_t *));
+int bugscopen(struct open_file *, ...);
+int bugscclose(struct open_file *);
+int bugscioctl(struct open_file *, u_long, void *);
+int bugscstrategy(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 *);
diff --git a/sys/arch/mvme68k/stand/netboot/dev_net.h b/sys/arch/mvme68k/stand/netboot/dev_net.h
index b6d35c84269..0607427320c 100644
--- a/sys/arch/mvme68k/stand/netboot/dev_net.h
+++ b/sys/arch/mvme68k/stand/netboot/dev_net.h
@@ -1,7 +1,7 @@
-/* $OpenBSD: dev_net.h,v 1.2 1996/04/28 10:49:20 deraadt Exp $ */
+/* $OpenBSD: dev_net.h,v 1.3 2002/03/14 01:26:38 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/mvme68k/stand/netboot/if_ie.c b/sys/arch/mvme68k/stand/netboot/if_ie.c
index b85a8f5447b..48c45acb861 100644
--- a/sys/arch/mvme68k/stand/netboot/if_ie.c
+++ b/sys/arch/mvme68k/stand/netboot/if_ie.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ie.c,v 1.8 2000/01/24 05:20:56 smurph Exp $ */
+/* $OpenBSD: if_ie.c,v 1.9 2002/03/14 01:26:38 millert Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -56,16 +56,16 @@
int ie_debug = 0;
-void ie_stop __P((struct netif *));
-void ie_end __P((struct netif *));
-void ie_error __P((struct netif *, char *, volatile struct iereg *));
-int ie_get __P((struct iodesc *, void *, size_t, time_t));
-void ie_init __P((struct iodesc *, void *));
-int ie_match __P((struct netif *, void *));
-int ie_poll __P((struct iodesc *, void *, int));
-int ie_probe __P((struct netif *, void *));
-int ie_put __P((struct iodesc *, void *, size_t));
-void ie_reset __P((struct netif *, u_char *));
+void ie_stop(struct netif *);
+void ie_end(struct netif *);
+void ie_error(struct netif *, char *, volatile struct iereg *);
+int ie_get(struct iodesc *, void *, size_t, time_t);
+void ie_init(struct iodesc *, void *);
+int ie_match(struct netif *, void *);
+int ie_poll(struct iodesc *, void *, int);
+int ie_probe(struct netif *, void *);
+int ie_put(struct iodesc *, void *, size_t);
+void ie_reset(struct netif *, u_char *);
struct netif_stats ie_stats;
diff --git a/sys/arch/mvme68k/stand/netboot/if_le.c b/sys/arch/mvme68k/stand/netboot/if_le.c
index 3ca8000c03f..8de7ac26810 100644
--- a/sys/arch/mvme68k/stand/netboot/if_le.c
+++ b/sys/arch/mvme68k/stand/netboot/if_le.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_le.c,v 1.7 1999/01/11 05:11:41 millert Exp $ */
+/* $OpenBSD: if_le.c,v 1.8 2002/03/14 01:26:38 millert Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -77,15 +77,15 @@
int le_debug = 0;
-void le_end __P((struct netif *));
-void le_error __P((struct netif *, char *, volatile struct lereg1 *));
-int le_get __P((struct iodesc *, void *, size_t, time_t));
-void le_init __P((struct iodesc *, void *));
-int le_match __P((struct netif *, void *));
-int le_poll __P((struct iodesc *, void *, int));
-int le_probe __P((struct netif *, void *));
-int le_put __P((struct iodesc *, void *, size_t));
-void le_reset __P((struct netif *, u_char *));
+void le_end(struct netif *);
+void le_error(struct netif *, char *, volatile struct lereg1 *);
+int le_get(struct iodesc *, void *, size_t, time_t);
+void le_init(struct iodesc *, void *);
+int le_match(struct netif *, void *);
+int le_poll(struct iodesc *, void *, int);
+int le_probe(struct netif *, void *);
+int le_put(struct iodesc *, void *, size_t);
+void le_reset(struct netif *, u_char *);
struct netif_stats le_stats;
diff --git a/sys/arch/mvme68k/stand/sboot/sboot.h b/sys/arch/mvme68k/stand/sboot/sboot.h
index 31461fcc762..aed437d3897 100644
--- a/sys/arch/mvme68k/stand/sboot/sboot.h
+++ b/sys/arch/mvme68k/stand/sboot/sboot.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sboot.h,v 1.6 1997/10/07 22:50:05 deraadt Exp $ */
+/* $OpenBSD: sboot.h,v 1.7 2002/03/14 01:26:38 millert Exp $ */
/*
* Copyright (c) 1995 Charles D. Cranor and Seth Widoff
@@ -38,37 +38,37 @@
extern caddr_t end;
/* console */
-void puts __P((char *));
-char *ngets __P((char *, int));
+void puts(char *);
+char *ngets(char *, int);
/* sboot */
-void callrom __P((void));
-void do_cmd __P((char *, char*));
+void callrom(void);
+void do_cmd(char *, char*);
/* le */
#define LANCE_ADDR 0xfffe0778
#define ERAM_ADDR 0xfffe0774
#define LANCE_REG_ADDR 0xfffe1800
-void le_end __P((void));
-void le_init __P((void));
-int le_get __P((u_char *, size_t, u_long));
-int le_put __P((u_char *, size_t));
+void le_end(void);
+void le_init(void);
+int le_get(u_char *, size_t, u_long);
+int le_put(u_char *, size_t);
/* etherfun */
#define READ 0
#define ACKN 1
-void do_rev_arp __P((void));
-int get_rev_arp __P((void));
-int rev_arp __P((void));
-void do_send_tftp __P((int));
-int do_get_file __P((void));
-void tftp_file __P((char *, u_long));
+void do_rev_arp(void);
+int get_rev_arp(void);
+int rev_arp(void);
+void do_send_tftp(int);
+int do_get_file(void);
+void tftp_file(char *, u_long);
/* clock */
-u_long ttime __P((void));
+u_long ttime(void);
/* checksum */
-u_long oc_cksum __P((void *, u_long, u_long));
+u_long oc_cksum(void *, u_long, u_long);
#define CONS_ZS_ADDR (0xfffe3002)
#define CLOCK_ADDR (0xfffe07f8)