From 5ca58d54f028de8e475c711996f8933c03bba2c9 Mon Sep 17 00:00:00 2001 From: Robert Garrett Date: Wed, 27 Aug 2003 06:48:15 +0000 Subject: [PATCH] lets go ahead and commit this before we hit the network interfaces __P removal --- sys/dev/powermng/i386/intpm/intpm.c | 4 +- sys/dev/powermng/pc98/pmc/pmc.c | 12 ++--- sys/dev/raid/asr/asr.c | 66 ++++++++++++++-------------- sys/dev/serial/cy/cy.c | 48 ++++++++++---------- sys/dev/serial/cy/cy_pci.c | 6 +-- sys/dev/serial/rc/rc.c | 28 ++++++------ sys/dev/serial/rp/rp.c | 12 ++--- sys/dev/serial/rp2/rp.c | 18 ++++---- sys/dev/serial/sio/sio.c | 62 +++++++++++++------------- sys/dev/sound/isa/i386/pca/pcaudio.c | 8 ++-- sys/dev/sound/isa/i386/soundcard.c | 6 +-- sys/dev/sound/isa/i386/spkr/spkr.c | 14 +++--- sys/dev/video/bktr/bktr_os.c | 8 ++-- sys/dev/video/ctx/ctx.c | 6 +-- sys/dev/video/meteor/meteor.c | 4 +- sys/dev/video/pcvt/i386/pcvt_drv.c | 4 +- 16 files changed, 153 insertions(+), 153 deletions(-) diff --git a/sys/dev/powermng/i386/intpm/intpm.c b/sys/dev/powermng/i386/intpm/intpm.c index d1e8b1a193..a6c46d5bca 100644 --- a/sys/dev/powermng/i386/intpm/intpm.c +++ b/sys/dev/powermng/i386/intpm/intpm.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pci/intpm.c,v 1.16.2.1 2001/12/23 08:17:47 pirzyk Exp $ - * $DragonFly: src/sys/dev/powermng/i386/intpm/intpm.c,v 1.4 2003/08/07 21:17:07 dillon Exp $ + * $DragonFly: src/sys/dev/powermng/i386/intpm/intpm.c,v 1.5 2003/08/27 06:48:14 rob Exp $ */ #include @@ -643,7 +643,7 @@ intsmb_bread(device_t dev, u_char slave, char cmd, u_char count, char *buf) DRIVER_MODULE(intsmb, intpm , intpm_driver, intsmb_devclass, 0, 0); -static void intpm_intr __P((void *arg)); +static void intpm_intr (void *arg); static int intpm_attach(device_t dev) { diff --git a/sys/dev/powermng/pc98/pmc/pmc.c b/sys/dev/powermng/pc98/pmc/pmc.c index 6475bdc5b5..ec04173f88 100644 --- a/sys/dev/powermng/pc98/pmc/pmc.c +++ b/sys/dev/powermng/pc98/pmc/pmc.c @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pc98/pc98/pmc.c,v 1.2.2.1 2001/11/01 09:42:29 nyan Exp $ - * $DragonFly: src/sys/dev/powermng/pc98/pmc/Attic/pmc.c,v 1.3 2003/08/07 21:17:07 dillon Exp $ + * $DragonFly: src/sys/dev/powermng/pc98/pmc/Attic/pmc.c,v 1.4 2003/08/27 06:48:14 rob Exp $ */ #include @@ -52,11 +52,11 @@ struct pmc_isa_softc { int flags; }; -static int pmc_isa_alloc_resources __P((device_t)); -static void pmc_isa_release_resources __P((device_t)); -static int pmc_isa_probe __P((device_t)); -static int pmc_isa_attach __P((device_t)); -static int pmc_isa_detach __P((device_t)); +static int pmc_isa_alloc_resources (device_t); +static void pmc_isa_release_resources (device_t); +static int pmc_isa_probe (device_t); +static int pmc_isa_attach (device_t); +static int pmc_isa_detach (device_t); #define PMC_ISA_PORT 0x8f0 #define PMC_ISA_PORTSIZE 4 diff --git a/sys/dev/raid/asr/asr.c b/sys/dev/raid/asr/asr.c index 00e44e2428..5246f97b57 100644 --- a/sys/dev/raid/asr/asr.c +++ b/sys/dev/raid/asr/asr.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/asr/asr.c,v 1.3.2.2 2001/08/23 05:21:29 scottl Exp $ */ -/* $DragonFly: src/sys/dev/raid/asr/asr.c,v 1.9 2003/08/07 21:17:08 dillon Exp $ */ +/* $DragonFly: src/sys/dev/raid/asr/asr.c,v 1.10 2003/08/27 06:48:14 rob Exp $ */ /* * Copyright (c) 1996-2000 Distributed Processing Technology Corporation * Copyright (c) 2000-2001 Adaptec Corporation @@ -440,48 +440,48 @@ STATIC Asr_softc_t * Asr_softc; #define ATTACH_RETURN(retval) return #endif /* I2O HDM interface */ -STATIC PROBE_RET asr_probe __P((PROBE_ARGS)); -STATIC ATTACH_RET asr_attach __P((ATTACH_ARGS)); +STATIC PROBE_RET asr_probe (PROBE_ARGS); +STATIC ATTACH_RET asr_attach (ATTACH_ARGS); /* DOMINO placeholder */ -STATIC PROBE_RET domino_probe __P((PROBE_ARGS)); -STATIC ATTACH_RET domino_attach __P((ATTACH_ARGS)); +STATIC PROBE_RET domino_probe (PROBE_ARGS); +STATIC ATTACH_RET domino_attach (ATTACH_ARGS); /* MODE0 adapter placeholder */ -STATIC PROBE_RET mode0_probe __P((PROBE_ARGS)); -STATIC ATTACH_RET mode0_attach __P((ATTACH_ARGS)); +STATIC PROBE_RET mode0_probe (PROBE_ARGS); +STATIC ATTACH_RET mode0_attach (ATTACH_ARGS); -STATIC Asr_softc_t * ASR_get_sc __P(( - IN dev_t dev)); -STATIC int asr_ioctl __P(( +STATIC Asr_softc_t * ASR_get_sc ( + IN dev_t dev); +STATIC int asr_ioctl ( IN dev_t dev, IN u_long cmd, INOUT caddr_t data, int flag, - d_thread_t *td)); -STATIC int asr_open __P(( + d_thread_t *td); +STATIC int asr_open ( IN dev_t dev, int32_t flags, int32_t ifmt, - IN d_thread_t *td)); -STATIC int asr_close __P(( + IN d_thread_t *td); +STATIC int asr_close ( dev_t dev, int flags, int ifmt, - d_thread_t *td)); -STATIC int asr_intr __P(( - IN Asr_softc_t * sc)); -STATIC void asr_timeout __P(( - INOUT void * arg)); -STATIC int ASR_init __P(( - IN Asr_softc_t * sc)); -STATIC INLINE int ASR_acquireLct __P(( - INOUT Asr_softc_t * sc)); -STATIC INLINE int ASR_acquireHrt __P(( - INOUT Asr_softc_t * sc)); -STATIC void asr_action __P(( + d_thread_t *td); +STATIC int asr_intr ( + IN Asr_softc_t * sc); +STATIC void asr_timeout ( + INOUT void * arg); +STATIC int ASR_init ( + IN Asr_softc_t * sc); +STATIC INLINE int ASR_acquireLct ( + INOUT Asr_softc_t * sc); +STATIC INLINE int ASR_acquireHrt ( + INOUT Asr_softc_t * sc); +STATIC void asr_action ( IN struct cam_sim * sim, - IN union ccb * ccb)); -STATIC void asr_poll __P(( - IN struct cam_sim * sim)); + IN union ccb * ccb); +STATIC void asr_poll ( + IN struct cam_sim * sim); /* * Here is the auto-probe structure used to nest our tests appropriately @@ -593,8 +593,8 @@ STATIC struct cdevsw asr_cdevsw = { }; #ifdef ASR_MEASURE_PERFORMANCE -STATIC u_int32_t asr_time_delta __P((IN struct timeval start, - IN struct timeval end)); +STATIC u_int32_t asr_time_delta (IN struct timeval start, + IN struct timeval end); #endif /* @@ -941,9 +941,9 @@ ASR_prstring ( /* * Prototypes */ -STATIC INLINE int ASR_queue __P(( +STATIC INLINE int ASR_queue ( IN Asr_softc_t * sc, - IN PI2O_MESSAGE_FRAME Message)); + IN PI2O_MESSAGE_FRAME Message); /* * Send a message synchronously and without Interrupt to a ccb. */ diff --git a/sys/dev/serial/cy/cy.c b/sys/dev/serial/cy/cy.c index a5e54149f1..c0fc7f79fb 100644 --- a/sys/dev/serial/cy/cy.c +++ b/sys/dev/serial/cy/cy.c @@ -28,7 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/cy.c,v 1.97.2.2 2001/08/22 13:04:58 bde Exp $ - * $DragonFly: src/sys/dev/serial/cy/cy.c,v 1.8 2003/08/07 21:17:10 dillon Exp $ + * $DragonFly: src/sys/dev/serial/cy/cy.c,v 1.9 2003/08/27 06:48:14 rob Exp $ */ #include "opt_compat.h" @@ -328,38 +328,38 @@ struct com_s { }; /* PCI driver entry point. */ -int cyattach_common __P((cy_addr cy_iobase, int cy_align)); +int cyattach_common (cy_addr cy_iobase, int cy_align); ointhand2_t siointr; -static int cy_units __P((cy_addr cy_iobase, int cy_align)); -static int sioattach __P((struct isa_device *dev)); -static void cd1400_channel_cmd __P((struct com_s *com, int cmd)); -static void cd1400_channel_cmd_wait __P((struct com_s *com)); -static void cd_etc __P((struct com_s *com, int etc)); -static int cd_getreg __P((struct com_s *com, int reg)); -static void cd_setreg __P((struct com_s *com, int reg, int val)); +static int cy_units (cy_addr cy_iobase, int cy_align); +static int sioattach (struct isa_device *dev); +static void cd1400_channel_cmd (struct com_s *com, int cmd); +static void cd1400_channel_cmd_wait (struct com_s *com); +static void cd_etc (struct com_s *com, int etc); +static int cd_getreg (struct com_s *com, int reg); +static void cd_setreg (struct com_s *com, int reg, int val); static timeout_t siodtrwakeup; -static void comhardclose __P((struct com_s *com)); -static void sioinput __P((struct com_s *com)); +static void comhardclose (struct com_s *com); +static void sioinput (struct com_s *com); #if 0 -static void siointr1 __P((struct com_s *com)); +static void siointr1 (struct com_s *com); #endif -static int commctl __P((struct com_s *com, int bits, int how)); -static int comparam __P((struct tty *tp, struct termios *t)); +static int commctl (struct com_s *com, int bits, int how); +static int comparam (struct tty *tp, struct termios *t); static inthand2_t siopoll; -static int sioprobe __P((struct isa_device *dev)); -static void siosettimeout __P((void)); -static int siosetwater __P((struct com_s *com, speed_t speed)); -static int comspeed __P((speed_t speed, u_long cy_clock, - int *prescaler_io)); -static void comstart __P((struct tty *tp)); -static void comstop __P((struct tty *tp, int rw)); +static int sioprobe (struct isa_device *dev); +static void siosettimeout (void); +static int siosetwater (struct com_s *com, speed_t speed); +static int comspeed (speed_t speed, u_long cy_clock, + int *prescaler_io); +static void comstart (struct tty *tp); +static void comstop (struct tty *tp, int rw); static timeout_t comwakeup; -static void disc_optim __P((struct tty *tp, struct termios *t, - struct com_s *com)); +static void disc_optim (struct tty *tp, struct termios *t, + struct com_s *com); #ifdef CyDebug -void cystatus __P((int unit)); +void cystatus (int unit); #endif static char driver_name[] = "cy"; diff --git a/sys/dev/serial/cy/cy_pci.c b/sys/dev/serial/cy/cy_pci.c index ce773c2ac2..05e55fcf45 100644 --- a/sys/dev/serial/cy/cy_pci.c +++ b/sys/dev/serial/cy/cy_pci.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pci/cy_pci.c,v 1.17.2.1 2002/03/17 04:14:18 bde Exp $ - * $DragonFly: src/sys/dev/serial/cy/cy_pci.c,v 1.3 2003/08/07 21:17:10 dillon Exp $ + * $DragonFly: src/sys/dev/serial/cy/cy_pci.c,v 1.4 2003/08/27 06:48:14 rob Exp $ */ /* @@ -48,8 +48,8 @@ #include #endif -static const char *cy_probe __P((pcici_t, pcidi_t)); -static void cy_attach __P((pcici_t, int)); +static const char *cy_probe (pcici_t, pcidi_t); +static void cy_attach (pcici_t, int); extern int cyattach_common(void *, int); /* Not exactly correct */ extern void cyintr(int); diff --git a/sys/dev/serial/rc/rc.c b/sys/dev/serial/rc/rc.c index bf0513f1fc..88d1b25e96 100644 --- a/sys/dev/serial/rc/rc.c +++ b/sys/dev/serial/rc/rc.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/rc.c,v 1.53.2.1 2001/02/26 04:23:10 jlemon Exp $ - * $DragonFly: src/sys/dev/serial/rc/rc.c,v 1.8 2003/08/07 21:17:10 dillon Exp $ + * $DragonFly: src/sys/dev/serial/rc/rc.c,v 1.9 2003/08/27 06:48:14 rob Exp $ * */ @@ -56,8 +56,8 @@ #include "rcreg.h" /* Prototypes */ -static int rcprobe __P((struct isa_device *)); -static int rcattach __P((struct isa_device *)); +static int rcprobe (struct isa_device *); +static int rcattach (struct isa_device *); #define rcin(port) RC_IN (nec, port) #define rcout(port,v) RC_OUT (nec, port, v) @@ -173,23 +173,23 @@ static int rc_rcsrt[16] = { /* Static prototypes */ static ointhand2_t rcintr; -static void rc_hwreset __P((int, int, unsigned int)); -static int rc_test __P((int, int)); -static void rc_discard_output __P((struct rc_chans *)); -static void rc_hardclose __P((struct rc_chans *)); -static int rc_modctl __P((struct rc_chans *, int, int)); -static void rc_start __P((struct tty *)); -static void rc_stop __P((struct tty *, int rw)); -static int rc_param __P((struct tty *, struct termios *)); +static void rc_hwreset (int, int, unsigned int); +static int rc_test (int, int); +static void rc_discard_output (struct rc_chans *); +static void rc_hardclose (struct rc_chans *); +static int rc_modctl (struct rc_chans *, int, int); +static void rc_start (struct tty *); +static void rc_stop (struct tty *, int rw); +static int rc_param (struct tty *, struct termios *); static inthand2_t rcpoll; -static void rc_reinit __P((struct rc_softc *)); +static void rc_reinit (struct rc_softc *); #ifdef RCDEBUG static void printrcflags(); #endif static timeout_t rc_dtrwakeup; static timeout_t rc_wakeup; -static void disc_optim __P((struct tty *tp, struct termios *t, struct rc_chans *)); -static void rc_wait0 __P((int nec, int unit, int chan, int line)); +static void disc_optim (struct tty *tp, struct termios *t, struct rc_chans *); +static void rc_wait0 (int nec, int unit, int chan, int line); /**********************************************/ diff --git a/sys/dev/serial/rp/rp.c b/sys/dev/serial/rp/rp.c index a866ae5e26..1f38bbb8ce 100644 --- a/sys/dev/serial/rp/rp.c +++ b/sys/dev/serial/rp/rp.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/rp/rp.c,v 1.45.2.2 2002/11/07 22:26:59 tegge Exp $ - * $DragonFly: src/sys/dev/serial/rp/rp.c,v 1.8 2003/08/07 21:17:11 dillon Exp $ + * $DragonFly: src/sys/dev/serial/rp/rp.c,v 1.9 2003/08/27 06:48:14 rob Exp $ */ /* @@ -622,11 +622,11 @@ static struct rp_port *p_rp_table[MAX_RP_PORTS]; * The top-level routines begin here */ -static int rpparam __P((struct tty *, struct termios *)); -static void rpstart __P((struct tty *)); -static void rpstop __P((struct tty *, int)); -static void rphardclose __P((struct rp_port *)); -static void rp_disc_optim __P((struct tty *tp, struct termios *t)); +static int rpparam (struct tty *, struct termios *); +static void rpstart (struct tty *); +static void rpstop (struct tty *, int); +static void rphardclose (struct rp_port *); +static void rp_disc_optim (struct tty *tp, struct termios *t); static _INLINE_ void rp_do_receive(struct rp_port *rp, struct tty *tp, CHANNEL_t *cp, unsigned int ChanStatus) diff --git a/sys/dev/serial/rp2/rp.c b/sys/dev/serial/rp2/rp.c index 0cd1b59f62..d6ffd781cf 100644 --- a/sys/dev/serial/rp2/rp.c +++ b/sys/dev/serial/rp2/rp.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/rp.c,v 1.33.2.2 2001/02/26 04:23:10 jlemon Exp $ - * $DragonFly: src/sys/dev/serial/rp2/Attic/rp.c,v 1.8 2003/08/07 21:17:11 dillon Exp $ + * $DragonFly: src/sys/dev/serial/rp2/Attic/rp.c,v 1.9 2003/08/27 06:48:14 rob Exp $ */ /* @@ -768,8 +768,8 @@ void sDisInterrupts(CHANNEL_T *ChP,Word_t Flags) Begin FreeBsd-specific driver code **********************************************************************/ -static int rpprobe __P((struct isa_device *)); -static int rpattach __P((struct isa_device *)); +static int rpprobe (struct isa_device *); +static int rpattach (struct isa_device *); static const char* rp_pciprobe(pcici_t tag, pcidi_t type); static void rp_pciattach(pcici_t tag, int unit); @@ -855,12 +855,12 @@ static struct rp_port *p_rp_table[MAX_RP_PORTS]; * The top-level routines begin here */ -static int rpparam __P((struct tty *, struct termios *)); -static void rpstart __P((struct tty *)); -static void rpstop __P((struct tty *, int)); -static void rphardclose __P((struct rp_port *)); -static void rp_disc_optim __P((struct tty *tp, struct termios *t, - struct rp_port *rp)); +static int rpparam (struct tty *, struct termios *); +static void rpstart (struct tty *); +static void rpstop (struct tty *, int); +static void rphardclose (struct rp_port *); +static void rp_disc_optim (struct tty *tp, struct termios *t, + struct rp_port *rp); static _INLINE_ void rp_do_receive(struct rp_port *rp, struct tty *tp, CHANNEL_t *cp, unsigned int ChanStatus) diff --git a/sys/dev/serial/sio/sio.c b/sys/dev/serial/sio/sio.c index e36f84f647..3f97caf1dc 100644 --- a/sys/dev/serial/sio/sio.c +++ b/sys/dev/serial/sio/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/isa/sio.c,v 1.291.2.35 2003/05/18 08:51:15 murray Exp $ - * $DragonFly: src/sys/dev/serial/sio/sio.c,v 1.9 2003/08/07 21:17:11 dillon Exp $ + * $DragonFly: src/sys/dev/serial/sio/sio.c,v 1.10 2003/08/27 06:48:14 rob Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.234 */ @@ -292,46 +292,46 @@ struct com_s { }; #ifdef COM_ESP -static int espattach __P((struct com_s *com, Port_t esp_port)); +static int espattach (struct com_s *com, Port_t esp_port); #endif -static int sioattach __P((device_t dev, int rid, u_long rclk)); -static int sio_isa_attach __P((device_t dev)); +static int sioattach (device_t dev, int rid, u_long rclk); +static int sio_isa_attach (device_t dev); static timeout_t siobusycheck; -static u_int siodivisor __P((u_long rclk, speed_t speed)); +static u_int siodivisor (u_long rclk, speed_t speed); static timeout_t siodtrwakeup; -static void comhardclose __P((struct com_s *com)); -static void sioinput __P((struct com_s *com)); -static void siointr1 __P((struct com_s *com)); -static void siointr __P((void *arg)); -static int commctl __P((struct com_s *com, int bits, int how)); -static int comparam __P((struct tty *tp, struct termios *t)); +static void comhardclose (struct com_s *com); +static void sioinput (struct com_s *com); +static void siointr1 (struct com_s *com); +static void siointr (void *arg); +static int commctl (struct com_s *com, int bits, int how); +static int comparam (struct tty *tp, struct termios *t); static inthand2_t siopoll; -static int sioprobe __P((device_t dev, int xrid, u_long rclk)); -static int sio_isa_probe __P((device_t dev)); -static void siosettimeout __P((void)); -static int siosetwater __P((struct com_s *com, speed_t speed)); -static void comstart __P((struct tty *tp)); -static void comstop __P((struct tty *tp, int rw)); +static int sioprobe (device_t dev, int xrid, u_long rclk); +static int sio_isa_probe (device_t dev); +static void siosettimeout (void); +static int siosetwater (struct com_s *com, speed_t speed); +static void comstart (struct tty *tp); +static void comstop (struct tty *tp, int rw); static timeout_t comwakeup; -static void disc_optim __P((struct tty *tp, struct termios *t, - struct com_s *com)); +static void disc_optim (struct tty *tp, struct termios *t, + struct com_s *com); #if NCARD > 0 -static int sio_pccard_attach __P((device_t dev)); -static int sio_pccard_detach __P((device_t dev)); -static int sio_pccard_probe __P((device_t dev)); +static int sio_pccard_attach (device_t dev); +static int sio_pccard_detach (device_t dev); +static int sio_pccard_probe (device_t dev); #endif /* NCARD > 0 */ #if NPCI > 0 -static int sio_pci_attach __P((device_t dev)); -static void sio_pci_kludge_unit __P((device_t dev)); -static int sio_pci_probe __P((device_t dev)); +static int sio_pci_attach (device_t dev); +static void sio_pci_kludge_unit (device_t dev); +static int sio_pci_probe (device_t dev); #endif /* NPCI > 0 */ #if NPUC > 0 -static int sio_puc_attach __P((device_t dev)); -static int sio_puc_probe __P((device_t dev)); +static int sio_puc_attach (device_t dev); +static int sio_puc_probe (device_t dev); #endif /* NPUC > 0 */ static char driver_name[] = "sio"; @@ -2979,10 +2979,10 @@ struct siocnstate { u_char mcr; }; -static speed_t siocngetspeed __P((Port_t, u_long rclk)); -static void siocnclose __P((struct siocnstate *sp, Port_t iobase)); -static void siocnopen __P((struct siocnstate *sp, Port_t iobase, int speed)); -static void siocntxwait __P((Port_t iobase)); +static speed_t siocngetspeed (Port_t, u_long rclk); +static void siocnclose (struct siocnstate *sp, Port_t iobase); +static void siocnopen (struct siocnstate *sp, Port_t iobase, int speed); +static void siocntxwait (Port_t iobase); static cn_probe_t siocnprobe; static cn_init_t siocninit; diff --git a/sys/dev/sound/isa/i386/pca/pcaudio.c b/sys/dev/sound/isa/i386/pca/pcaudio.c index 4f4e49c9e1..36aaec2ffe 100644 --- a/sys/dev/sound/isa/i386/pca/pcaudio.c +++ b/sys/dev/sound/isa/i386/pca/pcaudio.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/pcaudio.c,v 1.58 2000/01/25 21:58:43 dfr Exp $ - * $DragonFly: src/sys/dev/sound/isa/i386/pca/Attic/pcaudio.c,v 1.6 2003/08/07 21:17:12 dillon Exp $ + * $DragonFly: src/sys/dev/sound/isa/i386/pca/Attic/pcaudio.c,v 1.7 2003/08/27 06:48:15 rob Exp $ */ #include @@ -175,9 +175,9 @@ static struct cdevsw pca_cdevsw = { /* psize */ nopsize }; -static void pca_continue __P((void)); -static void pca_init __P((void)); -static void pca_pause __P((void)); +static void pca_continue (void); +static void pca_init (void); +static void pca_pause (void); static void conv(const unsigned char *table, unsigned char *buff, unsigned n) diff --git a/sys/dev/sound/isa/i386/soundcard.c b/sys/dev/sound/isa/i386/soundcard.c index eb7124e957..c534796624 100644 --- a/sys/dev/sound/isa/i386/soundcard.c +++ b/sys/dev/sound/isa/i386/soundcard.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/sound/soundcard.c,v 1.87 1999/12/20 18:05:01 eivind Exp $ - * $DragonFly: src/sys/dev/sound/isa/i386/Attic/soundcard.c,v 1.4 2003/08/07 21:17:12 dillon Exp $ + * $DragonFly: src/sys/dev/sound/isa/i386/Attic/soundcard.c,v 1.5 2003/08/27 06:48:15 rob Exp $ * */ #include "use_snd.h" @@ -76,8 +76,8 @@ audio_poll(int dev, struct fileinfo * file, int events, select_table * wait); int sequencer_poll (int dev, struct fileinfo *file, int events, select_table * wait); -static int sndprobe __P((struct isa_device *)); -static int sndattach __P((struct isa_device *)); +static int sndprobe (struct isa_device *); +static int sndattach (struct isa_device *); static d_open_t sndopen; static d_close_t sndclose; diff --git a/sys/dev/sound/isa/i386/spkr/spkr.c b/sys/dev/sound/isa/i386/spkr/spkr.c index cac230a56d..1553a618b5 100644 --- a/sys/dev/sound/isa/i386/spkr/spkr.c +++ b/sys/dev/sound/isa/i386/spkr/spkr.c @@ -5,7 +5,7 @@ * modified for FreeBSD by Andrew A. Chernov * * $FreeBSD: src/sys/i386/isa/spkr.c,v 1.45 2000/01/29 16:00:32 peter Exp $ - * $DragonFly: src/sys/dev/sound/isa/i386/spkr/Attic/spkr.c,v 1.7 2003/08/07 21:17:13 dillon Exp $ + * $DragonFly: src/sys/dev/sound/isa/i386/spkr/Attic/spkr.c,v 1.8 2003/08/27 06:48:15 rob Exp $ */ #include @@ -66,12 +66,12 @@ static struct cdevsw spkr_cdevsw = { static char endtone, endrest; -static void tone __P((unsigned int thz, unsigned int ticks)); -static void rest __P((int ticks)); -static void playinit __P((void)); -static void playtone __P((int pitch, int value, int sustain)); -static int abs __P((int n)); -static void playstring __P((char *cp, size_t slen)); +static void tone (unsigned int thz, unsigned int ticks); +static void rest (int ticks); +static void playinit (void); +static void playtone (int pitch, int value, int sustain); +static int abs (int n); +static void playstring (char *cp, size_t slen); /* emit tone of frequency thz for given number of ticks */ static void diff --git a/sys/dev/video/bktr/bktr_os.c b/sys/dev/video/bktr/bktr_os.c index 10ad2eacaf..4ad587f5c0 100644 --- a/sys/dev/video/bktr/bktr_os.c +++ b/sys/dev/video/bktr/bktr_os.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.4.2.3 2000/10/27 00:46:09 jhb Exp $ */ -/* $DragonFly: src/sys/dev/video/bktr/bktr_os.c,v 1.5 2003/08/07 21:17:15 dillon Exp $ */ +/* $DragonFly: src/sys/dev/video/bktr/bktr_os.c,v 1.6 2003/08/27 06:48:15 rob Exp $ */ /* * This is part of the Driver for Video Capture Cards (Frame grabbers) @@ -1306,11 +1306,11 @@ vm_offset_t vm_page_alloc_contig(vm_offset_t, vm_offset_t, vm_offset_t, vm_offset_t); #if defined(__OpenBSD__) -static int bktr_probe __P((struct device *, void *, void *)); +static int bktr_probe (struct device *, void *, void *); #else -static int bktr_probe __P((struct device *, struct cfdata *, void *)); +static int bktr_probe (struct device *, struct cfdata *, void *); #endif -static void bktr_attach __P((struct device *, struct device *, void *)); +static void bktr_attach (struct device *, struct device *, void *); struct cfattach bktr_ca = { sizeof(struct bktr_softc), bktr_probe, bktr_attach diff --git a/sys/dev/video/ctx/ctx.c b/sys/dev/video/ctx/ctx.c index 995bb14787..33e32176fb 100644 --- a/sys/dev/video/ctx/ctx.c +++ b/sys/dev/video/ctx/ctx.c @@ -9,7 +9,7 @@ * for damages incurred with its use. * * $FreeBSD: src/sys/i386/isa/ctx.c,v 1.36 2000/01/29 16:17:31 peter Exp $ - * $DragonFly: src/sys/dev/video/ctx/ctx.c,v 1.5 2003/08/07 21:17:15 dillon Exp $ + * $DragonFly: src/sys/dev/video/ctx/ctx.c,v 1.6 2003/08/27 06:48:15 rob Exp $ */ /* @@ -129,8 +129,8 @@ static int waitvb(int port); #define UNIT(x) ((x) & 0x07) -static int ctxprobe __P((struct isa_device *devp)); -static int ctxattach __P((struct isa_device *devp)); +static int ctxprobe (struct isa_device *devp); +static int ctxattach (struct isa_device *devp); struct isa_driver ctxdriver = {ctxprobe, ctxattach, "ctx"}; static d_open_t ctxopen; diff --git a/sys/dev/video/meteor/meteor.c b/sys/dev/video/meteor/meteor.c index 8760b94827..547459c765 100644 --- a/sys/dev/video/meteor/meteor.c +++ b/sys/dev/video/meteor/meteor.c @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/meteor.c,v 1.49 1999/09/25 18:24:41 phk Exp $ - * $DragonFly: src/sys/dev/video/meteor/meteor.c,v 1.8 2003/08/11 17:50:15 drhodus Exp $ + * $DragonFly: src/sys/dev/video/meteor/meteor.c,v 1.9 2003/08/27 06:48:15 rob Exp $ */ /* Change History: @@ -172,7 +172,7 @@ #include "meteor_reg.h" -static void meteor_intr __P((void *arg)); +static void meteor_intr (void *arg); /* * Allocate enough memory for: diff --git a/sys/dev/video/pcvt/i386/pcvt_drv.c b/sys/dev/video/pcvt/i386/pcvt_drv.c index 95206ca07a..013d4d0e98 100644 --- a/sys/dev/video/pcvt/i386/pcvt_drv.c +++ b/sys/dev/video/pcvt/i386/pcvt_drv.c @@ -51,7 +51,7 @@ * Last Edit-Date: [Mon Dec 27 14:03:36 1999] * * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_drv.c,v 1.63.2.1 2001/02/26 04:23:13 jlemon Exp $ - * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_drv.c,v 1.7 2003/08/07 21:17:16 dillon Exp $ + * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_drv.c,v 1.8 2003/08/27 06:48:15 rob Exp $ * *---------------------------------------------------------------------------*/ @@ -69,7 +69,7 @@ #include "machine/stdarg.h" #endif -extern int getchar __P((void)); +extern int getchar (void); #if PCVT_NETBSD extern u_short *Crtat; -- 2.41.0