src - OpenBSD base system

diff options


context:
space:
mode:

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/dev
parent	7b2c79b5895287d37f0c4e3adfc396eb7a6c03fb (diff)

First round of __P removal in sys

Diffstat (limited to 'sys/arch/mvme68k/dev')

-rw-r--r--

sys/arch/mvme68k/dev/bugtty.c

-rw-r--r--

sys/arch/mvme68k/dev/cl.c

-rw-r--r--

sys/arch/mvme68k/dev/clock.c

-rw-r--r--

sys/arch/mvme68k/dev/flash.c

-rw-r--r--

sys/arch/mvme68k/dev/fooip.c

-rw-r--r--

sys/arch/mvme68k/dev/if_ie.c

-rw-r--r--

sys/arch/mvme68k/dev/if_le.c

-rw-r--r--

sys/arch/mvme68k/dev/ipic.c

-rw-r--r--

sys/arch/mvme68k/dev/lp.c

-rw-r--r--

sys/arch/mvme68k/dev/mc.c

-rw-r--r--

sys/arch/mvme68k/dev/mcreg.h

-rw-r--r--

sys/arch/mvme68k/dev/memc.c

-rw-r--r--

sys/arch/mvme68k/dev/nvram.c

-rw-r--r--

sys/arch/mvme68k/dev/pcc.c

-rw-r--r--

sys/arch/mvme68k/dev/pccreg.h

-rw-r--r--

sys/arch/mvme68k/dev/pcctwo.c

-rw-r--r--

sys/arch/mvme68k/dev/sbic.c

-rw-r--r--

sys/arch/mvme68k/dev/sbicdma.c

-rw-r--r--

sys/arch/mvme68k/dev/sbicvar.h

-rw-r--r--

sys/arch/mvme68k/dev/sram.c

-rw-r--r--

sys/arch/mvme68k/dev/ssh.c

-rw-r--r--

sys/arch/mvme68k/dev/sshdma.c

-rw-r--r--

sys/arch/mvme68k/dev/sshvar.h

-rw-r--r--

sys/arch/mvme68k/dev/vme.c

-rw-r--r--

sys/arch/mvme68k/dev/vme.h

-rw-r--r--

sys/arch/mvme68k/dev/vmel.c

-rw-r--r--

sys/arch/mvme68k/dev/vmes.c

-rw-r--r--

sys/arch/mvme68k/dev/vs.c

-rw-r--r--

sys/arch/mvme68k/dev/vsdma.c

-rw-r--r--

sys/arch/mvme68k/dev/vsreg.h

-rw-r--r--

sys/arch/mvme68k/dev/vsvar.h

-rw-r--r--

sys/arch/mvme68k/dev/wdsc.c

-rw-r--r--

sys/arch/mvme68k/dev/wl.c

-rw-r--r--

sys/arch/mvme68k/dev/zs.c

34 files changed, 293 insertions, 293 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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

/*-

@@ -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 $ */

/*-

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 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 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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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 $ */

@@ -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