diff options
Diffstat (limited to 'sys/arch/hp300/dev')
39 files changed, 526 insertions, 526 deletions
diff --git a/sys/arch/hp300/dev/ac.c b/sys/arch/hp300/dev/ac.c index 693444f5114..17d3247e2f4 100644 --- a/sys/arch/hp300/dev/ac.c +++ b/sys/arch/hp300/dev/ac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ac.c,v 1.8 2001/05/31 10:21:01 art Exp $ */ +/* $OpenBSD: ac.c,v 1.9 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: ac.c,v 1.9 1997/04/02 22:37:21 scottr Exp $ */ /* @@ -69,12 +69,12 @@ /* cdev_decl(ac); */ /* XXX we should use macros to do these... */ -int acopen __P((dev_t, int, int, struct proc *)); -int acclose __P((dev_t, int, int, struct proc *)); -int acioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); +int acopen(dev_t, int, int, struct proc *); +int acclose(dev_t, int, int, struct proc *); +int acioctl(dev_t, u_long, caddr_t, int, struct proc *); -static int acmatch __P((struct device *, void *, void *)); -static void acattach __P((struct device *, struct device *, void *)); +static int acmatch(struct device *, void *, void *); +static void acattach(struct device *, struct device *, void *); struct cfattach ac_ca = { sizeof(struct ac_softc), acmatch, acattach @@ -84,9 +84,9 @@ struct cfdriver ac_cd = { NULL, "ac", DV_DULL }; -void acstart __P((void *)); -void acgo __P((void *)); -void acintr __P((void *, int)); +void acstart(void *); +void acgo(void *); +void acintr(void *, int); #ifdef DEBUG int ac_debug = 0x0000; diff --git a/sys/arch/hp300/dev/acvar.h b/sys/arch/hp300/dev/acvar.h index 96b622886e9..afe4c2e6eda 100644 --- a/sys/arch/hp300/dev/acvar.h +++ b/sys/arch/hp300/dev/acvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: acvar.h,v 1.4 1997/04/16 11:55:56 downsj Exp $ */ +/* $OpenBSD: acvar.h,v 1.5 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: acvar.h,v 1.4 1997/03/31 07:32:15 scottr Exp $ */ /* @@ -89,12 +89,12 @@ struct ac_restatdb { }; #ifdef _KERNEL -int accommand __P((dev_t, int, char *, int)); +int accommand(dev_t, int, char *, int); -void acstart __P((void *)); -void acgo __P((void *)); -void acintr __P((void *, int)); +void acstart(void *); +void acgo(void *); +void acintr(void *, int); -int acgeteinfo __P((dev_t)); -void acconvert __P((char *, char *, int)); +int acgeteinfo(dev_t); +void acconvert(char *, char *, int); #endif /* _KERNEL */ diff --git a/sys/arch/hp300/dev/apci.c b/sys/arch/hp300/dev/apci.c index 260a000852c..f78e3316b42 100644 --- a/sys/arch/hp300/dev/apci.c +++ b/sys/arch/hp300/dev/apci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apci.c,v 1.11 2001/09/23 07:05:06 millert Exp $ */ +/* $OpenBSD: apci.c,v 1.12 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: apci.c,v 1.9 2000/11/02 00:35:05 eeh Exp $ */ /*- @@ -143,8 +143,8 @@ struct apci_softc { #define APCI_ISCONSOLE 0x02 /* unit is console */ #define APCI_SOFTCAR 0x04 /* soft carrier */ -int apcimatch __P((struct device *, void *, void *)); -void apciattach __P((struct device *, struct device *, void *)); +int apcimatch(struct device *, void *, void *); +void apciattach(struct device *, struct device *, void *); struct cfattach apci_ca = { sizeof(struct apci_softc), apcimatch, apciattach @@ -154,14 +154,14 @@ struct cfdriver apci_cd = { NULL, "apci", DV_TTY }; -int apciintr __P((void *)); -void apcieint __P((struct apci_softc *, int)); -void apcimint __P((struct apci_softc *, u_char)); -int apciparam __P((struct tty *, struct termios *)); -void apcistart __P((struct tty *)); -int apcimctl __P((struct apci_softc *, int, int)); -void apciinit __P((struct apciregs *, int)); -void apcitimeout __P((void *)); +int apciintr(void *); +void apcieint(struct apci_softc *, int); +void apcimint(struct apci_softc *, u_char); +int apciparam(struct tty *, struct termios *); +void apcistart(struct tty *); +int apcimctl(struct apci_softc *, int, int); +void apciinit(struct apciregs *, int); +void apcitimeout(void *); cdev_decl(apci); @@ -197,10 +197,10 @@ struct apciregs *apci_cn = NULL; /* console hardware */ int apciconsinit; /* has been initialized */ int apcimajor; /* our major number */ -void apcicnprobe __P((struct consdev *)); -void apcicninit __P((struct consdev *)); -int apcicngetc __P((dev_t)); -void apcicnputc __P((dev_t, int)); +void apcicnprobe(struct consdev *); +void apcicninit(struct consdev *); +int apcicngetc(dev_t); +void apcicnputc(dev_t, int); int diff --git a/sys/arch/hp300/dev/ct.c b/sys/arch/hp300/dev/ct.c index 6b9f68b7942..ef2b5e8ccda 100644 --- a/sys/arch/hp300/dev/ct.c +++ b/sys/arch/hp300/dev/ct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ct.c,v 1.7 1997/04/16 11:55:57 downsj Exp $ */ +/* $OpenBSD: ct.c,v 1.8 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: ct.c,v 1.21 1997/04/02 22:37:23 scottr Exp $ */ /* @@ -109,8 +109,8 @@ struct ct_softc { #define CTF_CANSTREAM 0x200 #define CTF_WRTTN 0x400 -int ctmatch __P((struct device *, void *, void *)); -void ctattach __P((struct device *, struct device *, void *)); +int ctmatch(struct device *, void *, void *); +void ctattach(struct device *, struct device *, void *); struct cfattach ct_ca = { sizeof(struct ct_softc), ctmatch, ctattach @@ -120,20 +120,20 @@ struct cfdriver ct_cd = { NULL, "ct", DV_TAPE }; -int ctident __P((struct device *, struct ct_softc *, - struct hpibbus_attach_args *)); +int ctident(struct device *, struct ct_softc *, + struct hpibbus_attach_args *); -void ctreset __P((struct ct_softc *)); -void ctaddeof __P((struct ct_softc *)); -void ctustart __P((struct ct_softc *)); -void cteof __P((struct ct_softc *, struct buf *)); -void ctdone __P((struct ct_softc *, struct buf *)); +void ctreset(struct ct_softc *); +void ctaddeof(struct ct_softc *); +void ctustart(struct ct_softc *); +void cteof(struct ct_softc *, struct buf *); +void ctdone(struct ct_softc *, struct buf *); -void ctstart __P((void *)); -void ctgo __P((void *)); -void ctintr __P((void *)); +void ctstart(void *); +void ctgo(void *); +void ctintr(void *); -void ctcommand __P((dev_t, int, int)); +void ctcommand(dev_t, int, int); cdev_decl(ct); bdev_decl(ct); diff --git a/sys/arch/hp300/dev/dca.c b/sys/arch/hp300/dev/dca.c index 506484a74ba..78652a5b716 100644 --- a/sys/arch/hp300/dev/dca.c +++ b/sys/arch/hp300/dev/dca.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dca.c,v 1.14 2002/02/15 20:45:30 nordin Exp $ */ +/* $OpenBSD: dca.c,v 1.15 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: dca.c,v 1.35 1997/05/05 20:58:18 thorpej Exp $ */ /* @@ -94,8 +94,8 @@ struct dca_softc { }; -int dcamatch __P((struct device *, void *, void *)); -void dcaattach __P((struct device *, struct device *, void *)); +int dcamatch(struct device *, void *, void *); +void dcaattach(struct device *, struct device *, void *); struct cfattach dca_ca = { sizeof(struct dca_softc), dcamatch, dcaattach @@ -110,21 +110,21 @@ int dcamajor; cdev_decl(dca); -int dcaintr __P((void *)); -void dcaeint __P((struct dca_softc *, int)); -void dcamint __P((struct dca_softc *)); +int dcaintr(void *); +void dcaeint(struct dca_softc *, int); +void dcamint(struct dca_softc *); -int dcaparam __P((struct tty *, struct termios *)); -void dcastart __P((struct tty *)); -int dcastop __P((struct tty *, int)); -int dcamctl __P((struct dca_softc *, int, int)); -void dcainit __P((struct dcadevice *, int)); +int dcaparam(struct tty *, struct termios *); +void dcastart(struct tty *); +int dcastop(struct tty *, int); +int dcamctl(struct dca_softc *, int, int); +void dcainit(struct dcadevice *, int); -int dca_console_scan __P((int, caddr_t, void *)); -void dcacnprobe __P((struct consdev *)); -void dcacninit __P((struct consdev *)); -int dcacngetc __P((dev_t)); -void dcacnputc __P((dev_t, int)); +int dca_console_scan(int, caddr_t, void *); +void dcacnprobe(struct consdev *); +void dcacninit(struct consdev *); +int dcacngetc(dev_t); +void dcacnputc(dev_t, int); /* * Stuff for DCA console support. @@ -170,7 +170,7 @@ long dcaintrcount[16]; long dcamintcount[16]; #endif -void dcainit __P((struct dcadevice *, int)); +void dcainit(struct dcadevice *, int); int dcamatch(parent, match, aux) diff --git a/sys/arch/hp300/dev/dcm.c b/sys/arch/hp300/dev/dcm.c index e37846cf27f..5114370dd05 100644 --- a/sys/arch/hp300/dev/dcm.c +++ b/sys/arch/hp300/dev/dcm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dcm.c,v 1.12 2002/02/15 20:45:30 nordin Exp $ */ +/* $OpenBSD: dcm.c,v 1.13 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: dcm.c,v 1.41 1997/05/05 20:59:16 thorpej Exp $ */ /* @@ -251,30 +251,30 @@ struct dcm_softc { cdev_decl(dcm); -int dcmintr __P((void *)); -void dcmpint __P((struct dcm_softc *, int, int)); -void dcmrint __P((struct dcm_softc *)); -void dcmreadbuf __P((struct dcm_softc *, int)); -void dcmxint __P((struct dcm_softc *, int)); -void dcmmint __P((struct dcm_softc *, int, int)); - -int dcmparam __P((struct tty *, struct termios *)); -void dcmstart __P((struct tty *)); -int dcmstop __P((struct tty *, int)); -int dcmmctl __P((dev_t, int, int)); -void dcmsetischeme __P((int, int)); -void dcminit __P((struct dcmdevice *, int, int)); - -int dcmselftest __P((struct dcm_softc *)); - -int dcm_console_scan __P((int, caddr_t, void *)); -void dcmcnprobe __P((struct consdev *)); -void dcmcninit __P((struct consdev *)); -int dcmcngetc __P((dev_t)); -void dcmcnputc __P((dev_t, int)); - -int dcmmatch __P((struct device *, void *, void *)); -void dcmattach __P((struct device *, struct device *, void *)); +int dcmintr(void *); +void dcmpint(struct dcm_softc *, int, int); +void dcmrint(struct dcm_softc *); +void dcmreadbuf(struct dcm_softc *, int); +void dcmxint(struct dcm_softc *, int); +void dcmmint(struct dcm_softc *, int, int); + +int dcmparam(struct tty *, struct termios *); +void dcmstart(struct tty *); +int dcmstop(struct tty *, int); +int dcmmctl(dev_t, int, int); +void dcmsetischeme(int, int); +void dcminit(struct dcmdevice *, int, int); + +int dcmselftest(struct dcm_softc *); + +int dcm_console_scan(int, caddr_t, void *); +void dcmcnprobe(struct consdev *); +void dcmcninit(struct consdev *); +int dcmcngetc(dev_t); +void dcmcnputc(dev_t, int); + +int dcmmatch(struct device *, void *, void *); +void dcmattach(struct device *, struct device *, void *); struct cfattach dcm_ca = { sizeof(struct dcm_softc), dcmmatch, dcmattach diff --git a/sys/arch/hp300/dev/dio.c b/sys/arch/hp300/dev/dio.c index 4050e865588..eb4ecaf449b 100644 --- a/sys/arch/hp300/dev/dio.c +++ b/sys/arch/hp300/dev/dio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dio.c,v 1.6 1997/10/06 06:44:49 millert Exp $ */ +/* $OpenBSD: dio.c,v 1.7 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: dio.c,v 1.7 1997/05/05 21:00:32 thorpej Exp $ */ /*- @@ -63,13 +63,13 @@ extern caddr_t internalhpib; -int dio_scodesize __P((struct dio_attach_args *)); -char *dio_devinfo __P((struct dio_attach_args *, char *, size_t)); +int dio_scodesize(struct dio_attach_args *); +char *dio_devinfo(struct dio_attach_args *, char *, size_t); -int diomatch __P((struct device *, void *, void *)); -void dioattach __P((struct device *, struct device *, void *)); -int dioprint __P((void *, const char *)); -int diosubmatch __P((struct device *, void *, void *)); +int diomatch(struct device *, void *, void *); +void dioattach(struct device *, struct device *, void *); +int dioprint(void *, const char *); +int diosubmatch(struct device *, void *, void *); struct cfattach dio_ca = { sizeof(struct device), diomatch, dioattach @@ -320,7 +320,7 @@ dio_devinfo(da, buf, buflen) */ void * dio_intr_establish(func, arg, ipl, priority) - int (*func) __P((void *)); + int (*func)(void *); void *arg; int ipl; int priority; diff --git a/sys/arch/hp300/dev/diovar.h b/sys/arch/hp300/dev/diovar.h index 735334aa099..b211dc371a3 100644 --- a/sys/arch/hp300/dev/diovar.h +++ b/sys/arch/hp300/dev/diovar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: diovar.h,v 1.3 1997/07/06 08:01:48 downsj Exp $ */ +/* $OpenBSD: diovar.h,v 1.4 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: diovar.h,v 1.3 1997/05/05 21:01:33 thorpej Exp $ */ /*- @@ -76,7 +76,7 @@ struct dio_devdesc { #define DIO_UNKNOWN_SCODE -1 #ifdef _KERNEL -void *dio_scodetopa __P((int)); +void *dio_scodetopa(int); void *dio_intr_establish __P((int (*)(void *), void *, int, int)); -void dio_intr_disestablish __P((void *)); +void dio_intr_disestablish(void *); #endif /* _KERNEL */ diff --git a/sys/arch/hp300/dev/dma.c b/sys/arch/hp300/dev/dma.c index cde3f981f0f..0f577c73520 100644 --- a/sys/arch/hp300/dev/dma.c +++ b/sys/arch/hp300/dev/dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dma.c,v 1.11 2001/11/04 02:58:51 miod Exp $ */ +/* $OpenBSD: dma.c,v 1.12 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: dma.c,v 1.19 1997/05/05 21:02:39 thorpej Exp $ */ /* @@ -102,7 +102,7 @@ struct dma_softc { #define DMAF_VCFLUSH 0x02 #define DMAF_NOINTR 0x04 -int dmaintr __P((void *)); +int dmaintr(void *); #ifdef DEBUG int dmadebug = 0; @@ -111,7 +111,7 @@ int dmadebug = 0; #define DDB_FOLLOW 0x04 #define DDB_IO 0x08 -void dmatimeout __P((void *)); +void dmatimeout(void *); int dmatimo[NDMACHAN]; long dmahits[NDMACHAN]; diff --git a/sys/arch/hp300/dev/dmavar.h b/sys/arch/hp300/dev/dmavar.h index 19679b61638..cfb8897fa3e 100644 --- a/sys/arch/hp300/dev/dmavar.h +++ b/sys/arch/hp300/dev/dmavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dmavar.h,v 1.4 1997/04/16 11:56:01 downsj Exp $ */ +/* $OpenBSD: dmavar.h,v 1.5 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: dmavar.h,v 1.9 1997/04/01 03:10:59 scottr Exp $ */ /* @@ -65,15 +65,15 @@ struct dmaqueue { * it has been given the DMA controller, and to stop the * initiator when the DMA controller has stopped. */ - void (*dq_start) __P((void *)); - void (*dq_done) __P((void *)); + void (*dq_start)(void *); + void (*dq_done)(void *); }; #ifdef _KERNEL -void dmainit __P((void)); -void dmago __P((int, char *, int, int)); -void dmastop __P((int)); -void dmafree __P((struct dmaqueue *)); -int dmareq __P((struct dmaqueue *)); -void dmacomputeipl __P((void)); +void dmainit(void); +void dmago(int, char *, int, int); +void dmastop(int); +void dmafree(struct dmaqueue *); +int dmareq(struct dmaqueue *); +void dmacomputeipl(void); #endif /* _KERNEL */ diff --git a/sys/arch/hp300/dev/fhpib.c b/sys/arch/hp300/dev/fhpib.c index c45742ab320..aa9c9df07c2 100644 --- a/sys/arch/hp300/dev/fhpib.c +++ b/sys/arch/hp300/dev/fhpib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fhpib.c,v 1.9 2001/05/01 16:51:09 millert Exp $ */ +/* $OpenBSD: fhpib.c,v 1.10 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: fhpib.c,v 1.18 1997/05/05 21:04:16 thorpej Exp $ */ /* @@ -80,18 +80,18 @@ int doppollint = 1; /* use ppoll interrupts instead of watchdog */ int fhpibppolldelay = 50; #endif -void fhpibifc __P((struct fhpibdevice *)); -void fhpibdmadone __P((void *)); -int fhpibwait __P((struct fhpibdevice *, int)); +void fhpibifc(struct fhpibdevice *); +void fhpibdmadone(void *); +int fhpibwait(struct fhpibdevice *, int); -void fhpibreset __P((struct hpibbus_softc *)); -int fhpibsend __P((struct hpibbus_softc *, int, int, void *, int)); -int fhpibrecv __P((struct hpibbus_softc *, int, int, void *, int)); -int fhpibppoll __P((struct hpibbus_softc *)); -void fhpibppwatch __P((void *)); -void fhpibgo __P((struct hpibbus_softc *, int, int, void *, int, int, int)); -void fhpibdone __P((struct hpibbus_softc *)); -int fhpibintr __P((void *)); +void fhpibreset(struct hpibbus_softc *); +int fhpibsend(struct hpibbus_softc *, int, int, void *, int); +int fhpibrecv(struct hpibbus_softc *, int, int, void *, int); +int fhpibppoll(struct hpibbus_softc *); +void fhpibppwatch(void *); +void fhpibgo(struct hpibbus_softc *, int, int, void *, int, int, int); +void fhpibdone(struct hpibbus_softc *); +int fhpibintr(void *); /* * Our controller ops structure. @@ -118,8 +118,8 @@ struct fhpib_softc { struct hpibbus_softc *sc_hpibbus; /* XXX */ }; -int fhpibmatch __P((struct device *, void *, void *)); -void fhpibattach __P((struct device *, struct device *, void *)); +int fhpibmatch(struct device *, void *, void *); +void fhpibattach(struct device *, struct device *, void *); struct cfattach fhpib_ca = { sizeof(struct fhpib_softc), fhpibmatch, fhpibattach diff --git a/sys/arch/hp300/dev/frodo.c b/sys/arch/hp300/dev/frodo.c index e3e1e9c4b20..945cff1a19a 100644 --- a/sys/arch/hp300/dev/frodo.c +++ b/sys/arch/hp300/dev/frodo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: frodo.c,v 1.2 2001/05/10 20:17:54 millert Exp $ */ +/* $OpenBSD: frodo.c,v 1.3 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: frodo.c,v 1.5 1999/07/31 21:15:20 thorpej Exp $ */ /*- @@ -88,7 +88,7 @@ * Description of a Frodo interrupt handler. */ struct frodo_isr { - int (*isr_func) __P((void *)); + int (*isr_func)(void *); void *isr_arg; int isr_priority; }; @@ -101,15 +101,15 @@ struct frodo_softc { int sc_refcnt; /* number of interrupt refs */ }; -int frodomatch __P((struct device *, void *, void *)); -void frodoattach __P((struct device *, struct device *, void *)); +int frodomatch(struct device *, void *, void *); +void frodoattach(struct device *, struct device *, void *); -int frodoprint __P((void *, const char *)); -int frodosubmatch __P((struct device *, void *, void *)); +int frodoprint(void *, const char *); +int frodosubmatch(struct device *, void *, void *); -int frodointr __P((void *)); +int frodointr(void *); -void frodo_imask __P((struct frodo_softc *, u_int16_t, u_int16_t)); +void frodo_imask(struct frodo_softc *, u_int16_t, u_int16_t); struct cfattach frodo_ca = { sizeof(struct frodo_softc), frodomatch, frodoattach @@ -248,7 +248,7 @@ frodoprint(aux, pnp) void frodo_intr_establish(frdev, func, arg, line, priority) struct device *frdev; - int (*func) __P((void *)); + int (*func)(void *); void *arg; int line; int priority; diff --git a/sys/arch/hp300/dev/frodovar.h b/sys/arch/hp300/dev/frodovar.h index 7cd5dde1b3c..6958d75eef9 100644 --- a/sys/arch/hp300/dev/frodovar.h +++ b/sys/arch/hp300/dev/frodovar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: frodovar.h,v 1.1 1997/07/06 08:01:51 downsj Exp $ */ +/* $OpenBSD: frodovar.h,v 1.2 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: frodovar.h,v 1.1 1997/05/12 08:03:50 thorpej Exp $ */ /* @@ -46,4 +46,4 @@ struct frodo_attach_args { void frodo_intr_establish __P((struct device *, int (*func)(void *), void *, int, int)); -void frodo_intr_disestablish __P((struct device *, int)); +void frodo_intr_disestablish(struct device *, int); diff --git a/sys/arch/hp300/dev/grf.c b/sys/arch/hp300/dev/grf.c index 322cc2e78e9..4f3b20b93ec 100644 --- a/sys/arch/hp300/dev/grf.c +++ b/sys/arch/hp300/dev/grf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf.c,v 1.18 2001/12/19 08:58:05 art Exp $ */ +/* $OpenBSD: grf.c,v 1.19 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: grf.c,v 1.30 1998/08/20 08:33:41 kleink Exp $ */ /* @@ -88,8 +88,8 @@ extern struct emul emul_hpux; /* prototypes for the devsw entry points */ cdev_decl(grf); -int grfmatch __P((struct device *, void *, void *)); -void grfattach __P((struct device *, struct device *, void *)); +int grfmatch(struct device *, void *, void *); +void grfattach(struct device *, struct device *, void *); struct cfattach grf_ca = { sizeof(struct grf_softc), grfmatch, grfattach @@ -99,7 +99,7 @@ struct cfdriver grf_cd = { NULL, "grf", DV_DULL }; -int grfprint __P((void *, const char *)); +int grfprint(void *, const char *); /* * Frambuffer state information, statically allocated for benefit diff --git a/sys/arch/hp300/dev/grf_dv.c b/sys/arch/hp300/dev/grf_dv.c index 196ea7bf7cb..c26649795d8 100644 --- a/sys/arch/hp300/dev/grf_dv.c +++ b/sys/arch/hp300/dev/grf_dv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_dv.c,v 1.7 2000/11/10 15:33:05 provos Exp $ */ +/* $OpenBSD: grf_dv.c,v 1.8 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: grf_dv.c,v 1.11 1997/03/31 07:34:14 scottr Exp $ */ /* @@ -75,19 +75,19 @@ #include "ite.h" -int dv_init __P((struct grf_data *, int, caddr_t)); -int dv_mode __P((struct grf_data *, int, caddr_t)); -void dv_reset __P((struct dvboxfb *)); +int dv_init(struct grf_data *, int, caddr_t); +int dv_mode(struct grf_data *, int, caddr_t); +void dv_reset(struct dvboxfb *); -int dvbox_intio_match __P((struct device *, void *, void *)); -void dvbox_intio_attach __P((struct device *, struct device *, void *)); +int dvbox_intio_match(struct device *, void *, void *); +void dvbox_intio_attach(struct device *, struct device *, void *); -int dvbox_dio_match __P((struct device *, void *, void *)); -void dvbox_dio_attach __P((struct device *, struct device *, void *)); +int dvbox_dio_match(struct device *, void *, void *); +void dvbox_dio_attach(struct device *, struct device *, void *); -int dvbox_console_scan __P((int, caddr_t, void *)); -void dvboxcnprobe __P((struct consdev *cp)); -void dvboxcninit __P((struct consdev *cp)); +int dvbox_console_scan(int, caddr_t, void *); +void dvboxcnprobe(struct consdev *cp); +void dvboxcninit(struct consdev *cp); struct cfattach dvbox_intio_ca = { sizeof(struct grfdev_softc), dvbox_intio_match, dvbox_intio_attach @@ -107,14 +107,14 @@ struct grfsw dvbox_grfsw = { }; #if NITE > 0 -void dvbox_init __P((struct ite_data *)); -void dvbox_deinit __P((struct ite_data *)); -void dvbox_putc __P((struct ite_data *, int, int, int, int)); -void dvbox_cursor __P((struct ite_data *, int)); -void dvbox_clear __P((struct ite_data *, int, int, int, int)); -void dvbox_scroll __P((struct ite_data *, int, int, int, int)); -void dvbox_windowmove __P((struct ite_data *, int, int, int, int, - int, int, int)); +void dvbox_init(struct ite_data *); +void dvbox_deinit(struct ite_data *); +void dvbox_putc(struct ite_data *, int, int, int, int); +void dvbox_cursor(struct ite_data *, int); +void dvbox_clear(struct ite_data *, int, int, int, int); +void dvbox_scroll(struct ite_data *, int, int, int, int); +void dvbox_windowmove(struct ite_data *, int, int, int, int, + int, int, int); /* DaVinci ite switch */ struct itesw dvbox_itesw = { diff --git a/sys/arch/hp300/dev/grf_gb.c b/sys/arch/hp300/dev/grf_gb.c index 4e1b70161f6..dfb7bed13d1 100644 --- a/sys/arch/hp300/dev/grf_gb.c +++ b/sys/arch/hp300/dev/grf_gb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_gb.c,v 1.6 1997/04/16 11:56:03 downsj Exp $ */ +/* $OpenBSD: grf_gb.c,v 1.7 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: grf_gb.c,v 1.11 1997/03/31 07:34:15 scottr Exp $ */ /* @@ -85,19 +85,19 @@ u_char crtc_init_data[CRTC_DATA_LENGTH] = { 0x30, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00 }; -int gb_init __P((struct grf_data *gp, int, caddr_t)); -int gb_mode __P((struct grf_data *gp, int, caddr_t)); -void gb_microcode __P((struct gboxfb *)); +int gb_init(struct grf_data *gp, int, caddr_t); +int gb_mode(struct grf_data *gp, int, caddr_t); +void gb_microcode(struct gboxfb *); -int gbox_intio_match __P((struct device *, void *, void *)); -void gbox_intio_attach __P((struct device *, struct device *, void *)); +int gbox_intio_match(struct device *, void *, void *); +void gbox_intio_attach(struct device *, struct device *, void *); -int gbox_dio_match __P((struct device *, void *, void *)); -void gbox_dio_attach __P((struct device *, struct device *, void *)); +int gbox_dio_match(struct device *, void *, void *); +void gbox_dio_attach(struct device *, struct device *, void *); -int gbox_console_scan __P((int, caddr_t, void *)); -void gboxcnprobe __P((struct consdev *cp)); -void gboxcninit __P((struct consdev *cp)); +int gbox_console_scan(int, caddr_t, void *); +void gboxcnprobe(struct consdev *cp); +void gboxcninit(struct consdev *cp); struct cfattach gbox_intio_ca = { sizeof(struct grfdev_softc), gbox_intio_match, gbox_intio_attach @@ -117,14 +117,14 @@ struct grfsw gbox_grfsw = { }; #if NITE > 0 -void gbox_init __P((struct ite_data *)); -void gbox_deinit __P((struct ite_data *)); -void gbox_putc __P((struct ite_data *, int, int, int, int)); -void gbox_cursor __P((struct ite_data *, int)); -void gbox_clear __P((struct ite_data *, int, int, int, int)); -void gbox_scroll __P((struct ite_data *, int, int, int, int)); -void gbox_windowmove __P((struct ite_data *, int, int, int, int, - int, int, int)); +void gbox_init(struct ite_data *); +void gbox_deinit(struct ite_data *); +void gbox_putc(struct ite_data *, int, int, int, int); +void gbox_cursor(struct ite_data *, int); +void gbox_clear(struct ite_data *, int, int, int, int); +void gbox_scroll(struct ite_data *, int, int, int, int); +void gbox_windowmove(struct ite_data *, int, int, int, int, + int, int, int); /* Gatorbox ite switch */ struct itesw gbox_itesw = { diff --git a/sys/arch/hp300/dev/grf_hy.c b/sys/arch/hp300/dev/grf_hy.c index 300d032aa0f..96939b98c80 100644 --- a/sys/arch/hp300/dev/grf_hy.c +++ b/sys/arch/hp300/dev/grf_hy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_hy.c,v 1.7 2000/11/10 15:33:05 provos Exp $ */ +/* $OpenBSD: grf_hy.c,v 1.8 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: grf_hy.c,v 1.9 1997/03/31 07:34:16 scottr Exp $ */ /* @@ -79,16 +79,16 @@ caddr_t badhyaddr = (caddr_t) -1; -int hy_init __P((struct grf_data *gp, int, caddr_t)); -int hy_mode __P((struct grf_data *gp, int, caddr_t)); -void hyper_ite_fontinit __P((struct ite_data *)); +int hy_init(struct grf_data *gp, int, caddr_t); +int hy_mode(struct grf_data *gp, int, caddr_t); +void hyper_ite_fontinit(struct ite_data *); -int hyper_dio_match __P((struct device *, void *, void *)); -void hyper_dio_attach __P((struct device *, struct device *, void *)); +int hyper_dio_match(struct device *, void *, void *); +void hyper_dio_attach(struct device *, struct device *, void *); -int hyper_console_scan __P((int, caddr_t, void *)); -void hypercnprobe __P((struct consdev *cp)); -void hypercninit __P((struct consdev *cp)); +int hyper_console_scan(int, caddr_t, void *); +void hypercnprobe(struct consdev *cp); +void hypercninit(struct consdev *cp); struct cfattach hyper_dio_ca = { sizeof(struct grfdev_softc), hyper_dio_match, hyper_dio_attach @@ -104,15 +104,15 @@ struct grfsw hyper_grfsw = { }; #if NITE > 0 -void hyper_init __P((struct ite_data *)); -void hyper_deinit __P((struct ite_data *)); -void hyper_int_fontinit __P((struct ite_data *)); -void hyper_putc __P((struct ite_data *, int, int, int, int)); -void hyper_cursor __P((struct ite_data *, int)); -void hyper_clear __P((struct ite_data *, int, int, int, int)); -void hyper_scroll __P((struct ite_data *, int, int, int, int)); -void hyper_windowmove __P((struct ite_data *, int, int, int, int, - int, int, int)); +void hyper_init(struct ite_data *); +void hyper_deinit(struct ite_data *); +void hyper_int_fontinit(struct ite_data *); +void hyper_putc(struct ite_data *, int, int, int, int); +void hyper_cursor(struct ite_data *, int); +void hyper_clear(struct ite_data *, int, int, int, int); +void hyper_scroll(struct ite_data *, int, int, int, int); +void hyper_windowmove(struct ite_data *, int, int, int, int, + int, int, int); /* Hyperion ite switch */ struct itesw hyper_itesw = { diff --git a/sys/arch/hp300/dev/grf_rb.c b/sys/arch/hp300/dev/grf_rb.c index 9627a222c11..2e338f455b0 100644 --- a/sys/arch/hp300/dev/grf_rb.c +++ b/sys/arch/hp300/dev/grf_rb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_rb.c,v 1.7 2000/11/10 15:33:05 provos Exp $ */ +/* $OpenBSD: grf_rb.c,v 1.8 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: grf_rb.c,v 1.11 1997/03/31 07:34:17 scottr Exp $ */ /* @@ -75,18 +75,18 @@ #include "ite.h" -int rb_init __P((struct grf_data *gp, int, caddr_t)); -int rb_mode __P((struct grf_data *gp, int, caddr_t)); +int rb_init(struct grf_data *gp, int, caddr_t); +int rb_mode(struct grf_data *gp, int, caddr_t); -int rbox_intio_match __P((struct device *, void *, void *)); -void rbox_intio_attach __P((struct device *, struct device *, void *)); +int rbox_intio_match(struct device *, void *, void *); +void rbox_intio_attach(struct device *, struct device *, void *); -int rbox_dio_match __P((struct device *, void *, void *)); -void rbox_dio_attach __P((struct device *, struct device *, void *)); +int rbox_dio_match(struct device *, void *, void *); +void rbox_dio_attach(struct device *, struct device *, void *); -int rbox_console_scan __P((int, caddr_t, void *)); -void rboxcnprobe __P((struct consdev *cp)); -void rboxcninit __P((struct consdev *cp)); +int rbox_console_scan(int, caddr_t, void *); +void rboxcnprobe(struct consdev *cp); +void rboxcninit(struct consdev *cp); struct cfattach rbox_intio_ca = { sizeof(struct grfdev_softc), rbox_intio_match, rbox_intio_attach @@ -106,14 +106,14 @@ struct grfsw rbox_grfsw = { }; #if NITE > 0 -void rbox_init __P((struct ite_data *)); -void rbox_deinit __P((struct ite_data *)); -void rbox_putc __P((struct ite_data *, int, int, int, int)); -void rbox_cursor __P((struct ite_data *, int)); -void rbox_clear __P((struct ite_data *, int, int, int, int)); -void rbox_scroll __P((struct ite_data *, int, int, int, int)); -void rbox_windowmove __P((struct ite_data *, int, int, int, int, - int, int, int)); +void rbox_init(struct ite_data *); +void rbox_deinit(struct ite_data *); +void rbox_putc(struct ite_data *, int, int, int, int); +void rbox_cursor(struct ite_data *, int); +void rbox_clear(struct ite_data *, int, int, int, int); +void rbox_scroll(struct ite_data *, int, int, int, int); +void rbox_windowmove(struct ite_data *, int, int, int, int, + int, int, int); /* Renaissance ite switch */ struct itesw rbox_itesw = { diff --git a/sys/arch/hp300/dev/grf_subr.c b/sys/arch/hp300/dev/grf_subr.c index 19f11c0d058..3f545a27ebf 100644 --- a/sys/arch/hp300/dev/grf_subr.c +++ b/sys/arch/hp300/dev/grf_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_subr.c,v 1.5 1997/04/16 11:56:05 downsj Exp $ */ +/* $OpenBSD: grf_subr.c,v 1.6 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: grf_subr.c,v 1.4 1997/03/31 07:34:18 scottr Exp $ */ /*- @@ -54,12 +54,12 @@ #include <hp300/dev/itevar.h> -int grfdevprint __P((void *, const char *)); +int grfdevprint(void *, const char *); void grfdev_attach(sc, init, regs, sw, isw) struct grfdev_softc *sc; - int (*init) __P((struct grf_data *, int, caddr_t)); + int (*init)(struct grf_data *, int, caddr_t); caddr_t regs; struct grfsw *sw; struct itesw *isw; diff --git a/sys/arch/hp300/dev/grf_tc.c b/sys/arch/hp300/dev/grf_tc.c index 4b1c59cc684..188620c9447 100644 --- a/sys/arch/hp300/dev/grf_tc.c +++ b/sys/arch/hp300/dev/grf_tc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grf_tc.c,v 1.8 2000/11/10 15:33:05 provos Exp $ */ +/* $OpenBSD: grf_tc.c,v 1.9 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: grf_tc.c,v 1.11 1997/03/31 07:34:18 scottr Exp $ */ /* @@ -75,20 +75,20 @@ #include "ite.h" -int tc_init __P((struct grf_data *, int, caddr_t)); -int tc_mode __P((struct grf_data *, int, caddr_t)); +int tc_init(struct grf_data *, int, caddr_t); +int tc_mode(struct grf_data *, int, caddr_t); -void topcat_common_attach __P((struct grfdev_softc *, caddr_t, u_int8_t)); +void topcat_common_attach(struct grfdev_softc *, caddr_t, u_int8_t); -int topcat_intio_match __P((struct device *, void *, void *)); -void topcat_intio_attach __P((struct device *, struct device *, void *)); +int topcat_intio_match(struct device *, void *, void *); +void topcat_intio_attach(struct device *, struct device *, void *); -int topcat_dio_match __P((struct device *, void *, void *)); -void topcat_dio_attach __P((struct device *, struct device *, void *)); +int topcat_dio_match(struct device *, void *, void *); +void topcat_dio_attach(struct device *, struct device *, void *); -int topcat_console_scan __P((int, caddr_t, void *)); -void topcatcnprobe __P((struct consdev *cp)); -void topcatcninit __P((struct consdev *cp)); +int topcat_console_scan(int, caddr_t, void *); +void topcatcnprobe(struct consdev *cp); +void topcatcninit(struct consdev *cp); struct cfattach topcat_intio_ca = { sizeof(struct grfdev_softc), topcat_intio_match, topcat_intio_attach @@ -123,14 +123,14 @@ struct grfsw hrmcatseye_grfsw = { }; #if NITE > 0 -void topcat_init __P((struct ite_data *)); -void topcat_deinit __P((struct ite_data *)); -void topcat_putc __P((struct ite_data *, int, int, int, int)); -void topcat_cursor __P((struct ite_data *, int)); -void topcat_clear __P((struct ite_data *, int, int, int, int)); -void topcat_scroll __P((struct ite_data *, int, int, int, int)); -void topcat_windowmove __P((struct ite_data *, int, int, int, int, - int, int, int)); +void topcat_init(struct ite_data *); +void topcat_deinit(struct ite_data *); +void topcat_putc(struct ite_data *, int, int, int, int); +void topcat_cursor(struct ite_data *, int); +void topcat_clear(struct ite_data *, int, int, int, int); +void topcat_scroll(struct ite_data *, int, int, int, int); +void topcat_windowmove(struct ite_data *, int, int, int, int, + int, int, int); /* Topcat/catseye ite switch */ struct itesw topcat_itesw = { diff --git a/sys/arch/hp300/dev/grfvar.h b/sys/arch/hp300/dev/grfvar.h index 0da88462c8c..1c6a8ea3f3b 100644 --- a/sys/arch/hp300/dev/grfvar.h +++ b/sys/arch/hp300/dev/grfvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: grfvar.h,v 1.6 1997/04/16 11:56:06 downsj Exp $ */ +/* $OpenBSD: grfvar.h,v 1.7 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: grfvar.h,v 1.10 1997/03/31 07:34:19 scottr Exp $ */ /* @@ -72,9 +72,9 @@ struct grfsw { int gd_swid; /* id to be returned by software */ char *gd_desc; /* description printed at config time */ /* boot time init routine */ - int (*gd_init) __P((struct grf_data *, int, caddr_t)); + int (*gd_init)(struct grf_data *, int, caddr_t); /* misc function routine */ - int (*gd_mode) __P((struct grf_data *, int, caddr_t)); + int (*gd_mode)(struct grf_data *, int, caddr_t); }; struct grf_softc { @@ -127,26 +127,26 @@ struct grfdev_attach_args { extern struct grf_data grf_cn; /* grf_data for console device */ /* grf.c prototypes */ -int grfmap __P((dev_t, caddr_t *, struct proc *)); -int grfunmap __P((dev_t, caddr_t, struct proc *)); -int grfon __P((dev_t)); -int grfoff __P((dev_t)); -int grfaddr __P((struct grf_softc *, int)); +int grfmap(dev_t, caddr_t *, struct proc *); +int grfunmap(dev_t, caddr_t, struct proc *); +int grfon(dev_t); +int grfoff(dev_t); +int grfaddr(struct grf_softc *, int); #ifdef COMPAT_HPUX -int hpuxgrfioctl __P((dev_t, int, caddr_t, int, struct proc *)); +int hpuxgrfioctl(dev_t, int, caddr_t, int, struct proc *); -int grflock __P((struct grf_data *, int)); -int grfunlock __P((struct grf_data *)); -int grfdevno __P((dev_t)); +int grflock(struct grf_data *, int); +int grfunlock(struct grf_data *); +int grfdevno(dev_t); -int iommap __P((dev_t, caddr_t *)); -int iounmmap __P((dev_t, caddr_t)); +int iommap(dev_t, caddr_t *); +int iounmmap(dev_t, caddr_t); -int grffindpid __P((struct grf_data *)); -void grfrmpid __P((struct grf_data *)); -int grflckmmap __P((dev_t, caddr_t *)); -int grflckunmmap __P((dev_t, caddr_t)); +int grffindpid(struct grf_data *); +void grfrmpid(struct grf_data *); +int grflckmmap(dev_t, caddr_t *); +int grflckunmmap(dev_t, caddr_t); #endif /* COMPAT_HPUX */ /* grf_subr.c prototypes */ diff --git a/sys/arch/hp300/dev/hd.c b/sys/arch/hp300/dev/hd.c index 42d3e7d2fbf..a112a1c1c13 100644 --- a/sys/arch/hp300/dev/hd.c +++ b/sys/arch/hp300/dev/hd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hd.c,v 1.14 2001/09/20 17:02:30 mpech Exp $ */ +/* $OpenBSD: hd.c,v 1.15 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: rd.c,v 1.33 1997/07/10 18:14:08 kleink Exp $ */ /* @@ -217,25 +217,25 @@ int numhdidentinfo = sizeof(hdidentinfo) / sizeof(hdidentinfo[0]); bdev_decl(hd); cdev_decl(hd); -int hdident __P((struct device *, struct hd_softc *, - struct hpibbus_attach_args *)); -void hdreset __P((struct hd_softc *)); -void hdustart __P((struct hd_softc *)); -int hdgetinfo __P((dev_t, struct hd_softc *, struct disklabel *, int)); -void hdrestart __P((void *)); -struct buf *hdfinish __P((struct hd_softc *, struct buf *)); - -void hdstart __P((void *)); -void hdinterupt __P((void *)); -void hdgo __P((void *)); -int hdstatus __P((struct hd_softc *)); -int hderror __P((int)); +int hdident(struct device *, struct hd_softc *, + struct hpibbus_attach_args *); +void hdreset(struct hd_softc *); +void hdustart(struct hd_softc *); +int hdgetinfo(dev_t, struct hd_softc *, struct disklabel *, int); +void hdrestart(void *); +struct buf *hdfinish(struct hd_softc *, struct buf *); + +void hdstart(void *); +void hdinterupt(void *); +void hdgo(void *); +int hdstatus(struct hd_softc *); +int hderror(int); #ifdef DEBUG -void hdprinterr __P((char *, short, char **)); +void hdprinterr(char *, short, char **); #endif -int hdmatch __P((struct device *, void *, void *)); -void hdattach __P((struct device *, struct device *, void *)); +int hdmatch(struct device *, void *, void *); +void hdattach(struct device *, struct device *, void *); struct cfattach hd_ca = { sizeof(struct hd_softc), hdmatch, hdattach diff --git a/sys/arch/hp300/dev/hil.c b/sys/arch/hp300/dev/hil.c index 9ca2a2061a7..4d70c185fd8 100644 --- a/sys/arch/hp300/dev/hil.c +++ b/sys/arch/hp300/dev/hil.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hil.c,v 1.14 2001/11/01 12:13:46 art Exp $ */ +/* $OpenBSD: hil.c,v 1.15 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: hil.c,v 1.34 1997/04/02 22:37:32 scottr Exp $ */ /* @@ -102,26 +102,26 @@ char hilin[] = "hilin"; cdev_decl(hil); -void hilinfo __P((int)); -void hilconfig __P((struct hil_softc *)); -void hilreset __P((struct hil_softc *)); -void hilbeep __P((struct hil_softc *, struct _hilbell *)); -int hiliddev __P((struct hil_softc *)); +void hilinfo(int); +void hilconfig(struct hil_softc *); +void hilreset(struct hil_softc *); +void hilbeep(struct hil_softc *, struct _hilbell *); +int hiliddev(struct hil_softc *); -void hilint __P((int)); -void hil_process_int __P((struct hil_softc *, u_char, u_char)); -void hilevent __P((struct hil_softc *)); -void hpuxhilevent __P((struct hil_softc *, struct hilloopdev *)); +void hilint(int); +void hil_process_int(struct hil_softc *, u_char, u_char); +void hilevent(struct hil_softc *); +void hpuxhilevent(struct hil_softc *, struct hilloopdev *); -int hilqalloc __P((struct hil_softc *, struct hilqinfo *, struct proc *)); -int hilqfree __P((struct hil_softc *, int, struct proc *)); -int hilqmap __P((struct hil_softc *, int, int, struct proc *)); -int hilqunmap __P((struct hil_softc *, int, int, struct proc *)); +int hilqalloc(struct hil_softc *, struct hilqinfo *, struct proc *); +int hilqfree(struct hil_softc *, int, struct proc *); +int hilqmap(struct hil_softc *, int, int, struct proc *); +int hilqunmap(struct hil_softc *, int, int, struct proc *); #ifdef DEBUG -void printhilpollbuf __P((struct hil_softc *)); -void printhilcmdbuf __P((struct hil_softc *)); -void hilreport __P((struct hil_softc *)); +void printhilpollbuf(struct hil_softc *); +void printhilcmdbuf(struct hil_softc *); +void hilreport(struct hil_softc *); #endif /* DEBUG */ void diff --git a/sys/arch/hp300/dev/hilvar.h b/sys/arch/hp300/dev/hilvar.h index c0fe74432db..23eaf2a9549 100644 --- a/sys/arch/hp300/dev/hilvar.h +++ b/sys/arch/hp300/dev/hilvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: hilvar.h,v 1.4 1997/04/16 11:56:08 downsj Exp $ */ +/* $OpenBSD: hilvar.h,v 1.5 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: hilvar.h,v 1.14 1997/04/01 19:29:10 scottr Exp $ */ /* @@ -120,26 +120,26 @@ struct hil_softc { #define KBD_AR2 0x04 /* keyboard auto-repeat rate 2 */ #ifdef _KERNEL -void kbdbell __P((int)); -void kbdenable __P((int)); -void kbddisable __P((int)); -int kbdgetc __P((int *)); -void kbdcninit __P((void)); +void kbdbell(int); +void kbdenable(int); +void kbddisable(int); +int kbdgetc(int *); +void kbdcninit(void); -int kbdnmi __P((void)); +int kbdnmi(void); -void hilsoftinit __P((int, struct hil_dev *)); -void hilinit __P((int, struct hil_dev *)); +void hilsoftinit(int, struct hil_dev *); +void hilinit(int, struct hil_dev *); -void send_hil_cmd __P((struct hil_dev *, u_char, - u_char *, u_char, u_char *)); -void send_hildev_cmd __P((struct hil_softc *, char, char)); +void send_hil_cmd(struct hil_dev *, u_char, + u_char *, u_char, u_char *); +void send_hildev_cmd(struct hil_softc *, char, char); -void polloff __P((struct hil_dev *)); -void pollon __P((struct hil_dev *)); +void polloff(struct hil_dev *); +void pollon(struct hil_dev *); #ifdef COMPAT_HPUX -int hpuxhilioctl __P((dev_t, int, caddr_t, int)); -int hildevno __P((dev_t)); +int hpuxhilioctl(dev_t, int, caddr_t, int); +int hildevno(dev_t); #endif /* COMPAT_HPUX */ #endif /* _KERNEL */ diff --git a/sys/arch/hp300/dev/hpib.c b/sys/arch/hp300/dev/hpib.c index 234318413ca..1c0f75f8ff5 100644 --- a/sys/arch/hp300/dev/hpib.c +++ b/sys/arch/hp300/dev/hpib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hpib.c,v 1.8 1997/07/06 08:01:53 downsj Exp $ */ +/* $OpenBSD: hpib.c,v 1.9 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: hpib.c,v 1.16 1997/04/27 20:58:57 thorpej Exp $ */ /* @@ -54,8 +54,8 @@ #include <machine/cpu.h> #include <machine/hp300spu.h> -int hpibbusmatch __P((struct device *, void *, void *)); -void hpibbusattach __P((struct device *, struct device *, void *)); +int hpibbusmatch(struct device *, void *, void *); +void hpibbusattach(struct device *, struct device *, void *); struct cfattach hpibbus_ca = { sizeof(struct hpibbus_softc), hpibbusmatch, hpibbusattach @@ -65,15 +65,15 @@ struct cfdriver hpibbus_cd = { NULL, "hpibbus", DV_DULL }; -void hpibbus_attach_children __P((struct hpibbus_softc *)); -int hpibbussearch __P((struct device *, void *, void *)); -int hpibbusprint __P((void *, const char *)); +void hpibbus_attach_children(struct hpibbus_softc *); +int hpibbussearch(struct device *, void *, void *); +int hpibbusprint(void *, const char *); -int hpibbus_alloc __P((struct hpibbus_softc *, int, int)); -void hpibbus_free __P((struct hpibbus_softc *, int, int)); +int hpibbus_alloc(struct hpibbus_softc *, int, int); +void hpibbus_free(struct hpibbus_softc *, int, int); -void hpibstart __P((void *)); -void hpibdone __P((void *)); +void hpibstart(void *); +void hpibdone(void *); int hpibtimeout = 100000; /* # of status tests before we give up */ int hpibidtimeout = 10000; /* # of status tests for hpibid() calls */ @@ -363,7 +363,7 @@ hpibswait(unit, slave) { struct hpibbus_softc *sc = hpibbus_cd.cd_devs[unit]; int timo = hpibtimeout; - int mask, (*ppoll) __P((struct hpibbus_softc *)); + int mask, (*ppoll)(struct hpibbus_softc *); ppoll = sc->sc_ops->hpib_ppoll; mask = 0x80 >> slave; diff --git a/sys/arch/hp300/dev/hpibvar.h b/sys/arch/hp300/dev/hpibvar.h index e8f5336d8b0..220a55e2b3d 100644 --- a/sys/arch/hp300/dev/hpibvar.h +++ b/sys/arch/hp300/dev/hpibvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: hpibvar.h,v 1.6 1997/04/16 11:56:09 downsj Exp $ */ +/* $OpenBSD: hpibvar.h,v 1.7 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: hpibvar.h,v 1.10 1997/03/31 07:34:25 scottr Exp $ */ /* @@ -77,17 +77,17 @@ struct hpibbus_softc; * is used by the indirect driver to call controller-specific functions. */ struct hpib_controller { - void (*hpib_reset) __P((struct hpibbus_softc *)); - int (*hpib_send) __P((struct hpibbus_softc *, - int, int, void *, int)); - int (*hpib_recv) __P((struct hpibbus_softc *, - int, int, void *, int)); - int (*hpib_ppoll) __P((struct hpibbus_softc *)); - void (*hpib_ppwatch) __P((void *)); - void (*hpib_go) __P((struct hpibbus_softc *, - int, int, void *, int, int, int)); - void (*hpib_done) __P((struct hpibbus_softc *)); - int (*hpib_intr) __P((void *)); + void (*hpib_reset)(struct hpibbus_softc *); + int (*hpib_send)(struct hpibbus_softc *, + int, int, void *, int); + int (*hpib_recv)(struct hpibbus_softc *, + int, int, void *, int); + int (*hpib_ppoll)(struct hpibbus_softc *); + void (*hpib_ppwatch)(void *); + void (*hpib_go)(struct hpibbus_softc *, + int, int, void *, int, int, int); + void (*hpib_done)(struct hpibbus_softc *); + int (*hpib_intr)(void *); }; /* @@ -131,9 +131,9 @@ struct hpibqueue { /* * Callbacks used to start and stop the slave driver. */ - void (*hq_start) __P((void *)); - void (*hq_go) __P((void *)); - void (*hq_intr) __P((void *)); + void (*hq_start)(void *); + void (*hq_go)(void *); + void (*hq_intr)(void *); }; struct dmaqueue; @@ -173,24 +173,24 @@ extern caddr_t internalhpib; extern int hpibtimeout; extern int hpibdmathresh; -void hpibreset __P((int)); -int hpibsend __P((int, int, int, void *, int)); -int hpibrecv __P((int, int, int, void *, int)); -int hpibustart __P((int)); -void hpibstart __P((void *)); -void hpibgo __P((int, int, int, void *, int, int, int)); -void hpibdone __P((void *)); -int hpibpptest __P((int, int)); -void hpibppclear __P((int)); -void hpibawait __P((int)); -int hpibswait __P((int, int)); -int hpibid __P((int, int)); - -int hpibreq __P((struct device *, struct hpibqueue *)); -void hpibfree __P((struct device *, struct hpibqueue *)); -int hpibbus_alloc __P((struct hpibbus_softc *, int, int)); -void hpibbus_free __P((struct hpibbus_softc *, int, int)); - -int hpibintr __P((void *)); -int hpibdevprint __P((void *, const char *)); +void hpibreset(int); +int hpibsend(int, int, int, void *, int); +int hpibrecv(int, int, int, void *, int); +int hpibustart(int); +void hpibstart(void *); +void hpibgo(int, int, int, void *, int, int, int); +void hpibdone(void *); +int hpibpptest(int, int); +void hpibppclear(int); +void hpibawait(int); +int hpibswait(int, int); +int hpibid(int, int); + +int hpibreq(struct device *, struct hpibqueue *); +void hpibfree(struct device *, struct hpibqueue *); +int hpibbus_alloc(struct hpibbus_softc *, int, int); +void hpibbus_free(struct hpibbus_softc *, int, int); + +int hpibintr(void *); +int hpibdevprint(void *, const char *); #endif diff --git a/sys/arch/hp300/dev/if_le.c b/sys/arch/hp300/dev/if_le.c index af6d92831e4..81937267e6c 100644 --- a/sys/arch/hp300/dev/if_le.c +++ b/sys/arch/hp300/dev/if_le.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le.c,v 1.13 2001/08/26 00:15:37 miod Exp $ */ +/* $OpenBSD: if_le.c,v 1.14 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: if_le.c,v 1.43 1997/05/05 21:05:32 thorpej Exp $ */ /*- @@ -75,20 +75,20 @@ #include <hp300/hp300/leds.h> #endif -int lematch __P((struct device *, void *, void *)); -void leattach __P((struct device *, struct device *, void *)); +int lematch(struct device *, void *, void *); +void leattach(struct device *, struct device *, void *); struct cfattach le_ca = { sizeof(struct le_softc), lematch, leattach }; -int leintr __P((void *)); +int leintr(void *); /* offsets for: ID, REGS, MEM, NVRAM */ int lestd[] = { 0, 0x4000, 0x8000, 0xC008 }; -hide void lewrcsr __P((struct am7990_softc *, u_int16_t, u_int16_t)); -hide u_int16_t lerdcsr __P((struct am7990_softc *, u_int16_t)); +hide void lewrcsr(struct am7990_softc *, u_int16_t, u_int16_t); +hide u_int16_t lerdcsr(struct am7990_softc *, u_int16_t); hide void lewrcsr(sc, port, val) diff --git a/sys/arch/hp300/dev/intio.c b/sys/arch/hp300/dev/intio.c index 80b0401e8e0..10dd01ef14e 100644 --- a/sys/arch/hp300/dev/intio.c +++ b/sys/arch/hp300/dev/intio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intio.c,v 1.2 1997/02/03 04:47:36 downsj Exp $ */ +/* $OpenBSD: intio.c,v 1.3 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: intio.c,v 1.2 1997/01/30 09:18:54 thorpej Exp $ */ /*- @@ -47,10 +47,10 @@ #include <hp300/dev/intiovar.h> -int intiomatch __P((struct device *, void *, void *)); -void intioattach __P((struct device *, struct device *, void *)); -int intioprint __P((void *, const char *)); -int intiosearch __P((struct device *, void *, void *)); +int intiomatch(struct device *, void *, void *); +void intioattach(struct device *, struct device *, void *); +int intioprint(void *, const char *); +int intiosearch(struct device *, void *, void *); struct cfattach intio_ca = { sizeof(struct device), intiomatch, intioattach diff --git a/sys/arch/hp300/dev/ite.c b/sys/arch/hp300/dev/ite.c index 161259260c0..8bae218cee2 100644 --- a/sys/arch/hp300/dev/ite.c +++ b/sys/arch/hp300/dev/ite.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ite.c,v 1.13 2001/11/25 23:23:01 miod Exp $ */ +/* $OpenBSD: ite.c,v 1.14 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: ite.c,v 1.38 1997/03/31 07:37:25 scottr Exp $ */ /* @@ -86,8 +86,8 @@ int iteburst = 64; struct ite_data *kbd_ite = NULL; -int itematch __P((struct device *, void *, void *)); -void iteattach __P((struct device *, struct device *, void *)); +int itematch(struct device *, void *, void *); +void iteattach(struct device *, struct device *, void *); struct cfattach ite_ca = { sizeof(struct ite_softc), itematch, iteattach @@ -103,16 +103,16 @@ struct cfdriver ite_cd = { */ struct ite_data ite_cn; -void iteinit __P((struct ite_data *)); -void iteputchar __P((int, struct ite_data *)); -void itecheckwrap __P((struct ite_data *, struct itesw *)); -void ite_dchar __P((struct ite_data *, struct itesw *)); -void ite_ichar __P((struct ite_data *, struct itesw *)); -void ite_dline __P((struct ite_data *, struct itesw *)); -void ite_iline __P((struct ite_data *, struct itesw *)); -void ite_clrtoeol __P((struct ite_data *, struct itesw *, int, int)); -void ite_clrtoeos __P((struct ite_data *, struct itesw *)); -void itestart __P((struct tty *)); +void iteinit(struct ite_data *); +void iteputchar(int, struct ite_data *); +void itecheckwrap(struct ite_data *, struct itesw *); +void ite_dchar(struct ite_data *, struct itesw *); +void ite_ichar(struct ite_data *, struct itesw *); +void ite_dline(struct ite_data *, struct itesw *); +void ite_iline(struct ite_data *, struct itesw *); +void ite_clrtoeol(struct ite_data *, struct itesw *, int, int); +void ite_clrtoeos(struct ite_data *, struct itesw *); +void itestart(struct tty *); /* * Primary attribute buffer to be used by the first bitmapped console diff --git a/sys/arch/hp300/dev/itevar.h b/sys/arch/hp300/dev/itevar.h index 0ef7dcc62da..c5d7c652acf 100644 --- a/sys/arch/hp300/dev/itevar.h +++ b/sys/arch/hp300/dev/itevar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: itevar.h,v 1.9 1997/04/16 11:56:11 downsj Exp $ */ +/* $OpenBSD: itevar.h,v 1.10 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: itevar.h,v 1.14 1997/03/31 07:37:27 scottr Exp $ */ /* @@ -79,14 +79,14 @@ struct ite_data { }; struct itesw { - void (*ite_init) __P((struct ite_data *)); - void (*ite_deinit) __P((struct ite_data *)); - void (*ite_clear) __P((struct ite_data *, int, int, int, int)); - void (*ite_putc) __P((struct ite_data *, int, int, int, int)); - void (*ite_cursor) __P((struct ite_data *, int)); - void (*ite_scroll) __P((struct ite_data *, int, int, int, int)); - u_char (*ite_readbyte) __P((struct ite_data *, int)); - void (*ite_writeglyph) __P((struct ite_data *, u_char *, u_char *)); + void (*ite_init)(struct ite_data *); + void (*ite_deinit)(struct ite_data *); + void (*ite_clear)(struct ite_data *, int, int, int, int); + void (*ite_putc)(struct ite_data *, int, int, int, int); + void (*ite_cursor)(struct ite_data *, int); + void (*ite_scroll)(struct ite_data *, int, int, int, int); + u_char (*ite_readbyte)(struct ite_data *, int); + void (*ite_writeglyph)(struct ite_data *, u_char *, u_char *); }; struct ite_softc { @@ -200,18 +200,18 @@ extern struct itesw itesw[]; extern int nitesw; /* ite.c prototypes */ -void ite_attach_grf __P((int, int)); -int iteon __P((struct ite_data *, int)); -void iteoff __P((struct ite_data *, int)); -void itefilter __P((char, char)); -void itecninit __P((struct grf_data *, struct itesw *)); -int itecngetc __P((dev_t)); -void itecnputc __P((dev_t, int)); -int ite_major __P((void)); +void ite_attach_grf(int, int); +int iteon(struct ite_data *, int); +void iteoff(struct ite_data *, int); +void itefilter(char, char); +void itecninit(struct grf_data *, struct itesw *); +int itecngetc(dev_t); +void itecnputc(dev_t, int); +int ite_major(void); /* ite_subr.c prototypes */ -void ite_fontinfo __P((struct ite_data *)); -void ite_fontinit __P((struct ite_data *)); -u_char ite_readbyte __P((struct ite_data *, int)); -void ite_writeglyph __P((struct ite_data *, u_char *, u_char *)); +void ite_fontinfo(struct ite_data *); +void ite_fontinit(struct ite_data *); +u_char ite_readbyte(struct ite_data *, int); +void ite_writeglyph(struct ite_data *, u_char *, u_char *); #endif diff --git a/sys/arch/hp300/dev/mt.c b/sys/arch/hp300/dev/mt.c index d8bab8503d2..ff8104144bd 100644 --- a/sys/arch/hp300/dev/mt.c +++ b/sys/arch/hp300/dev/mt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mt.c,v 1.8 2002/02/15 20:45:30 nordin Exp $ */ +/* $OpenBSD: mt.c,v 1.9 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: mt.c,v 1.8 1997/03/31 07:37:29 scottr Exp $ */ /* @@ -94,8 +94,8 @@ int mtdebug = 0; #define B_CMD B_XXX /* command buf instead of data */ #define b_cmd b_blkno /* blkno holds cmd when B_CMD */ -int mtmatch __P((struct device *, void *, void *)); -void mtattach __P((struct device *, struct device *, void *)); +int mtmatch(struct device *, void *, void *); +void mtattach(struct device *, struct device *, void *); struct cfattach mt_ca = { sizeof(struct mt_softc), mtmatch, mtattach @@ -105,16 +105,16 @@ struct cfdriver mt_cd = { NULL, "mt", DV_TAPE }; -int mtident __P((struct mt_softc *, struct hpibbus_attach_args *)); -void mtustart __P((struct mt_softc *)); -int mtreaddsj __P((struct mt_softc *, int)); -int mtcommand __P((dev_t, int, int)); -void spl_mtintr __P((void *)); -void spl_mtstart __P((void *)); +int mtident(struct mt_softc *, struct hpibbus_attach_args *); +void mtustart(struct mt_softc *); +int mtreaddsj(struct mt_softc *, int); +int mtcommand(dev_t, int, int); +void spl_mtintr(void *); +void spl_mtstart(void *); -void mtstart __P((void *)); -void mtgo __P((void *)); -void mtintr __P((void *)); +void mtstart(void *); +void mtgo(void *); +void mtintr(void *); bdev_decl(mt); cdev_decl(mt); diff --git a/sys/arch/hp300/dev/nhpib.c b/sys/arch/hp300/dev/nhpib.c index b26b3e4800e..4d4be010427 100644 --- a/sys/arch/hp300/dev/nhpib.c +++ b/sys/arch/hp300/dev/nhpib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nhpib.c,v 1.10 2001/06/25 00:43:08 mickey Exp $ */ +/* $OpenBSD: nhpib.c,v 1.11 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: nhpib.c,v 1.17 1997/05/05 21:06:41 thorpej Exp $ */ /* @@ -83,18 +83,18 @@ static u_char sec_par[] = { 0370,0171,0172,0373,0174,0375,0376,0177 }; -void nhpibifc __P((struct nhpibdevice *)); -void nhpibreadtimo __P((void *)); -int nhpibwait __P((struct nhpibdevice *, int)); +void nhpibifc(struct nhpibdevice *); +void nhpibreadtimo(void *); +int nhpibwait(struct nhpibdevice *, int); -void nhpibreset __P((struct hpibbus_softc *)); -int nhpibsend __P((struct hpibbus_softc *, int, int, void *, int)); -int nhpibrecv __P((struct hpibbus_softc *, int, int, void *, int)); -int nhpibppoll __P((struct hpibbus_softc *)); -void nhpibppwatch __P((void *)); -void nhpibgo __P((struct hpibbus_softc *, int, int, void *, int, int, int)); -void nhpibdone __P((struct hpibbus_softc *)); -int nhpibintr __P((void *)); +void nhpibreset(struct hpibbus_softc *); +int nhpibsend(struct hpibbus_softc *, int, int, void *, int); +int nhpibrecv(struct hpibbus_softc *, int, int, void *, int); +int nhpibppoll(struct hpibbus_softc *); +void nhpibppwatch(void *); +void nhpibgo(struct hpibbus_softc *, int, int, void *, int, int, int); +void nhpibdone(struct hpibbus_softc *); +int nhpibintr(void *); /* * Our controller ops structure. @@ -118,8 +118,8 @@ struct nhpib_softc { struct timeout sc_watch_to; /* nhpibppwatch timeout */ }; -int nhpibmatch __P((struct device *, void *, void *)); -void nhpibattach __P((struct device *, struct device *, void *)); +int nhpibmatch(struct device *, void *, void *); +void nhpibattach(struct device *, struct device *, void *); struct cfattach nhpib_ca = { sizeof(struct nhpib_softc), nhpibmatch, nhpibattach diff --git a/sys/arch/hp300/dev/ppi.c b/sys/arch/hp300/dev/ppi.c index 21b93167729..720f80e5292 100644 --- a/sys/arch/hp300/dev/ppi.c +++ b/sys/arch/hp300/dev/ppi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ppi.c,v 1.8 2001/05/01 16:51:10 millert Exp $ */ +/* $OpenBSD: ppi.c,v 1.9 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: ppi.c,v 1.13 1997/04/02 22:37:33 scottr Exp $ */ /* @@ -76,8 +76,8 @@ struct ppi_softc { #define PPIF_TIMO 0x08 #define PPIF_DELAY 0x10 -int ppimatch __P((struct device *, void *, void *)); -void ppiattach __P((struct device *, struct device *, void *)); +int ppimatch(struct device *, void *, void *); +void ppiattach(struct device *, struct device *, void *); struct cfattach ppi_ca = { sizeof(struct ppi_softc), ppimatch, ppiattach @@ -87,13 +87,13 @@ struct cfdriver ppi_cd = { NULL, "ppi", DV_DULL }; -void ppistart __P((void *)); -void ppinoop __P((void *)); +void ppistart(void *); +void ppinoop(void *); -void ppitimo __P((void *)); -int ppirw __P((dev_t, struct uio *)); -int ppihztoms __P((int)); -int ppimstohz __P((int)); +void ppitimo(void *); +int ppirw(dev_t, struct uio *); +int ppihztoms(int); +int ppimstohz(int); bdev_decl(ppi); cdev_decl(ppi); diff --git a/sys/arch/hp300/dev/scsi.c b/sys/arch/hp300/dev/scsi.c index 98bd898d591..5a8c82740e1 100644 --- a/sys/arch/hp300/dev/scsi.c +++ b/sys/arch/hp300/dev/scsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsi.c,v 1.10 1997/07/06 08:01:55 downsj Exp $ */ +/* $OpenBSD: scsi.c,v 1.11 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: scsi.c,v 1.21 1997/05/05 21:08:26 thorpej Exp $ */ /* @@ -96,28 +96,28 @@ struct scsi_softc { #define SCSI_DATA_WAIT 10000 /* wait per data in/out step */ #define SCSI_INIT_WAIT 50000 /* wait per step (both) during init */ -static void scsiabort __P((int, struct scsi_softc *, - volatile struct scsidevice *, char *)); -static void scsierror __P((struct scsi_softc *, - volatile struct scsidevice *, u_char)); -static int issue_select __P((volatile struct scsidevice *, - u_char, u_char)); -static int wait_for_select __P((volatile struct scsidevice *)); -static int ixfer_start __P((volatile struct scsidevice *, - int, u_char, int)); -static int ixfer_out __P((volatile struct scsidevice *, int, u_char *)); -static void ixfer_in __P((volatile struct scsidevice *, int, u_char *)); -static int mxfer_in __P((volatile struct scsidevice *, - int, u_char *, u_char)); -static int scsiicmd __P((struct scsi_softc *, int, u_char *, int, - u_char *, int, u_char)); -static void finishxfer __P((struct scsi_softc *, - volatile struct scsidevice *, int)); - -int scsimatch __P((struct device *, void *, void *)); -void scsiattach __P((struct device *, struct device *, void *)); -void scsi_attach_children __P((struct scsi_softc *)); -int scsisubmatch __P((struct device *, void *, void *)); +static void scsiabort(int, struct scsi_softc *, + volatile struct scsidevice *, char *); +static void scsierror(struct scsi_softc *, + volatile struct scsidevice *, u_char); +static int issue_select(volatile struct scsidevice *, + u_char, u_char); +static int wait_for_select(volatile struct scsidevice *); +static int ixfer_start(volatile struct scsidevice *, + int, u_char, int); +static int ixfer_out(volatile struct scsidevice *, int, u_char *); +static void ixfer_in(volatile struct scsidevice *, int, u_char *); +static int mxfer_in(volatile struct scsidevice *, + int, u_char *, u_char); +static int scsiicmd(struct scsi_softc *, int, u_char *, int, + u_char *, int, u_char); +static void finishxfer(struct scsi_softc *, + volatile struct scsidevice *, int); + +int scsimatch(struct device *, void *, void *); +void scsiattach(struct device *, struct device *, void *); +void scsi_attach_children(struct scsi_softc *); +int scsisubmatch(struct device *, void *, void *); struct cfattach oscsi_ca = { sizeof(struct scsi_softc), scsimatch, scsiattach diff --git a/sys/arch/hp300/dev/scsivar.h b/sys/arch/hp300/dev/scsivar.h index 76ca923085c..2a8634fd733 100644 --- a/sys/arch/hp300/dev/scsivar.h +++ b/sys/arch/hp300/dev/scsivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: scsivar.h,v 1.5 1997/04/16 11:56:15 downsj Exp $ */ +/* $OpenBSD: scsivar.h,v 1.6 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: scsivar.h,v 1.7 1997/03/31 07:40:05 scottr Exp $ */ /* @@ -55,9 +55,9 @@ struct scsiqueue { /* * Callbacks used to start and stop the target driver. */ - void (*sq_start) __P((void *)); - void (*sq_go) __P((void *)); - void (*sq_intr) __P((void *, int)); + void (*sq_start)(void *); + void (*sq_go)(void *); + void (*sq_intr)(void *, int); }; struct scsi_inquiry; @@ -71,25 +71,25 @@ struct oscsi_attach_args { }; #ifdef _KERNEL -int scsi_print __P((void *, const char *)); +int scsi_print(void *, const char *); -void scsi_delay __P((int)); -void scsistart __P((void *)); -void scsireset __P((int)); -int scsi_test_unit_rdy __P((int, int, int)); -int scsi_request_sense __P((int, int, int, u_char *, u_int)); -int scsi_immed_command __P((int, int, int, struct scsi_fmt_cdb *, - u_char *, u_int, int)); -int scsi_tt_read __P((int, int, int, u_char *, u_int, daddr_t, int)); -int scsi_tt_write __P((int, int, int, u_char *, u_int, daddr_t, int)); -int scsireq __P((struct device *, struct scsiqueue *)); -int scsiustart __P((int)); -void scsistart __P((void *)); -int scsigo __P((int, int, int, struct buf *, struct scsi_fmt_cdb *, int)); -void scsidone __P((void *)); -int scsiintr __P((void *)); -void scsifree __P((struct device *, struct scsiqueue *)); -int scsi_tt_oddio __P((int, int, int, u_char *, u_int, int, int)); -void scsi_str __P((char *, char *, size_t)); -int scsi_probe_device __P((int, int, int, struct scsi_inquiry *, int)); +void scsi_delay(int); +void scsistart(void *); +void scsireset(int); +int scsi_test_unit_rdy(int, int, int); +int scsi_request_sense(int, int, int, u_char *, u_int); +int scsi_immed_command(int, int, int, struct scsi_fmt_cdb *, + u_char *, u_int, int); +int scsi_tt_read(int, int, int, u_char *, u_int, daddr_t, int); +int scsi_tt_write(int, int, int, u_char *, u_int, daddr_t, int); +int scsireq(struct device *, struct scsiqueue *); +int scsiustart(int); +void scsistart(void *); +int scsigo(int, int, int, struct buf *, struct scsi_fmt_cdb *, int); +void scsidone(void *); +int scsiintr(void *); +void scsifree(struct device *, struct scsiqueue *); +int scsi_tt_oddio(int, int, int, u_char *, u_int, int, int); +void scsi_str(char *, char *, size_t); +int scsi_probe_device(int, int, int, struct scsi_inquiry *, int); #endif diff --git a/sys/arch/hp300/dev/sd.c b/sys/arch/hp300/dev/sd.c index 74fa53ad8b9..df542861022 100644 --- a/sys/arch/hp300/dev/sd.c +++ b/sys/arch/hp300/dev/sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sd.c,v 1.23 2001/08/26 00:15:37 miod Exp $ */ +/* $OpenBSD: sd.c,v 1.24 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: sd.c,v 1.34 1997/07/10 18:14:10 kleink Exp $ */ /* @@ -73,8 +73,8 @@ extern int physio(); extern void TBIS(); */ -int sdmatch __P((struct device *, void *, void *)); -void sdattach __P((struct device *, struct device *, void *)); +int sdmatch(struct device *, void *, void *); +void sdattach(struct device *, struct device *, void *); struct cfattach sd_ca = { sizeof(struct sd_softc), sdmatch, sdattach @@ -122,22 +122,22 @@ static char legal_cmds[256] = { /* bdev_decl(sd); */ /* cdev_decl(sd); */ /* XXX we should use macros to do these... */ -int sdopen __P((dev_t, int, int, struct proc *)); -int sdclose __P((dev_t, int, int, struct proc *)); - -int sdioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); -int sdread __P((dev_t, struct uio *, int)); -void sdreset __P((struct sd_softc *)); -int sdwrite __P((dev_t, struct uio *, int)); - -void sdstrategy __P((struct buf *)); -int sddump __P((dev_t, daddr_t, caddr_t, size_t)); -int sdsize __P((dev_t)); - -static void sdgetgeom __P((struct sd_softc *)); -static void sdlblkstrat __P((struct buf *, int)); -static int sderror __P((struct sd_softc *, int)); -static void sdfinish __P((struct sd_softc *, struct buf *)); +int sdopen(dev_t, int, int, struct proc *); +int sdclose(dev_t, int, int, struct proc *); + +int sdioctl(dev_t, u_long, caddr_t, int, struct proc *); +int sdread(dev_t, struct uio *, int); +void sdreset(struct sd_softc *); +int sdwrite(dev_t, struct uio *, int); + +void sdstrategy(struct buf *); +int sddump(dev_t, daddr_t, caddr_t, size_t); +int sdsize(dev_t); + +static void sdgetgeom(struct sd_softc *); +static void sdlblkstrat(struct buf *, int); +static int sderror(struct sd_softc *, int); +static void sdfinish(struct sd_softc *, struct buf *); /* * Perform a mode-sense on page 0x04 (rigid geometry). diff --git a/sys/arch/hp300/dev/sdvar.h b/sys/arch/hp300/dev/sdvar.h index ee41b424efd..78813016d9f 100644 --- a/sys/arch/hp300/dev/sdvar.h +++ b/sys/arch/hp300/dev/sdvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sdvar.h,v 1.9 1998/10/04 01:02:25 millert Exp $ */ +/* $OpenBSD: sdvar.h,v 1.10 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: sdvar.h,v 1.7 1997/03/31 07:40:07 scottr Exp $ */ /* @@ -84,15 +84,15 @@ struct sd_softc { #ifdef _KERNEL /* sd.c */ -void sdustart __P((int)); +void sdustart(int); -void sdstart __P((void *)); -void sdgo __P((void *)); -void sdintr __P((void *, int)); +void sdstart(void *); +void sdgo(void *); +void sdintr(void *, int); -int sdgetcapacity __P((struct sd_softc *, dev_t)); -int sdgetinfo __P((dev_t, struct sd_softc *, struct disklabel *, int)); +int sdgetcapacity(struct sd_softc *, dev_t); +int sdgetinfo(dev_t, struct sd_softc *, struct disklabel *, int); /* sd_compat.c */ -void sdmakedisklabel __P((int, struct disklabel *)); +void sdmakedisklabel(int, struct disklabel *); #endif /* _KERNEL */ diff --git a/sys/arch/hp300/dev/st.c b/sys/arch/hp300/dev/st.c index 52f0d375855..1e6588bdaf5 100644 --- a/sys/arch/hp300/dev/st.c +++ b/sys/arch/hp300/dev/st.c @@ -1,4 +1,4 @@ -/* $OpenBSD: st.c,v 1.11 1999/09/18 22:48:28 downsj Exp $ */ +/* $OpenBSD: st.c,v 1.12 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: st.c,v 1.22 1997/04/02 22:37:38 scottr Exp $ */ /* @@ -165,26 +165,26 @@ int st_extti = 0x01; /* bitmask of unit numbers, do extra */ /* bdev_decl(st); */ /* cdev_decl(st); */ /* XXX we should use macros to do these... */ -int stopen __P((dev_t, int, int, struct proc *)); -int stclose __P((dev_t, int, int, struct proc *)); +int stopen(dev_t, int, int, struct proc *); +int stclose(dev_t, int, int, struct proc *); -int stioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); -int stread __P((dev_t, struct uio *, int)); -int stwrite __P((dev_t, struct uio *, int)); +int stioctl(dev_t, u_long, caddr_t, int, struct proc *); +int stread(dev_t, struct uio *, int); +int stwrite(dev_t, struct uio *, int); -void ststrategy __P((struct buf *)); -int stdump __P((dev_t)); +void ststrategy(struct buf *); +int stdump(dev_t); #ifdef DEBUG -void dumpxsense __P((struct st_xsense *)); -void prtmodsel __P((struct mode_select_data *, int)); -void prtmodstat __P((struct mode_sense *)); +void dumpxsense(struct st_xsense *); +void prtmodsel(struct mode_select_data *, int); +void prtmodstat(struct mode_sense *); #endif /* DEBUG */ -static void stfinish __P((struct st_softc *, struct buf *)); -static void sterror __P((struct st_softc *, int)); -static int stmatch __P((struct device *, void *, void *)); -static void stattach __P((struct device *, struct device *, void *)); +static void stfinish(struct st_softc *, struct buf *); +static void sterror(struct st_softc *, int); +static int stmatch(struct device *, void *, void *); +static void stattach(struct device *, struct device *, void *); struct cfattach st_ca = { sizeof(struct st_softc), stmatch, stattach diff --git a/sys/arch/hp300/dev/stvar.h b/sys/arch/hp300/dev/stvar.h index f8c5a881e97..81b2fc0bca9 100644 --- a/sys/arch/hp300/dev/stvar.h +++ b/sys/arch/hp300/dev/stvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stvar.h,v 1.3 1997/04/16 11:56:17 downsj Exp $ */ +/* $OpenBSD: stvar.h,v 1.4 2002/03/14 01:26:30 millert Exp $ */ /* $NetBSD: stvar.h,v 1.6 1997/04/02 22:37:40 scottr Exp $ */ /* @@ -212,13 +212,13 @@ struct st_softc { #define STF_MOVED 0x0040 #ifdef _KERNEL -void stcommand __P((dev_t, u_int, int)); -void stustart __P((int)); +void stcommand(dev_t, u_int, int); +void stustart(int); -void ststart __P((void *)); -void stgo __P((void *)); -void stintr __P((void *, int)); +void ststart(void *); +void stgo(void *); +void stintr(void *, int); -void stxsense __P((int, int, int, struct st_softc *)); -void prtkey __P((struct st_softc *)); +void stxsense(int, int, int, struct st_softc *); +void prtkey(struct st_softc *); #endif /* _KERNEL */ |