diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2002-03-14 01:27:20 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2002-03-14 01:27:20 +0000 |
| commit | 8327d0774703553db5e1a41a04bfdf4b1797c2ce (patch) | |
| tree | ac9a52bace179e17769651fb9f805070d78abe5f /sys/arch/sun3 | |
| parent | 7b2c79b5895287d37f0c4e3adfc396eb7a6c03fb (diff) | |
First round of __P removal in sys
Diffstat (limited to 'sys/arch/sun3')
74 files changed, 618 insertions, 619 deletions
diff --git a/sys/arch/sun3/dev/btvar.h b/sys/arch/sun3/dev/btvar.h index b2481fcf708..bb7567f2f35 100644 --- a/sys/arch/sun3/dev/btvar.h +++ b/sys/arch/sun3/dev/btvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: btvar.h,v 1.2 2001/07/04 08:33:41 niklas Exp $ */ +/* $OpenBSD: btvar.h,v 1.3 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: btvar.h,v 1.1 1995/03/10 01:50:47 gwr Exp $ */ /* @@ -62,8 +62,8 @@ union bt_cmap { /* * Routines in bt_subr.c. */ -int bt_getcmap __P((struct fbcmap *, union bt_cmap *, int)); -int bt_putcmap __P((struct fbcmap *, union bt_cmap *, int)); +int bt_getcmap(struct fbcmap *, union bt_cmap *, int); +int bt_putcmap(struct fbcmap *, union bt_cmap *, int); /* * Compute (x / 4) * 3 and (x / 4) * 4. These are used in turning diff --git a/sys/arch/sun3/dev/bw2.c b/sys/arch/sun3/dev/bw2.c index ad8aed93ec3..7196bd6ce98 100644 --- a/sys/arch/sun3/dev/bw2.c +++ b/sys/arch/sun3/dev/bw2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bw2.c,v 1.10 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: bw2.c,v 1.11 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: bw2.c,v 1.8 1996/10/13 03:47:25 christos Exp $ */ /* @@ -82,8 +82,8 @@ struct bw2_softc { }; /* autoconfiguration driver */ -static void bw2attach __P((struct device *, struct device *, void *)); -static int bw2match __P((struct device *, void *, void *)); +static void bw2attach(struct device *, struct device *, void *); +static int bw2match(struct device *, void *, void *); struct cfattach bwtwo_ca = { sizeof(struct bw2_softc), bw2match, bw2attach @@ -95,8 +95,8 @@ struct cfdriver bwtwo_cd = { /* XXX we do not handle frame buffer interrupts */ -static int bw2gvideo __P((struct fbdevice *, int *)); -static int bw2svideo __P((struct fbdevice *, int *)); +static int bw2gvideo(struct fbdevice *, int *); +static int bw2svideo(struct fbdevice *, int *); static struct fbdriver bw2fbdriver = { bw2open, bw2close, bw2mmap, diff --git a/sys/arch/sun3/dev/cg2.c b/sys/arch/sun3/dev/cg2.c index 53411377c73..17aca349433 100644 --- a/sys/arch/sun3/dev/cg2.c +++ b/sys/arch/sun3/dev/cg2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cg2.c,v 1.9 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: cg2.c,v 1.10 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: cg2.c,v 1.7 1996/10/13 03:47:26 christos Exp $ */ /* @@ -95,8 +95,8 @@ struct cg2_softc { }; /* autoconfiguration driver */ -static void cg2attach __P((struct device *, struct device *, void *)); -static int cg2match __P((struct device *, void *, void *)); +static void cg2attach(struct device *, struct device *, void *); +static int cg2match(struct device *, void *, void *); struct cfattach cgtwo_ca = { sizeof(struct cg2_softc), cg2match, cg2attach @@ -106,11 +106,11 @@ struct cfdriver cgtwo_cd = { NULL, "cgtwo", DV_DULL }; -static int cg2gattr __P((struct fbdevice *, struct fbgattr *)); -static int cg2gvideo __P((struct fbdevice *, int *)); -static int cg2svideo __P((struct fbdevice *, int *)); -static int cg2getcmap __P((struct fbdevice *, struct fbcmap *)); -static int cg2putcmap __P((struct fbdevice *, struct fbcmap *)); +static int cg2gattr(struct fbdevice *, struct fbgattr *); +static int cg2gvideo(struct fbdevice *, int *); +static int cg2svideo(struct fbdevice *, int *); +static int cg2getcmap(struct fbdevice *, struct fbcmap *); +static int cg2putcmap(struct fbdevice *, struct fbcmap *); static struct fbdriver cg2fbdriver = { cg2open, cg2close, cg2mmap, cg2gattr, @@ -118,7 +118,7 @@ static struct fbdriver cg2fbdriver = { cg2getcmap, cg2putcmap }; -static int cg2intr __P((void*)); +static int cg2intr(void*); /* * Match a cg2. diff --git a/sys/arch/sun3/dev/cg4.c b/sys/arch/sun3/dev/cg4.c index c6115e12381..da050615dae 100644 --- a/sys/arch/sun3/dev/cg4.c +++ b/sys/arch/sun3/dev/cg4.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cg4.c,v 1.10 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: cg4.c,v 1.11 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: cg4.c,v 1.11 1996/10/29 19:54:19 gwr Exp $ */ /* @@ -108,8 +108,8 @@ struct cg4_softc { }; /* autoconfiguration driver */ -static void cg4attach __P((struct device *, struct device *, void *)); -static int cg4match __P((struct device *, void *, void *)); +static void cg4attach(struct device *, struct device *, void *); +static int cg4match(struct device *, void *, void *); struct cfattach cgfour_ca = { sizeof(struct cg4_softc), cg4match, cg4attach @@ -121,19 +121,19 @@ struct cfdriver cgfour_cd = { /* frame buffer generic driver */ -static int cg4gattr __P((struct fbdevice *, struct fbgattr *)); -static int cg4gvideo __P((struct fbdevice *, int *)); -static int cg4svideo __P((struct fbdevice *, int *)); -static int cg4getcmap __P((struct fbdevice *, struct fbcmap *)); -static int cg4putcmap __P((struct fbdevice *, struct fbcmap *)); +static int cg4gattr(struct fbdevice *, struct fbgattr *); +static int cg4gvideo(struct fbdevice *, int *); +static int cg4svideo(struct fbdevice *, int *); +static int cg4getcmap(struct fbdevice *, struct fbcmap *); +static int cg4putcmap(struct fbdevice *, struct fbcmap *); -static void cg4a_init __P((struct cg4_softc *)); -static void cg4a_svideo __P((struct cg4_softc *, int)); -static void cg4a_ldcmap __P((struct cg4_softc *)); +static void cg4a_init(struct cg4_softc *); +static void cg4a_svideo(struct cg4_softc *, int); +static void cg4a_ldcmap(struct cg4_softc *); -static void cg4b_init __P((struct cg4_softc *)); -static void cg4b_svideo __P((struct cg4_softc *, int)); -static void cg4b_ldcmap __P((struct cg4_softc *)); +static void cg4b_init(struct cg4_softc *); +static void cg4b_svideo(struct cg4_softc *, int); +static void cg4b_ldcmap(struct cg4_softc *); static struct fbdriver cg4_fbdriver = { cg4open, cg4close, cg4mmap, cg4gattr, diff --git a/sys/arch/sun3/dev/eeprom.c b/sys/arch/sun3/dev/eeprom.c index 61672907da6..863535aaefd 100644 --- a/sys/arch/sun3/dev/eeprom.c +++ b/sys/arch/sun3/dev/eeprom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eeprom.c,v 1.8 2001/05/16 12:49:48 ho Exp $ */ +/* $OpenBSD: eeprom.c,v 1.9 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: eeprom.c,v 1.8 1996/03/26 15:16:06 gwr Exp $ */ /* @@ -54,12 +54,12 @@ int ee_console; /* for convenience of drivers */ static char *eeprom_va; static int ee_busy, ee_want; -static int eeprom_match __P((struct device *, void *vcf, void *args)); -static void eeprom_attach __P((struct device *, struct device *, void *)); -static int ee_update __P((caddr_t, int, int)); -static int ee_take __P((void)); -static void ee_give __P((void)); -int ee_get_byte __P((int, int)); +static int eeprom_match(struct device *, void *vcf, void *args); +static void eeprom_attach(struct device *, struct device *, void *); +static int ee_update(caddr_t, int, int); +static int ee_take(void); +static void ee_give(void); +int ee_get_byte(int, int); struct cfattach eeprom_ca = { sizeof(struct device), eeprom_match, eeprom_attach diff --git a/sys/arch/sun3/dev/fbvar.h b/sys/arch/sun3/dev/fbvar.h index 9a6dce8fc4f..f110a276521 100644 --- a/sys/arch/sun3/dev/fbvar.h +++ b/sys/arch/sun3/dev/fbvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fbvar.h,v 1.6 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: fbvar.h,v 1.7 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: fbvar.h,v 1.3 1996/10/29 19:27:37 gwr Exp $ */ /* @@ -68,16 +68,16 @@ struct fbdevice { struct fbdriver { /* These avoid the need to know our major number. */ - int (*fbd_open) __P((dev_t, int, int, struct proc *)); - int (*fbd_close) __P((dev_t, int, int, struct proc *)); - paddr_t (*fbd_mmap) __P((dev_t, off_t, int)); + int (*fbd_open)(dev_t, int, int, struct proc *); + int (*fbd_close)(dev_t, int, int, struct proc *); + paddr_t (*fbd_mmap)(dev_t, off_t, int); /* These are the internal ioctl functions */ - int (*fbd_gattr) __P((struct fbdevice *, struct fbgattr *)); - int (*fbd_gvideo) __P((struct fbdevice *, int *)); - int (*fbd_svideo) __P((struct fbdevice *, int *)); - int (*fbd_getcmap) __P((struct fbdevice *, struct fbcmap *)); - int (*fbd_putcmap) __P((struct fbdevice *, struct fbcmap *)); + int (*fbd_gattr)(struct fbdevice *, struct fbgattr *); + int (*fbd_gvideo)(struct fbdevice *, int *); + int (*fbd_svideo)(struct fbdevice *, int *); + int (*fbd_getcmap)(struct fbdevice *, struct fbcmap *); + int (*fbd_putcmap)(struct fbdevice *, struct fbcmap *); }; -void fb_attach __P((struct fbdevice *, int)); -int fbioctlfb __P((struct fbdevice *, u_long, caddr_t)); +void fb_attach(struct fbdevice *, int); +int fbioctlfb(struct fbdevice *, u_long, caddr_t); diff --git a/sys/arch/sun3/dev/if_ie.c b/sys/arch/sun3/dev/if_ie.c index 8c5d88c3b92..125779bc848 100644 --- a/sys/arch/sun3/dev/if_ie.c +++ b/sys/arch/sun3/dev/if_ie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ie.c,v 1.15 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: if_ie.c,v 1.16 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: if_ie.c,v 1.15 1996/10/30 00:24:33 gwr Exp $ */ /*- @@ -168,38 +168,38 @@ static struct mbuf *last_not_for_us; #define ETHER_MAX_LEN 1518 #define ETHER_ADDR_LEN 6 -void iewatchdog __P((struct ifnet *)); -int ieinit __P((struct ie_softc *)); -int ieioctl __P((struct ifnet *, u_long, caddr_t)); -void iestart __P((struct ifnet *)); -void iereset __P((struct ie_softc *)); -static void ie_readframe __P((struct ie_softc *, int)); -static void ie_drop_packet_buffer __P((struct ie_softc *)); -static int command_and_wait __P((struct ie_softc *, int, void volatile *, int)); -static __inline__ void ie_setup_config __P((volatile struct ie_config_cmd *, - int, int)); -static void ierint __P((struct ie_softc *)); -static void ietint __P((struct ie_softc *)); -static void setup_bufs __P((struct ie_softc *)); -static int mc_setup __P((struct ie_softc *, void *)); -static void mc_reset __P((struct ie_softc *)); -static int ie_setupram __P((struct ie_softc *)); -static __inline__ caddr_t Align __P((caddr_t)); -static __inline__ void ie_ack __P((struct ie_softc *, u_int)); -static __inline__ u_short ether_cmp __P((u_char *, u_char *)); -static __inline__ int check_eh __P((struct ie_softc *, struct ether_header *, - int *)); -static __inline__ int ie_buflen __P((struct ie_softc *, int)); -static __inline__ int ie_packet_len __P((struct ie_softc *)); -static __inline__ void iexmit __P((struct ie_softc *)); -static __inline__ int ieget __P((struct ie_softc *, struct mbuf **, - struct ether_header *, int *)); -static void chan_attn_timeout __P((void *)); -static void run_tdr __P((struct ie_softc *, struct ie_tdr_cmd *)); -static void iestop __P((struct ie_softc *)); +void iewatchdog(struct ifnet *); +int ieinit(struct ie_softc *); +int ieioctl(struct ifnet *, u_long, caddr_t); +void iestart(struct ifnet *); +void iereset(struct ie_softc *); +static void ie_readframe(struct ie_softc *, int); +static void ie_drop_packet_buffer(struct ie_softc *); +static int command_and_wait(struct ie_softc *, int, void volatile *, int); +static __inline__ void ie_setup_config(volatile struct ie_config_cmd *, + int, int); +static void ierint(struct ie_softc *); +static void ietint(struct ie_softc *); +static void setup_bufs(struct ie_softc *); +static int mc_setup(struct ie_softc *, void *); +static void mc_reset(struct ie_softc *); +static int ie_setupram(struct ie_softc *); +static __inline__ caddr_t Align(caddr_t); +static __inline__ void ie_ack(struct ie_softc *, u_int); +static __inline__ u_short ether_cmp(u_char *, u_char *); +static __inline__ int check_eh(struct ie_softc *, struct ether_header *, + int *); +static __inline__ int ie_buflen(struct ie_softc *, int); +static __inline__ int ie_packet_len(struct ie_softc *); +static __inline__ void iexmit(struct ie_softc *); +static __inline__ int ieget(struct ie_softc *, struct mbuf **, + struct ether_header *, int *); +static void chan_attn_timeout(void *); +static void run_tdr(struct ie_softc *, struct ie_tdr_cmd *); +static void iestop(struct ie_softc *); #ifdef IEDEBUG -void print_rbd __P((volatile struct ie_recv_buf_desc *)); +void print_rbd(volatile struct ie_recv_buf_desc *); int in_ierint = 0; int in_ietint = 0; #endif diff --git a/sys/arch/sun3/dev/if_ie_obio.c b/sys/arch/sun3/dev/if_ie_obio.c index e3e830b150d..f6de6ac4ade 100644 --- a/sys/arch/sun3/dev/if_ie_obio.c +++ b/sys/arch/sun3/dev/if_ie_obio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ie_obio.c,v 1.6 2000/08/28 21:59:34 miod Exp $ */ +/* $OpenBSD: if_ie_obio.c,v 1.7 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: if_ie_obio.c,v 1.6 1996/11/20 18:56:51 gwr Exp $ */ /*- @@ -67,16 +67,16 @@ #include <sun3/dev/if_iereg.h> #include <sun3/dev/if_ievar.h> -static void ie_obreset __P((struct ie_softc *)); -static void ie_obattend __P((struct ie_softc *)); -static void ie_obrun __P((struct ie_softc *)); +static void ie_obreset(struct ie_softc *); +static void ie_obattend(struct ie_softc *); +static void ie_obrun(struct ie_softc *); /* * New-style autoconfig attachment */ -static int ie_obio_match __P((struct device *, void *, void *)); -static void ie_obio_attach __P((struct device *, struct device *, void *)); +static int ie_obio_match(struct device *, void *, void *); +static void ie_obio_attach(struct device *, struct device *, void *); struct cfattach ie_obio_ca = { sizeof(struct ie_softc), ie_obio_match, ie_obio_attach diff --git a/sys/arch/sun3/dev/if_ie_vmes.c b/sys/arch/sun3/dev/if_ie_vmes.c index 89287d75658..23d0ac4e173 100644 --- a/sys/arch/sun3/dev/if_ie_vmes.c +++ b/sys/arch/sun3/dev/if_ie_vmes.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ie_vmes.c,v 1.6 2000/08/28 21:59:35 miod Exp $ */ +/* $OpenBSD: if_ie_vmes.c,v 1.7 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: if_ie_vmes.c,v 1.5 1996/11/20 18:56:51 gwr Exp $ */ /*- @@ -66,23 +66,23 @@ #include <sun3/dev/if_iereg.h> #include <sun3/dev/if_ievar.h> -static void ie_vmereset __P((struct ie_softc *)); -static void ie_vmeattend __P((struct ie_softc *)); -static void ie_vmerun __P((struct ie_softc *)); +static void ie_vmereset(struct ie_softc *); +static void ie_vmeattend(struct ie_softc *); +static void ie_vmerun(struct ie_softc *); /* * zero/copy functions: OBIO can use the normal functions, but VME * must do only byte or half-word (16 bit) accesses... */ -static void wcopy __P((const void *, void *, u_int)); -static void wzero __P((void *, u_int)); +static void wcopy(const void *, void *, u_int); +static void wzero(void *, u_int); /* * New-style autoconfig attachment */ -static int ie_vmes_match __P((struct device *, void *, void *)); -static void ie_vmes_attach __P((struct device *, struct device *, void *)); +static int ie_vmes_match(struct device *, void *, void *); +static void ie_vmes_attach(struct device *, struct device *, void *); struct cfattach ie_vmes_ca = { sizeof(struct ie_softc), ie_vmes_match, ie_vmes_attach diff --git a/sys/arch/sun3/dev/if_ievar.h b/sys/arch/sun3/dev/if_ievar.h index 259673c60eb..a3e024390f0 100644 --- a/sys/arch/sun3/dev/if_ievar.h +++ b/sys/arch/sun3/dev/if_ievar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ievar.h,v 1.4 1997/01/16 04:03:48 kstailey Exp $ */ +/* $OpenBSD: if_ievar.h,v 1.5 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: if_ievar.h,v 1.6 1996/03/26 14:38:33 gwr Exp $ */ /* @@ -68,11 +68,11 @@ struct ie_softc { caddr_t sc_reg; /* KVA of card's register */ enum ie_hardware hard_type; /* card type */ - void (*reset_586) __P((struct ie_softc *)); /* three card */ - void (*chan_attn) __P((struct ie_softc *)); /* dependant */ - void (*run_586) __P((struct ie_softc *)); /* functions */ - void (*sc_bcopy) __P((const void *, void *, u_int)); - void (*sc_bzero) __P((void *, u_int)); + void (*reset_586)(struct ie_softc *); /* three card */ + void (*chan_attn)(struct ie_softc *); /* dependant */ + void (*run_586)(struct ie_softc *); /* functions */ + void (*sc_bcopy)(const void *, void *, u_int); + void (*sc_bzero)(void *, u_int); int want_mcsetup; /* flag for multicast setup */ int promisc; /* are we in promisc mode? */ @@ -118,5 +118,5 @@ struct ie_softc { }; -extern void ie_attach __P((struct ie_softc *)); -extern int ie_intr __P((void *)); +extern void ie_attach(struct ie_softc *); +extern int ie_intr(void *); diff --git a/sys/arch/sun3/dev/if_le.c b/sys/arch/sun3/dev/if_le.c index db30b8b027d..734719c9e96 100644 --- a/sys/arch/sun3/dev/if_le.c +++ b/sys/arch/sun3/dev/if_le.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le.c,v 1.12 2000/08/28 22:03:01 miod Exp $ */ +/* $OpenBSD: if_le.c,v 1.13 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: if_le.c,v 1.33 1996/11/20 18:56:52 gwr Exp $ */ /*- @@ -83,15 +83,15 @@ struct le_softc { struct lereg1 *sc_r1; /* LANCE registers */ }; -static int le_match __P((struct device *, void *, void *)); -static void le_attach __P((struct device *, struct device *, void *)); +static int le_match(struct device *, void *, void *); +static void le_attach(struct device *, struct device *, void *); struct cfattach le_ca = { sizeof(struct le_softc), le_match, le_attach }; -hide void lewrcsr __P((struct am7990_softc *, u_int16_t, u_int16_t)); -hide u_int16_t lerdcsr __P((struct am7990_softc *, u_int16_t)); +hide void lewrcsr(struct am7990_softc *, u_int16_t, u_int16_t); +hide u_int16_t lerdcsr(struct am7990_softc *, u_int16_t); hide void lewrcsr(sc, port, val) diff --git a/sys/arch/sun3/dev/kbd.c b/sys/arch/sun3/dev/kbd.c index 2f8e405606b..d9d5b23986e 100644 --- a/sys/arch/sun3/dev/kbd.c +++ b/sys/arch/sun3/dev/kbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kbd.c,v 1.8 2001/08/12 12:03:02 heko Exp $ */ +/* $OpenBSD: kbd.c,v 1.9 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: kbd.c,v 1.8 1996/05/17 19:32:06 gwr Exp $ */ /* @@ -190,18 +190,18 @@ struct zsops zsops_kbd; * Definition of the driver for autoconfig. ****************************************************************/ -static int kbd_match __P((struct device *, void *, void *)); -static void kbd_attach __P((struct device *, struct device *, void *)); +static int kbd_match(struct device *, void *, void *); +static void kbd_attach(struct device *, struct device *, void *); -static int kbd_drain_tx __P((struct kbd_softc *)); -static void kbd_input_string __P((struct kbd_softc *, char *str)); -static void kbd_input_funckey __P((struct kbd_softc *,register int)); -static void kbd_input_keysym __P((struct kbd_softc *,register int)); -static void kbd_input_raw __P((struct kbd_softc *,register int)); -static void kbd_rxint __P((register struct zs_chanstate *)); -static void kbd_txint __P((register struct zs_chanstate *)); -static void kbd_stint __P((register struct zs_chanstate *)); -static void kbd_softint __P((register struct zs_chanstate *)); +static int kbd_drain_tx(struct kbd_softc *); +static void kbd_input_string(struct kbd_softc *, char *str); +static void kbd_input_funckey(struct kbd_softc *,register int); +static void kbd_input_keysym(struct kbd_softc *,register int); +static void kbd_input_raw(struct kbd_softc *,register int); +static void kbd_rxint(register struct zs_chanstate *); +static void kbd_txint(register struct zs_chanstate *); +static void kbd_stint(register struct zs_chanstate *); +static void kbd_softint(register struct zs_chanstate *); struct cfattach kbd_ca = { sizeof(struct kbd_softc), kbd_match, kbd_attach @@ -395,14 +395,14 @@ kbdselect(dev, rw, p) static int kbd_ioccmd(struct kbd_softc *k, int *data); -static int kbd_iockeymap __P((struct kbd_state *ks, - u_long cmd, struct kiockeymap *kio)); +static int kbd_iockeymap(struct kbd_state *ks, + u_long cmd, struct kiockeymap *kio); static int kbd_iocsled(struct kbd_softc *k, int *data); #ifdef KIOCGETKEY -static int kbd_oldkeymap __P((struct kbd_state *ks, - u_long cmd, struct okiockey *okio)); +static int kbd_oldkeymap(struct kbd_state *ks, + u_long cmd, struct okiockey *okio); #endif int diff --git a/sys/arch/sun3/dev/kbd_xlate.h b/sys/arch/sun3/dev/kbd_xlate.h index 2a811e0ece5..e2bf24adf2f 100644 --- a/sys/arch/sun3/dev/kbd_xlate.h +++ b/sys/arch/sun3/dev/kbd_xlate.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kbd_xlate.h,v 1.2 1997/08/19 23:09:32 kstailey Exp $ */ +/* $OpenBSD: kbd_xlate.h,v 1.3 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: kbd_xlate.h,v 1.1.1.1 1996/01/24 01:15:35 gwr Exp $ */ /* @@ -79,14 +79,14 @@ struct kbd_state { }; -extern void kbd_xlate_init __P((struct kbd_state *ks)); -extern int kbd_code_to_keysym __P((struct kbd_state *ks, int c)); +extern void kbd_xlate_init(struct kbd_state *ks); +extern int kbd_code_to_keysym(struct kbd_state *ks, int c); /* * XXX: kd/kbd interface... Does this belong elsewhere? * This is the only header shared between them... */ -extern int kbd_iopen __P((int unit)); -extern void kd_init __P((int unit)); -extern void kd_input __P((int c)); +extern int kbd_iopen(int unit); +extern void kd_init(int unit); +extern void kd_input(int c); diff --git a/sys/arch/sun3/dev/memerr.c b/sys/arch/sun3/dev/memerr.c index 37de3dbb300..4cab97e942a 100644 --- a/sys/arch/sun3/dev/memerr.c +++ b/sys/arch/sun3/dev/memerr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: memerr.c,v 1.8 1997/01/16 04:03:50 kstailey Exp $ */ +/* $OpenBSD: memerr.c,v 1.9 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: memerr.c,v 1.6 1996/11/13 07:05:14 thorpej Exp $ */ /* @@ -73,10 +73,10 @@ struct memerr_softc { /* XXX: counters? */ }; -static int memerr_match __P((struct device *, void *vcf, void *args)); -static void memerr_attach __P((struct device *, struct device *, void *)); -static int memerr_interrupt __P((void *)); -static void memerr_correctable __P((struct memerr_softc *)); +static int memerr_match(struct device *, void *vcf, void *args); +static void memerr_attach(struct device *, struct device *, void *); +static int memerr_interrupt(void *); +static void memerr_correctable(struct memerr_softc *); struct cfattach memerr_ca = { sizeof(struct memerr_softc), memerr_match, memerr_attach diff --git a/sys/arch/sun3/dev/ms.c b/sys/arch/sun3/dev/ms.c index 7128789dbe1..cc87729cae9 100644 --- a/sys/arch/sun3/dev/ms.c +++ b/sys/arch/sun3/dev/ms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ms.c,v 1.4 1997/08/19 23:09:34 kstailey Exp $ */ +/* $OpenBSD: ms.c,v 1.5 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: ms.c,v 1.6 1996/05/17 19:32:09 gwr Exp $ */ /* @@ -141,14 +141,14 @@ struct zsops zsops_ms; * Definition of the driver for autoconfig. ****************************************************************/ -static int ms_match __P((struct device *, void *, void *)); -static void ms_attach __P((struct device *, struct device *, void *)); +static int ms_match(struct device *, void *, void *); +static void ms_attach(struct device *, struct device *, void *); -static void ms_input __P((register struct ms_softc *, register int)); -static void ms_rxint __P((register struct zs_chanstate *)); -static void ms_txint __P((register struct zs_chanstate *)); -static void ms_stint __P((register struct zs_chanstate *)); -static void ms_softint __P((struct zs_chanstate *)); +static void ms_input(register struct ms_softc *, register int); +static void ms_rxint(register struct zs_chanstate *); +static void ms_txint(register struct zs_chanstate *); +static void ms_stint(register struct zs_chanstate *); +static void ms_softint(struct zs_chanstate *); struct cfattach ms_ca = { sizeof(struct ms_softc), ms_match, ms_attach diff --git a/sys/arch/sun3/dev/obio.c b/sys/arch/sun3/dev/obio.c index 5160324edf3..5a1ff223dd6 100644 --- a/sys/arch/sun3/dev/obio.c +++ b/sys/arch/sun3/dev/obio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: obio.c,v 1.7 1999/01/11 05:12:02 millert Exp $ */ +/* $OpenBSD: obio.c,v 1.8 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: obio.c,v 1.23 1996/11/20 18:56:56 gwr Exp $ */ /*- @@ -47,13 +47,13 @@ #include <machine/mon.h> #include <machine/obio.h> -static int obio_match __P((struct device *, void *, void *)); -static void obio_attach __P((struct device *, struct device *, void *)); -static int obio_print __P((void *, const char *parentname)); -static int obio_submatch __P((struct device *, void *, void *)); +static int obio_match(struct device *, void *, void *); +static void obio_attach(struct device *, struct device *, void *); +static int obio_print(void *, const char *parentname); +static int obio_submatch(struct device *, void *, void *); -static void save_prom_mappings __P((void)); -static void make_required_mappings __P((void)); +static void save_prom_mappings(void); +static void make_required_mappings(void); struct cfattach obio_ca = { sizeof(struct device), obio_match, obio_attach diff --git a/sys/arch/sun3/dev/obmem.c b/sys/arch/sun3/dev/obmem.c index 72b3bb15870..296c543beeb 100644 --- a/sys/arch/sun3/dev/obmem.c +++ b/sys/arch/sun3/dev/obmem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: obmem.c,v 1.6 1997/01/16 04:03:51 kstailey Exp $ */ +/* $OpenBSD: obmem.c,v 1.7 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: obmem.c,v 1.11 1996/11/20 18:56:57 gwr Exp $ */ /*- @@ -49,8 +49,8 @@ #include <machine/autoconf.h> #include <machine/obmem.h> -static int obmem_match __P((struct device *, void *, void *)); -static void obmem_attach __P((struct device *, struct device *, void *)); +static int obmem_match(struct device *, void *, void *); +static void obmem_attach(struct device *, struct device *, void *); struct cfattach obmem_ca = { sizeof(struct device), obmem_match, obmem_attach diff --git a/sys/arch/sun3/dev/si.c b/sys/arch/sun3/dev/si.c index 917e3167cd2..8e7b3796708 100644 --- a/sys/arch/sun3/dev/si.c +++ b/sys/arch/sun3/dev/si.c @@ -1,4 +1,4 @@ -/* $OpenBSD: si.c,v 1.14 2001/05/16 12:49:49 ho Exp $ */ +/* $OpenBSD: si.c,v 1.15 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: si.c,v 1.31 1996/11/20 18:56:59 gwr Exp $ */ /*- @@ -115,7 +115,7 @@ static int si_link_flags = 0 /* | SDEV_DB2 */ ; /* How long to wait for DMA before declaring an error. */ int si_dma_intr_timo = 500; /* ticks (sec. X 100) */ -static void si_minphys __P((struct buf *)); +static void si_minphys(struct buf *); static struct scsi_adapter si_ops = { ncr5380_scsi_cmd, /* scsi_cmd() */ diff --git a/sys/arch/sun3/dev/si_obio.c b/sys/arch/sun3/dev/si_obio.c index 23cdac9b2b7..88f879778d8 100644 --- a/sys/arch/sun3/dev/si_obio.c +++ b/sys/arch/sun3/dev/si_obio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: si_obio.c,v 1.10 2001/01/25 03:50:49 todd Exp $ */ +/* $OpenBSD: si_obio.c,v 1.11 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: si_obio.c,v 1.7 1996/11/20 18:57:00 gwr Exp $ */ /*- @@ -117,21 +117,21 @@ */ #define UDC_WAIT_USEC 5 -void si_obio_dma_setup __P((struct ncr5380_softc *)); -void si_obio_dma_start __P((struct ncr5380_softc *)); -void si_obio_dma_eop __P((struct ncr5380_softc *)); -void si_obio_dma_stop __P((struct ncr5380_softc *)); +void si_obio_dma_setup(struct ncr5380_softc *); +void si_obio_dma_start(struct ncr5380_softc *); +void si_obio_dma_eop(struct ncr5380_softc *); +void si_obio_dma_stop(struct ncr5380_softc *); -static __inline__ int si_obio_udc_read __P((volatile struct si_regs *, int)); -static __inline__ void si_obio_udc_write __P((volatile struct si_regs *, - int, int)); +static __inline__ int si_obio_udc_read(volatile struct si_regs *, int); +static __inline__ void si_obio_udc_write(volatile struct si_regs *, + int, int); /* * New-style autoconfig attachment */ -static int si_obio_match __P((struct device *, void *, void *)); -static void si_obio_attach __P((struct device *, struct device *, void *)); +static int si_obio_match(struct device *, void *, void *); +static void si_obio_attach(struct device *, struct device *, void *); struct cfattach si_obio_ca = { sizeof(struct si_softc), si_obio_match, si_obio_attach diff --git a/sys/arch/sun3/dev/si_vme.c b/sys/arch/sun3/dev/si_vme.c index 4505e66c825..f370898b017 100644 --- a/sys/arch/sun3/dev/si_vme.c +++ b/sys/arch/sun3/dev/si_vme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: si_vme.c,v 1.6 1997/01/16 04:03:54 kstailey Exp $ */ +/* $OpenBSD: si_vme.c,v 1.7 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: si_vme.c,v 1.7 1996/11/20 18:57:01 gwr Exp $ */ /*- @@ -107,20 +107,20 @@ #include "sireg.h" #include "sivar.h" -void si_vme_dma_setup __P((struct ncr5380_softc *)); -void si_vme_dma_start __P((struct ncr5380_softc *)); -void si_vme_dma_eop __P((struct ncr5380_softc *)); -void si_vme_dma_stop __P((struct ncr5380_softc *)); +void si_vme_dma_setup(struct ncr5380_softc *); +void si_vme_dma_start(struct ncr5380_softc *); +void si_vme_dma_eop(struct ncr5380_softc *); +void si_vme_dma_stop(struct ncr5380_softc *); -void si_vme_intr_on __P((struct ncr5380_softc *)); -void si_vme_intr_off __P((struct ncr5380_softc *)); +void si_vme_intr_on(struct ncr5380_softc *); +void si_vme_intr_off(struct ncr5380_softc *); /* * New-style autoconfig attachment */ -static int si_vmes_match __P((struct device *, void *, void *)); -static void si_vmes_attach __P((struct device *, struct device *, void *)); +static int si_vmes_match(struct device *, void *, void *); +static void si_vmes_attach(struct device *, struct device *, void *); struct cfattach si_vmes_ca = { sizeof(struct si_softc), si_vmes_match, si_vmes_attach diff --git a/sys/arch/sun3/dev/sivar.h b/sys/arch/sun3/dev/sivar.h index f1f6bee8442..8b5c51328f0 100644 --- a/sys/arch/sun3/dev/sivar.h +++ b/sys/arch/sun3/dev/sivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sivar.h,v 1.3 2000/05/02 21:48:52 miod Exp $ */ +/* $OpenBSD: sivar.h,v 1.4 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: sivar.h,v 1.3 1996/11/20 18:57:01 gwr Exp $ */ /*- @@ -92,11 +92,11 @@ struct si_softc { extern int si_debug; -void si_attach __P((struct si_softc *)); -int si_intr __P((void *)); +void si_attach(struct si_softc *); +int si_intr(void *); -void si_reset_adapter __P((struct ncr5380_softc *)); +void si_reset_adapter(struct ncr5380_softc *); -void si_dma_alloc __P((struct ncr5380_softc *)); -void si_dma_free __P((struct ncr5380_softc *)); -void si_dma_poll __P((struct ncr5380_softc *)); +void si_dma_alloc(struct ncr5380_softc *); +void si_dma_free(struct ncr5380_softc *); +void si_dma_poll(struct ncr5380_softc *); diff --git a/sys/arch/sun3/dev/vme.c b/sys/arch/sun3/dev/vme.c index b188762dc39..ceb8667b1a8 100644 --- a/sys/arch/sun3/dev/vme.c +++ b/sys/arch/sun3/dev/vme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vme.c,v 1.4 1997/01/16 04:03:55 kstailey Exp $ */ +/* $OpenBSD: vme.c,v 1.5 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: vme.c,v 1.6 1996/11/20 18:57:02 gwr Exp $ */ /*- @@ -44,10 +44,10 @@ #include <machine/autoconf.h> /* #include <machine/vme.h> */ -static int vmes_match __P((struct device *, void *, void *)); -static int vmel_match __P((struct device *, void *, void *)); +static int vmes_match(struct device *, void *, void *); +static int vmel_match(struct device *, void *, void *); -static void vme_attach __P((struct device *, struct device *, void *)); +static void vme_attach(struct device *, struct device *, void *); struct cfattach vmes_ca = { sizeof(struct device), vmes_match, vme_attach diff --git a/sys/arch/sun3/dev/xd.c b/sys/arch/sun3/dev/xd.c index bb14ceb4b71..9f3d204a0ab 100644 --- a/sys/arch/sun3/dev/xd.c +++ b/sys/arch/sun3/dev/xd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xd.c,v 1.15 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: xd.c,v 1.16 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: xd.c,v 1.10 1996/10/13 03:47:39 christos Exp $ */ /* @@ -201,46 +201,46 @@ */ /* internals */ -int xdc_cmd __P((struct xdc_softc *, int, int, int, int, int, char *, int)); -char *xdc_e2str __P((int)); -int xdc_error __P((struct xdc_softc *, struct xd_iorq *, - struct xd_iopb *, int, int)); -int xdc_ioctlcmd __P((struct xd_softc *, dev_t dev, struct xd_iocmd *)); -void xdc_perror __P((struct xd_iorq *, struct xd_iopb *, int)); -int xdc_piodriver __P((struct xdc_softc *, int, int)); -int xdc_remove_iorq __P((struct xdc_softc *)); -int xdc_reset __P((struct xdc_softc *, int, int, int, struct xd_softc *)); -inline void xdc_rqinit __P((struct xd_iorq *, struct xdc_softc *, +int xdc_cmd(struct xdc_softc *, int, int, int, int, int, char *, int); +char *xdc_e2str(int); +int xdc_error(struct xdc_softc *, struct xd_iorq *, + struct xd_iopb *, int, int); +int xdc_ioctlcmd(struct xd_softc *, dev_t dev, struct xd_iocmd *); +void xdc_perror(struct xd_iorq *, struct xd_iopb *, int); +int xdc_piodriver(struct xdc_softc *, int, int); +int xdc_remove_iorq(struct xdc_softc *); +int xdc_reset(struct xdc_softc *, int, int, int, struct xd_softc *); +inline void xdc_rqinit(struct xd_iorq *, struct xdc_softc *, struct xd_softc *, int, u_long, int, - caddr_t, struct buf *)); -void xdc_rqtopb __P((struct xd_iorq *, struct xd_iopb *, int, int)); -void xdc_start __P((struct xdc_softc *, int)); -int xdc_startbuf __P((struct xdc_softc *, struct xd_softc *, struct buf *)); -int xdc_submit_iorq __P((struct xdc_softc *, int, int)); -void xdc_tick __P((void *)); -void xdc_xdreset __P((struct xdc_softc *, struct xd_softc *)); + caddr_t, struct buf *); +void xdc_rqtopb(struct xd_iorq *, struct xd_iopb *, int, int); +void xdc_start(struct xdc_softc *, int); +int xdc_startbuf(struct xdc_softc *, struct xd_softc *, struct buf *); +int xdc_submit_iorq(struct xdc_softc *, int, int); +void xdc_tick(void *); +void xdc_xdreset(struct xdc_softc *, struct xd_softc *); /* machine interrupt hook */ -int xdcintr __P((void *)); +int xdcintr(void *); /* {b,c}devsw */ -int xdclose __P((dev_t, int, int)); -int xddump __P((dev_t)); -int xdioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); -int xdopen __P((dev_t, int, int)); -int xdread __P((dev_t, struct uio *)); -int xdwrite __P((dev_t, struct uio *)); -int xdsize __P((dev_t)); -void xdstrategy __P((struct buf *)); +int xdclose(dev_t, int, int); +int xddump(dev_t); +int xdioctl(dev_t, u_long, caddr_t, int, struct proc *); +int xdopen(dev_t, int, int); +int xdread(dev_t, struct uio *); +int xdwrite(dev_t, struct uio *); +int xdsize(dev_t); +void xdstrategy(struct buf *); /* autoconf */ -int xdcmatch __P((struct device *, void *, void *)); -void xdcattach __P((struct device *, struct device *, void *)); -int xdmatch __P((struct device *, void *, void *)); -void xdattach __P((struct device *, struct device *, void *)); +int xdcmatch(struct device *, void *, void *); +void xdcattach(struct device *, struct device *, void *); +int xdmatch(struct device *, void *, void *); +void xdattach(struct device *, struct device *, void *); -static void xddummystrat __P((struct buf *)); -int xdgetdisklabel __P((struct xd_softc *, void *)); +static void xddummystrat(struct buf *); +int xdgetdisklabel(struct xd_softc *, void *); /* * cfdrivers: device driver interface to autoconfig diff --git a/sys/arch/sun3/dev/xy.c b/sys/arch/sun3/dev/xy.c index 50e73f1a45d..7a9afd87300 100644 --- a/sys/arch/sun3/dev/xy.c +++ b/sys/arch/sun3/dev/xy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xy.c,v 1.15 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: xy.c,v 1.16 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: xy.c,v 1.11 1996/10/13 03:47:40 christos Exp $ */ /* @@ -139,50 +139,50 @@ */ /* internals */ -struct xy_iopb *xyc_chain __P((struct xyc_softc *, struct xy_iorq *)); -int xyc_cmd __P((struct xyc_softc *, int, int, int, int, int, char *, int)); -char *xyc_e2str __P((int)); -int xyc_entoact __P((int)); -int xyc_error __P((struct xyc_softc *, struct xy_iorq *, - struct xy_iopb *, int)); -int xyc_ioctlcmd __P((struct xy_softc *, dev_t dev, struct xd_iocmd *)); -void xyc_perror __P((struct xy_iorq *, struct xy_iopb *, int)); -int xyc_piodriver __P((struct xyc_softc *, struct xy_iorq *)); -int xyc_remove_iorq __P((struct xyc_softc *)); -int xyc_reset __P((struct xyc_softc *, int, struct xy_iorq *, int, - struct xy_softc *)); -inline void xyc_rqinit __P((struct xy_iorq *, struct xyc_softc *, +struct xy_iopb *xyc_chain(struct xyc_softc *, struct xy_iorq *); +int xyc_cmd(struct xyc_softc *, int, int, int, int, int, char *, int); +char *xyc_e2str(int); +int xyc_entoact(int); +int xyc_error(struct xyc_softc *, struct xy_iorq *, + struct xy_iopb *, int); +int xyc_ioctlcmd(struct xy_softc *, dev_t dev, struct xd_iocmd *); +void xyc_perror(struct xy_iorq *, struct xy_iopb *, int); +int xyc_piodriver(struct xyc_softc *, struct xy_iorq *); +int xyc_remove_iorq(struct xyc_softc *); +int xyc_reset(struct xyc_softc *, int, struct xy_iorq *, int, + struct xy_softc *); +inline void xyc_rqinit(struct xy_iorq *, struct xyc_softc *, struct xy_softc *, int, u_long, int, - caddr_t, struct buf *)); -void xyc_rqtopb __P((struct xy_iorq *, struct xy_iopb *, int, int)); -void xyc_start __P((struct xyc_softc *, struct xy_iorq *)); -int xyc_startbuf __P((struct xyc_softc *, struct xy_softc *, struct buf *)); -int xyc_submit_iorq __P((struct xyc_softc *, struct xy_iorq *, int)); -void xyc_tick __P((void *)); -int xyc_unbusy __P((struct xyc *, int)); -void xyc_xyreset __P((struct xyc_softc *, struct xy_softc *)); + caddr_t, struct buf *); +void xyc_rqtopb(struct xy_iorq *, struct xy_iopb *, int, int); +void xyc_start(struct xyc_softc *, struct xy_iorq *); +int xyc_startbuf(struct xyc_softc *, struct xy_softc *, struct buf *); +int xyc_submit_iorq(struct xyc_softc *, struct xy_iorq *, int); +void xyc_tick(void *); +int xyc_unbusy(struct xyc *, int); +void xyc_xyreset(struct xyc_softc *, struct xy_softc *); /* machine interrupt hook */ -int xycintr __P((void *)); +int xycintr(void *); /* {b,c}devsw */ -int xyclose __P((dev_t, int, int)); -int xydump __P((dev_t)); -int xyioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); -int xyopen __P((dev_t, int, int)); -int xyread __P((dev_t, struct uio *)); -int xywrite __P((dev_t, struct uio *)); -int xysize __P((dev_t)); -void xystrategy __P((struct buf *)); +int xyclose(dev_t, int, int); +int xydump(dev_t); +int xyioctl(dev_t, u_long, caddr_t, int, struct proc *); +int xyopen(dev_t, int, int); +int xyread(dev_t, struct uio *); +int xywrite(dev_t, struct uio *); +int xysize(dev_t); +void xystrategy(struct buf *); /* autoconf */ -int xycmatch __P((struct device *, void *, void *)); -void xycattach __P((struct device *, struct device *, void *)); -int xymatch __P((struct device *, void *, void *)); -void xyattach __P((struct device *, struct device *, void *)); +int xycmatch(struct device *, void *, void *); +void xycattach(struct device *, struct device *, void *); +int xymatch(struct device *, void *, void *); +void xyattach(struct device *, struct device *, void *); -static void xydummystrat __P((struct buf *)); -int xygetdisklabel __P((struct xy_softc *, void *)); +static void xydummystrat(struct buf *); +int xygetdisklabel(struct xy_softc *, void *); /* * cfdrivers: device driver interface to autoconfig diff --git a/sys/arch/sun3/dev/zs.c b/sys/arch/sun3/dev/zs.c index 28cf5bd432d..269a0f38298 100644 --- a/sys/arch/sun3/dev/zs.c +++ b/sys/arch/sun3/dev/zs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zs.c,v 1.10 2001/05/13 00:22:21 miod Exp $ */ +/* $OpenBSD: zs.c,v 1.11 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: zs.c,v 1.42 1996/11/20 18:57:03 gwr Exp $ */ /*- @@ -124,14 +124,14 @@ static int zs_defspeed[NZS][2] = { }; -static struct zschan *zs_get_chan_addr __P((int, int)); -int zs_getc __P((volatile void *)); -static void zs_putc __P((volatile void *, int)); +static struct zschan *zs_get_chan_addr(int, int); +int zs_getc(volatile void *); +static void zs_putc(volatile void *, int); -int zscngetc __P((dev_t)); -void zscnputc __P((dev_t, int)); -void nullcnprobe __P((struct consdev *)); -void zscninit __P((struct consdev *)); +int zscngetc(dev_t); +void zscnputc(dev_t, int); +void nullcnprobe(struct consdev *); +void zscninit(struct consdev *); /* Find PROM mappings (for console support). */ void zs_init() @@ -191,9 +191,9 @@ static u_char zs_init_reg[16] = { ****************************************************************/ /* Definition of the driver for autoconfig. */ -static int zsc_match __P((struct device *, void *, void *)); -static void zsc_attach __P((struct device *, struct device *, void *)); -static int zsc_print __P((void *, const char *name)); +static int zsc_match(struct device *, void *, void *); +static void zsc_attach(struct device *, struct device *, void *); +static int zsc_print(void *, const char *name); struct cfattach zsc_ca = { sizeof(struct zsc_softc), zsc_match, zsc_attach diff --git a/sys/arch/sun3/dev/zs_cons.h b/sys/arch/sun3/dev/zs_cons.h index e8afb5faca7..1cedb7ae4af 100644 --- a/sys/arch/sun3/dev/zs_cons.h +++ b/sys/arch/sun3/dev/zs_cons.h @@ -1,9 +1,9 @@ -/* $OpenBSD: zs_cons.h,v 1.1 1997/01/16 04:04:01 kstailey Exp $ */ +/* $OpenBSD: zs_cons.h,v 1.2 2002/03/14 01:26:46 millert Exp $ */ extern void *zs_conschan; -extern void nullcnprobe __P((struct consdev *)); +extern void nullcnprobe(struct consdev *); -extern int zs_getc __P((void *arg)); -extern void zs_putc __P((void *arg, int c)); +extern int zs_getc(void *arg); +extern void zs_putc(void *arg, int c); diff --git a/sys/arch/sun3/dev/zs_kgdb.c b/sys/arch/sun3/dev/zs_kgdb.c index 0700f3d2441..8fb478bce04 100644 --- a/sys/arch/sun3/dev/zs_kgdb.c +++ b/sys/arch/sun3/dev/zs_kgdb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zs_kgdb.c,v 1.5 1997/01/16 04:04:01 kstailey Exp $ */ +/* $OpenBSD: zs_kgdb.c,v 1.6 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: zs_kgdb.c,v 1.9 1996/11/20 18:57:04 gwr Exp $ */ /*- @@ -79,10 +79,10 @@ struct zschan { extern int kgdb_dev; extern int kgdb_rate; -struct zschan * zs_get_chan_addr __P((int zsc_unit, int channel)); +struct zschan * zs_get_chan_addr(int zsc_unit, int channel); -extern int zs_getc __P((void *arg)); -extern void zs_putc __P((void *arg, int c)); +extern int zs_getc(void *arg); +extern void zs_putc(void *arg, int c); struct zsops zsops_kgdb; diff --git a/sys/arch/sun3/include/autoconf.h b/sys/arch/sun3/include/autoconf.h index bb03f2fc41f..62b095b3664 100644 --- a/sys/arch/sun3/include/autoconf.h +++ b/sys/arch/sun3/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.7 1997/01/16 04:04:04 kstailey Exp $ */ +/* $OpenBSD: autoconf.h,v 1.8 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: autoconf.h,v 1.12 1996/11/20 18:57:05 gwr Exp $ */ /*- @@ -62,19 +62,19 @@ struct confargs { #define cf_intpri cf_loc[1] #define cf_intvec cf_loc[2] -int bus_scan __P((struct device *, void *, void *)); -int bus_print __P((void *, const char *)); -int bus_peek __P((int, int, int)); -char * bus_mapin __P((int, int, int)); +int bus_scan(struct device *, void *, void *); +int bus_print(void *, const char *); +int bus_peek(int, int, int); +char * bus_mapin(int, int, int); -typedef int (*isr_func_t) __P((void *)); -void isr_add_custom __P((int, void *)); -void isr_add_autovect __P((isr_func_t, void *arg, int level)); -void isr_add_vectored __P((isr_func_t, void *arg, int pri, int vec)); +typedef int (*isr_func_t)(void *); +void isr_add_custom(int, void *); +void isr_add_autovect(isr_func_t, void *arg, int level); +void isr_add_vectored(isr_func_t, void *arg, int pri, int vec); -void isr_soft_request __P((int level)); -void isr_soft_clear __P((int level)); +void isr_soft_request(int level); +void isr_soft_clear(int level); /* Bus-error tolerant access to mapped address. */ -int peek_byte __P((caddr_t)); -int peek_word __P((caddr_t)); +int peek_byte(caddr_t); +int peek_word(caddr_t); diff --git a/sys/arch/sun3/include/control.h b/sys/arch/sun3/include/control.h index ddde823e01c..c7c5854f5bf 100644 --- a/sys/arch/sun3/include/control.h +++ b/sys/arch/sun3/include/control.h @@ -1,4 +1,4 @@ -/* $OpenBSD: control.h,v 1.5 1997/09/21 04:21:06 niklas Exp $ */ +/* $OpenBSD: control.h,v 1.6 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: control.h,v 1.14 1996/11/20 18:57:06 gwr Exp $ */ /*- @@ -85,18 +85,18 @@ #include <sys/types.h> -unsigned char get_control_byte __P((char *)); -unsigned int get_control_word __P((char *)); -void set_control_byte __P((char *, unsigned char)); -void set_control_word __P((char *, unsigned int)); +unsigned char get_control_byte(char *); +unsigned int get_control_word(char *); +void set_control_byte(char *, unsigned char); +void set_control_word(char *, unsigned int); -int get_context __P((void)); -void set_context __P((int)); +int get_context(void); +void set_context(int); -vm_offset_t get_pte __P((vm_offset_t va)); -void set_pte __P((vm_offset_t, vm_offset_t)); +vm_offset_t get_pte(vm_offset_t va); +void set_pte(vm_offset_t, vm_offset_t); -unsigned char get_segmap __P((vm_offset_t)); -void set_segmap __P((vm_offset_t va, unsigned char)); -void set_segmap_allctx __P((vm_offset_t va, unsigned char)); +unsigned char get_segmap(vm_offset_t); +void set_segmap(vm_offset_t va, unsigned char); +void set_segmap_allctx(vm_offset_t va, unsigned char); diff --git a/sys/arch/sun3/include/cpu.h b/sys/arch/sun3/include/cpu.h index 0c7d910b1e4..c4b85a7a936 100644 --- a/sys/arch/sun3/include/cpu.h +++ b/sys/arch/sun3/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.14 2001/11/06 18:41:10 art Exp $ */ +/* $OpenBSD: cpu.h,v 1.15 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: cpu.h,v 1.20 1995/12/21 05:02:10 mycroft Exp $ */ /* @@ -117,7 +117,7 @@ extern int want_resched; /* resched() was called */ * isr_soft_request() so this scheme just multiplexes four * software interrupt `sources' on the level one handler. */ -extern void isr_soft_request __P((int level)); +extern void isr_soft_request(int level); union sun3sir { int sir_any; char sir_which[4]; @@ -147,15 +147,15 @@ union sun3sir { extern unsigned char cpu_machine_id; /* dma.c */ -long dvma_kvtopa __P((long, int)); +long dvma_kvtopa(long, int); /* machdep.c */ -void dumpconf __P((void)); +void dumpconf(void); struct pcb; -void savectx __P((struct pcb *)); -void switch_exit __P((struct proc *)); -void proc_trampoline __P((void)); +void savectx(struct pcb *); +void switch_exit(struct proc *); +void proc_trampoline(void); #endif /* _KERNEL */ diff --git a/sys/arch/sun3/include/cpufunc.h b/sys/arch/sun3/include/cpufunc.h index 20c32f11420..cc5688fa516 100644 --- a/sys/arch/sun3/include/cpufunc.h +++ b/sys/arch/sun3/include/cpufunc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpufunc.h,v 1.3 1997/09/21 04:21:07 niklas Exp $ */ +/* $OpenBSD: cpufunc.h,v 1.4 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: cpufunc.h,v 1.6 1996/11/20 18:57:07 gwr Exp $ */ /*- @@ -41,5 +41,5 @@ * Functions to provide access to special 68k instructions. */ -unsigned int *getvbr __P((void)); -void setvbr __P((unsigned int *)); +unsigned int *getvbr(void); +void setvbr(unsigned int *); diff --git a/sys/arch/sun3/include/db_machdep.h b/sys/arch/sun3/include/db_machdep.h index fcf395331a2..32e16665fc5 100644 --- a/sys/arch/sun3/include/db_machdep.h +++ b/sys/arch/sun3/include/db_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.h,v 1.4 1997/01/16 04:04:06 kstailey Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.5 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: db_machdep.h,v 1.7 1995/02/07 04:34:45 gwr Exp $ */ #include <m68k/db_machdep.h> @@ -6,9 +6,9 @@ /* This enables some code in db_command.c */ #define DB_MACHINE_COMMANDS -void db_machine_init __P((void)); -void ddb_init __P((void)); +void db_machine_init(void); +void ddb_init(void); /* These are in db_memrw.c */ -extern void db_read_bytes __P((vm_offset_t addr, size_t size, char *data)); -extern void db_write_bytes __P((vm_offset_t addr, size_t size, char *data)); +extern void db_read_bytes(vm_offset_t addr, size_t size, char *data); +extern void db_write_bytes(vm_offset_t addr, size_t size, char *data); diff --git a/sys/arch/sun3/include/dvma.h b/sys/arch/sun3/include/dvma.h index 9ebbdbe3bc8..2944477d965 100644 --- a/sys/arch/sun3/include/dvma.h +++ b/sys/arch/sun3/include/dvma.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dvma.h,v 1.6 1997/01/16 04:04:06 kstailey Exp $ */ +/* $OpenBSD: dvma.h,v 1.7 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: dvma.h,v 1.4 1996/11/20 18:57:08 gwr Exp $ */ /*- @@ -76,7 +76,7 @@ #define DVMA_SPACE_START 0x0FF00000 #define DVMA_SPACE_END 0x0FFFE000 -void dvma_init __P((void)); +void dvma_init(void); /* Allocate/free actual pages of DVMA space. */ caddr_t dvma_malloc(size_t bytes); diff --git a/sys/arch/sun3/include/eeprom.h b/sys/arch/sun3/include/eeprom.h index 6f6dbba9db7..8f1fcee2862 100644 --- a/sys/arch/sun3/include/eeprom.h +++ b/sys/arch/sun3/include/eeprom.h @@ -1,4 +1,4 @@ -/* $OpenBSD: eeprom.h,v 1.2 1996/10/12 08:27:14 deraadt Exp $ */ +/* $OpenBSD: eeprom.h,v 1.3 2002/03/14 01:26:46 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -360,5 +360,5 @@ struct eeprom { #ifdef _KERNEL extern char *eeprom_va; -int eeprom_uio __P((struct uio *)); +int eeprom_uio(struct uio *); #endif /* _KERNEL */ diff --git a/sys/arch/sun3/include/idprom.h b/sys/arch/sun3/include/idprom.h index 50cd844a2d5..d09a62262dd 100644 --- a/sys/arch/sun3/include/idprom.h +++ b/sys/arch/sun3/include/idprom.h @@ -1,4 +1,4 @@ -/* $OpenBSD: idprom.h,v 1.5 1997/01/16 04:04:07 kstailey Exp $ */ +/* $OpenBSD: idprom.h,v 1.6 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: idprom.h,v 1.12 1996/11/20 18:57:10 gwr Exp $ */ /*- @@ -58,7 +58,7 @@ struct idprom { extern struct idprom identity_prom; -int idprom_init __P((void)); -void idprom_etheraddr __P((u_char *)); +int idprom_init(void); +void idprom_etheraddr(u_char *); #endif diff --git a/sys/arch/sun3/include/machdep.h b/sys/arch/sun3/include/machdep.h index 51f20b4e3c4..da3f744ed42 100644 --- a/sys/arch/sun3/include/machdep.h +++ b/sys/arch/sun3/include/machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.h,v 1.16 2001/11/06 18:41:10 art Exp $ */ +/* $OpenBSD: machdep.h,v 1.17 2002/03/14 01:26:46 millert Exp $ */ /* * Copyright (c) 1994 Gordon W. Ross @@ -73,67 +73,67 @@ extern vm_offset_t avail_start, avail_end; /* The "hole" (used to skip the Sun3/50 video RAM) */ extern vm_offset_t hole_start, hole_size; -void ICIA __P((void)); -void DCIA __P((void)); -void DCIU __P((void)); +void ICIA(void); +void DCIA(void); +void DCIU(void); -void cache_enable __P((void)); +void cache_enable(void); void cache_flush_page(vm_offset_t pgva); void cache_flush_segment(vm_offset_t sgva); void cache_flush_context(void); -int cachectl __P((int req, caddr_t addr, int len)); +int cachectl(int req, caddr_t addr, int len); -void cninit __P((void)); +void cninit(void); -void dumpconf __P((void)); -void dumpsys __P((void)); +void dumpconf(void); +void dumpsys(void); -void fb_unblank __P((void)); +void fb_unblank(void); -int fpu_emulate __P((struct frame *, struct fpframe *)); +int fpu_emulate(struct frame *, struct fpframe *); /* Backward compatibility... */ #define getsr _getsr -void** getvbr __P((void)); +void** getvbr(void); -vm_offset_t high_segment_alloc __P((int npages)); +vm_offset_t high_segment_alloc(int npages); -void initfpu __P((void)); +void initfpu(void); -void intreg_init __P((void)); +void intreg_init(void); -void isr_init __P((void)); -void isr_config __P((void)); +void isr_init(void); +void isr_config(void); -void m68881_save __P((struct fpframe *)); -void m68881_restore __P((struct fpframe *)); +void m68881_save(struct fpframe *); +void m68881_restore(struct fpframe *); -void proc_do_uret __P((void)); -void proc_trampoline __P((void)); +void proc_do_uret(void); +void proc_trampoline(void); -void pmap_bootstrap __P((void)); -vm_offset_t pmap_map __P((vm_offset_t, vm_offset_t, vm_offset_t, int)); -int pmap_fault_reload __P((struct pmap *, vm_offset_t, int)); -void pmap_get_ksegmap __P((u_char *)); -void pmap_get_pagemap __P((int *pt, int off)); +void pmap_bootstrap(void); +vm_offset_t pmap_map(vm_offset_t, vm_offset_t, vm_offset_t, int); +int pmap_fault_reload(struct pmap *, vm_offset_t, int); +void pmap_get_ksegmap(u_char *); +void pmap_get_pagemap(int *pt, int off); -int reboot2 __P((int, char *)); +int reboot2(int, char *); -void savectx __P((struct pcb *)); +void savectx(struct pcb *); -void setvbr __P((void **)); +void setvbr(void **); -void sun3_mon_abort __P((void)); -void sun3_mon_halt __P((void)); -void sun3_mon_reboot __P((char *)); -void sun3_pmeg_init __P((void)); -void sun3_reserve_pmeg __P((int pmeg_num)); +void sun3_mon_abort(void); +void sun3_mon_halt(void); +void sun3_mon_reboot(char *); +void sun3_pmeg_init(void); +void sun3_reserve_pmeg(int pmeg_num); -void swapconf __P((void)); -void swapgeneric __P((void)); +void swapconf(void); +void swapgeneric(void); -void switch_exit __P((struct proc *)); +void switch_exit(struct proc *); #endif /* _KERNEL */ diff --git a/sys/arch/sun3/include/mon.h b/sys/arch/sun3/include/mon.h index d142f001e57..bb1dcc2f69f 100644 --- a/sys/arch/sun3/include/mon.h +++ b/sys/arch/sun3/include/mon.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mon.h,v 1.5 1997/01/16 04:04:08 kstailey Exp $ */ +/* $OpenBSD: mon.h,v 1.6 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: mon.h,v 1.19 1996/11/20 18:57:12 gwr Exp $ */ /*- @@ -106,7 +106,7 @@ typedef struct bootparam { typedef struct { char *initSp; /* Initial system stack ptr * for hardware */ - int (*startMon)__P((void)); /* Initial PC for hardware */ + int (*startMon)(void); /* Initial PC for hardware */ int *diagberr; /* Bus err handler for diags */ @@ -121,10 +121,10 @@ typedef struct { * Single-character input and output */ - u_char (*getChar)__P((void)); /* Get char from input source */ - int (*putChar)__P((int)); /* Put char to output sink */ - int (*mayGet)__P((void)); /* Maybe get char, or -1 */ - int (*mayPut)__P((int)); /* Maybe put char, or -1 */ + u_char (*getChar)(void); /* Get char from input source */ + int (*putChar)(int); /* Put char to output sink */ + int (*mayGet)(void); /* Maybe get char, or -1 */ + int (*mayPut)(int); /* Maybe put char, or -1 */ u_char *echo; /* Should getchar echo? */ u_char *inSource; /* Input source selector */ u_char *outSink; /* Output sink selector */ @@ -133,8 +133,8 @@ typedef struct { * Keyboard input (scanned by monitor nmi routine) */ - int (*getKey)__P((void)); /* Get next key if one exists */ - int (*initGetKey)__P((void*)); /* Initialize get key */ + int (*getKey)(void); /* Get next key if one exists */ + int (*initGetKey)(void*); /* Initialize get key */ u_int *translation; /* Kbd translation selector (see keyboard.h in sun monitor code) */ @@ -153,18 +153,18 @@ typedef struct { * Frame buffer output and terminal emulation */ - int (*fbWriteChar)__P((int)); /* Write a character to FB */ + int (*fbWriteChar)(int); /* Write a character to FB */ int *fbAddr; /* Address of frame buffer */ char **font; /* Font table for FB */ /* Quickly write string to FB */ - int (*fbWriteStr)__P((char *buf, int len)); + int (*fbWriteStr)(char *buf, int len); /* * Reboot interface routine -- resets and reboots system. No return. * XXX should this be declared volatile? */ - int (*reBoot)__P((char *)); /* e.g. reBoot("sd()bsd") */ + int (*reBoot)(char *); /* e.g. reBoot("sd()bsd") */ /* * Line input and parsing @@ -173,32 +173,32 @@ typedef struct { u_char *lineBuf; /* The line input buffer */ u_char **linePtr; /* Cur pointer into linebuf */ int *lineSize; /* length of line in linebuf */ - int (*getLine)__P((int)); /* Get line from user */ - u_char (*getNextChar)__P((void)); /* Get next char from linebuf */ - u_char (*peekNextChar)__P((void)); /* Peek at next char */ + int (*getLine)(int); /* Get line from user */ + u_char (*getNextChar)(void); /* Get next char from linebuf */ + u_char (*peekNextChar)(void); /* Peek at next char */ int *fbThere; /* =1 if frame buffer there */ - int (*getNum)__P((void)); /* Grab hex num from line */ + int (*getNum)(void); /* Grab hex num from line */ /* * Print formatted output to current output sink */ - int (*printf)__P((char *, ...)); /* Similar to "Kernel printf" */ - int (*printHex)__P((int,int)); /* Format N digits in hex */ + int (*printf)(char *, ...); /* Similar to "Kernel printf" */ + int (*printHex)(int,int); /* Format N digits in hex */ /* * Led stuff */ u_char *leds; /* RAM copy of LED register */ - int (*setLeds)__P((int)); /* Sets LED's and RAM copy */ + int (*setLeds)(int); /* Sets LED's and RAM copy */ /* * Non-maskable interrupt (nmi) information */ - int (*nmiAddr)__P((void*)); /* Addr for level 7 vector */ - int (*abortEntry)__P((void*)); /* Entry for keyboard abort */ + int (*nmiAddr)(void*); /* Addr for level 7 vector */ + int (*abortEntry)(void*); /* Entry for keyboard abort */ int *nmiClock; /* Counts up in msec */ /* @@ -221,10 +221,10 @@ typedef struct { long *resetAddr; /* where to jump on a reset */ long *resetMap; /* pgmap entry for resetaddr */ /* Really struct pgmapent * */ - int (*exitToMon)__P((void)); /* Exit from user program */ + int (*exitToMon)(void); /* Exit from user program */ u_char **memorybitmap; /* V1: &{0 or &bits} */ - void (*setcxsegmap)__P((int,int,int)); /* Set seg in any context */ - void (**vector_cmd)__P((int, char*)); /* V2: Handler for 'v' cmd */ + void (*setcxsegmap)(int,int,int); /* Set seg in any context */ + void (**vector_cmd)(int, char*); /* V2: Handler for 'v' cmd */ int dummy1z; int dummy2z; int dummy3z; diff --git a/sys/arch/sun3/include/obio.h b/sys/arch/sun3/include/obio.h index f8d8c3b9a39..01a7be77faa 100644 --- a/sys/arch/sun3/include/obio.h +++ b/sys/arch/sun3/include/obio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: obio.h,v 1.7 2000/08/28 22:04:22 miod Exp $ */ +/* $OpenBSD: obio.h,v 1.8 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: obio.h,v 1.16 1996/11/20 18:57:14 gwr Exp $ */ /*- @@ -77,15 +77,15 @@ #ifdef _KERNEL -caddr_t obio_alloc __P((int, int)); -caddr_t obio_vm_alloc __P((int)); -caddr_t obio_find_mapping __P((int pa, int size)); +caddr_t obio_alloc(int, int); +caddr_t obio_vm_alloc(int); +caddr_t obio_find_mapping(int pa, int size); /* routines called during earily startup */ -void obio_init __P((void)); -void zs_init __P((void)); -void eeprom_init __P((void)); -void intreg_init __P((void)); -void clock_init __P((void)); +void obio_init(void); +void zs_init(void); +void eeprom_init(void); +void intreg_init(void); +void clock_init(void); #endif /* _KERNEL */ diff --git a/sys/arch/sun3/include/param.h b/sys/arch/sun3/include/param.h index 85c0f2231c0..714ad6151e3 100644 --- a/sys/arch/sun3/include/param.h +++ b/sys/arch/sun3/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.29 2001/12/05 01:57:15 provos Exp $ */ +/* $OpenBSD: param.h,v 1.30 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: param.h,v 1.34 1996/03/04 05:04:40 cgd Exp $ */ /* @@ -93,7 +93,7 @@ #if defined(_KERNEL) && !defined(_LOCORE) #include <machine/cpu.h> -extern void _delay __P((unsigned)); +extern void _delay(unsigned); #define delay(us) _delay((us)<<8) #define DELAY(n) delay(n) #endif /* _KERNEL && !_LOCORE */ diff --git a/sys/arch/sun3/include/pmap.h b/sys/arch/sun3/include/pmap.h index 21670f5f7e5..14a04f3e825 100644 --- a/sys/arch/sun3/include/pmap.h +++ b/sys/arch/sun3/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.12 2001/12/05 00:11:51 millert Exp $ */ +/* $OpenBSD: pmap.h,v 1.13 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: pmap.h,v 1.18 1997/01/27 19:41:06 gwr Exp $ */ /*- @@ -60,7 +60,7 @@ extern struct pmap kernel_pmap_store; #define pmap_kernel() (&kernel_pmap_store) /* This is called from locore.s:cpu_switch() */ -void pmap_switch __P((pmap_t pmap)); +void pmap_switch(pmap_t pmap); /* This lets us have some say in choosing VA locations. */ extern void pmap_prefer(vm_offset_t, vm_offset_t *); diff --git a/sys/arch/sun3/include/psl.h b/sys/arch/sun3/include/psl.h index 605c941115c..d6a5029747f 100644 --- a/sys/arch/sun3/include/psl.h +++ b/sys/arch/sun3/include/psl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: psl.h,v 1.11 2001/11/23 00:47:47 miod Exp $ */ +/* $OpenBSD: psl.h,v 1.12 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: psl.h,v 1.14 1998/11/24 17:07:54 kleink Exp $ */ /*- @@ -48,9 +48,9 @@ #ifndef __GNUC__ /* No inline, use the real functions in locore.s */ -extern int _getsr __P((void)); -extern int _spl __P((int new)); -extern int _splraise __P((int new)); +extern int _getsr(void); +extern int _spl(int new); +extern int _splraise(int new); #else /* GNUC */ /* * Define inline functions for PSL manipulation. @@ -61,9 +61,9 @@ extern int _splraise __P((int new)); * (See the GCC extensions info document.) */ -static __inline int _getsr __P((void)); -static __inline int _spl __P((int)); -static __inline int _splraise __P((int)); +static __inline int _getsr(void); +static __inline int _spl(int); +static __inline int _splraise(int); /* Get current sr value. */ static __inline int diff --git a/sys/arch/sun3/include/z8530var.h b/sys/arch/sun3/include/z8530var.h index 5f28e10b1e1..9b60b3c8eb7 100644 --- a/sys/arch/sun3/include/z8530var.h +++ b/sys/arch/sun3/include/z8530var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530var.h,v 1.8 2001/08/18 22:37:40 art Exp $ */ +/* $OpenBSD: z8530var.h,v 1.9 2002/03/14 01:26:46 millert Exp $ */ /* $NetBSD: z8530var.h,v 1.5 1996/10/13 03:47:44 christos Exp $ */ /* @@ -60,23 +60,23 @@ struct zsc_softc { * These could be inlines, but with the delay, speed is moot. */ -u_char zs_read_reg __P((struct zs_chanstate *cs, u_char reg)); -u_char zs_read_csr __P((struct zs_chanstate *cs)); -u_char zs_read_data __P((struct zs_chanstate *cs)); +u_char zs_read_reg(struct zs_chanstate *cs, u_char reg); +u_char zs_read_csr(struct zs_chanstate *cs); +u_char zs_read_data(struct zs_chanstate *cs); -void zs_write_reg __P((struct zs_chanstate *cs, u_char reg, u_char val)); -void zs_write_csr __P((struct zs_chanstate *cs, u_char val)); -void zs_write_data __P((struct zs_chanstate *cs, u_char val)); +void zs_write_reg(struct zs_chanstate *cs, u_char reg, u_char val); +void zs_write_csr(struct zs_chanstate *cs, u_char val); +void zs_write_data(struct zs_chanstate *cs, u_char val); /* * How to request a "soft" interrupt. * This could be a macro if you like. */ -void zsc_req_softint __P((struct zsc_softc *zsc)); +void zsc_req_softint(struct zsc_softc *zsc); /* Handle user request to enter kernel debugger. */ -void zs_abort __P((void)); +void zs_abort(void); /* * Some warts needed by z8530tty.c - diff --git a/sys/arch/sun3/stand/installboot/installboot.c b/sys/arch/sun3/stand/installboot/installboot.c index cd3bca8bd5d..8f3621e75aa 100644 --- a/sys/arch/sun3/stand/installboot/installboot.c +++ b/sys/arch/sun3/stand/installboot/installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.c,v 1.6 2001/07/04 08:33:46 niklas Exp $ */ +/* $OpenBSD: installboot.c,v 1.7 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */ /* @@ -65,11 +65,11 @@ 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 *[])); +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 diff --git a/sys/arch/sun3/stand/libsa/dev_disk.h b/sys/arch/sun3/stand/libsa/dev_disk.h index f1897aaf848..c03c96842fd 100644 --- a/sys/arch/sun3/stand/libsa/dev_disk.h +++ b/sys/arch/sun3/stand/libsa/dev_disk.h @@ -1,8 +1,8 @@ -/* $OpenBSD: dev_disk.h,v 1.2 2001/07/04 08:33:48 niklas Exp $ */ +/* $OpenBSD: dev_disk.h,v 1.3 2002/03/14 01:26:47 millert Exp $ */ -int disk_open __P((struct open_file *, ...)); -int disk_close __P((struct open_file *)); -int disk_strategy __P((void *, int, daddr_t, size_t, void *, size_t *)); +int disk_open(struct open_file *, ...); +int disk_close(struct open_file *); +int disk_strategy(void *, int, daddr_t, size_t, void *, size_t *); int disk_ioctl(); diff --git a/sys/arch/sun3/stand/libsa/dvma.c b/sys/arch/sun3/stand/libsa/dvma.c index 221cf6324e6..f92b3b17c17 100644 --- a/sys/arch/sun3/stand/libsa/dvma.c +++ b/sys/arch/sun3/stand/libsa/dvma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dvma.c,v 1.4 2001/07/04 08:33:48 niklas Exp $ */ +/* $OpenBSD: dvma.c,v 1.5 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: dvma.c,v 1.6 1996/01/31 17:20:39 gwr Exp $ */ /* @@ -45,8 +45,8 @@ #include "stand.h" /* XXX */ -extern int get_segmap __P((int)); -extern void set_segmap __P((int, int)); +extern int get_segmap(int); +extern void set_segmap(int, int); #define DVMA_BASE 0xFFf00000 diff --git a/sys/arch/sun3/stand/libsa/netif.h b/sys/arch/sun3/stand/libsa/netif.h index 381375b3a4e..ca8f791c6f6 100644 --- a/sys/arch/sun3/stand/libsa/netif.h +++ b/sys/arch/sun3/stand/libsa/netif.h @@ -1,4 +1,4 @@ -/* $OpenBSD: netif.h,v 1.3 2001/07/04 08:33:50 niklas Exp $ */ +/* $OpenBSD: netif.h,v 1.4 2002/03/14 01:26:47 millert Exp $ */ #include "iodesc.h" @@ -7,11 +7,11 @@ struct netif { void *nif_devdata; }; -ssize_t netif_get __P((struct iodesc *, void *, size_t, time_t)); -ssize_t netif_put __P((struct iodesc *, void *, size_t)); +ssize_t netif_get(struct iodesc *, void *, size_t, time_t); +ssize_t netif_put(struct iodesc *, void *, size_t); -int netif_open __P((void *)); -int netif_close __P((int)); +int netif_open(void *); +int netif_close(int); -struct iodesc *socktodesc __P((int)); +struct iodesc *socktodesc(int); diff --git a/sys/arch/sun3/stand/libsa/netif_sun.c b/sys/arch/sun3/stand/libsa/netif_sun.c index 2a4116c2b57..7b447035acf 100644 --- a/sys/arch/sun3/stand/libsa/netif_sun.c +++ b/sys/arch/sun3/stand/libsa/netif_sun.c @@ -1,4 +1,4 @@ -/* $OpenBSD: netif_sun.c,v 1.5 2001/07/04 08:33:51 niklas Exp $ */ +/* $OpenBSD: netif_sun.c,v 1.6 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: netif_sun.c,v 1.4 1996/01/29 23:41:07 gwr Exp $ */ /* @@ -66,7 +66,7 @@ int debug; int errno; -static void sun3_getether __P((u_char *)); +static void sun3_getether(u_char *); struct iodesc sockets[SOPEN_MAX]; diff --git a/sys/arch/sun3/stand/libsa/promdev.c b/sys/arch/sun3/stand/libsa/promdev.c index 620c8a4d1b8..e585af44173 100644 --- a/sys/arch/sun3/stand/libsa/promdev.c +++ b/sys/arch/sun3/stand/libsa/promdev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: promdev.c,v 1.6 2001/07/04 08:33:52 niklas Exp $ */ +/* $OpenBSD: promdev.c,v 1.7 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: promdev.c,v 1.7 1996/01/29 23:41:10 gwr Exp $ */ /* @@ -40,7 +40,7 @@ #include "stand.h" #include "dvma.h" -extern void set_pte __P((int, int)); +extern void set_pte(int, int); extern int debug; static int promdev_inuse; diff --git a/sys/arch/sun3/stand/netboot/dev_net.h b/sys/arch/sun3/stand/netboot/dev_net.h index 9a8986fe528..4fb7675949d 100644 --- a/sys/arch/sun3/stand/netboot/dev_net.h +++ b/sys/arch/sun3/stand/netboot/dev_net.h @@ -1,8 +1,8 @@ -/* $OpenBSD: dev_net.h,v 1.2 2001/07/04 08:33:54 niklas Exp $ */ +/* $OpenBSD: dev_net.h,v 1.3 2002/03/14 01:26:47 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/sun3/stand/tapeboot/dev_tape.h b/sys/arch/sun3/stand/tapeboot/dev_tape.h index 7e530554dea..d88fbe96ede 100644 --- a/sys/arch/sun3/stand/tapeboot/dev_tape.h +++ b/sys/arch/sun3/stand/tapeboot/dev_tape.h @@ -1,8 +1,8 @@ -/* $OpenBSD: dev_tape.h,v 1.3 2001/07/04 08:33:57 niklas Exp $ */ +/* $OpenBSD: dev_tape.h,v 1.4 2002/03/14 01:26:47 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/sun3/stand/tapeboot/rawfs.c b/sys/arch/sun3/stand/tapeboot/rawfs.c index a7490fe8357..c2ada1c9653 100644 --- a/sys/arch/sun3/stand/tapeboot/rawfs.c +++ b/sys/arch/sun3/stand/tapeboot/rawfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rawfs.c,v 1.2 2001/07/04 08:33:57 niklas Exp $ */ +/* $OpenBSD: rawfs.c,v 1.3 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: rawfs.c,v 1.1 1995/10/17 22:58:27 gwr Exp $ */ /* @@ -59,7 +59,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/sun3/stand/tapeboot/rawfs.h b/sys/arch/sun3/stand/tapeboot/rawfs.h index 1b1538ae4f1..2dc10b99a8e 100644 --- a/sys/arch/sun3/stand/tapeboot/rawfs.h +++ b/sys/arch/sun3/stand/tapeboot/rawfs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rawfs.h,v 1.2 2001/07/04 08:33:57 niklas Exp $ */ +/* $OpenBSD: rawfs.h,v 1.3 2002/03/14 01:26:47 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/sun3/sun3/autoconf.c b/sys/arch/sun3/sun3/autoconf.c index 0b1184ef1e3..98316a8e94d 100644 --- a/sys/arch/sun3/sun3/autoconf.c +++ b/sys/arch/sun3/sun3/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.20 2002/01/16 20:50:17 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.21 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: autoconf.c,v 1.37 1996/11/20 18:57:22 gwr Exp $ */ /*- @@ -73,12 +73,12 @@ /* Want compile-time initialization here. */ int cold = 1; -void setroot __P((void)); -void swapconf __P((void)); -int findblkmajor __P((struct device *)); -struct device *getdisk __P((char *, int, int, dev_t *)); -struct device *parsedisk __P((char *, int, int, dev_t *)); -int getstr __P((char *, int)); +void setroot(void); +void swapconf(void); +int findblkmajor(struct device *); +struct device *getdisk(char *, int, int, dev_t *); +struct device *parsedisk(char *, int, int, dev_t *); +int getstr(char *, int); void cpu_configure() @@ -366,12 +366,12 @@ struct nam2blk { }; /* This takes the args: name, ctlr, unit */ -typedef struct device *(*findfunc_t) __P((char *, int, int)); +typedef struct device *(*findfunc_t)(char *, int, int); -struct device *find_dev_byname __P((char *)); -struct device *net_find __P((char *, int, int)); -struct device *scsi_find __P((char *, int, int)); -struct device *xx_find __P((char *, int, int)); +struct device *find_dev_byname(char *); +struct device *net_find(char *, int, int); +struct device *scsi_find(char *, int, int); +struct device *xx_find(char *, int, int); struct prom_n2f { char name[4]; diff --git a/sys/arch/sun3/sun3/cache.c b/sys/arch/sun3/sun3/cache.c index 223f431480b..4f270de9828 100644 --- a/sys/arch/sun3/sun3/cache.c +++ b/sys/arch/sun3/sun3/cache.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cache.c,v 1.8 2001/11/06 02:49:22 art Exp $ */ +/* $OpenBSD: cache.c,v 1.9 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: cache.c,v 1.5 1996/11/20 18:57:24 gwr Exp $ */ /*- @@ -60,7 +60,7 @@ #define VAC_FLUSH_INCR 512 /* bytes */ #define VADDR_MASK 0xfFFffFF /* 28 bits */ -static void cache_clear_tags __P((void)); +static void cache_clear_tags(void); void cache_flush_page(pgva) diff --git a/sys/arch/sun3/sun3/clock.c b/sys/arch/sun3/sun3/clock.c index 7e3a9ef2e48..85bf6ff7586 100644 --- a/sys/arch/sun3/sun3/clock.c +++ b/sys/arch/sun3/sun3/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.9 2001/01/04 22:34:48 miod Exp $ */ +/* $OpenBSD: clock.c,v 1.10 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: clock.c,v 1.31 1996/10/30 00:24:42 gwr Exp $ */ /* @@ -68,8 +68,8 @@ #define CLOCK_PRI 5 -void cpu_initclocks __P((void)); -void clock_intr __P((struct clockframe *)); +void cpu_initclocks(void); +void clock_intr(struct clockframe *); extern volatile u_char *interrupt_reg; volatile char *clock_va; @@ -82,8 +82,8 @@ volatile char *clock_va; #define intersil_clear() (void)intersil_clock->clk_intr_reg -static int clock_match __P((struct device *, void *vcf, void *args)); -static void clock_attach __P((struct device *, struct device *, void *)); +static int clock_match(struct device *, void *vcf, void *args); +static void clock_attach(struct device *, struct device *, void *); struct cfattach clock_ca = { sizeof(struct device), clock_match, clock_attach @@ -222,7 +222,7 @@ void cpu_initclocks() { int s; - extern void _isr_clock __P((void)); /* in locore.s */ + extern void _isr_clock(void); /* in locore.s */ if (!intersil_clock) panic("cpu_initclocks"); @@ -329,12 +329,12 @@ microtime(tvp) #define SECDAY 86400L #define SECYR (SECDAY * 365) -static void clk_get_dt __P((struct date_time *)); -static void clk_set_dt __P((struct date_time *)); -void gmt_to_dt __P((long *, struct date_time *)); -void dt_to_gmt __P((struct date_time *, long *)); -static long clk_get_secs __P((void)); -static void clk_set_secs __P((long)); +static void clk_get_dt(struct date_time *); +static void clk_set_dt(struct date_time *); +void gmt_to_dt(long *, struct date_time *); +void dt_to_gmt(struct date_time *, long *); +static long clk_get_secs(void); +static void clk_set_secs(long); /* * Initialize the time of day register, based on the time base diff --git a/sys/arch/sun3/sun3/db_machdep.c b/sys/arch/sun3/sun3/db_machdep.c index 78f481d5815..734784838d0 100644 --- a/sys/arch/sun3/sun3/db_machdep.c +++ b/sys/arch/sun3/sun3/db_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.c,v 1.12 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: db_machdep.c,v 1.13 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: db_machdep.c,v 1.8 1996/11/20 18:57:27 gwr Exp $ */ /*- @@ -55,10 +55,10 @@ #include <ddb/db_command.h> #include <ddb/db_output.h> -static void db_mach_pagemap __P((db_expr_t, int, db_expr_t, char *)); -static void db_mach_abort __P((db_expr_t, int, db_expr_t, char *)); +static void db_mach_pagemap(db_expr_t, int, db_expr_t, char *); +static void db_mach_abort(db_expr_t, int, db_expr_t, char *); -static void pte_print __P((int)); +static void pte_print(int); static char *pgt_names[] = { "MEM", "OBIO", "VMES", "VMEL" }; diff --git a/sys/arch/sun3/sun3/db_memrw.c b/sys/arch/sun3/sun3/db_memrw.c index c1b267265fc..886af8e81f3 100644 --- a/sys/arch/sun3/sun3/db_memrw.c +++ b/sys/arch/sun3/sun3/db_memrw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_memrw.c,v 1.9 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: db_memrw.c,v 1.10 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: db_memrw.c,v 1.13 1996/11/20 18:57:28 gwr Exp $ */ /*- @@ -67,7 +67,7 @@ #include <ddb/db_access.h> -static void db_write_text __P((vm_offset_t, size_t size, char *)); +static void db_write_text(vm_offset_t, size_t size, char *); /* * Read bytes from kernel address space for debugger. diff --git a/sys/arch/sun3/sun3/disksubr.c b/sys/arch/sun3/sun3/disksubr.c index aed8243bef4..953abb22bcf 100644 --- a/sys/arch/sun3/sun3/disksubr.c +++ b/sys/arch/sun3/sun3/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.16 2002/02/19 02:50:59 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.17 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: disksubr.c,v 1.14 1996/09/26 18:10:21 gwr Exp $ */ /* @@ -65,9 +65,9 @@ #error "Default value of LABELSECTOR no longer zero?" #endif -static char * disklabel_sun_to_bsd __P((char *, struct disklabel *)); -static int disklabel_bsd_to_sun __P((struct disklabel *, char *)); -static __inline u_long sun_extended_sum __P((struct sun_disklabel *)); +static char * disklabel_sun_to_bsd(char *, struct disklabel *); +static int disklabel_bsd_to_sun(struct disklabel *, char *); +static __inline u_long sun_extended_sum(struct sun_disklabel *); /* * Attempt to read a disk label from a device @@ -84,7 +84,7 @@ static __inline u_long sun_extended_sum __P((struct sun_disklabel *)); char * readdisklabel(dev, strat, lp, clp, spoofonly) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); struct disklabel *lp; struct cpu_disklabel *clp; int spoofonly; @@ -208,7 +208,7 @@ setdisklabel(olp, nlp, openmask, clp) int writedisklabel(dev, strat, lp, clp) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); struct disklabel *lp; struct cpu_disklabel *clp; { diff --git a/sys/arch/sun3/sun3/fpu.c b/sys/arch/sun3/sun3/fpu.c index 652ec087d3d..415bd24cb87 100644 --- a/sys/arch/sun3/sun3/fpu.c +++ b/sys/arch/sun3/sun3/fpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpu.c,v 1.7 1997/04/05 20:24:24 kstailey Exp $ */ +/* $OpenBSD: fpu.c,v 1.8 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: fpu.c,v 1.9 1996/11/20 18:57:29 gwr Exp $ */ /*- @@ -67,7 +67,7 @@ static char *fpu_descr[] = { "mc68882", /* 2 */ "?" }; -static int fpu_probe __P((void)); +static int fpu_probe(void); void initfpu() diff --git a/sys/arch/sun3/sun3/interreg.h b/sys/arch/sun3/sun3/interreg.h index fdd95ce51d6..d8eae3933cf 100644 --- a/sys/arch/sun3/sun3/interreg.h +++ b/sys/arch/sun3/sun3/interreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: interreg.h,v 1.5 1997/01/16 04:04:22 kstailey Exp $ */ +/* $OpenBSD: interreg.h,v 1.6 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: interreg.h,v 1.7 1996/11/20 18:57:30 gwr Exp $ */ /*- @@ -48,4 +48,4 @@ #define IREG_BITS "\20\8CLK7\7RSV6\6CLK5\5VIDEO\4SOFT3\3SOFT2\2SOFT1\1ALL\n" -void set_clk_mode __P((u_char on, u_char off, int enable)); +void set_clk_mode(u_char on, u_char off, int enable); diff --git a/sys/arch/sun3/sun3/intreg.c b/sys/arch/sun3/sun3/intreg.c index a0e9796c11b..d8efcc211cf 100644 --- a/sys/arch/sun3/sun3/intreg.c +++ b/sys/arch/sun3/sun3/intreg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intreg.c,v 1.9 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: intreg.c,v 1.10 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: intreg.c,v 1.5 1996/11/20 18:57:32 gwr Exp $ */ /*- @@ -64,9 +64,9 @@ struct intreg_softc { volatile u_char *sc_reg; }; -static int intreg_match __P((struct device *, void *vcf, void *args)); -static void intreg_attach __P((struct device *, struct device *, void *)); -static int soft1intr __P((void *)); +static int intreg_match(struct device *, void *vcf, void *args); +static void intreg_attach(struct device *, struct device *, void *); +static int soft1intr(void *); struct cfattach intreg_ca = { sizeof(struct intreg_softc), intreg_match, intreg_attach diff --git a/sys/arch/sun3/sun3/isr.c b/sys/arch/sun3/sun3/isr.c index 8ed7530e513..e651d78ae2d 100644 --- a/sys/arch/sun3/sun3/isr.c +++ b/sys/arch/sun3/sun3/isr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isr.c,v 1.15 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: isr.c,v 1.16 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: isr.c,v 1.25 1996/11/20 18:57:32 gwr Exp $ */ /*- @@ -69,11 +69,11 @@ struct isr { int isr_ipl; }; -void set_vector_entry __P((int, void (*handler) __P((void)))); -unsigned int get_vector_entry __P((int)); +void set_vector_entry __P((int, void (*handler)(void))); +unsigned int get_vector_entry(int); -void isr_autovec __P((int)); -void isr_vectored __P((int)); +void isr_autovec(int); +void isr_vectored(int); void isr_add_custom(level, handler) @@ -193,7 +193,7 @@ isr_vectored(evec) * Called by driver attach functions. */ -extern void _isr_vectored __P((void)); +extern void _isr_vectored(void); void isr_add_vectored(func, arg, level, vec) @@ -223,7 +223,7 @@ isr_add_vectored(func, arg, level, vec) void set_vector_entry(entry, handler) int entry; - void (*handler) __P((void)); + void (*handler)(void); { if ((entry <0) || (entry >= NVECTORS)) panic("set_vector_entry: setting vector too high or low"); diff --git a/sys/arch/sun3/sun3/kgdb_stub.c b/sys/arch/sun3/sun3/kgdb_stub.c index 68d000596f3..56523d79b5a 100644 --- a/sys/arch/sun3/sun3/kgdb_stub.c +++ b/sys/arch/sun3/sun3/kgdb_stub.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kgdb_stub.c,v 1.8 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: kgdb_stub.c,v 1.9 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: kgdb_stub.c,v 1.6 1996/10/23 16:30:48 gwr Exp $ */ /* @@ -81,14 +81,14 @@ int kgdb_active = 0; /* remote debugging active if != 0 */ int kgdb_debug_init = 0; /* != 0 waits for remote at system init */ int kgdb_debug_panic = 0; /* != 0 waits for remote on panic */ -static void kgdb_send __P((u_int, u_char *, int)); -static int kgdb_recv __P((u_char *, int *)); -static int computeSignal __P((int)); -int kgdb_trap __P((int, struct trapframe *)); -int kgdb_acc __P((caddr_t, int)); +static void kgdb_send(u_int, u_char *, int); +static int kgdb_recv(u_char *, int *); +static int computeSignal(int); +int kgdb_trap(int, struct trapframe *); +int kgdb_acc(caddr_t, int); -static int (*kgdb_getc) __P((void *)); -static void (*kgdb_putc) __P((void *, int)); +static int (*kgdb_getc)(void *); +static void (*kgdb_putc)(void *, int); static void *kgdb_ioarg; #define GETC() ((*kgdb_getc)(kgdb_ioarg)) @@ -113,8 +113,8 @@ static void *kgdb_ioarg; */ void kgdb_attach(getfn, putfn, ioarg) - int (*getfn) __P((void *)); - void (*putfn) __P((void *, int)); + int (*getfn)(void *); + void (*putfn)(void *, int); void *ioarg; { diff --git a/sys/arch/sun3/sun3/ledsvar.h b/sys/arch/sun3/sun3/ledsvar.h index 91c80eef6f4..495b3283b1f 100644 --- a/sys/arch/sun3/sun3/ledsvar.h +++ b/sys/arch/sun3/sun3/ledsvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ledsvar.h,v 1.2 1997/01/16 04:04:26 kstailey Exp $ */ +/* $OpenBSD: ledsvar.h,v 1.3 2002/03/14 01:26:47 millert Exp $ */ extern volatile unsigned int led_n_patterns; extern volatile unsigned int led_countmax; @@ -6,4 +6,4 @@ extern volatile const unsigned char * volatile led_patterns; extern volatile unsigned int led_countdown; extern volatile unsigned int led_px; -extern int ledrw __P((struct uio *)); +extern int ledrw(struct uio *); diff --git a/sys/arch/sun3/sun3/machdep.c b/sys/arch/sun3/sun3/machdep.c index 00c3a9ebb93..0932cdd5cb9 100644 --- a/sys/arch/sun3/sun3/machdep.c +++ b/sys/arch/sun3/sun3/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.51 2002/02/17 22:59:53 maja Exp $ */ +/* $OpenBSD: machdep.c,v 1.52 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: machdep.c,v 1.77 1996/10/13 03:47:51 christos Exp $ */ /* @@ -129,13 +129,13 @@ int bufpages = 0; #endif int bufcachepercent = BUFCACHEPERCENT; -static caddr_t allocsys __P((caddr_t)); -static void identifycpu __P((void)); -static void initcpu __P((void)); -static void reboot_sync __P((void)); -int reboot2 __P((int, char *)); /* share with sunos_misc.c */ +static caddr_t allocsys(caddr_t); +static void identifycpu(void); +static void initcpu(void); +static void reboot_sync(void); +int reboot2(int, char *); /* share with sunos_misc.c */ -void straytrap __P((struct trapframe)); /* called from locore.s */ +void straytrap(struct trapframe); /* called from locore.s */ /* * Console initialization: called early on from main, @@ -641,7 +641,7 @@ dumpconf() { int nblks; /* size of dump area */ int maj; - int (*getsize) __P((dev_t)); + int (*getsize)(dev_t); if (dumpdev == NODEV) return; @@ -843,8 +843,7 @@ cpu_exec_aout_makecmds(p, epp) int error = ENOEXEC; #ifdef COMPAT_SUNOS - extern int sunos_exec_aout_makecmds - __P((struct proc *, struct exec_package *)); + extern int sunos_exec_aout_makecmds(struct proc *, struct exec_package *); if ((error = sunos_exec_aout_makecmds(p, epp)) == 0) return 0; #endif diff --git a/sys/arch/sun3/sun3/mainbus.c b/sys/arch/sun3/sun3/mainbus.c index 369460f5419..c40830b925b 100644 --- a/sys/arch/sun3/sun3/mainbus.c +++ b/sys/arch/sun3/sun3/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.4 1997/01/16 04:04:29 kstailey Exp $ */ +/* $OpenBSD: mainbus.c,v 1.5 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: mainbus.c,v 1.5 1996/12/17 21:11:35 gwr Exp $ */ /*- @@ -43,8 +43,8 @@ #include <machine/autoconf.h> -static int main_match __P((struct device *, void *, void *)); -static void main_attach __P((struct device *, struct device *, void *)); +static int main_match(struct device *, void *, void *); +static void main_attach(struct device *, struct device *, void *); struct cfattach mainbus_ca = { sizeof(struct device), main_match, main_attach diff --git a/sys/arch/sun3/sun3/mem.c b/sys/arch/sun3/sun3/mem.c index 4de002442ce..927127a9de1 100644 --- a/sys/arch/sun3/sun3/mem.c +++ b/sys/arch/sun3/sun3/mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.18 2001/12/08 02:24:07 art Exp $ */ +/* $OpenBSD: mem.c,v 1.19 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: mem.c,v 1.19 1995/08/08 21:09:01 gwr Exp $ */ /* @@ -64,7 +64,7 @@ #include <machine/pte.h> #include <machine/pmap.h> -extern int ledrw __P((struct uio *)); +extern int ledrw(struct uio *); static caddr_t devzeropage; diff --git a/sys/arch/sun3/sun3/pmap.c b/sys/arch/sun3/sun3/pmap.c index ec8b438e322..f2ba5a2fd41 100644 --- a/sys/arch/sun3/sun3/pmap.c +++ b/sys/arch/sun3/sun3/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.34 2001/11/28 15:34:17 art Exp $ */ +/* $OpenBSD: pmap.c,v 1.35 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: pmap.c,v 1.64 1996/11/20 18:57:35 gwr Exp $ */ /*- @@ -191,7 +191,7 @@ typedef struct pv_entry *pv_entry_t; pv_entry_t pv_head_table = NULL; #ifdef DIAGNOSTIC -static struct pv_entry * pa_to_pvp __P((vm_offset_t pa)); +static struct pv_entry * pa_to_pvp(vm_offset_t pa); static struct pv_entry * pa_to_pvp(pa) vm_offset_t pa; @@ -314,12 +314,12 @@ struct pmeg_tailq pmeg_free_queue, pmeg_inactive_queue, static struct pmeg_state pmeg_array[NPMEG]; #ifdef PMAP_DEBUG -void pmap_print __P((pmap_t pmap)); -void pv_print __P((vm_offset_t pa)); +void pmap_print(pmap_t pmap); +void pv_print(vm_offset_t pa); -static pmeg_t pmeg_p __P((int sme)); -static void pmeg_verify_empty __P((vm_offset_t va)); -static void pmeg_print __P((pmeg_t pmegp)); +static pmeg_t pmeg_p(int sme); +static void pmeg_verify_empty(vm_offset_t va); +static void pmeg_print(pmeg_t pmegp); static pmeg_t pmeg_p(sme) @@ -358,56 +358,56 @@ int tmp_vpages_inuse; /* * prototypes */ -static int get_pte_pmeg __P((int, int)); -static void set_pte_pmeg __P((int, int, int)); +static int get_pte_pmeg(int, int); +static void set_pte_pmeg(int, int, int); -static void context_allocate __P((pmap_t pmap)); -static void context_free __P((pmap_t pmap)); -static void context_init __P((void)); +static void context_allocate(pmap_t pmap); +static void context_free(pmap_t pmap); +static void context_init(void); -static pmeg_t pmeg_allocate __P((pmap_t pmap, vm_offset_t va)); -static void pmeg_release __P((pmeg_t pmegp)); -static void pmeg_free __P((pmeg_t pmegp, int segnum)); -static pmeg_t pmeg_cache __P((pmap_t pmap, vm_offset_t va)); -static void pmeg_set_wiring __P((pmeg_t pmegp, vm_offset_t va, int)); +static pmeg_t pmeg_allocate(pmap_t pmap, vm_offset_t va); +static void pmeg_release(pmeg_t pmegp); +static void pmeg_free(pmeg_t pmegp, int segnum); +static pmeg_t pmeg_cache(pmap_t pmap, vm_offset_t va); +static void pmeg_set_wiring(pmeg_t pmegp, vm_offset_t va, int); -static int pv_link __P((pmap_t pmap, vm_offset_t, vm_offset_t, u_int)); -static void pv_unlink __P((pmap_t, vm_offset_t, vm_offset_t)); -static void pv_remove_all __P(( vm_offset_t pa)); -static void pv_changepte __P((pv_entry_t, int, int)); -static void pv_syncflags __P((pv_entry_t head)); +static int pv_link(pmap_t pmap, vm_offset_t, vm_offset_t, u_int); +static void pv_unlink(pmap_t, vm_offset_t, vm_offset_t); +static void pv_remove_all( vm_offset_t pa); +static void pv_changepte(pv_entry_t, int, int); +static void pv_syncflags(pv_entry_t head); -static void pmeg_clean __P((pmeg_t pmegp)); -static void pmeg_clean_free __P((void)); +static void pmeg_clean(pmeg_t pmegp); +static void pmeg_clean_free(void); -static void sun3_protection_init __P((void)); +static void sun3_protection_init(void); -static void pmap_common_init __P((pmap_t pmap)); +static void pmap_common_init(pmap_t pmap); -static void pmap_user_pmap_init __P((pmap_t pmap)); -static void pmap_page_upload __P((void)); +static void pmap_user_pmap_init(pmap_t pmap); +static void pmap_page_upload(void); -static void pmap_remove_range_mmu __P((pmap_t, vm_offset_t, vm_offset_t)); -static void pmap_remove_range_noctx __P((pmap_t, vm_offset_t, vm_offset_t)); -static void pmap_remove_range __P((pmap_t pmap, vm_offset_t, vm_offset_t)); +static void pmap_remove_range_mmu(pmap_t, vm_offset_t, vm_offset_t); +static void pmap_remove_range_noctx(pmap_t, vm_offset_t, vm_offset_t); +static void pmap_remove_range(pmap_t pmap, vm_offset_t, vm_offset_t); -static void pmap_enter_kernel __P((vm_offset_t va, vm_offset_t pa, - vm_prot_t prot, boolean_t wired, int pte_proto)); -static void pmap_enter_user __P((pmap_t pmap, vm_offset_t va, vm_offset_t pa, - vm_prot_t prot, boolean_t wired, int pte_proto)); +static void pmap_enter_kernel(vm_offset_t va, vm_offset_t pa, + vm_prot_t prot, boolean_t wired, int pte_proto); +static void pmap_enter_user(pmap_t pmap, vm_offset_t va, vm_offset_t pa, + vm_prot_t prot, boolean_t wired, int pte_proto); -static void pmap_protect_range_noctx __P((pmap_t, vm_offset_t, vm_offset_t)); -static void pmap_protect_range_mmu __P((pmap_t, vm_offset_t, vm_offset_t)); -static void pmap_protect_range __P((pmap_t, vm_offset_t, vm_offset_t)); +static void pmap_protect_range_noctx(pmap_t, vm_offset_t, vm_offset_t); +static void pmap_protect_range_mmu(pmap_t, vm_offset_t, vm_offset_t); +static void pmap_protect_range(pmap_t, vm_offset_t, vm_offset_t); -void pmap_switch __P((pmap_t pmap)); +void pmap_switch(pmap_t pmap); -extern int pmap_page_index __P((paddr_t)); -extern u_int pmap_free_pages __P((void)); -extern int pmap_next_page __P((vm_offset_t *)); +extern int pmap_page_index(paddr_t); +extern u_int pmap_free_pages(void); +extern int pmap_next_page(vm_offset_t *); -void pmap_pinit __P((struct pmap *)); -void pmap_release __P((struct pmap *)); +void pmap_pinit(struct pmap *); +void pmap_release(struct pmap *); /* * Debugging support. diff --git a/sys/arch/sun3/sun3/stub.c b/sys/arch/sun3/sun3/stub.c index c79cfbd0785..64762e9b9e7 100644 --- a/sys/arch/sun3/sun3/stub.c +++ b/sys/arch/sun3/sun3/stub.c @@ -1,4 +1,4 @@ -/* $OpenBSD: stub.c,v 1.8 2001/05/30 20:37:54 miod Exp $ */ +/* $OpenBSD: stub.c,v 1.9 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: stub.c,v 1.13 1996/11/20 18:57:37 gwr Exp $ */ /*- @@ -47,7 +47,7 @@ #include <machine/machdep.h> #ifndef DDB -void Debugger __P((void)); +void Debugger(void); /* * When DDB is included, Debugger() comes from db_interface.c diff --git a/sys/arch/sun3/sun3/sun3_startup.c b/sys/arch/sun3/sun3/sun3_startup.c index f5335b1c66f..7975deb4a13 100644 --- a/sys/arch/sun3/sun3/sun3_startup.c +++ b/sys/arch/sun3/sun3/sun3_startup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sun3_startup.c,v 1.20 2001/11/06 19:53:16 miod Exp $ */ +/* $OpenBSD: sun3_startup.c,v 1.21 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: sun3_startup.c,v 1.55 1996/11/20 18:57:38 gwr Exp $ */ /*- @@ -106,22 +106,22 @@ extern struct pcb *curpcb; extern vm_offset_t dumppage_pa; extern vm_offset_t dumppage_va; -void sun3_bootstrap __P((struct exec)); +void sun3_bootstrap(struct exec); -static void sun3_mode_monitor __P((void)); -static void sun3_mode_normal __P((void)); -static void sun3_mon_init __P((vm_offset_t sva, vm_offset_t eva, int keep)); -static void sun3_monitor_hooks __P((void)); -static void sun3_context_equiv __P((void)); +static void sun3_mode_monitor(void); +static void sun3_mode_normal(void); +static void sun3_mon_init(vm_offset_t sva, vm_offset_t eva, int keep); +static void sun3_monitor_hooks(void); +static void sun3_context_equiv(void); #if (defined(DDB) || NKSYMS > 0) && !defined(SYMTAB_SPACE) -static void sun3_save_symtab __P((struct exec *kehp)); +static void sun3_save_symtab(struct exec *kehp); #endif -static void sun3_verify_hardware __P((void)); -static void sun3_vm_init __P((struct exec *kehp)); -static void tracedump __P((int)); -static void v_handler __P((int addr, char *str)); +static void sun3_verify_hardware(void); +static void sun3_vm_init(struct exec *kehp); +static void tracedump(int); +static void v_handler(int addr, char *str); -static void internal_configure __P((void)); +static void internal_configure(void); vm_offset_t high_segment_alloc(npages) diff --git a/sys/arch/sun3/sun3/swapgeneric.c b/sys/arch/sun3/sun3/swapgeneric.c index 049738b45ec..b236178efe5 100644 --- a/sys/arch/sun3/sun3/swapgeneric.c +++ b/sys/arch/sun3/sun3/swapgeneric.c @@ -1,4 +1,4 @@ -/* $OpenBSD: swapgeneric.c,v 1.7 2001/09/29 18:40:33 miod Exp $ */ +/* $OpenBSD: swapgeneric.c,v 1.8 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: swapgeneric.c,v 1.14 1995/04/26 23:30:08 gwr Exp $ */ /* @@ -38,7 +38,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/sun3/sun3/trap.c b/sys/arch/sun3/sun3/trap.c index 4ff91c75db8..0605c2ecf8e 100644 --- a/sys/arch/sun3/sun3/trap.c +++ b/sys/arch/sun3/sun3/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.31 2001/11/28 16:13:29 art Exp $ */ +/* $OpenBSD: trap.c,v 1.32 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: trap.c,v 1.63-1.65ish 1997/01/16 15:41:40 gwr Exp $ */ /* @@ -78,9 +78,9 @@ extern struct emul emul_sunos; extern char fubail[], subail[]; /* These are called from locore.s */ -void syscall __P((register_t code, struct frame)); -void trap __P((int type, u_int code, u_int v, struct frame)); -int nodb_trap __P((int type, struct frame *)); +void syscall(register_t code, struct frame); +void trap(int type, u_int code, u_int v, struct frame); +int nodb_trap(int type, struct frame *); int astpending; diff --git a/sys/arch/sun3/sun3/vector.c b/sys/arch/sun3/sun3/vector.c index 5629660a2e3..d100b60c432 100644 --- a/sys/arch/sun3/sun3/vector.c +++ b/sys/arch/sun3/sun3/vector.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vector.c,v 1.7 2000/08/28 22:06:36 miod Exp $ */ +/* $OpenBSD: vector.c,v 1.8 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: vector.c,v 1.15 1996/11/20 18:57:40 gwr Exp $ */ /*- @@ -59,7 +59,7 @@ #define fpsnan fpfault #define fpunfl fpfault -void (*vector_table[NVECTORS]) __P((void)) = { +void (*vector_table[NVECTORS])(void) = { (void*)0xfffe000, /* 0: NOT USED (reset SP) */ (void*)0xfef0000, /* 1: NOT USED (reset PC) */ buserr, /* 2: bus error */ diff --git a/sys/arch/sun3/sun3/vector.h b/sys/arch/sun3/sun3/vector.h index 24efecad59c..4ebba66540b 100644 --- a/sys/arch/sun3/sun3/vector.h +++ b/sys/arch/sun3/sun3/vector.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vector.h,v 1.6 2000/08/28 22:06:36 miod Exp $ */ +/* $OpenBSD: vector.h,v 1.7 2002/03/14 01:26:47 millert Exp $ */ /* $NetBSD: vector.h,v 1.10 1996/11/20 18:57:40 gwr Exp $ */ /*- @@ -41,27 +41,27 @@ #define AUTOVEC_BASE 0x18 -extern void (*vector_table[]) __P((void)); +extern void (*vector_table[])(void); -void addrerr __P((void)); -void badtrap __P((void)); -void buserr __P((void)); -void chkinst __P((void)); -void coperr __P((void)); -void fmterr __P((void)); -void fpfline __P((void)); -void fpunsupp __P((void)); -void illinst __P((void)); -void privinst __P((void)); -void trace __P((void)); -void trap0 __P((void)); -void trap1 __P((void)); -void trap12 __P((void)); -void trap15 __P((void)); -void trap2 __P((void)); -void trapvinst __P((void)); -void zerodiv __P((void)); -void fpfault __P((void)); +void addrerr(void); +void badtrap(void); +void buserr(void); +void chkinst(void); +void coperr(void); +void fmterr(void); +void fpfline(void); +void fpunsupp(void); +void illinst(void); +void privinst(void); +void trace(void); +void trap0(void); +void trap1(void); +void trap12(void); +void trap15(void); +void trap2(void); +void trapvinst(void); +void zerodiv(void); +void fpfault(void); -void _isr_autovec __P((void)); +void _isr_autovec(void); |