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/mvme68k | |
| parent | 7b2c79b5895287d37f0c4e3adfc396eb7a6c03fb (diff) | |
First round of __P removal in sys
Diffstat (limited to 'sys/arch/mvme68k')
55 files changed, 420 insertions, 421 deletions
diff --git a/sys/arch/mvme68k/dev/bugtty.c b/sys/arch/mvme68k/dev/bugtty.c index aa88ca53765..91815f82be1 100644 --- a/sys/arch/mvme68k/dev/bugtty.c +++ b/sys/arch/mvme68k/dev/bugtty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bugtty.c,v 1.5 2002/02/15 20:45:30 nordin Exp $ */ +/* $OpenBSD: bugtty.c,v 1.6 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Dale Rahn. @@ -47,8 +47,8 @@ #include "bugtty.h" -int bugttymatch __P((struct device *parent, void *self, void *aux)); -void bugttyattach __P((struct device *parent, struct device *self, void *aux)); +int bugttymatch(struct device *parent, void *self, void *aux); +void bugttyattach(struct device *parent, struct device *self, void *aux); struct cfattach bugtty_ca = { sizeof(struct device), bugttymatch, bugttyattach @@ -59,17 +59,17 @@ struct cfdriver bugtty_cd = { }; /* prototypes */ -int bugttycnprobe __P((struct consdev *cp)); -int bugttycninit __P((struct consdev *cp)); -int bugttycngetc __P((dev_t dev)); -int bugttycnputc __P((dev_t dev, char c)); - -int bugttyopen __P((dev_t dev, int flag, int mode, struct proc *p)); -int bugttyclose __P((dev_t dev, int flag, int mode, struct proc *p)); -int bugttyread __P((dev_t dev, struct uio *uio, int flag)); -int bugttywrite __P((dev_t dev, struct uio *uio, int flag)); -int bugttyioctl __P((dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)); -int bugttystop __P((struct tty *tp, int flag)); +int bugttycnprobe(struct consdev *cp); +int bugttycninit(struct consdev *cp); +int bugttycngetc(dev_t dev); +int bugttycnputc(dev_t dev, char c); + +int bugttyopen(dev_t dev, int flag, int mode, struct proc *p); +int bugttyclose(dev_t dev, int flag, int mode, struct proc *p); +int bugttyread(dev_t dev, struct uio *uio, int flag); +int bugttywrite(dev_t dev, struct uio *uio, int flag); +int bugttyioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p); +int bugttystop(struct tty *tp, int flag); #define DIALOUT(x) ((x) & 0x80) #define SWFLAGS(dev) (bugttyswflags | (DIALOUT(dev) ? TIOCFLAG_SOFTCAR : 0)) @@ -116,7 +116,7 @@ bugttyattach(parent, self, aux) printf("\n"); } -void bugttyoutput __P((struct tty *tp)); +void bugttyoutput(struct tty *tp); int bugttydefaultrate = TTYDEF_SPEED; int bugttyswflags; diff --git a/sys/arch/mvme68k/dev/cl.c b/sys/arch/mvme68k/dev/cl.c index a84881a26a4..66deacb69a6 100644 --- a/sys/arch/mvme68k/dev/cl.c +++ b/sys/arch/mvme68k/dev/cl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cl.c,v 1.23 2002/02/15 20:45:30 nordin Exp $ */ +/* $OpenBSD: cl.c,v 1.24 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Dale Rahn. All rights reserved. @@ -158,44 +158,44 @@ struct { }; /* prototypes */ -int clcnprobe __P((struct consdev *cp)); -int clcninit __P((struct consdev *cp)); -int clcngetc __P((dev_t dev)); -int clcnputc __P((dev_t dev, u_char c)); -u_char cl_clkdiv __P((int speed)); -u_char cl_clknum __P((int speed)); -u_char cl_clkrxtimeout __P((int speed)); -void clstart __P((struct tty *tp)); -void cl_unblock __P((struct tty *tp)); -int clccparam __P((struct clsoftc *sc, struct termios *par, int channel)); - -int clparam __P((struct tty *tp, struct termios *t)); -int cl_mintr __P((struct clsoftc *sc)); -int cl_txintr __P((struct clsoftc *sc)); -int cl_rxintr __P((struct clsoftc *sc)); -void cl_overflow __P((struct clsoftc *sc, int channel, time_t *ptime, u_char *msg)); -void cl_parity __P((struct clsoftc *sc, int channel)); -void cl_frame __P((struct clsoftc *sc, int channel)); -void cl_break __P(( struct clsoftc *sc, int channel)); -int clmctl __P((dev_t dev, int bits, int how)); -void cl_dumpport __P((int channel)); - -int clprobe __P((struct device *parent, void *self, void *aux)); -void clattach __P((struct device *parent, struct device *self, void *aux)); - -int clopen __P((dev_t dev, int flag, int mode, struct proc *p)); -int clclose __P((dev_t dev, int flag, int mode, struct proc *p)); -int clread __P((dev_t dev, struct uio *uio, int flag)); -int clwrite __P((dev_t dev, struct uio *uio, int flag)); -int clioctl __P((dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)); -int clstop __P((struct tty *tp, int flag)); - -static void cl_initchannel __P((struct clsoftc *sc, int channel)); -static void clputc __P((struct clsoftc *sc, int unit, u_char c)); -static u_char clgetc __P((struct clsoftc *sc, int *channel)); +int clcnprobe(struct consdev *cp); +int clcninit(struct consdev *cp); +int clcngetc(dev_t dev); +int clcnputc(dev_t dev, u_char c); +u_char cl_clkdiv(int speed); +u_char cl_clknum(int speed); +u_char cl_clkrxtimeout(int speed); +void clstart(struct tty *tp); +void cl_unblock(struct tty *tp); +int clccparam(struct clsoftc *sc, struct termios *par, int channel); + +int clparam(struct tty *tp, struct termios *t); +int cl_mintr(struct clsoftc *sc); +int cl_txintr(struct clsoftc *sc); +int cl_rxintr(struct clsoftc *sc); +void cl_overflow(struct clsoftc *sc, int channel, time_t *ptime, u_char *msg); +void cl_parity(struct clsoftc *sc, int channel); +void cl_frame(struct clsoftc *sc, int channel); +void cl_break( struct clsoftc *sc, int channel); +int clmctl(dev_t dev, int bits, int how); +void cl_dumpport(int channel); + +int clprobe(struct device *parent, void *self, void *aux); +void clattach(struct device *parent, struct device *self, void *aux); + +int clopen(dev_t dev, int flag, int mode, struct proc *p); +int clclose(dev_t dev, int flag, int mode, struct proc *p); +int clread(dev_t dev, struct uio *uio, int flag); +int clwrite(dev_t dev, struct uio *uio, int flag); +int clioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p); +int clstop(struct tty *tp, int flag); + +static void cl_initchannel(struct clsoftc *sc, int channel); +static void clputc(struct clsoftc *sc, int unit, u_char c); +static u_char clgetc(struct clsoftc *sc, int *channel); static void cloutput __P( (struct tty *tp)); -void cl_softint __P((struct clsoftc *sc)); -void cl_appendbufn __P((struct clsoftc *sc, u_char channel, u_char *buf, u_short cnt)); +void cl_softint(struct clsoftc *sc); +void cl_appendbufn(struct clsoftc *sc, u_char channel, u_char *buf, u_short cnt); struct cfattach cl_ca = { sizeof(struct clsoftc), clprobe, clattach diff --git a/sys/arch/mvme68k/dev/clock.c b/sys/arch/mvme68k/dev/clock.c index 01157b04684..28d05823924 100644 --- a/sys/arch/mvme68k/dev/clock.c +++ b/sys/arch/mvme68k/dev/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.3 1996/04/28 11:06:02 deraadt Exp $ */ +/* $OpenBSD: clock.c,v 1.4 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -116,8 +116,8 @@ struct clocksoftc { struct intrhand sc_statih; }; -void clockattach __P((struct device *, struct device *, void *)); -int clockmatch __P((struct device *, void *, void *)); +void clockattach(struct device *, struct device *, void *); +int clockmatch(struct device *, void *, void *); struct cfattach clock_ca = { sizeof(struct clocksoftc), clockmatch, clockattach @@ -127,8 +127,8 @@ struct cfdriver clock_cd = { NULL, "clock", DV_DULL, 0 }; -int clockintr __P((void *)); -int statintr __P((void *)); +int clockintr(void *); +int statintr(void *); int clockbus; u_char stat_reset, prof_reset; diff --git a/sys/arch/mvme68k/dev/flash.c b/sys/arch/mvme68k/dev/flash.c index bd1907c403f..fbb994480e4 100644 --- a/sys/arch/mvme68k/dev/flash.c +++ b/sys/arch/mvme68k/dev/flash.c @@ -1,4 +1,4 @@ -/* $OpenBSD: flash.c,v 1.9 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: flash.c,v 1.10 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -66,8 +66,8 @@ struct flashsoftc { int sc_zonesize; }; -void flashattach __P((struct device *, struct device *, void *)); -int flashmatch __P((struct device *, void *, void *)); +void flashattach(struct device *, struct device *, void *); +int flashmatch(struct device *, void *, void *); struct cfattach flash_ca = { sizeof(struct flashsoftc), flashmatch, flashattach @@ -77,8 +77,8 @@ struct cfdriver flash_cd = { NULL, "flash", DV_DULL, 0 }; -int flashwritebyte __P((struct flashsoftc *sc, int addr, u_char val)); -int flasherasezone __P((struct flashsoftc *sc, int addr)); +int flashwritebyte(struct flashsoftc *sc, int addr, u_char val); +int flasherasezone(struct flashsoftc *sc, int addr); struct flashii intel_flashii[] = { { "28F008SA", FLII_INTEL_28F008SA, 1024*1024, 64*1024 }, diff --git a/sys/arch/mvme68k/dev/fooip.c b/sys/arch/mvme68k/dev/fooip.c index 4d27d78da48..4edd4024a01 100644 --- a/sys/arch/mvme68k/dev/fooip.c +++ b/sys/arch/mvme68k/dev/fooip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fooip.c,v 1.4 2000/03/26 23:31:59 deraadt Exp $ */ +/* $OpenBSD: fooip.c,v 1.5 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -64,8 +64,8 @@ struct fooipsoftc { struct fooipregs *sc_regs; }; -void fooipattach __P((struct device *, struct device *, void *)); -int fooipmatch __P((struct device *, void *, void *)); +void fooipattach(struct device *, struct device *, void *); +int fooipmatch(struct device *, void *, void *); struct cfattach fooip_ca = { sizeof(struct fooipsoftc), fooipmatch, fooipattach @@ -75,7 +75,7 @@ struct cfdriver fooip_cd = { NULL, "fooip", DV_DULL, 0 }; -int fooipintr __P((void *)); +int fooipintr(void *); int fooipmatch(parent, cf, args) diff --git a/sys/arch/mvme68k/dev/if_ie.c b/sys/arch/mvme68k/dev/if_ie.c index 81bb9908036..ed0eb95e9d0 100644 --- a/sys/arch/mvme68k/dev/if_ie.c +++ b/sys/arch/mvme68k/dev/if_ie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ie.c,v 1.17 2001/11/28 16:13:28 art Exp $ */ +/* $OpenBSD: if_ie.c,v 1.18 2002/03/14 01:26:37 millert Exp $ */ /*- * Copyright (c) 1999 Steve Murphree, Jr. @@ -185,9 +185,9 @@ struct ie_softc { void (*reset_596)(); /* card dependent reset function */ void (*chan_attn)(); /* card dependent attn function */ void (*run_596)(); /* card depenent "go on-line" function */ - void (*memcopy) __P((const void *, void *, u_int)); + void (*memcopy)(const void *, void *, u_int); /* card dependent memory copy function */ - void (*memzero) __P((void *, u_int)); + void (*memzero)(void *, u_int); /* card dependent memory zero function */ int want_mcsetup; /* mcsetup flag */ int promisc; /* are we in promisc mode? */ @@ -241,31 +241,31 @@ struct ie_softc { #endif }; -static void ie_obreset __P((struct ie_softc *)); -static void ie_obattend __P((struct ie_softc *)); -static void ie_obrun __P((struct ie_softc *)); - -void iewatchdog __P((struct ifnet *)); -int ieintr __P((void *)); -int iefailintr __P((void *)); -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*/ void ierint __P((struct ie_softc *)); -/*static*/ void ietint __P((struct ie_softc *)); -static int ieget __P((struct ie_softc *, struct mbuf **, - struct ether_header *, int *)); -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 void ie_obreset(struct ie_softc *); +static void ie_obattend(struct ie_softc *); +static void ie_obrun(struct ie_softc *); + +void iewatchdog(struct ifnet *); +int ieintr(void *); +int iefailintr(void *); +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*/ void ierint(struct ie_softc *); +/*static*/ void ietint(struct ie_softc *); +static int ieget(struct ie_softc *, struct mbuf **, + struct ether_header *, int *); +static void setup_bufs(struct ie_softc *); +static int mc_setup(struct ie_softc *, void *); +static void mc_reset(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; diff --git a/sys/arch/mvme68k/dev/if_le.c b/sys/arch/mvme68k/dev/if_le.c index 23495ef9ac0..222888e9662 100644 --- a/sys/arch/mvme68k/dev/if_le.c +++ b/sys/arch/mvme68k/dev/if_le.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le.c,v 1.16 2001/12/21 20:45:51 miod Exp $ */ +/* $OpenBSD: if_le.c,v 1.17 2002/03/14 01:26:37 millert Exp $ */ /*- * Copyright (c) 1982, 1992, 1993 @@ -80,10 +80,10 @@ struct cfattach le_ca = { static int lebustype; -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 vlewrcsr __P((struct am7990_softc *, u_int16_t, u_int16_t)); -hide u_int16_t vlerdcsr __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 vlewrcsr(struct am7990_softc *, u_int16_t, u_int16_t); +hide u_int16_t vlerdcsr(struct am7990_softc *, u_int16_t); /* send command to the nvram controller */ nvram_cmd(sc, cmd, addr ) diff --git a/sys/arch/mvme68k/dev/ipic.c b/sys/arch/mvme68k/dev/ipic.c index 4681df759ae..a1ce3ab839d 100644 --- a/sys/arch/mvme68k/dev/ipic.c +++ b/sys/arch/mvme68k/dev/ipic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipic.c,v 1.7 2000/03/26 23:31:59 deraadt Exp $ */ +/* $OpenBSD: ipic.c,v 1.8 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -48,8 +48,8 @@ #include <mvme68k/dev/ipicreg.h> #include <mvme68k/dev/mcreg.h> -void ipicattach __P((struct device *, struct device *, void *)); -int ipicmatch __P((struct device *, void *, void *)); +void ipicattach(struct device *, struct device *, void *); +int ipicmatch(struct device *, void *, void *); struct cfattach ipic_ca = { sizeof(struct ipicsoftc), ipicmatch, ipicattach diff --git a/sys/arch/mvme68k/dev/lp.c b/sys/arch/mvme68k/dev/lp.c index 5b602af277f..f3970a0449d 100644 --- a/sys/arch/mvme68k/dev/lp.c +++ b/sys/arch/mvme68k/dev/lp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lp.c,v 1.4 2000/03/26 23:31:59 deraadt Exp $ */ +/* $OpenBSD: lp.c,v 1.5 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -53,8 +53,8 @@ struct lpsoftc { struct pccreg *sc_pcc; }; -void lpattach __P((struct device *, struct device *, void *)); -int lpmatch __P((struct device *, void *, void *)); +void lpattach(struct device *, struct device *, void *); +int lpmatch(struct device *, void *, void *); struct cfattach lp_ca = { sizeof(struct lpsoftc), lpmatch, lpattach @@ -64,7 +64,7 @@ struct cfdriver lp_cd = { NULL, "lp", DV_DULL, 0 }; -int lpintr __P((void *)); +int lpintr(void *); /* * a PCC chip always has an lp attached to it. diff --git a/sys/arch/mvme68k/dev/mc.c b/sys/arch/mvme68k/dev/mc.c index f0896d235df..7807912a998 100644 --- a/sys/arch/mvme68k/dev/mc.c +++ b/sys/arch/mvme68k/dev/mc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mc.c,v 1.8 2000/03/26 23:31:59 deraadt Exp $ */ +/* $OpenBSD: mc.c,v 1.9 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -60,9 +60,9 @@ struct mcsoftc { struct intrhand sc_nmiih; }; -void mcattach __P((struct device *, struct device *, void *)); -int mcmatch __P((struct device *, void *, void *)); -int mcabort __P((struct frame *)); +void mcattach(struct device *, struct device *, void *); +int mcmatch(struct device *, void *, void *); +int mcabort(struct frame *); struct cfattach mc_ca = { sizeof(struct mcsoftc), mcmatch, mcattach diff --git a/sys/arch/mvme68k/dev/mcreg.h b/sys/arch/mvme68k/dev/mcreg.h index cee26cb8764..d8dfb341833 100644 --- a/sys/arch/mvme68k/dev/mcreg.h +++ b/sys/arch/mvme68k/dev/mcreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mcreg.h,v 1.5 2000/01/29 04:11:25 smurph Exp $ */ +/* $OpenBSD: mcreg.h,v 1.6 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -169,8 +169,8 @@ extern struct mcreg *sys_mc; #define MC_VER_NOVME 0x02 #define MC_VER_33MHZ 0x01 -void mc_enableflashwrite __P((int on)); +void mc_enableflashwrite(int on); #define MC_ENAFLASHWRITE_OFFSET 0xcc000 #define MC_DISFLASHWRITE_OFFSET 0xc8000 -int mc_hasflash __P((void)); +int mc_hasflash(void); diff --git a/sys/arch/mvme68k/dev/memc.c b/sys/arch/mvme68k/dev/memc.c index 95cb3c38a6a..f4435780c3c 100644 --- a/sys/arch/mvme68k/dev/memc.c +++ b/sys/arch/mvme68k/dev/memc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: memc.c,v 1.5 2000/03/26 23:31:59 deraadt Exp $ */ +/* $OpenBSD: memc.c,v 1.6 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -61,8 +61,8 @@ struct memcsoftc { struct intrhand sc_ih; }; -void memcattach __P((struct device *, struct device *, void *)); -int memcmatch __P((struct device *, void *, void *)); +void memcattach(struct device *, struct device *, void *); +int memcmatch(struct device *, void *, void *); struct cfattach memc_ca = { sizeof(struct memcsoftc), memcmatch, memcattach @@ -72,7 +72,7 @@ struct cfdriver memc_cd = { NULL, "memc", DV_DULL, 0 }; -int memcintr __P((struct frame *frame)); +int memcintr(struct frame *frame); int memcmatch(parent, vcf, args) diff --git a/sys/arch/mvme68k/dev/nvram.c b/sys/arch/mvme68k/dev/nvram.c index fe17a557c75..82f0bbdd007 100644 --- a/sys/arch/mvme68k/dev/nvram.c +++ b/sys/arch/mvme68k/dev/nvram.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nvram.c,v 1.8 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: nvram.c,v 1.9 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -58,8 +58,8 @@ struct nvramsoftc { struct clockreg *sc_regs; }; -void nvramattach __P((struct device *, struct device *, void *)); -int nvrammatch __P((struct device *, void *, void *)); +void nvramattach(struct device *, struct device *, void *); +int nvrammatch(struct device *, void *, void *); struct cfattach nvram_ca = { sizeof(struct nvramsoftc), nvrammatch, nvramattach diff --git a/sys/arch/mvme68k/dev/pcc.c b/sys/arch/mvme68k/dev/pcc.c index 63a5bc69556..ab823418723 100644 --- a/sys/arch/mvme68k/dev/pcc.c +++ b/sys/arch/mvme68k/dev/pcc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcc.c,v 1.6 2000/03/26 23:31:59 deraadt Exp $ */ +/* $OpenBSD: pcc.c,v 1.7 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -60,9 +60,9 @@ struct pccsoftc { struct intrhand sc_nmiih; }; -void pccattach __P((struct device *, struct device *, void *)); -int pccmatch __P((struct device *, void *, void *)); -int pccabort __P((struct frame *)); +void pccattach(struct device *, struct device *, void *); +int pccmatch(struct device *, void *, void *); +int pccabort(struct frame *); struct cfattach pcc_ca = { sizeof(struct pccsoftc), pccmatch, pccattach diff --git a/sys/arch/mvme68k/dev/pccreg.h b/sys/arch/mvme68k/dev/pccreg.h index a5b0a800f21..b434cea7032 100644 --- a/sys/arch/mvme68k/dev/pccreg.h +++ b/sys/arch/mvme68k/dev/pccreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pccreg.h,v 1.3 1996/04/28 11:03:27 deraadt Exp $ */ +/* $OpenBSD: pccreg.h,v 1.4 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -153,6 +153,6 @@ extern struct pccreg *sys_pcc; #define ZS1_PHYS_147 (INTIOBASE_147 + 0x3800) /* XXX */ -int pccintr_establish __P((int vec, struct intrhand *ih)); +int pccintr_establish(int vec, struct intrhand *ih); #define PCC_GENCTL_IEN 0x10 diff --git a/sys/arch/mvme68k/dev/pcctwo.c b/sys/arch/mvme68k/dev/pcctwo.c index 3a4dffb18e3..0b498bfcf7b 100644 --- a/sys/arch/mvme68k/dev/pcctwo.c +++ b/sys/arch/mvme68k/dev/pcctwo.c @@ -1,5 +1,5 @@ -/* $OpenBSD: pcctwo.c,v 1.7 2000/03/26 23:31:59 deraadt Exp $ */ +/* $OpenBSD: pcctwo.c,v 1.8 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -60,8 +60,8 @@ struct pcctwosoftc { struct pcctworeg *sc_pcc2; /* the actual registers */ }; -void pcctwoattach __P((struct device *, struct device *, void *)); -int pcctwomatch __P((struct device *, void *, void *)); +void pcctwoattach(struct device *, struct device *, void *); +int pcctwomatch(struct device *, void *, void *); struct cfattach pcctwo_ca = { sizeof(struct pcctwosoftc), pcctwomatch, pcctwoattach diff --git a/sys/arch/mvme68k/dev/sbic.c b/sys/arch/mvme68k/dev/sbic.c index 09f08311bdc..f396e4bc08b 100644 --- a/sys/arch/mvme68k/dev/sbic.c +++ b/sys/arch/mvme68k/dev/sbic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sbic.c,v 1.8 2001/11/06 02:49:22 art Exp $ */ +/* $OpenBSD: sbic.c,v 1.9 2002/03/14 01:26:37 millert Exp $ */ /* $NetBSD: sbic.c,v 1.2 1996/04/23 16:32:54 chuck Exp $ */ /* @@ -91,28 +91,28 @@ extern u_int kvtop(); -int sbicicmd __P((struct sbic_softc *, void *, int, void *, int)); -int sbicgo __P((struct sbic_softc *, struct scsi_xfer *)); -int sbicdmaok __P((struct sbic_softc *, struct scsi_xfer *)); -int sbicwait __P((sbic_regmap_p, u_char, int , int)); -int sbiccheckdmap __P((void *, u_long, u_long)); -u_char sbicselectbus __P((struct sbic_softc *)); -int sbicxfout __P((sbic_regmap_p, int, void *)); -int sbicxfin __P((sbic_regmap_p, int, void *)); -int sbicfromscsiperiod __P((struct sbic_softc *, int)); -int sbictoscsiperiod __P((struct sbic_softc *, int)); -int sbicintr __P((struct sbic_softc *)); -int sbicpoll __P((struct sbic_softc *)); -int sbicnextstate __P((struct sbic_softc *, u_char, u_char)); -int sbicmsgin __P((struct sbic_softc *)); -int sbicabort __P((struct sbic_softc *, char *)); -void sbicxfdone __P((struct sbic_softc *)); -void sbicerror __P((struct sbic_softc *,u_char)); -void sbicreset __P((struct sbic_softc *)); -void sbic_scsidone __P((struct sbic_acb *, int)); -void sbic_sched __P((struct sbic_softc *)); -void sbic_save_ptrs __P((struct sbic_softc *)); -void sbic_load_ptrs __P((struct sbic_softc *)); +int sbicicmd(struct sbic_softc *, void *, int, void *, int); +int sbicgo(struct sbic_softc *, struct scsi_xfer *); +int sbicdmaok(struct sbic_softc *, struct scsi_xfer *); +int sbicwait(sbic_regmap_p, u_char, int , int); +int sbiccheckdmap(void *, u_long, u_long); +u_char sbicselectbus(struct sbic_softc *); +int sbicxfout(sbic_regmap_p, int, void *); +int sbicxfin(sbic_regmap_p, int, void *); +int sbicfromscsiperiod(struct sbic_softc *, int); +int sbictoscsiperiod(struct sbic_softc *, int); +int sbicintr(struct sbic_softc *); +int sbicpoll(struct sbic_softc *); +int sbicnextstate(struct sbic_softc *, u_char, u_char); +int sbicmsgin(struct sbic_softc *); +int sbicabort(struct sbic_softc *, char *); +void sbicxfdone(struct sbic_softc *); +void sbicerror(struct sbic_softc *,u_char); +void sbicreset(struct sbic_softc *); +void sbic_scsidone(struct sbic_acb *, int); +void sbic_sched(struct sbic_softc *); +void sbic_save_ptrs(struct sbic_softc *); +void sbic_load_ptrs(struct sbic_softc *); /* * Synch xfer parameters, and timing conversions @@ -149,7 +149,7 @@ int reselect_debug = 0; /* Debug all reselection related things */ int report_sense = 0; /* Always print Sense information */ int data_pointer_debug = 0; /* Debug Data Pointer related things */ -void sbictimeout __P((struct sbic_softc *dev)); +void sbictimeout(struct sbic_softc *dev); #else #define QPRINTF(a) /* */ diff --git a/sys/arch/mvme68k/dev/sbicdma.c b/sys/arch/mvme68k/dev/sbicdma.c index 8d7bdeff949..8ade6085da1 100644 --- a/sys/arch/mvme68k/dev/sbicdma.c +++ b/sys/arch/mvme68k/dev/sbicdma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sbicdma.c,v 1.6 2001/11/06 19:53:15 miod Exp $ */ +/* $OpenBSD: sbicdma.c,v 1.7 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -54,16 +54,16 @@ #include <mvme68k/dev/sbicvar.h> #include <mvme68k/dev/dmavar.h> -void sbicdmaattach __P((struct device *, struct device *, void *)); -int sbicdmamatch __P((struct device *, void *, void *)); -int sbicdmaprint __P((void *auxp, const char *)); +void sbicdmaattach(struct device *, struct device *, void *); +int sbicdmamatch(struct device *, void *, void *); +int sbicdmaprint(void *auxp, const char *); -void sbicdma_dmafree __P((struct sbic_softc *)); -void sbicdma_dmastop __P((struct sbic_softc *)); -int sbicdma_dmanext __P((struct sbic_softc *)); -int sbicdma_dmago __P((struct sbic_softc *, char *, int, int)); -int sbicdma_dmaintr __P((struct sbic_softc *)); -int sbicdma_scintr __P((struct sbic_softc *)); +void sbicdma_dmafree(struct sbic_softc *); +void sbicdma_dmastop(struct sbic_softc *); +int sbicdma_dmanext(struct sbic_softc *); +int sbicdma_dmago(struct sbic_softc *, char *, int, int); +int sbicdma_dmaintr(struct sbic_softc *); +int sbicdma_scintr(struct sbic_softc *); struct scsi_adapter sbicdma_scsiswitch = { sbic_scsicmd, diff --git a/sys/arch/mvme68k/dev/sbicvar.h b/sys/arch/mvme68k/dev/sbicvar.h index 02f50b1e892..d0668ca6f69 100644 --- a/sys/arch/mvme68k/dev/sbicvar.h +++ b/sys/arch/mvme68k/dev/sbicvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sbicvar.h,v 1.4 2001/01/25 03:50:48 todd Exp $ */ +/* $OpenBSD: sbicvar.h,v 1.5 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1990 The Regents of the University of California. @@ -128,10 +128,10 @@ struct sbic_softc { #endif struct dma_chain *sc_cur; struct dma_chain *sc_last; - int (*sc_dmago) __P((struct sbic_softc *, char *, int, int)); - int (*sc_dmanext) __P((struct sbic_softc *)); - void (*sc_enintr) __P((struct sbic_softc *)); - void (*sc_dmastop) __P((struct sbic_softc *)); + int (*sc_dmago)(struct sbic_softc *, char *, int, int); + int (*sc_dmanext)(struct sbic_softc *); + void (*sc_enintr)(struct sbic_softc *); + void (*sc_dmastop)(struct sbic_softc *); }; /* @@ -201,7 +201,7 @@ struct sbic_softc { struct buf; struct scsi_xfer; -void sbic_minphys __P((struct buf *bp)); -int sbic_scsicmd __P((struct scsi_xfer *)); +void sbic_minphys(struct buf *bp); +int sbic_scsicmd(struct scsi_xfer *); #endif /* _SBICVAR_H_ */ diff --git a/sys/arch/mvme68k/dev/sram.c b/sys/arch/mvme68k/dev/sram.c index 97145cb2582..a06cdf4f2b7 100644 --- a/sys/arch/mvme68k/dev/sram.c +++ b/sys/arch/mvme68k/dev/sram.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sram.c,v 1.7 2001/11/06 19:53:15 miod Exp $ */ +/* $OpenBSD: sram.c,v 1.8 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -59,8 +59,8 @@ struct sramsoftc { int sc_len; }; -void sramattach __P((struct device *, struct device *, void *)); -int srammatch __P((struct device *, void *, void *)); +void sramattach(struct device *, struct device *, void *); +int srammatch(struct device *, void *, void *); struct cfattach sram_ca = { sizeof(struct sramsoftc), srammatch, sramattach diff --git a/sys/arch/mvme68k/dev/ssh.c b/sys/arch/mvme68k/dev/ssh.c index 27330ad4df4..ef574286139 100644 --- a/sys/arch/mvme68k/dev/ssh.c +++ b/sys/arch/mvme68k/dev/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.1 2001/02/18 17:41:08 deraadt Exp $ */ +/* $OpenBSD: ssh.c,v 1.2 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1994 Michael L. Hitch @@ -66,16 +66,16 @@ extern u_int kvtop(); #define SCSI_DATA_WAIT 500000 /* wait per data in/out step */ #define SCSI_INIT_WAIT 500000 /* wait per step (both) during init */ -void ssh_select __P((struct ssh_softc *)); -void sshabort __P((struct ssh_softc *, ssh_regmap_p, char *)); -void ssherror __P((struct ssh_softc *, ssh_regmap_p, u_char)); -void sshstart __P((struct ssh_softc *)); -void sshreset __P((struct ssh_softc *)); -void sshsetdelay __P((int)); -void ssh_scsidone __P((struct ssh_acb *, int)); -void ssh_sched __P((struct ssh_softc *)); -int ssh_poll __P((struct ssh_softc *, struct ssh_acb *)); -int sshintr __P((struct ssh_softc *)); +void ssh_select(struct ssh_softc *); +void sshabort(struct ssh_softc *, ssh_regmap_p, char *); +void ssherror(struct ssh_softc *, ssh_regmap_p, u_char); +void sshstart(struct ssh_softc *); +void sshreset(struct ssh_softc *); +void sshsetdelay(int); +void ssh_scsidone(struct ssh_acb *, int); +void ssh_sched(struct ssh_softc *); +int ssh_poll(struct ssh_softc *, struct ssh_acb *); +int sshintr(struct ssh_softc *); /* 53C710 script */ const diff --git a/sys/arch/mvme68k/dev/sshdma.c b/sys/arch/mvme68k/dev/sshdma.c index 76155df4de8..fcb2ad66bfe 100644 --- a/sys/arch/mvme68k/dev/sshdma.c +++ b/sys/arch/mvme68k/dev/sshdma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshdma.c,v 1.1 2001/02/18 17:41:09 deraadt Exp $ */ +/* $OpenBSD: sshdma.c,v 1.2 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -57,11 +57,11 @@ #include <mvme68k/dev/pcctworeg.h> #endif -int afscmatch __P((struct device *, void *, void *)); -void afscattach __P((struct device *, struct device *, void *)); +int afscmatch(struct device *, void *, void *); +void afscattach(struct device *, struct device *, void *); -int sshintr __P((struct ssh_softc *)); -int afsc_dmaintr __P((struct ssh_softc *)); +int sshintr(struct ssh_softc *); +int afsc_dmaintr(struct ssh_softc *); struct scsi_adapter afsc_scsiswitch = { ssh_scsicmd, diff --git a/sys/arch/mvme68k/dev/sshvar.h b/sys/arch/mvme68k/dev/sshvar.h index 7f4dfac4924..b05426252f6 100644 --- a/sys/arch/mvme68k/dev/sshvar.h +++ b/sys/arch/mvme68k/dev/sshvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sshvar.h,v 1.1 2001/02/18 17:41:09 deraadt Exp $ */ +/* $OpenBSD: sshvar.h,v 1.2 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -197,7 +197,7 @@ struct ssh_softc { #define STS_INTERMED 0x10 /* Intermediate status sent */ #define STS_EXT 0x80 /* Extended status valid */ -void ssh_minphys __P((struct buf *bp)); -int ssh_scsicmd __P((struct scsi_xfer *)); +void ssh_minphys(struct buf *bp); +int ssh_scsicmd(struct scsi_xfer *); #endif /* _SSHVAR_H */ diff --git a/sys/arch/mvme68k/dev/vme.c b/sys/arch/mvme68k/dev/vme.c index 44eb3f287f7..df63dd35f15 100644 --- a/sys/arch/mvme68k/dev/vme.c +++ b/sys/arch/mvme68k/dev/vme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vme.c,v 1.11 2000/03/26 23:31:59 deraadt Exp $ */ +/* $OpenBSD: vme.c,v 1.12 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -62,13 +62,13 @@ #include <mvme68k/dev/pcctworeg.h> #endif -int vmematch __P((struct device *, void *, void *)); -void vmeattach __P((struct device *, struct device *, void *)); +int vmematch(struct device *, void *, void *); +void vmeattach(struct device *, struct device *, void *); -int vme1chip_init __P((struct vmesoftc *sc)); -int vme2chip_init __P((struct vmesoftc *sc)); -u_long vme2chip_map __P((u_long base, int len, int dwidth)); -int vme2abort __P((struct frame *frame)); +int vme1chip_init(struct vmesoftc *sc); +int vme2chip_init(struct vmesoftc *sc); +u_long vme2chip_map(u_long base, int len, int dwidth); +int vme2abort(struct frame *frame); static int vmebustype; diff --git a/sys/arch/mvme68k/dev/vme.h b/sys/arch/mvme68k/dev/vme.h index 32cdaa4aa45..8fd737e1be9 100644 --- a/sys/arch/mvme68k/dev/vme.h +++ b/sys/arch/mvme68k/dev/vme.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vme.h,v 1.6 1999/09/27 20:30:31 smurph Exp $ */ +/* $OpenBSD: vme.h,v 1.7 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -333,8 +333,8 @@ struct vme2reg { #define VME2_A16BASE 0xffff0000UL #define VME2_A24BASE 0xff000000UL -void * vmepmap __P((struct vmesoftc *sc, void * vmeaddr, int len, - int bustype)); -void * vmemap __P((struct vmesoftc *sc, void * vmeaddr, int len, - int bustype)); -int vmerw __P((struct vmesoftc *sc, struct uio *uio, int flags, int bus)); +void * vmepmap(struct vmesoftc *sc, void * vmeaddr, int len, + int bustype); +void * vmemap(struct vmesoftc *sc, void * vmeaddr, int len, + int bustype); +int vmerw(struct vmesoftc *sc, struct uio *uio, int flags, int bus); diff --git a/sys/arch/mvme68k/dev/vmel.c b/sys/arch/mvme68k/dev/vmel.c index b27ccdec6c1..aeec0bc86da 100644 --- a/sys/arch/mvme68k/dev/vmel.c +++ b/sys/arch/mvme68k/dev/vmel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmel.c,v 1.7 2001/11/05 19:45:34 art Exp $ */ +/* $OpenBSD: vmel.c,v 1.8 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -48,8 +48,8 @@ * functions will decide how many address bits are relevant. */ -void vmelattach __P((struct device *, struct device *, void *)); -int vmelmatch __P((struct device *, void *, void *)); +void vmelattach(struct device *, struct device *, void *); +int vmelmatch(struct device *, void *, void *); struct cfattach vmel_ca = { sizeof(struct vmelsoftc), vmelmatch, vmelattach diff --git a/sys/arch/mvme68k/dev/vmes.c b/sys/arch/mvme68k/dev/vmes.c index ff97ad2831f..635dfe03c05 100644 --- a/sys/arch/mvme68k/dev/vmes.c +++ b/sys/arch/mvme68k/dev/vmes.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmes.c,v 1.8 2001/11/05 19:45:34 art Exp $ */ +/* $OpenBSD: vmes.c,v 1.9 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -48,8 +48,8 @@ * functions will decide how many address bits are relevant. */ -void vmesattach __P((struct device *, struct device *, void *)); -int vmesmatch __P((struct device *, void *, void *)); +void vmesattach(struct device *, struct device *, void *); +int vmesmatch(struct device *, void *, void *); struct cfattach vmes_ca = { sizeof(struct vmessoftc), vmesmatch, vmesattach diff --git a/sys/arch/mvme68k/dev/vs.c b/sys/arch/mvme68k/dev/vs.c index b28ef4ca9ba..d7330d66b7b 100644 --- a/sys/arch/mvme68k/dev/vs.c +++ b/sys/arch/mvme68k/dev/vs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vs.c,v 1.6 2001/11/06 00:30:38 art Exp $ */ +/* $OpenBSD: vs.c,v 1.7 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. @@ -66,16 +66,16 @@ #include <mvme68k/dev/vsvar.h> #endif -int vs_checkintr __P((struct vs_softc *, struct scsi_xfer *, int *)); -int vs_chksense __P((struct scsi_xfer *)); -void vs_reset __P((struct vs_softc *)); -void vs_resync __P((struct vs_softc *)); -void vs_initialize __P((struct vs_softc *)); -int vs_intr __P((struct vs_softc *)); -int vs_poll __P((struct vs_softc *, struct scsi_xfer *)); -void vs_scsidone __P((struct scsi_xfer *, int)); -M328_CQE * vs_getcqe __P((struct vs_softc *)); -M328_IOPB * vs_getiopb __P((struct vs_softc *)); +int vs_checkintr(struct vs_softc *, struct scsi_xfer *, int *); +int vs_chksense(struct scsi_xfer *); +void vs_reset(struct vs_softc *); +void vs_resync(struct vs_softc *); +void vs_initialize(struct vs_softc *); +int vs_intr(struct vs_softc *); +int vs_poll(struct vs_softc *, struct scsi_xfer *); +void vs_scsidone(struct scsi_xfer *, int); +M328_CQE * vs_getcqe(struct vs_softc *); +M328_IOPB * vs_getiopb(struct vs_softc *); extern u_int kvtop(); /* diff --git a/sys/arch/mvme68k/dev/vsdma.c b/sys/arch/mvme68k/dev/vsdma.c index 5c0979d859d..68ca1a7279b 100644 --- a/sys/arch/mvme68k/dev/vsdma.c +++ b/sys/arch/mvme68k/dev/vsdma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vsdma.c,v 1.3 2001/06/26 21:35:39 miod Exp $ */ +/* $OpenBSD: vsdma.c,v 1.4 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * All rights reserved. @@ -57,13 +57,13 @@ #include <mvme68k/dev/vme.h> #endif -int vsmatch __P((struct device *, void *, void *)); -void vsattach __P((struct device *, struct device *, void *)); -int vsprint __P((void *auxp, char *)); -void vs_initialize __P((struct vs_softc *)); -int vs_intr __P((struct vs_softc *)); -int vs_nintr __P((struct vs_softc *)); -int vs_eintr __P((struct vs_softc *)); +int vsmatch(struct device *, void *, void *); +void vsattach(struct device *, struct device *, void *); +int vsprint(void *auxp, char *); +void vs_initialize(struct vs_softc *); +int vs_intr(struct vs_softc *); +int vs_nintr(struct vs_softc *); +int vs_eintr(struct vs_softc *); struct scsi_adapter vs_scsiswitch = { vs_scsicmd, diff --git a/sys/arch/mvme68k/dev/vsreg.h b/sys/arch/mvme68k/dev/vsreg.h index 299e0203949..1852fe03e18 100644 --- a/sys/arch/mvme68k/dev/vsreg.h +++ b/sys/arch/mvme68k/dev/vsreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vsreg.h,v 1.2 2000/06/10 19:53:23 deraadt Exp $ */ +/* $OpenBSD: vsreg.h,v 1.3 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * Copyright (c) 1990 The Regents of the University of California. @@ -743,14 +743,14 @@ typedef struct ipsg * Scatter/gather functions */ -M328_SG vs_alloc_scatter_gather __P((void)); -void vs_dealloc_scatter_gather __P((M328_SG sg)); -void vs_link_scatter_gather_element __P((sg_list_element_t *element, +M328_SG vs_alloc_scatter_gather(void); +void vs_dealloc_scatter_gather(M328_SG sg); +void vs_link_scatter_gather_element(sg_list_element_t *element, register vm_offset_t phys_add, - register int len)); -void vs_link_scatter_gather_list __P((sg_list_element_t *list, + register int len); +void vs_link_scatter_gather_list(sg_list_element_t *list, register vm_offset_t phys_add, - register int elements)); -M328_SG vs_build_memory_structure __P((struct scsi_xfer *xs, M328_IOPB *iopb)); + register int elements); +M328_SG vs_build_memory_structure(struct scsi_xfer *xs, M328_IOPB *iopb); #endif /* _M328REG_H_ */ diff --git a/sys/arch/mvme68k/dev/vsvar.h b/sys/arch/mvme68k/dev/vsvar.h index b72a86cf4e9..0863e66302e 100644 --- a/sys/arch/mvme68k/dev/vsvar.h +++ b/sys/arch/mvme68k/dev/vsvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vsvar.h,v 1.1 2000/01/25 04:18:18 smurph Exp $ */ +/* $OpenBSD: vsvar.h,v 1.2 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * Copyright (c) 1990 The Regents of the University of California. @@ -126,7 +126,7 @@ struct vs_softc { #define WQO_RFWQ 0x0020 /* report frozen work queue bit */ #define WQO_INIT 0x8000 /* work queue init bit */ -void vs_minphys __P((struct buf *bp)); -int vs_scsicmd __P((struct scsi_xfer *)); +void vs_minphys(struct buf *bp); +int vs_scsicmd(struct scsi_xfer *); #endif /* _M328VAR_H */ diff --git a/sys/arch/mvme68k/dev/wdsc.c b/sys/arch/mvme68k/dev/wdsc.c index ed207c95e40..407e761620c 100644 --- a/sys/arch/mvme68k/dev/wdsc.c +++ b/sys/arch/mvme68k/dev/wdsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdsc.c,v 1.5 1997/01/28 10:54:10 deraadt Exp $ */ +/* $OpenBSD: wdsc.c,v 1.6 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1996 Steve Woodford @@ -48,15 +48,15 @@ #include <machine/autoconf.h> #include <mvme68k/dev/pccreg.h> -void wdscattach __P((struct device *, struct device *, void *)); -int wdscmatch __P((struct device *, struct cfdata *, void *)); +void wdscattach(struct device *, struct device *, void *); +int wdscmatch(struct device *, struct cfdata *, void *); -void wdsc_enintr __P((struct sbic_softc *)); -int wdsc_dmago __P((struct sbic_softc *, char *, int, int)); -int wdsc_dmanext __P((struct sbic_softc *)); -void wdsc_dmastop __P((struct sbic_softc *)); -int wdsc_dmaintr __P((struct sbic_softc *)); -int wdsc_scsiintr __P((struct sbic_softc *)); +void wdsc_enintr(struct sbic_softc *); +int wdsc_dmago(struct sbic_softc *, char *, int, int); +int wdsc_dmanext(struct sbic_softc *); +void wdsc_dmastop(struct sbic_softc *); +int wdsc_dmaintr(struct sbic_softc *); +int wdsc_scsiintr(struct sbic_softc *); struct scsi_adapter wdsc_scsiswitch = { sbic_scsicmd, diff --git a/sys/arch/mvme68k/dev/wl.c b/sys/arch/mvme68k/dev/wl.c index dbfd421bf43..8a5638cea2d 100644 --- a/sys/arch/mvme68k/dev/wl.c +++ b/sys/arch/mvme68k/dev/wl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wl.c,v 1.6 2002/02/15 20:45:30 nordin Exp $ */ +/* $OpenBSD: wl.c,v 1.7 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Dale Rahn. All rights reserved. @@ -165,38 +165,38 @@ struct { }; /* prototypes */ -u_char cl_clkdiv __P((int speed)); -u_char cl_clknum __P((int speed)); -u_char cl_clkrxtimeout __P((int speed)); -void clstart __P((struct tty *tp)); -void cl_unblock __P((struct tty *tp)); -int clccparam __P((struct wlsoftc *sc, struct termios *par, int channel)); - -int clparam __P((struct tty *tp, struct termios *t)); -int cl_intr __P((struct wlsoftc *sc, int)); -int cl_mintr __P((struct wlsoftc *sc)); -int cl_txintr __P((struct wlsoftc *sc)); -int cl_rxintr __P((struct wlsoftc *sc)); -void cl_overflow __P((struct wlsoftc *sc, int channel, long *ptime, u_char *msg)); -void cl_parity __P((struct wlsoftc *sc, int channel)); -void cl_frame __P((struct wlsoftc *sc, int channel)); -void cl_break __P(( struct wlsoftc *sc, int channel)); -int clmctl __P((dev_t dev, int bits, int how)); -void cl_dumpport __P((int channel)); - -int wlprobe __P((struct device *parent, void *self, void *aux)); -void wlattach __P((struct device *parent, struct device *self, void *aux)); - -int wlopen __P((dev_t dev, int flag, int mode, struct proc *p)); -int wlclose __P((dev_t dev, int flag, int mode, struct proc *p)); -int wlread __P((dev_t dev, struct uio *uio, int flag)); -int wlwrite __P((dev_t dev, struct uio *uio, int flag)); -int wlioctl __P((dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)); -int wlstop __P((struct tty *tp, int flag)); - -static void cl_initchannel __P((struct wlsoftc *sc, int channel)); -static void clputc __P((struct wlsoftc *sc, int unit, u_char c)); -static u_char clgetc __P((struct wlsoftc *sc, int *channel)); +u_char cl_clkdiv(int speed); +u_char cl_clknum(int speed); +u_char cl_clkrxtimeout(int speed); +void clstart(struct tty *tp); +void cl_unblock(struct tty *tp); +int clccparam(struct wlsoftc *sc, struct termios *par, int channel); + +int clparam(struct tty *tp, struct termios *t); +int cl_intr(struct wlsoftc *sc, int); +int cl_mintr(struct wlsoftc *sc); +int cl_txintr(struct wlsoftc *sc); +int cl_rxintr(struct wlsoftc *sc); +void cl_overflow(struct wlsoftc *sc, int channel, long *ptime, u_char *msg); +void cl_parity(struct wlsoftc *sc, int channel); +void cl_frame(struct wlsoftc *sc, int channel); +void cl_break( struct wlsoftc *sc, int channel); +int clmctl(dev_t dev, int bits, int how); +void cl_dumpport(int channel); + +int wlprobe(struct device *parent, void *self, void *aux); +void wlattach(struct device *parent, struct device *self, void *aux); + +int wlopen(dev_t dev, int flag, int mode, struct proc *p); +int wlclose(dev_t dev, int flag, int mode, struct proc *p); +int wlread(dev_t dev, struct uio *uio, int flag); +int wlwrite(dev_t dev, struct uio *uio, int flag); +int wlioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p); +int wlstop(struct tty *tp, int flag); + +static void cl_initchannel(struct wlsoftc *sc, int channel); +static void clputc(struct wlsoftc *sc, int unit, u_char c); +static u_char clgetc(struct wlsoftc *sc, int *channel); static void cloutput __P( (struct tty *tp)); struct cfattach wl_ca = { diff --git a/sys/arch/mvme68k/dev/zs.c b/sys/arch/mvme68k/dev/zs.c index 9dcb9a31e77..1d2dc73a241 100644 --- a/sys/arch/mvme68k/dev/zs.c +++ b/sys/arch/mvme68k/dev/zs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zs.c,v 1.9 2000/03/26 23:31:59 deraadt Exp $ */ +/* $OpenBSD: zs.c,v 1.10 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 2000 Steve Murphree, Jr. @@ -130,16 +130,16 @@ int zs_cons_unit = 0; int zs_is_console = 0; struct sccregs *zs_cons_scc; -int zsopen __P((dev_t, int, int, struct proc *)); -void zsstart __P((struct tty *)); -int zsparam __P((struct tty *, struct termios *)); -int zsirq __P((int unit)); -int zsregs __P((void *va, int unit, volatile u_char **crp, - volatile u_char **drp)); -int zspclk __P((void)); +int zsopen(dev_t, int, int, struct proc *); +void zsstart(struct tty *); +int zsparam(struct tty *, struct termios *); +int zsirq(int unit); +int zsregs(void *va, int unit, volatile u_char **crp, + volatile u_char **drp); +int zspclk(void); u_long sir_zs; -void zs_softint __P((void)); +void zs_softint(void); #define zsunit(dev) (minor(dev) >> 1) #define zsside(dev) (minor(dev) & 1) @@ -147,8 +147,8 @@ void zs_softint __P((void)); /* * Autoconfiguration stuff. */ -void zsattach __P((struct device *, struct device *, void *)); -int zsmatch __P((struct device *, void *, void *)); +void zsattach(struct device *, struct device *, void *); +int zsmatch(struct device *, void *, void *); struct cfattach zs_ca = { sizeof(struct zssoftc), zsmatch, zsattach diff --git a/sys/arch/mvme68k/include/autoconf.h b/sys/arch/mvme68k/include/autoconf.h index 1249e5122b1..55ce4ad0615 100644 --- a/sys/arch/mvme68k/include/autoconf.h +++ b/sys/arch/mvme68k/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.6 1997/03/31 00:23:58 downsj Exp $ */ +/* $OpenBSD: autoconf.h,v 1.7 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -66,7 +66,7 @@ struct device *bootdv; /* boot device */ /* PARTITIONSHIFT from disklabel.h */ #define PARTITIONMASK ((1 << PARTITIONSHIFT) - 1) -void *mapiodev __P((void *pa, int size)); -void unmapiodev __P((void *kva, int size)); +void *mapiodev(void *pa, int size); +void unmapiodev(void *kva, int size); #endif diff --git a/sys/arch/mvme68k/include/cpu.h b/sys/arch/mvme68k/include/cpu.h index ff6d0b519ce..6c0c985301a 100644 --- a/sys/arch/mvme68k/include/cpu.h +++ b/sys/arch/mvme68k/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.7 2000/01/06 03:21:43 smurph Exp $ */ +/* $OpenBSD: cpu.h,v 1.8 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -271,7 +271,7 @@ struct intrhand { struct haltvec { struct haltvec *hv_next; - void (*hv_fn) __P((void)); + void (*hv_fn)(void); int hv_pri; }; #endif diff --git a/sys/arch/mvme68k/include/hpux_machdep.h b/sys/arch/mvme68k/include/hpux_machdep.h index e9133eb543f..6ca49ae126d 100644 --- a/sys/arch/mvme68k/include/hpux_machdep.h +++ b/sys/arch/mvme68k/include/hpux_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: hpux_machdep.h,v 1.1 1997/03/31 00:24:02 downsj Exp $ */ +/* $OpenBSD: hpux_machdep.h,v 1.2 2002/03/14 01:26:37 millert Exp $ */ /* $NetBSD: hpux_machdep.h,v 1.6 1997/03/16 10:02:40 thorpej Exp $ */ /*- @@ -66,15 +66,15 @@ struct hpuxsigcontext { int _hsc_ap; /* pointer to hpuxsigstate */ }; -int hpux_cpu_makecmds __P((struct proc *, struct exec_package *)); -int hpux_cpu_vmcmd __P((struct proc *, struct exec_vmcmd *)); -void hpux_cpu_bsd_to_hpux_stat __P((struct stat *, struct hpux_stat *)); -void hpux_cpu_uname __P((struct hpux_utsname *)); -int hpux_cpu_sysconf_arch __P((void)); -int hpux_to_bsd_uoff __P((int *, int *, struct proc *)); +int hpux_cpu_makecmds(struct proc *, struct exec_package *); +int hpux_cpu_vmcmd(struct proc *, struct exec_vmcmd *); +void hpux_cpu_bsd_to_hpux_stat(struct stat *, struct hpux_stat *); +void hpux_cpu_uname(struct hpux_utsname *); +int hpux_cpu_sysconf_arch(void); +int hpux_to_bsd_uoff(int *, int *, struct proc *); -void hpux_sendsig __P((sig_t, int, int, u_long, int, union sigval)); -void hpux_setregs __P((struct proc *, struct exec_package *, - u_long, register_t *)); +void hpux_sendsig(sig_t, int, int, u_long, int, union sigval); +void hpux_setregs(struct proc *, struct exec_package *, + u_long, register_t *); #endif /* ! _MVME68K_HPUX_MACHDEP_H_ */ diff --git a/sys/arch/mvme68k/include/intr.h b/sys/arch/mvme68k/include/intr.h index 2045e781344..cd0c173bb3d 100644 --- a/sys/arch/mvme68k/include/intr.h +++ b/sys/arch/mvme68k/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.4 2001/11/23 00:47:46 miod Exp $ */ +/* $OpenBSD: intr.h,v 1.5 2002/03/14 01:26:37 millert Exp $ */ /* * Copyright (C) 2000 Steve Murphree, Jr. * All rights reserved. @@ -78,6 +78,6 @@ u_long allocate_sir __P((void (*proc)(), void *arg)); #define splx(s) (s & PSL_IPL ? _spl(s) : spl0()) /* locore.s */ -int spl0 __P((void)); +int spl0(void); #endif /* _KERNEL */ #endif /* _MVME68K_INTR_H_ */ diff --git a/sys/arch/mvme68k/include/pmap.h b/sys/arch/mvme68k/include/pmap.h index 9e32d5ed681..5ce273cca92 100644 --- a/sys/arch/mvme68k/include/pmap.h +++ b/sys/arch/mvme68k/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.11 2002/02/22 22:45:34 miod Exp $ */ +/* $OpenBSD: pmap.h,v 1.12 2002/03/14 01:26:37 millert Exp $ */ #ifndef _MACHINE_PMAP_H_ #define _MACHINE_PMAP_H_ @@ -6,7 +6,7 @@ #include <m68k/pmap_motorola.h> #ifdef _KERNEL -void pmap_init_md __P((void)); +void pmap_init_md(void); #define PMAP_INIT_MD() pmap_init_md() #endif diff --git a/sys/arch/mvme68k/mvme68k/autoconf.c b/sys/arch/mvme68k/mvme68k/autoconf.c index 1c9b954cf1c..917b53ace88 100644 --- a/sys/arch/mvme68k/mvme68k/autoconf.c +++ b/sys/arch/mvme68k/mvme68k/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.16 2002/01/16 23:19:31 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.17 2002/03/14 01:26:38 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -96,8 +96,8 @@ #include <machine/cpu.h> #include <machine/pte.h> -struct device *parsedisk __P((char *, int, int, dev_t *)); -void setroot __P((void)); +struct device *parsedisk(char *, int, int, dev_t *); +void setroot(void); /* * XXX some storage space must be allocated statically because of @@ -108,8 +108,8 @@ char extiospace[EXTENT_FIXED_STORAGE_SIZE(EIOMAPSIZE / 16)]; struct extent *extio; extern void *extiobase; -void mainbus_attach __P((struct device *, struct device *, void *)); -int mainbus_match __P((struct device *, void *, void *)); +void mainbus_attach(struct device *, struct device *, void *); +int mainbus_match(struct device *, void *, void *); struct cfattach mainbus_ca = { sizeof(struct device), mainbus_match, mainbus_attach diff --git a/sys/arch/mvme68k/mvme68k/disksubr.c b/sys/arch/mvme68k/mvme68k/disksubr.c index 23100c3b853..68ba803851b 100644 --- a/sys/arch/mvme68k/mvme68k/disksubr.c +++ b/sys/arch/mvme68k/mvme68k/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.23 2001/08/06 20:45:07 miod Exp $ */ +/* $OpenBSD: disksubr.c,v 1.24 2002/03/14 01:26:38 millert Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1995 Dale Rahn. @@ -48,14 +48,14 @@ int disksubr_debug = 0; #endif -static void bsdtocpulabel __P((struct disklabel *lp, - struct cpu_disklabel *clp)); -static void cputobsdlabel __P((struct disklabel *lp, - struct cpu_disklabel *clp)); +static void bsdtocpulabel(struct disklabel *lp, + struct cpu_disklabel *clp); +static void cputobsdlabel(struct disklabel *lp, + struct cpu_disklabel *clp); #ifdef DEBUG -static void printlp __P((struct disklabel *lp, char *str)); -static void printclp __P((struct cpu_disklabel *clp, char *str)); +static void printlp(struct disklabel *lp, char *str); +static void printclp(struct cpu_disklabel *clp, char *str); #endif void @@ -113,7 +113,7 @@ dk_establish(dk, dev) 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; diff --git a/sys/arch/mvme68k/mvme68k/machdep.c b/sys/arch/mvme68k/mvme68k/machdep.c index 75812cb0b4b..f1204e95efa 100644 --- a/sys/arch/mvme68k/mvme68k/machdep.c +++ b/sys/arch/mvme68k/mvme68k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.64 2002/01/23 17:51:52 art Exp $ */ +/* $OpenBSD: machdep.c,v 1.65 2002/03/14 01:26:38 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -162,11 +162,11 @@ extern struct emul emul_sunos; * XXX this is to fake out the console routines, while * booting. New and improved! :-) smurph */ -void bootcnprobe __P((struct consdev *)); -void bootcninit __P((struct consdev *)); -void bootcnputc __P((dev_t, int)); -int bootcngetc __P((dev_t)); -extern void nullcnpollc __P((dev_t, int)); +void bootcnprobe(struct consdev *); +void bootcninit(struct consdev *); +void bootcnputc(dev_t, int); +int bootcngetc(dev_t); +extern void nullcnpollc(dev_t, int); #define bootcnpollc nullcnpollc @@ -622,7 +622,7 @@ static struct haltvec *halts; /* XXX insert by priority */ void halt_establish(fn, pri) - void (*fn) __P((void)); + void (*fn)(void); int pri; { struct haltvec *hv, *h; @@ -787,7 +787,7 @@ dumpsys() int psize; daddr_t blkno; /* current block to write */ /* dump routine */ - int (*dump) __P((dev_t, daddr_t, caddr_t, size_t)); + int (*dump)(dev_t, daddr_t, caddr_t, size_t); int pg; /* page being dumped */ paddr_t maddr; /* PA being dumped */ int error; /* error code from (*dump)() */ @@ -904,7 +904,7 @@ int m68060_pcr_init = 0x21; /* make this patchable */ void initvectors() { - typedef void trapfun __P((void)); + typedef void trapfun(void); /* XXX should init '40 vecs here, too */ #if defined(M68060) || defined(M68040) @@ -1075,8 +1075,7 @@ cpu_exec_aout_makecmds(p, epp) #ifdef COMPAT_SUNOS { - extern sunos_exec_aout_makecmds - __P((struct proc *, struct exec_package *)); + extern sunos_exec_aout_makecmds(struct proc *, struct exec_package *); if ((error = sunos_exec_aout_makecmds(p, epp)) == 0) return (0); } diff --git a/sys/arch/mvme68k/mvme68k/swapgeneric.c b/sys/arch/mvme68k/mvme68k/swapgeneric.c index 0e73cc89e30..4eb8ef59711 100644 --- a/sys/arch/mvme68k/mvme68k/swapgeneric.c +++ b/sys/arch/mvme68k/mvme68k/swapgeneric.c @@ -1,4 +1,4 @@ -/* $OpenBSD: swapgeneric.c,v 1.6 2001/09/29 18:40:32 miod Exp $ */ +/* $OpenBSD: swapgeneric.c,v 1.7 2002/03/14 01:26:38 millert Exp $ */ /*- * Copyright (c) 1994 @@ -42,7 +42,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/mvme68k/mvme68k/trap.c b/sys/arch/mvme68k/mvme68k/trap.c index 8914bc10e54..8cc271cbe58 100644 --- a/sys/arch/mvme68k/mvme68k/trap.c +++ b/sys/arch/mvme68k/mvme68k/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.41 2001/12/08 02:24:06 art Exp $ */ +/* $OpenBSD: trap.c,v 1.42 2002/03/14 01:26:38 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -166,7 +166,7 @@ void (*sir_routines[NSIR])(); void *sir_args[NSIR]; u_char next_sir; -int writeback __P((struct frame *fp, int docachepush)); +int writeback(struct frame *fp, int docachepush); /* * trap and syscall both need the following work done before returning diff --git a/sys/arch/mvme68k/stand/bootst/dev_tape.h b/sys/arch/mvme68k/stand/bootst/dev_tape.h index 409e56ccae8..9404db80701 100644 --- a/sys/arch/mvme68k/stand/bootst/dev_tape.h +++ b/sys/arch/mvme68k/stand/bootst/dev_tape.h @@ -1,8 +1,8 @@ -/* $OpenBSD: dev_tape.h,v 1.2 2001/07/04 08:06:54 niklas Exp $ */ +/* $OpenBSD: dev_tape.h,v 1.3 2002/03/14 01:26:38 millert Exp $ */ -int tape_open __P((struct open_file *, ...)); -int tape_close __P((struct open_file *)); -int tape_strategy __P((void *, int, daddr_t, size_t, void *, size_t *)); +int tape_open(struct open_file *, ...); +int tape_close(struct open_file *); +int tape_strategy(void *, int, daddr_t, size_t, void *, size_t *); int tape_ioctl(); diff --git a/sys/arch/mvme68k/stand/bootst/rawfs.c b/sys/arch/mvme68k/stand/bootst/rawfs.c index 91d572fa04b..a7033027829 100644 --- a/sys/arch/mvme68k/stand/bootst/rawfs.c +++ b/sys/arch/mvme68k/stand/bootst/rawfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rawfs.c,v 1.2 2001/07/04 08:06:54 niklas Exp $ */ +/* $OpenBSD: rawfs.c,v 1.3 2002/03/14 01:26:38 millert Exp $ */ /* $NetBSD: rawfs.c,v 1.1 1995/10/17 22:58:27 gwr Exp $ */ /* @@ -58,7 +58,7 @@ struct file { }; static int -rawfs_get_block __P((struct open_file *)); +rawfs_get_block(struct open_file *); int rawfs_open(path, f) char *path; diff --git a/sys/arch/mvme68k/stand/bootst/rawfs.h b/sys/arch/mvme68k/stand/bootst/rawfs.h index bca3a3fb0d2..daac3710be3 100644 --- a/sys/arch/mvme68k/stand/bootst/rawfs.h +++ b/sys/arch/mvme68k/stand/bootst/rawfs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rawfs.h,v 1.2 2001/07/04 08:06:54 niklas Exp $ */ +/* $OpenBSD: rawfs.h,v 1.3 2002/03/14 01:26:38 millert Exp $ */ /* $NetBSD: rawfs.h,v 1.1 1995/10/17 22:58:29 gwr Exp $ */ /* @@ -6,11 +6,11 @@ * No random access, only sequential read allowed. */ -int rawfs_open __P((char *path, struct open_file *f)); -int rawfs_close __P((struct open_file *f)); -int rawfs_read __P((struct open_file *f, void *buf, - u_int size, u_int *resid)); -int rawfs_write __P((struct open_file *f, void *buf, - u_int size, u_int *resid)); -off_t rawfs_seek __P((struct open_file *f, off_t offset, int where)); -int rawfs_stat __P((struct open_file *f, struct stat *sb)); +int rawfs_open(char *path, struct open_file *f); +int rawfs_close(struct open_file *f); +int rawfs_read(struct open_file *f, void *buf, + u_int size, u_int *resid); +int rawfs_write(struct open_file *f, void *buf, + u_int size, u_int *resid); +off_t rawfs_seek(struct open_file *f, off_t offset, int where); +int rawfs_stat(struct open_file *f, struct stat *sb); diff --git a/sys/arch/mvme68k/stand/installboot/installboot.c b/sys/arch/mvme68k/stand/installboot/installboot.c index 27234a21ed3..c6850974557 100644 --- a/sys/arch/mvme68k/stand/installboot/installboot.c +++ b/sys/arch/mvme68k/stand/installboot/installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.c,v 1.5 2001/07/04 08:06:55 niklas Exp $ */ +/* $OpenBSD: installboot.c,v 1.6 2002/03/14 01:26:38 millert Exp $ */ /* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */ /* @@ -69,12 +69,12 @@ daddr_t *block_table; /* block number array in prototype image */ int maxblocknum; /* size of this array */ -char *loadprotoblocks __P((char *, long *)); -int loadblocknums __P((char *, int)); -static void devread __P((int, void *, daddr_t, size_t, char *)); -static void usage __P((void)); -int main __P((int, char *[])); -static void vid_to_disklabel __P((char *, char*)); +char *loadprotoblocks(char *, long *); +int loadblocknums(char *, int); +static void devread(int, void *, daddr_t, size_t, char *); +static void usage(void); +int main(int, char *[]); +static void vid_to_disklabel(char *, char*); static void diff --git a/sys/arch/mvme68k/stand/libbug/libbug.h b/sys/arch/mvme68k/stand/libbug/libbug.h index e57de84104e..f0a65a6a1ec 100644 --- a/sys/arch/mvme68k/stand/libbug/libbug.h +++ b/sys/arch/mvme68k/stand/libbug/libbug.h @@ -1,18 +1,18 @@ -/* $OpenBSD: libbug.h,v 1.1 1996/05/16 02:25:39 chuck Exp $ */ +/* $OpenBSD: libbug.h,v 1.2 2002/03/14 01:26:38 millert Exp $ */ /* * prototypes and such. note that get/put char are in stand.h */ -void mvmeprom_delay __P((int)); -int mvmeprom_diskrd __P((struct mvmeprom_dskio *)); -int mvmeprom_diskwr __P((struct mvmeprom_dskio *)); -struct mvmeprom_brdid *mvmeprom_getbrdid __P((void)); -int peekchar __P((void)); -void mvmeprom_outln __P((char *, char *)); -void mvmeprom_outstr __P((char *, char *)); -void mvmeprom_rtc_rd __P((struct mvmeprom_time *)); +void mvmeprom_delay(int); +int mvmeprom_diskrd(struct mvmeprom_dskio *); +int mvmeprom_diskwr(struct mvmeprom_dskio *); +struct mvmeprom_brdid *mvmeprom_getbrdid(void); +int peekchar(void); +void mvmeprom_outln(char *, char *); +void mvmeprom_outstr(char *, char *); +void mvmeprom_rtc_rd(struct mvmeprom_time *); /* * bugcrt stuff diff --git a/sys/arch/mvme68k/stand/libsa/bugdev.c b/sys/arch/mvme68k/stand/libsa/bugdev.c index 3fe8cf36f51..0c0b9ec13db 100644 --- a/sys/arch/mvme68k/stand/libsa/bugdev.c +++ b/sys/arch/mvme68k/stand/libsa/bugdev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bugdev.c,v 1.1 1996/05/16 02:30:36 chuck Exp $ */ +/* $OpenBSD: bugdev.c,v 1.2 2002/03/14 01:26:38 millert Exp $ */ /* * Copyright (c) 1993 Paul Kranenburg @@ -37,7 +37,7 @@ #include "stand.h" #include "libsa.h" -void cputobsdlabel __P((struct disklabel *lp, struct cpu_disklabel *clp)); +void cputobsdlabel(struct disklabel *lp, struct cpu_disklabel *clp); int errno; diff --git a/sys/arch/mvme68k/stand/libsa/libsa.h b/sys/arch/mvme68k/stand/libsa/libsa.h index fa95d205194..da15e3a0ac5 100644 --- a/sys/arch/mvme68k/stand/libsa/libsa.h +++ b/sys/arch/mvme68k/stand/libsa/libsa.h @@ -1,4 +1,4 @@ -/* $OpenBSD: libsa.h,v 1.4 2001/07/04 08:06:56 niklas Exp $ */ +/* $OpenBSD: libsa.h,v 1.5 2002/03/14 01:26:38 millert Exp $ */ /* * libsa prototypes @@ -7,14 +7,14 @@ #include "libbug.h" /* bugdev.c */ -int bugscopen __P((struct open_file *, ...)); -int bugscclose __P((struct open_file *)); -int bugscioctl __P((struct open_file *, u_long, void *)); -int bugscstrategy __P((void *, int, daddr_t, size_t, void *, size_t *)); +int bugscopen(struct open_file *, ...); +int bugscclose(struct open_file *); +int bugscioctl(struct open_file *, u_long, void *); +int bugscstrategy(void *, int, daddr_t, size_t, void *, size_t *); /* exec_mvme.c */ -void exec_mvme __P((char *, int)); +void exec_mvme(char *, int); /* parse_args.c */ -int parse_args __P((char **, int *)); +int parse_args(char **, int *); diff --git a/sys/arch/mvme68k/stand/netboot/dev_net.h b/sys/arch/mvme68k/stand/netboot/dev_net.h index b6d35c84269..0607427320c 100644 --- a/sys/arch/mvme68k/stand/netboot/dev_net.h +++ b/sys/arch/mvme68k/stand/netboot/dev_net.h @@ -1,7 +1,7 @@ -/* $OpenBSD: dev_net.h,v 1.2 1996/04/28 10:49:20 deraadt Exp $ */ +/* $OpenBSD: dev_net.h,v 1.3 2002/03/14 01:26:38 millert Exp $ */ -int net_open __P((struct open_file *, ...)); -int net_close __P((struct open_file *)); +int net_open(struct open_file *, ...); +int net_close(struct open_file *); int net_ioctl(); int net_strategy(); diff --git a/sys/arch/mvme68k/stand/netboot/if_ie.c b/sys/arch/mvme68k/stand/netboot/if_ie.c index b85a8f5447b..48c45acb861 100644 --- a/sys/arch/mvme68k/stand/netboot/if_ie.c +++ b/sys/arch/mvme68k/stand/netboot/if_ie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ie.c,v 1.8 2000/01/24 05:20:56 smurph Exp $ */ +/* $OpenBSD: if_ie.c,v 1.9 2002/03/14 01:26:38 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -56,16 +56,16 @@ int ie_debug = 0; -void ie_stop __P((struct netif *)); -void ie_end __P((struct netif *)); -void ie_error __P((struct netif *, char *, volatile struct iereg *)); -int ie_get __P((struct iodesc *, void *, size_t, time_t)); -void ie_init __P((struct iodesc *, void *)); -int ie_match __P((struct netif *, void *)); -int ie_poll __P((struct iodesc *, void *, int)); -int ie_probe __P((struct netif *, void *)); -int ie_put __P((struct iodesc *, void *, size_t)); -void ie_reset __P((struct netif *, u_char *)); +void ie_stop(struct netif *); +void ie_end(struct netif *); +void ie_error(struct netif *, char *, volatile struct iereg *); +int ie_get(struct iodesc *, void *, size_t, time_t); +void ie_init(struct iodesc *, void *); +int ie_match(struct netif *, void *); +int ie_poll(struct iodesc *, void *, int); +int ie_probe(struct netif *, void *); +int ie_put(struct iodesc *, void *, size_t); +void ie_reset(struct netif *, u_char *); struct netif_stats ie_stats; diff --git a/sys/arch/mvme68k/stand/netboot/if_le.c b/sys/arch/mvme68k/stand/netboot/if_le.c index 3ca8000c03f..8de7ac26810 100644 --- a/sys/arch/mvme68k/stand/netboot/if_le.c +++ b/sys/arch/mvme68k/stand/netboot/if_le.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le.c,v 1.7 1999/01/11 05:11:41 millert Exp $ */ +/* $OpenBSD: if_le.c,v 1.8 2002/03/14 01:26:38 millert Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -77,15 +77,15 @@ int le_debug = 0; -void le_end __P((struct netif *)); -void le_error __P((struct netif *, char *, volatile struct lereg1 *)); -int le_get __P((struct iodesc *, void *, size_t, time_t)); -void le_init __P((struct iodesc *, void *)); -int le_match __P((struct netif *, void *)); -int le_poll __P((struct iodesc *, void *, int)); -int le_probe __P((struct netif *, void *)); -int le_put __P((struct iodesc *, void *, size_t)); -void le_reset __P((struct netif *, u_char *)); +void le_end(struct netif *); +void le_error(struct netif *, char *, volatile struct lereg1 *); +int le_get(struct iodesc *, void *, size_t, time_t); +void le_init(struct iodesc *, void *); +int le_match(struct netif *, void *); +int le_poll(struct iodesc *, void *, int); +int le_probe(struct netif *, void *); +int le_put(struct iodesc *, void *, size_t); +void le_reset(struct netif *, u_char *); struct netif_stats le_stats; diff --git a/sys/arch/mvme68k/stand/sboot/sboot.h b/sys/arch/mvme68k/stand/sboot/sboot.h index 31461fcc762..aed437d3897 100644 --- a/sys/arch/mvme68k/stand/sboot/sboot.h +++ b/sys/arch/mvme68k/stand/sboot/sboot.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sboot.h,v 1.6 1997/10/07 22:50:05 deraadt Exp $ */ +/* $OpenBSD: sboot.h,v 1.7 2002/03/14 01:26:38 millert Exp $ */ /* * Copyright (c) 1995 Charles D. Cranor and Seth Widoff @@ -38,37 +38,37 @@ extern caddr_t end; /* console */ -void puts __P((char *)); -char *ngets __P((char *, int)); +void puts(char *); +char *ngets(char *, int); /* sboot */ -void callrom __P((void)); -void do_cmd __P((char *, char*)); +void callrom(void); +void do_cmd(char *, char*); /* le */ #define LANCE_ADDR 0xfffe0778 #define ERAM_ADDR 0xfffe0774 #define LANCE_REG_ADDR 0xfffe1800 -void le_end __P((void)); -void le_init __P((void)); -int le_get __P((u_char *, size_t, u_long)); -int le_put __P((u_char *, size_t)); +void le_end(void); +void le_init(void); +int le_get(u_char *, size_t, u_long); +int le_put(u_char *, size_t); /* etherfun */ #define READ 0 #define ACKN 1 -void do_rev_arp __P((void)); -int get_rev_arp __P((void)); -int rev_arp __P((void)); -void do_send_tftp __P((int)); -int do_get_file __P((void)); -void tftp_file __P((char *, u_long)); +void do_rev_arp(void); +int get_rev_arp(void); +int rev_arp(void); +void do_send_tftp(int); +int do_get_file(void); +void tftp_file(char *, u_long); /* clock */ -u_long ttime __P((void)); +u_long ttime(void); /* checksum */ -u_long oc_cksum __P((void *, u_long, u_long)); +u_long oc_cksum(void *, u_long, u_long); #define CONS_ZS_ADDR (0xfffe3002) #define CLOCK_ADDR (0xfffe07f8) |