From: Robert Garrett Date: Wed, 27 Aug 2003 10:35:18 +0000 (+0000) Subject: remove __P() from this directory X-Git-Tag: v2.0.1~13022 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/38e94a2553dc2f0ca65cde6d7622e6c98428d96c remove __P() from this directory --- diff --git a/sys/dev/atm/en/midway.c b/sys/dev/atm/en/midway.c index 9da69f438d..cffc388582 100644 --- a/sys/dev/atm/en/midway.c +++ b/sys/dev/atm/en/midway.c @@ -33,7 +33,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/en/midway.c,v 1.19.2.1 2003/01/23 21:06:42 sam Exp $ - * $DragonFly: src/sys/dev/atm/en/midway.c,v 1.4 2003/08/07 21:54:27 dillon Exp $ + * $DragonFly: src/sys/dev/atm/en/midway.c,v 1.5 2003/08/27 10:35:15 rob Exp $ */ /* @@ -265,36 +265,36 @@ static struct en_dmatab *en_dmaplan = en_dma_planB; * prototypes */ -STATIC INLINE int en_b2sz __P((int)) __attribute__ ((unused)); +STATIC INLINE int en_b2sz (int) __attribute__ ((unused)); #ifdef EN_DDBHOOK - int en_dump __P((int,int)); - int en_dumpmem __P((int,int,int)); -#endif -STATIC void en_dmaprobe __P((struct en_softc *)); -STATIC int en_dmaprobe_doit __P((struct en_softc *, u_int8_t *, - u_int8_t *, int)); -STATIC INLINE int en_dqneed __P((struct en_softc *, caddr_t, u_int, - u_int)) __attribute__ ((unused)); -STATIC void en_init __P((struct en_softc *)); -STATIC int en_ioctl __P((struct ifnet *, EN_IOCTL_CMDT, caddr_t)); -STATIC INLINE int en_k2sz __P((int)) __attribute__ ((unused)); -STATIC void en_loadvc __P((struct en_softc *, int)); -STATIC int en_mfix __P((struct en_softc *, struct mbuf **, - struct mbuf *)); -STATIC INLINE struct mbuf *en_mget __P((struct en_softc *, u_int, - u_int *)) __attribute__ ((unused)); -STATIC INLINE u_int32_t en_read __P((struct en_softc *, - u_int32_t)) __attribute__ ((unused)); -STATIC int en_rxctl __P((struct en_softc *, struct atm_pseudoioctl *, - int)); -STATIC void en_txdma __P((struct en_softc *, int)); -STATIC void en_txlaunch __P((struct en_softc *, int, - struct en_launch *)); -STATIC void en_service __P((struct en_softc *)); -STATIC void en_start __P((struct ifnet *)); -STATIC INLINE int en_sz2b __P((int)) __attribute__ ((unused)); -STATIC INLINE void en_write __P((struct en_softc *, u_int32_t, - u_int32_t)) __attribute__ ((unused)); + int en_dump (int,int); + int en_dumpmem (int,int,int); +#endif +STATIC void en_dmaprobe (struct en_softc *); +STATIC int en_dmaprobe_doit (struct en_softc *, u_int8_t *, + u_int8_t *, int); +STATIC INLINE int en_dqneed (struct en_softc *, caddr_t, u_int, + u_int) __attribute__ ((unused)); +STATIC void en_init (struct en_softc *); +STATIC int en_ioctl (struct ifnet *, EN_IOCTL_CMDT, caddr_t); +STATIC INLINE int en_k2sz (int) __attribute__ ((unused)); +STATIC void en_loadvc (struct en_softc *, int); +STATIC int en_mfix (struct en_softc *, struct mbuf **, + struct mbuf *); +STATIC INLINE struct mbuf *en_mget (struct en_softc *, u_int, + u_int *) __attribute__ ((unused)); +STATIC INLINE u_int32_t en_read (struct en_softc *, + u_int32_t) __attribute__ ((unused)); +STATIC int en_rxctl (struct en_softc *, struct atm_pseudoioctl *, + int); +STATIC void en_txdma (struct en_softc *, int); +STATIC void en_txlaunch (struct en_softc *, int, + struct en_launch *); +STATIC void en_service (struct en_softc *); +STATIC void en_start (struct ifnet *); +STATIC INLINE int en_sz2b (int) __attribute__ ((unused)); +STATIC INLINE void en_write (struct en_softc *, u_int32_t, + u_int32_t) __attribute__ ((unused)); /* * macros/inline diff --git a/sys/dev/atm/en/midwayvar.h b/sys/dev/atm/en/midwayvar.h index 62d05bf6d3..abc5e0b33d 100644 --- a/sys/dev/atm/en/midwayvar.h +++ b/sys/dev/atm/en/midwayvar.h @@ -1,4 +1,5 @@ /* $NetBSD: midwayvar.h,v 1.10 1997/03/20 21:34:46 chuck Exp $ */ +/* $DragonFly: src/sys/dev/atm/en/midwayvar.h,v 1.2 2003/08/27 10:35:15 rob Exp $ /* /* * @@ -103,7 +104,7 @@ struct en_softc { bus_space_tag_t en_memt; /* for EN_READ/EN_WRITE */ bus_space_handle_t en_base; /* base of en card */ bus_size_t en_obmemsz; /* size of en card (bytes) */ - void (*en_busreset) __P((void *)); + void (*en_busreset) (void *); /* bus specific reset function */ /* serv list */ @@ -201,6 +202,6 @@ struct en_softc { * exported functions */ -void en_attach __P((struct en_softc *)); -EN_INTR_TYPE en_intr __P((void *)); -void en_reset __P((struct en_softc *)); +void en_attach (struct en_softc *); +EN_INTR_TYPE en_intr (void *); +void en_reset (struct en_softc *); diff --git a/sys/dev/atm/hea/eni.c b/sys/dev/atm/hea/eni.c index 59e5f0a5bd..6508292adf 100644 --- a/sys/dev/atm/hea/eni.c +++ b/sys/dev/atm/hea/eni.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hea/eni.c,v 1.10 1999/08/28 00:41:42 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hea/eni.c,v 1.4 2003/08/07 21:54:28 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hea/eni.c,v 1.5 2003/08/27 10:35:15 rob Exp $ */ /* @@ -44,18 +44,18 @@ /* * Typedef local functions */ -static const char *eni_pci_probe __P((pcici_t, pcidi_t)); -static void eni_pci_attach __P((pcici_t, int)); -static int eni_get_ack __P((Eni_unit *)); -static int eni_get_sebyte __P((Eni_unit *)); -static void eni_read_seeprom __P((Eni_unit *)); +static const char *eni_pci_probe (pcici_t, pcidi_t); +static void eni_pci_attach (pcici_t, int); +static int eni_get_ack (Eni_unit *); +static int eni_get_sebyte (Eni_unit *); +static void eni_read_seeprom (Eni_unit *); #ifdef __FreeBSD__ #if BSD < 199506 -static int eni_pci_shutdown __P((struct kern_devconf *, int)); +static int eni_pci_shutdown (struct kern_devconf *, int); #else -static void eni_pci_shutdown __P((void *, int)); +static void eni_pci_shutdown (void *, int); #endif -static void eni_pci_reset __P((Eni_unit *)); +static void eni_pci_reset (Eni_unit *); #endif /* __FreeBSD__ */ /* diff --git a/sys/dev/atm/hea/eni_buffer.c b/sys/dev/atm/hea/eni_buffer.c index 5355736913..76f60476ba 100644 --- a/sys/dev/atm/hea/eni_buffer.c +++ b/sys/dev/atm/hea/eni_buffer.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hea/eni_buffer.c,v 1.5 1999/08/28 00:41:43 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hea/eni_buffer.c,v 1.4 2003/08/07 21:54:28 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hea/eni_buffer.c,v 1.5 2003/08/27 10:35:15 rob Exp $ */ /* @@ -41,7 +41,7 @@ #include "eni.h" #include "eni_var.h" -static int eni_test_memory __P((Eni_unit *)); +static int eni_test_memory (Eni_unit *); /* * The host is going to manage (that is, allocate and free) buffers diff --git a/sys/dev/atm/hea/eni_if.c b/sys/dev/atm/hea/eni_if.c index c43cc6b001..3bea49f23e 100644 --- a/sys/dev/atm/hea/eni_if.c +++ b/sys/dev/atm/hea/eni_if.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hea/eni_if.c,v 1.5 1999/08/28 00:41:44 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hea/eni_if.c,v 1.4 2003/08/07 21:54:28 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hea/eni_if.c,v 1.5 2003/08/27 10:35:15 rob Exp $ */ /* @@ -42,7 +42,7 @@ #include "eni_suni.h" #include "eni_var.h" -static void eni_get_stats __P((Eni_unit *)); +static void eni_get_stats (Eni_unit *); /* * SUNI statistics counters take one of three forms: diff --git a/sys/dev/atm/hea/eni_intr.c b/sys/dev/atm/hea/eni_intr.c index 1cb3bfd13f..18fc332c34 100644 --- a/sys/dev/atm/hea/eni_intr.c +++ b/sys/dev/atm/hea/eni_intr.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hea/eni_intr.c,v 1.4 1999/08/28 00:41:44 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hea/eni_intr.c,v 1.4 2003/08/07 21:54:28 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hea/eni_intr.c,v 1.5 2003/08/27 10:35:15 rob Exp $ */ /* @@ -42,7 +42,7 @@ #include "eni_suni.h" #include "eni_var.h" -static void eni_suni_intr __P((Eni_unit *)); +static void eni_suni_intr (Eni_unit *); /* * SUNI Interrupt processing diff --git a/sys/dev/atm/hea/eni_receive.c b/sys/dev/atm/hea/eni_receive.c index 6ead38f6be..bd7b10d6bf 100644 --- a/sys/dev/atm/hea/eni_receive.c +++ b/sys/dev/atm/hea/eni_receive.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hea/eni_receive.c,v 1.5 1999/08/28 00:41:45 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hea/eni_receive.c,v 1.4 2003/08/07 21:54:28 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hea/eni_receive.c,v 1.5 2003/08/27 10:35:15 rob Exp $ */ /* @@ -41,7 +41,7 @@ #include "eni.h" #include "eni_var.h" -static void eni_recv_stack __P((void *, KBuffer *)); +static void eni_recv_stack (void *, KBuffer *); #ifdef DIAGNOSTIC extern int eni_pdu_print; diff --git a/sys/dev/atm/hea/eni_var.h b/sys/dev/atm/hea/eni_var.h index f8487d4623..abc05433f8 100644 --- a/sys/dev/atm/hea/eni_var.h +++ b/sys/dev/atm/hea/eni_var.h @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hea/eni_var.h,v 1.2 1999/08/28 00:41:46 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hea/eni_var.h,v 1.2 2003/06/17 04:28:26 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hea/eni_var.h,v 1.3 2003/08/27 10:35:15 rob Exp $ * */ @@ -43,37 +43,37 @@ * Global function declarations */ /* eni_buffer.c */ -int eni_init_memory __P((Eni_unit *)); -caddr_t eni_allocate_buffer __P((Eni_unit *, u_long *)); -void eni_free_buffer __P((Eni_unit *, caddr_t)); +int eni_init_memory (Eni_unit *); +caddr_t eni_allocate_buffer (Eni_unit *, u_long *); +void eni_free_buffer (Eni_unit *, caddr_t); /* eni_if.c */ -int eni_atm_ioctl __P((int, caddr_t, caddr_t)); -void eni_zero_stats __P((Eni_unit *)); +int eni_atm_ioctl (int, caddr_t, caddr_t); +void eni_zero_stats (Eni_unit *); /* eni_init.c */ -int eni_init __P((Eni_unit *)); +int eni_init (Eni_unit *); /* eni_intr.c */ #if defined(BSD) && BSD < 199506 -int eni_intr __P((void *)); +int eni_intr (void *); #else -void eni_intr __P((void *)); +void eni_intr (void *); #endif /* eni_receive.c */ -void eni_do_service __P((Eni_unit *)); -void eni_recv_drain __P((Eni_unit *)); +void eni_do_service (Eni_unit *); +void eni_recv_drain (Eni_unit *); /* eni_transmit.c */ -int eni_set_dma __P((Eni_unit *, int, u_long *, int, long *, int, u_long, int )); -void eni_output __P((Cmn_unit *, Cmn_vcc *, KBuffer *)); -void eni_xmit_drain __P((Eni_unit *)); +int eni_set_dma (Eni_unit *, int, u_long *, int, long *, int, u_long, int ); +void eni_output (Cmn_unit *, Cmn_vcc *, KBuffer *); +void eni_xmit_drain (Eni_unit *); /* eni_vcm.c */ -int eni_instvcc __P((Cmn_unit *, Cmn_vcc *)); -int eni_openvcc __P((Cmn_unit *, Cmn_vcc *)); -int eni_closevcc __P((Cmn_unit *, Cmn_vcc *)); +int eni_instvcc (Cmn_unit *, Cmn_vcc *); +int eni_openvcc (Cmn_unit *, Cmn_vcc *); +int eni_closevcc (Cmn_unit *, Cmn_vcc *); /* * Global variable declarations diff --git a/sys/dev/atm/hfa/fore_buffer.c b/sys/dev/atm/hfa/fore_buffer.c index ad6c655c6e..2fb23e4165 100644 --- a/sys/dev/atm/hfa/fore_buffer.c +++ b/sys/dev/atm/hfa/fore_buffer.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hfa/fore_buffer.c,v 1.5 2000/01/15 21:01:04 mks Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_buffer.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_buffer.c,v 1.4 2003/08/27 10:35:16 rob Exp $ */ /* @@ -40,9 +40,9 @@ /* * Local functions */ -static void fore_buf_drain __P((Fore_unit *)); -static void fore_buf_supply_1s __P((Fore_unit *)); -static void fore_buf_supply_1l __P((Fore_unit *)); +static void fore_buf_drain (Fore_unit *); +static void fore_buf_supply_1s (Fore_unit *); +static void fore_buf_supply_1l (Fore_unit *); /* diff --git a/sys/dev/atm/hfa/fore_include.h b/sys/dev/atm/hfa/fore_include.h index 02fd2de91d..6eae8d859f 100644 --- a/sys/dev/atm/hfa/fore_include.h +++ b/sys/dev/atm/hfa/fore_include.h @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hfa/fore_include.h,v 1.2 1999/08/28 00:41:50 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_include.h,v 1.4 2003/08/07 21:54:29 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_include.h,v 1.5 2003/08/27 10:35:16 rob Exp $ * */ @@ -67,63 +67,63 @@ * Global function declarations */ /* fore_buffer.c */ -int fore_buf_allocate __P((Fore_unit *)); -void fore_buf_initialize __P((Fore_unit *)); -void fore_buf_supply __P((Fore_unit *)); -void fore_buf_free __P((Fore_unit *)); +int fore_buf_allocate (Fore_unit *); +void fore_buf_initialize (Fore_unit *); +void fore_buf_supply (Fore_unit *); +void fore_buf_free (Fore_unit *); /* fore_command.c */ -int fore_cmd_allocate __P((Fore_unit *)); -void fore_cmd_initialize __P((Fore_unit *)); -void fore_cmd_drain __P((Fore_unit *)); -void fore_cmd_free __P((Fore_unit *)); +int fore_cmd_allocate (Fore_unit *); +void fore_cmd_initialize (Fore_unit *); +void fore_cmd_drain (Fore_unit *); +void fore_cmd_free (Fore_unit *); /* fore_if.c */ -int fore_atm_ioctl __P((int, caddr_t, caddr_t)); -void fore_interface_free __P((Fore_unit *)); +int fore_atm_ioctl (int, caddr_t, caddr_t); +void fore_interface_free (Fore_unit *); /* fore_init.c */ -void fore_initialize __P((Fore_unit *)); -void fore_initialize_complete __P((Fore_unit *)); +void fore_initialize (Fore_unit *); +void fore_initialize_complete (Fore_unit *); /* fore_intr.c */ #if defined(sun) -int fore_poll __P((void)); +int fore_poll (void); #endif #if (defined(BSD) && (BSD <= 199306)) -int fore_intr __P((void *)); +int fore_intr (void *); #else -void fore_intr __P((void *)); +void fore_intr (void *); #endif -void fore_watchdog __P((Fore_unit *)); +void fore_watchdog (Fore_unit *); /* fore_load.c */ /* fore_output.c */ -void fore_output __P((Cmn_unit *, Cmn_vcc *, KBuffer *)); +void fore_output (Cmn_unit *, Cmn_vcc *, KBuffer *); /* fore_receive.c */ -int fore_recv_allocate __P((Fore_unit *)); -void fore_recv_initialize __P((Fore_unit *)); -void fore_recv_drain __P((Fore_unit *)); -void fore_recv_free __P((Fore_unit *)); +int fore_recv_allocate (Fore_unit *); +void fore_recv_initialize (Fore_unit *); +void fore_recv_drain (Fore_unit *); +void fore_recv_free (Fore_unit *); /* fore_stats.c */ -int fore_get_stats __P((Fore_unit *)); +int fore_get_stats (Fore_unit *); /* fore_timer.c */ -void fore_timeout __P((struct atm_time *)); +void fore_timeout (struct atm_time *); /* fore_transmit.c */ -int fore_xmit_allocate __P((Fore_unit *)); -void fore_xmit_initialize __P((Fore_unit *)); -void fore_xmit_drain __P((Fore_unit *)); -void fore_xmit_free __P((Fore_unit *)); +int fore_xmit_allocate (Fore_unit *); +void fore_xmit_initialize (Fore_unit *); +void fore_xmit_drain (Fore_unit *); +void fore_xmit_free (Fore_unit *); /* fore_vcm.c */ -int fore_instvcc __P((Cmn_unit *, Cmn_vcc *)); -int fore_openvcc __P((Cmn_unit *, Cmn_vcc *)); -int fore_closevcc __P((Cmn_unit *, Cmn_vcc *)); +int fore_instvcc (Cmn_unit *, Cmn_vcc *); +int fore_openvcc (Cmn_unit *, Cmn_vcc *); +int fore_closevcc (Cmn_unit *, Cmn_vcc *); /* diff --git a/sys/dev/atm/hfa/fore_init.c b/sys/dev/atm/hfa/fore_init.c index 28019cfc1d..bd86dc670a 100644 --- a/sys/dev/atm/hfa/fore_init.c +++ b/sys/dev/atm/hfa/fore_init.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hfa/fore_init.c,v 1.6 1999/08/29 10:28:09 bde Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_init.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_init.c,v 1.4 2003/08/27 10:35:16 rob Exp $ */ /* @@ -41,7 +41,7 @@ * Local functions */ #ifdef FORE_PCI -static void fore_get_prom __P((Fore_unit *)); +static void fore_get_prom (Fore_unit *); #endif @@ -77,7 +77,7 @@ fore_initialize(fup) * Try again later */ fup->fu_thandle = - timeout((KTimeout_ret(*) __P((void *)))fore_initialize, + timeout((KTimeout_ret(*) (void *))fore_initialize, (void *)fup, hz); return; } else diff --git a/sys/dev/atm/hfa/fore_load.c b/sys/dev/atm/hfa/fore_load.c index 9164b4f8e6..fc2cb4adbf 100644 --- a/sys/dev/atm/hfa/fore_load.c +++ b/sys/dev/atm/hfa/fore_load.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hfa/fore_load.c,v 1.13 1999/09/25 18:23:49 phk Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_load.c,v 1.5 2003/08/07 21:16:49 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_load.c,v 1.6 2003/08/27 10:35:16 rob Exp $ */ /* @@ -40,25 +40,25 @@ /* * Local functions */ -static int fore_start __P((void)); +static int fore_start (void); #ifdef sun -static int fore_stop __P((void)); -static int fore_doload __P((void)); -static int fore_dounload __P((void)); -static int fore_identify __P((char *)); -static int fore_attach __P((struct devinfo *)); +static int fore_stop (void); +static int fore_doload (void); +static int fore_dounload (void); +static int fore_identify (char *); +static int fore_attach (struct devinfo *); #endif #ifdef __FreeBSD__ -static const char * fore_pci_probe __P((pcici_t, pcidi_t)); -static void fore_pci_attach __P((pcici_t, int)); +static const char * fore_pci_probe (pcici_t, pcidi_t); +static void fore_pci_attach (pcici_t, int); #if BSD < 199506 -static int fore_pci_shutdown __P((struct kern_devconf *, int)); +static int fore_pci_shutdown (struct kern_devconf *, int); #else -static void fore_pci_shutdown __P((void *, int)); +static void fore_pci_shutdown (void *, int); #endif #endif -static void fore_unattach __P((Fore_unit *)); -static void fore_reset __P((Fore_unit *)); +static void fore_unattach (Fore_unit *); +static void fore_reset (Fore_unit *); /* @@ -1173,7 +1173,7 @@ fore_unattach(fup) /* * Remove any pending timeout()'s */ - (void)untimeout((KTimeout_ret(*) __P((void *)))fore_initialize, + (void)untimeout((KTimeout_ret(*) (void *))fore_initialize, (void *)fup, fup->fu_thandle); #ifdef sun diff --git a/sys/dev/atm/hfa/fore_output.c b/sys/dev/atm/hfa/fore_output.c index 585afbfdf8..22107e4756 100644 --- a/sys/dev/atm/hfa/fore_output.c +++ b/sys/dev/atm/hfa/fore_output.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hfa/fore_output.c,v 1.5 2000/01/15 21:01:04 mks Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_output.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_output.c,v 1.4 2003/08/27 10:35:16 rob Exp $ */ /* @@ -40,9 +40,9 @@ /* * Local functions */ -static KBuffer * fore_xmit_segment __P((Fore_unit *, KBuffer *, - H_xmit_queue *, int *, int *)); -static void fore_seg_dma_free __P((H_xmit_queue *, KBuffer *, int)); +static KBuffer * fore_xmit_segment (Fore_unit *, KBuffer *, + H_xmit_queue *, int *, int *); +static void fore_seg_dma_free (H_xmit_queue *, KBuffer *, int); /* diff --git a/sys/dev/atm/hfa/fore_receive.c b/sys/dev/atm/hfa/fore_receive.c index 4d727dab4a..7acfdd0c31 100644 --- a/sys/dev/atm/hfa/fore_receive.c +++ b/sys/dev/atm/hfa/fore_receive.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hfa/fore_receive.c,v 1.5.2.2 2003/01/23 21:06:43 sam Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_receive.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_receive.c,v 1.4 2003/08/27 10:35:16 rob Exp $ */ /* @@ -40,7 +40,7 @@ /* * Local functions */ -static void fore_recv_stack __P((void *, KBuffer *)); +static void fore_recv_stack (void *, KBuffer *); /* diff --git a/sys/dev/disk/aic/aic.c b/sys/dev/disk/aic/aic.c index 3510d75b43..454d72b955 100644 --- a/sys/dev/disk/aic/aic.c +++ b/sys/dev/disk/aic/aic.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aic/aic.c,v 1.8 2000/01/14 23:42:35 imp Exp $ - * $DragonFly: src/sys/dev/disk/aic/aic.c,v 1.3 2003/08/07 21:16:50 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aic/aic.c,v 1.4 2003/08/27 10:35:16 rob Exp $ */ #include @@ -50,26 +50,26 @@ #include "aic6360reg.h" #include "aicvar.h" -static void aic_action __P((struct cam_sim *sim, union ccb *ccb)); -static void aic_execute_scb __P((void *arg, bus_dma_segment_t *dm_segs, - int nseg, int error)); -static void aic_start __P((struct aic_softc *aic)); -static void aic_select __P((struct aic_softc *aic)); -static void aic_selected __P((struct aic_softc *aic)); -static void aic_reselected __P((struct aic_softc *aic)); -static void aic_reconnect __P((struct aic_softc *aic, int tag)); -static void aic_cmd __P((struct aic_softc *aic)); -static void aic_msgin __P((struct aic_softc *aic)); -static void aic_handle_msgin __P((struct aic_softc *aic)); -static void aic_msgout __P((struct aic_softc *aic)); -static void aic_datain __P((struct aic_softc *aic)); -static void aic_dataout __P((struct aic_softc *aic)); -static void aic_done __P((struct aic_softc *aic, struct aic_scb *scb)); -static void aic_poll __P((struct cam_sim *sim)); -static void aic_timeout __P((void *arg)); -static void aic_scsi_reset __P((struct aic_softc *aic)); -static void aic_chip_reset __P((struct aic_softc *aic)); -static void aic_reset __P((struct aic_softc *aic, int initiate_reset)); +static void aic_action (struct cam_sim *sim, union ccb *ccb); +static void aic_execute_scb (void *arg, bus_dma_segment_t *dm_segs, + int nseg, int error); +static void aic_start (struct aic_softc *aic); +static void aic_select (struct aic_softc *aic); +static void aic_selected (struct aic_softc *aic); +static void aic_reselected (struct aic_softc *aic); +static void aic_reconnect (struct aic_softc *aic, int tag); +static void aic_cmd (struct aic_softc *aic); +static void aic_msgin (struct aic_softc *aic); +static void aic_handle_msgin (struct aic_softc *aic); +static void aic_msgout (struct aic_softc *aic); +static void aic_datain (struct aic_softc *aic); +static void aic_dataout (struct aic_softc *aic); +static void aic_done (struct aic_softc *aic, struct aic_scb *scb); +static void aic_poll (struct cam_sim *sim); +static void aic_timeout (void *arg); +static void aic_scsi_reset (struct aic_softc *aic); +static void aic_chip_reset (struct aic_softc *aic); +static void aic_reset (struct aic_softc *aic, int initiate_reset); devclass_t aic_devclass; diff --git a/sys/dev/disk/aic/aic_cbus.c b/sys/dev/disk/aic/aic_cbus.c index ad2e75e246..27c250268c 100644 --- a/sys/dev/disk/aic/aic_cbus.c +++ b/sys/dev/disk/aic/aic_cbus.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aic/aic_cbus.c,v 1.1.2.2 2000/06/21 09:37:09 nyan Exp $ - * $DragonFly: src/sys/dev/disk/aic/Attic/aic_cbus.c,v 1.3 2003/08/07 21:16:50 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aic/Attic/aic_cbus.c,v 1.4 2003/08/27 10:35:16 rob Exp $ */ #include @@ -50,10 +50,10 @@ struct aic_isa_softc { void *sc_ih; }; -static int aic_isa_alloc_resources __P((device_t)); -static void aic_isa_release_resources __P((device_t)); -static int aic_isa_probe __P((device_t)); -static int aic_isa_attach __P((device_t)); +static int aic_isa_alloc_resources (device_t); +static void aic_isa_release_resources (device_t); +static int aic_isa_probe (device_t); +static int aic_isa_attach (device_t); #ifdef PC98 static u_int aic_isa_ports[] = { 0x1840 }; diff --git a/sys/dev/disk/aic/aic_isa.c b/sys/dev/disk/aic/aic_isa.c index 7e4e4747ba..afaa179d09 100644 --- a/sys/dev/disk/aic/aic_isa.c +++ b/sys/dev/disk/aic/aic_isa.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aic/aic_isa.c,v 1.3 2000/01/14 23:42:35 imp Exp $ - * $DragonFly: src/sys/dev/disk/aic/aic_isa.c,v 1.3 2003/08/07 21:16:50 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aic/aic_isa.c,v 1.4 2003/08/27 10:35:16 rob Exp $ */ #include @@ -50,10 +50,10 @@ struct aic_isa_softc { void *sc_ih; }; -static int aic_isa_alloc_resources __P((device_t)); -static void aic_isa_release_resources __P((device_t)); -static int aic_isa_probe __P((device_t)); -static int aic_isa_attach __P((device_t)); +static int aic_isa_alloc_resources (device_t); +static void aic_isa_release_resources (device_t); +static int aic_isa_probe (device_t); +static int aic_isa_attach (device_t); static u_int aic_isa_ports[] = { 0x340, 0x140 }; #define AIC_ISA_NUMPORTS (sizeof(aic_isa_ports) / sizeof(aic_isa_ports[0])) diff --git a/sys/dev/disk/aic/aic_pccard.c b/sys/dev/disk/aic/aic_pccard.c index 90cbedb79c..a9465ca16d 100644 --- a/sys/dev/disk/aic/aic_pccard.c +++ b/sys/dev/disk/aic/aic_pccard.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aic/aic_pccard.c,v 1.1 2000/01/14 23:42:36 imp Exp $ - * $DragonFly: src/sys/dev/disk/aic/aic_pccard.c,v 1.3 2003/08/07 21:16:50 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aic/aic_pccard.c,v 1.4 2003/08/27 10:35:16 rob Exp $ */ #include @@ -48,10 +48,10 @@ struct aic_pccard_softc { void *sc_ih; }; -static int aic_pccard_alloc_resources __P((device_t)); -static void aic_pccard_release_resources __P((device_t)); -static int aic_pccard_probe __P((device_t)); -static int aic_pccard_attach __P((device_t)); +static int aic_pccard_alloc_resources (device_t); +static void aic_pccard_release_resources (device_t); +static int aic_pccard_probe (device_t); +static int aic_pccard_attach (device_t); #define AIC_PCCARD_PORTSIZE 0x20 diff --git a/sys/dev/disk/aic/aicvar.h b/sys/dev/disk/aic/aicvar.h index 7a723f2fd8..2998a57b61 100644 --- a/sys/dev/disk/aic/aicvar.h +++ b/sys/dev/disk/aic/aicvar.h @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aic/aicvar.h,v 1.2.2.1 2000/08/08 23:51:23 peter Exp $ - * $DragonFly: src/sys/dev/disk/aic/aicvar.h,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aic/aicvar.h,v 1.3 2003/08/27 10:35:16 rob Exp $ */ struct aic_transinfo { @@ -145,7 +145,7 @@ struct aic_softc { bus_space_write_multi_4((aic)->tag, (aic)->bsh, (port), \ (u_int32_t *)(addr), (count)) -extern int aic_probe __P((struct aic_softc *)); -extern int aic_attach __P((struct aic_softc *)); -extern int aic_detach __P((struct aic_softc *)); -extern void aic_intr __P((void *)); +extern int aic_probe (struct aic_softc *); +extern int aic_attach (struct aic_softc *); +extern int aic_detach (struct aic_softc *); +extern void aic_intr (void *); diff --git a/sys/dev/disk/ccd/ccd.c b/sys/dev/disk/ccd/ccd.c index 5fc47f4e11..ba6c566c84 100644 --- a/sys/dev/disk/ccd/ccd.c +++ b/sys/dev/disk/ccd/ccd.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/ccd/ccd.c,v 1.73.2.1 2001/09/11 09:49:52 kris Exp $ */ -/* $DragonFly: src/sys/dev/disk/ccd/ccd.c,v 1.10 2003/08/07 21:54:29 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/ccd/ccd.c,v 1.11 2003/08/27 10:35:16 rob Exp $ */ /* $NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $ */ @@ -192,26 +192,26 @@ static struct cdevsw ccd_cdevsw = { }; /* called during module initialization */ -static void ccdattach __P((void)); -static int ccd_modevent __P((module_t, int, void *)); +static void ccdattach (void); +static int ccd_modevent (module_t, int, void *); /* called by biodone() at interrupt time */ -static void ccdiodone __P((struct ccdbuf *cbp)); - -static void ccdstart __P((struct ccd_softc *, struct buf *)); -static void ccdinterleave __P((struct ccd_softc *, int)); -static void ccdintr __P((struct ccd_softc *, struct buf *)); -static int ccdinit __P((struct ccddevice *, char **, struct thread *)); -static int ccdlookup __P((char *, struct thread *td, struct vnode **)); -static void ccdbuffer __P((struct ccdbuf **ret, struct ccd_softc *, - struct buf *, daddr_t, caddr_t, long)); -static void ccdgetdisklabel __P((dev_t)); -static void ccdmakedisklabel __P((struct ccd_softc *)); -static int ccdlock __P((struct ccd_softc *)); -static void ccdunlock __P((struct ccd_softc *)); +static void ccdiodone (struct ccdbuf *cbp); + +static void ccdstart (struct ccd_softc *, struct buf *); +static void ccdinterleave (struct ccd_softc *, int); +static void ccdintr (struct ccd_softc *, struct buf *); +static int ccdinit (struct ccddevice *, char **, struct thread *); +static int ccdlookup (char *, struct thread *td, struct vnode **); +static void ccdbuffer (struct ccdbuf **ret, struct ccd_softc *, + struct buf *, daddr_t, caddr_t, long); +static void ccdgetdisklabel (dev_t); +static void ccdmakedisklabel (struct ccd_softc *); +static int ccdlock (struct ccd_softc *); +static void ccdunlock (struct ccd_softc *); #ifdef DEBUG -static void printiinfo __P((struct ccdiinfo *)); +static void printiinfo (struct ccdiinfo *); #endif /* Non-private for the benefit of libkvm. */ diff --git a/sys/dev/disk/ct/bshw_machdep.c b/sys/dev/disk/ct/bshw_machdep.c index 456b361339..f65ab93442 100644 --- a/sys/dev/disk/ct/bshw_machdep.c +++ b/sys/dev/disk/ct/bshw_machdep.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/ct/bshw_machdep.c,v 1.3.2.1 2001/07/26 02:32:18 nyan Exp $ */ -/* $DragonFly: src/sys/dev/disk/ct/Attic/bshw_machdep.c,v 1.3 2003/08/07 21:16:52 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/ct/Attic/bshw_machdep.c,v 1.4 2003/08/27 10:35:16 rob Exp $ */ /* $NecBSD: bshw_machdep.c,v 1.8.12.6 2001/06/29 06:28:05 honda Exp $ */ /* $NetBSD$ */ @@ -211,9 +211,9 @@ bshw_read_settings(chp, bs) #define SF_ABORT 0x08 #define SF_RDY 0x10 -static __inline void bshw_lc_smit_start __P((struct ct_softc *, int, u_int)); -static __inline void bshw_lc_smit_stop __P((struct ct_softc *)); -static int bshw_lc_smit_fstat __P((struct ct_softc *, int, int)); +static __inline void bshw_lc_smit_start (struct ct_softc *, int, u_int); +static __inline void bshw_lc_smit_stop (struct ct_softc *); +static int bshw_lc_smit_fstat (struct ct_softc *, int, int); static __inline void bshw_lc_smit_stop(ct) @@ -423,9 +423,9 @@ bshw_smit_xfer_start(ct) * DMA TRANSFER (BS) *********************************************************/ static __inline void bshw_dma_write_1 \ - __P((struct ct_bus_access_handle *, bus_addr_t, u_int8_t)); -static void bshw_dmastart __P((struct ct_softc *)); -static void bshw_dmadone __P((struct ct_softc *)); + (struct ct_bus_access_handle *, bus_addr_t, u_int8_t); +static void bshw_dmastart (struct ct_softc *); +static void bshw_dmadone (struct ct_softc *); int bshw_dma_xfer_start(ct) @@ -632,12 +632,12 @@ bshw_dmadone(ct) /********************************************** * VENDOR UNIQUE DMA FUNCS **********************************************/ -static int bshw_dma_init_sc98 __P((struct ct_softc *)); -static void bshw_dma_start_sc98 __P((struct ct_softc *)); -static void bshw_dma_stop_sc98 __P((struct ct_softc *)); -static int bshw_dma_init_texa __P((struct ct_softc *)); -static void bshw_dma_start_elecom __P((struct ct_softc *)); -static void bshw_dma_stop_elecom __P((struct ct_softc *)); +static int bshw_dma_init_sc98 (struct ct_softc *); +static void bshw_dma_start_sc98 (struct ct_softc *); +static void bshw_dma_stop_sc98 (struct ct_softc *); +static int bshw_dma_init_texa (struct ct_softc *); +static void bshw_dma_start_elecom (struct ct_softc *); +static void bshw_dma_stop_elecom (struct ct_softc *); static int bshw_dma_init_texa(ct) diff --git a/sys/dev/disk/ct/bshwvar.h b/sys/dev/disk/ct/bshwvar.h index 60d130f28c..a9015d4fb2 100644 --- a/sys/dev/disk/ct/bshwvar.h +++ b/sys/dev/disk/ct/bshwvar.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/ct/bshwvar.h,v 1.2.2.1 2001/07/26 02:32:18 nyan Exp $ */ -/* $DragonFly: src/sys/dev/disk/ct/Attic/bshwvar.h,v 1.2 2003/06/17 04:28:23 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/ct/Attic/bshwvar.h,v 1.3 2003/08/27 10:35:16 rob Exp $ */ /* $NecBSD: bshwvar.h,v 1.3.14.3 2001/06/21 04:07:37 honda Exp $ */ /* $NetBSD$ */ @@ -49,9 +49,9 @@ struct bshw { u_int hw_flags; u_int hw_sregaddr; - int ((*hw_dma_init) __P((struct ct_softc *))); - void ((*hw_dma_start) __P((struct ct_softc *))); - void ((*hw_dma_stop) __P((struct ct_softc *))); + int ((*hw_dma_init) (struct ct_softc *)); + void ((*hw_dma_start) (struct ct_softc *)); + void ((*hw_dma_stop) (struct ct_softc *)); }; struct bshw_softc { @@ -81,17 +81,17 @@ struct bshw_softc { /* hardware */ struct bshw *sc_hw; - void ((*sc_dmasync_before)) __P((struct ct_softc *)); - void ((*sc_dmasync_after)) __P((struct ct_softc *)); + void ((*sc_dmasync_before)) (struct ct_softc *); + void ((*sc_dmasync_after)) (struct ct_softc *); }; -void bshw_synch_setup __P((struct ct_softc *, struct targ_info *)); -void bshw_bus_reset __P((struct ct_softc *)); -int bshw_read_settings __P((struct ct_bus_access_handle *, struct bshw_softc *)); -int bshw_smit_xfer_start __P((struct ct_softc *)); -void bshw_smit_xfer_stop __P((struct ct_softc *)); -int bshw_dma_xfer_start __P((struct ct_softc *)); -void bshw_dma_xfer_stop __P((struct ct_softc *)); +void bshw_synch_setup (struct ct_softc *, struct targ_info *); +void bshw_bus_reset (struct ct_softc *); +int bshw_read_settings (struct ct_bus_access_handle *, struct bshw_softc *); +int bshw_smit_xfer_start (struct ct_softc *); +void bshw_smit_xfer_stop (struct ct_softc *); +int bshw_dma_xfer_start (struct ct_softc *); +void bshw_dma_xfer_stop (struct ct_softc *); extern struct dvcfg_hwsel bshw_hwsel; #endif /* !_BSHWVAR_H_ */ diff --git a/sys/dev/disk/ct/ct.c b/sys/dev/disk/ct/ct.c index 9465302aaf..5be11848ff 100644 --- a/sys/dev/disk/ct/ct.c +++ b/sys/dev/disk/ct/ct.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/ct/ct.c,v 1.4.2.1 2001/07/26 02:32:18 nyan Exp $ */ -/* $DragonFly: src/sys/dev/disk/ct/Attic/ct.c,v 1.4 2003/08/07 21:16:52 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/ct/Attic/ct.c,v 1.5 2003/08/27 10:35:16 rob Exp $ */ /* $NecBSD: ct.c,v 1.13.12.5 2001/06/26 07:31:53 honda Exp $ */ /* $NetBSD$ */ @@ -150,25 +150,25 @@ extern struct cfdriver ct_cd; /***************************************************************** * Interface functions *****************************************************************/ -static int ct_xfer __P((struct ct_softc *, u_int8_t *, int, int, u_int *)); -static void ct_io_xfer __P((struct ct_softc *)); -static int ct_reselected __P((struct ct_softc *, u_int8_t)); -static void ct_phase_error __P((struct ct_softc *, u_int8_t)); -static int ct_start_selection __P((struct ct_softc *, struct slccb *)); -static int ct_msg __P((struct ct_softc *, struct targ_info *, u_int)); -static int ct_world_start __P((struct ct_softc *, int)); -static __inline void cthw_phase_bypass __P((struct ct_softc *, u_int8_t)); -static int cthw_chip_reset __P((struct ct_bus_access_handle *, int *, int, int)); -static void cthw_bus_reset __P((struct ct_softc *)); -static int ct_ccb_nexus_establish __P((struct ct_softc *)); -static int ct_lun_nexus_establish __P((struct ct_softc *)); -static int ct_target_nexus_establish __P((struct ct_softc *, int, int)); -static void cthw_attention __P((struct ct_softc *)); -static int ct_targ_init __P((struct ct_softc *, struct targ_info *, int)); -static int ct_unbusy __P((struct ct_softc *)); -static void ct_attention __P((struct ct_softc *)); -static struct ct_synch_data *ct_make_synch_table __P((struct ct_softc *)); -static int ct_catch_intr __P((struct ct_softc *)); +static int ct_xfer (struct ct_softc *, u_int8_t *, int, int, u_int *); +static void ct_io_xfer (struct ct_softc *); +static int ct_reselected (struct ct_softc *, u_int8_t); +static void ct_phase_error (struct ct_softc *, u_int8_t); +static int ct_start_selection (struct ct_softc *, struct slccb *); +static int ct_msg (struct ct_softc *, struct targ_info *, u_int); +static int ct_world_start (struct ct_softc *, int); +static __inline void cthw_phase_bypass (struct ct_softc *, u_int8_t); +static int cthw_chip_reset (struct ct_bus_access_handle *, int *, int, int); +static void cthw_bus_reset (struct ct_softc *); +static int ct_ccb_nexus_establish (struct ct_softc *); +static int ct_lun_nexus_establish (struct ct_softc *); +static int ct_target_nexus_establish (struct ct_softc *, int, int); +static void cthw_attention (struct ct_softc *); +static int ct_targ_init (struct ct_softc *, struct targ_info *, int); +static int ct_unbusy (struct ct_softc *); +static void ct_attention (struct ct_softc *); +static struct ct_synch_data *ct_make_synch_table (struct ct_softc *); +static int ct_catch_intr (struct ct_softc *); struct scsi_low_funcs ct_funcs = { SC_LOW_INIT_T ct_world_start, diff --git a/sys/dev/disk/ct/ct_isa.c b/sys/dev/disk/ct/ct_isa.c index 44e23b7dad..004921b52b 100644 --- a/sys/dev/disk/ct/ct_isa.c +++ b/sys/dev/disk/ct/ct_isa.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/ct/ct_isa.c,v 1.3.2.3 2003/06/01 04:26:44 nyan Exp $ */ -/* $DragonFly: src/sys/dev/disk/ct/Attic/ct_isa.c,v 1.3 2003/08/07 21:16:52 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/ct/Attic/ct_isa.c,v 1.4 2003/08/27 10:35:16 rob Exp $ */ /* $NecBSD: ct_isa.c,v 1.6 1999/07/26 06:32:01 honda Exp $ */ /* $NetBSD$ */ @@ -104,9 +104,9 @@ static int ct_space_map(device_t, struct bshw *, static void ct_space_unmap(device_t, struct ct_softc *); static struct bshw *ct_find_hw(device_t); static void ct_dmamap(void *, bus_dma_segment_t *, int, int); -static void ct_isa_bus_access_weight __P((struct ct_bus_access_handle *)); -static void ct_isa_dmasync_before __P((struct ct_softc *)); -static void ct_isa_dmasync_after __P((struct ct_softc *)); +static void ct_isa_bus_access_weight (struct ct_bus_access_handle *); +static void ct_isa_dmasync_before (struct ct_softc *); +static void ct_isa_dmasync_after (struct ct_softc *); struct ct_isa_softc { struct ct_softc sc_ct; diff --git a/sys/dev/disk/ct/ct_machdep.h b/sys/dev/disk/ct/ct_machdep.h index fee78b35b1..652b406df9 100644 --- a/sys/dev/disk/ct/ct_machdep.h +++ b/sys/dev/disk/ct/ct_machdep.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/ct/ct_machdep.h,v 1.2.2.1 2001/07/26 02:32:18 nyan Exp $ */ -/* $DragonFly: src/sys/dev/disk/ct/Attic/ct_machdep.h,v 1.2 2003/06/17 04:28:23 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/ct/Attic/ct_machdep.h,v 1.3 2003/08/27 10:35:16 rob Exp $ */ /* $NecBSD: ct_machdep.h,v 1.4.12.2 2001/06/20 06:13:34 honda Exp $ */ /* $NetBSD$ */ @@ -74,21 +74,21 @@ * All port accesses primitive methods */ static __inline u_int8_t ct_stat_read_1 - __P((struct ct_bus_access_handle *)); + (struct ct_bus_access_handle *); static __inline u_int8_t ct_cmdp_read_1 - __P((struct ct_bus_access_handle *)); + (struct ct_bus_access_handle *); static __inline void ct_cmdp_write_1 - __P((struct ct_bus_access_handle *, u_int8_t)); + (struct ct_bus_access_handle *, u_int8_t); static __inline u_int8_t ct_cr_read_1 - __P((struct ct_bus_access_handle *, bus_addr_t)); + (struct ct_bus_access_handle *, bus_addr_t); static __inline void ct_cr_write_1 - __P((struct ct_bus_access_handle *, bus_addr_t, u_int8_t)); + (struct ct_bus_access_handle *, bus_addr_t, u_int8_t); static __inline void ct_write_cmds - __P((struct ct_bus_access_handle *, u_int8_t *, int)); + (struct ct_bus_access_handle *, u_int8_t *, int); static __inline u_int cthw_get_count - __P((struct ct_bus_access_handle *)); + (struct ct_bus_access_handle *); static __inline void cthw_set_count - __P((struct ct_bus_access_handle *, u_int)); + (struct ct_bus_access_handle *, u_int); static __inline u_int8_t ct_stat_read_1(chp) diff --git a/sys/dev/disk/ct/ctvar.h b/sys/dev/disk/ct/ctvar.h index 154a05f6e8..d71c9b7f6c 100644 --- a/sys/dev/disk/ct/ctvar.h +++ b/sys/dev/disk/ct/ctvar.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/ct/ctvar.h,v 1.2.2.1 2001/07/26 02:32:18 nyan Exp $ */ -/* $DragonFly: src/sys/dev/disk/ct/Attic/ctvar.h,v 1.2 2003/06/17 04:28:23 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/ct/Attic/ctvar.h,v 1.3 2003/08/27 10:35:16 rob Exp $ */ /* $NecBSD: ctvar.h,v 1.4.14.3 2001/06/20 06:13:34 honda Exp $ */ /* $NetBSD$ */ @@ -55,7 +55,7 @@ struct ct_bus_access_handle { bus_space_handle_t ch_datah; bus_space_handle_t ch_memh; - void (*ch_bus_weight) __P((struct ct_bus_access_handle *)); + void (*ch_bus_weight) (struct ct_bus_access_handle *); #ifdef CT_USE_RELOCATE_OFFSET bus_addr_t ch_offset[4]; @@ -119,12 +119,12 @@ struct ct_softc { * Machdep stuff. */ void *ct_hw; /* point to bshw_softc etc ... */ - int (*ct_dma_xfer_start) __P((struct ct_softc *)); - int (*ct_pio_xfer_start) __P((struct ct_softc *)); - void (*ct_dma_xfer_stop) __P((struct ct_softc *)); - void (*ct_pio_xfer_stop) __P((struct ct_softc *)); - void (*ct_bus_reset) __P((struct ct_softc *)); - void (*ct_synch_setup) __P((struct ct_softc *, struct targ_info *)); + int (*ct_dma_xfer_start) (struct ct_softc *); + int (*ct_pio_xfer_start) (struct ct_softc *); + void (*ct_dma_xfer_stop) (struct ct_softc *); + void (*ct_pio_xfer_stop) (struct ct_softc *); + void (*ct_bus_reset) (struct ct_softc *); + void (*ct_synch_setup) (struct ct_softc *, struct targ_info *); }; /***************************************************************** @@ -139,8 +139,8 @@ struct ct_targ_info { /***************************************************************** * PROTO *****************************************************************/ -int ctprobesubr __P((struct ct_bus_access_handle *, u_int, int, u_int, int *)); -void ctattachsubr __P((struct ct_softc *)); -int ctprint __P((void *, const char *)); -int ctintr __P((void *)); +int ctprobesubr (struct ct_bus_access_handle *, u_int, int, u_int, int *); +void ctattachsubr (struct ct_softc *); +int ctprint (void *, const char *); +int ctintr (void *); #endif /* !_CTVAR_H_ */ diff --git a/sys/dev/disk/i386/bs/bs.c b/sys/dev/disk/i386/bs/bs.c index 21d83f6fa7..83eeec321e 100644 --- a/sys/dev/disk/i386/bs/bs.c +++ b/sys/dev/disk/i386/bs/bs.c @@ -1,7 +1,7 @@ /* $NecBSD: bs.c,v 1.1 1997/07/18 09:18:59 kmatsuda Exp $ */ /* $NetBSD$ */ /* $FreeBSD: src/sys/i386/isa/bs/bs.c,v 1.8 1999/12/03 11:58:11 nyan Exp $ */ -/* $DragonFly: src/sys/dev/disk/i386/bs/Attic/bs.c,v 1.4 2003/08/07 21:16:52 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/i386/bs/Attic/bs.c,v 1.5 2003/08/27 10:35:16 rob Exp $ */ /* * [NetBSD for NEC PC98 series] * Copyright (c) 1994, 1995, 1996 NetBSD/pc98 porting staff. @@ -54,25 +54,25 @@ * Inline phase funcs *****************************************************************/ /* static inline declare */ -static BS_INLINE struct targ_info *bs_reselect __P((struct bs_softc *)); -static BS_INLINE void bs_sat_continue __P((struct bs_softc *, struct targ_info *, struct bsccb *)); -static BS_INLINE struct targ_info *bs_selected __P((struct bs_softc *, struct targ_info *, struct bsccb *)); -static BS_INLINE u_int8_t bs_read_1byte __P((struct bs_softc *)); -static BS_INLINE void bs_write_1byte __P((struct bs_softc *, u_int8_t)); -static BS_INLINE void bs_commandout __P((struct bs_softc *, struct targ_info *, struct bsccb *)); -static BS_INLINE void bs_status_check __P((struct bs_softc *, struct targ_info *)); -static BS_INLINE void bs_msgin __P((struct bs_softc *, struct targ_info *)); -static BS_INLINE void bs_msgout __P((struct bs_softc *, struct targ_info *, struct bsccb *)); -static BS_INLINE void bs_disconnect_phase __P((struct bs_softc *, struct targ_info *, struct bsccb *)); -static void bs_phase_error __P((struct targ_info *, struct bsccb *)); -static int bs_scsi_cmd_poll_internal __P((struct targ_info *)); -static int bs_xfer __P((struct bs_softc *, char *, int)); -static void bs_io_xfer __P((struct targ_info *)); -static void bs_quick_abort __P((struct targ_info *, u_int)); -static void bs_msgin_error __P((struct targ_info *, u_int)); -static void bs_msgin_ext __P((struct targ_info *)); -static void bs_msg_reject __P((struct targ_info *)); -static void bshoststart __P((struct bs_softc *, struct targ_info *)); +static BS_INLINE struct targ_info *bs_reselect (struct bs_softc *); +static BS_INLINE void bs_sat_continue (struct bs_softc *, struct targ_info *, struct bsccb *); +static BS_INLINE struct targ_info *bs_selected (struct bs_softc *, struct targ_info *, struct bsccb *); +static BS_INLINE u_int8_t bs_read_1byte (struct bs_softc *); +static BS_INLINE void bs_write_1byte (struct bs_softc *, u_int8_t); +static BS_INLINE void bs_commandout (struct bs_softc *, struct targ_info *, struct bsccb *); +static BS_INLINE void bs_status_check (struct bs_softc *, struct targ_info *); +static BS_INLINE void bs_msgin (struct bs_softc *, struct targ_info *); +static BS_INLINE void bs_msgout (struct bs_softc *, struct targ_info *, struct bsccb *); +static BS_INLINE void bs_disconnect_phase (struct bs_softc *, struct targ_info *, struct bsccb *); +static void bs_phase_error (struct targ_info *, struct bsccb *); +static int bs_scsi_cmd_poll_internal (struct targ_info *); +static int bs_xfer (struct bs_softc *, char *, int); +static void bs_io_xfer (struct targ_info *); +static void bs_quick_abort (struct targ_info *, u_int); +static void bs_msgin_error (struct targ_info *, u_int); +static void bs_msgin_ext (struct targ_info *); +static void bs_msg_reject (struct targ_info *); +static void bshoststart (struct bs_softc *, struct targ_info *); /***************************************************************** * SIM interface @@ -1296,7 +1296,7 @@ bs_phase_error(ti, cb) /************************************************** * ### SCSI PHASE SEQUENCER ### **************************************************/ -static BS_INLINE void bs_ack_wait __P((struct bs_softc *, struct targ_info *, struct bsccb *)); +static BS_INLINE void bs_ack_wait (struct bs_softc *, struct targ_info *, struct bsccb *); static BS_INLINE void bs_ack_wait(bsc, ti, cb) diff --git a/sys/dev/disk/i386/bs/bsfunc.c b/sys/dev/disk/i386/bs/bsfunc.c index f7e9e7f9aa..3527ac4a0f 100644 --- a/sys/dev/disk/i386/bs/bsfunc.c +++ b/sys/dev/disk/i386/bs/bsfunc.c @@ -1,7 +1,7 @@ /* $NecBSD: bsfunc.c,v 1.2 1997/10/31 17:43:37 honda Exp $ */ /* $NetBSD$ */ /* $FreeBSD: src/sys/i386/isa/bs/bsfunc.c,v 1.7.2.2 2001/07/26 02:32:18 nyan Exp $ */ -/* $DragonFly: src/sys/dev/disk/i386/bs/Attic/bsfunc.c,v 1.3 2003/08/07 21:16:52 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/i386/bs/Attic/bsfunc.c,v 1.4 2003/08/27 10:35:16 rob Exp $ */ /* * [NetBSD for NEC PC98 series] * Copyright (c) 1994, 1995, 1996 NetBSD/pc98 porting staff. @@ -51,12 +51,12 @@ u_int bs_bounce_used[NTARGETS]; int bs_debug_flag = 0; #endif /* BS_DEBUG */ -static void bs_print_syncmsg __P((struct targ_info *, char*)); -static void bs_timeout_target __P((struct targ_info *)); -static void bs_kill_msg __P((struct bsccb *cb)); +static void bs_print_syncmsg (struct targ_info *, char*); +static void bs_timeout_target (struct targ_info *); +static void bs_kill_msg (struct bsccb *cb); -static int bs_start_target __P((struct targ_info *)); -static int bs_check_target __P((struct targ_info *)); +static int bs_start_target (struct targ_info *); +static int bs_check_target (struct targ_info *); /************************************************************* * CCB diff --git a/sys/dev/disk/i386/bs/bsfunc.h b/sys/dev/disk/i386/bs/bsfunc.h index 13c06868d0..ece6c2cdab 100644 --- a/sys/dev/disk/i386/bs/bsfunc.h +++ b/sys/dev/disk/i386/bs/bsfunc.h @@ -1,5 +1,6 @@ /* $NecBSD: bsfunc.h,v 1.1 1997/07/18 09:19:03 kmatsuda Exp $ */ /* $NetBSD$ */ +/* $DragonFly: src/sys/dev/disk/i386/bs/Attic/bsfunc.h,v 1.2 2003/08/27 10:35:16 rob Exp $ */ /* * [NetBSD for NEC PC98 series] * Copyright (c) 1994, 1995, 1996 NetBSD/pc98 porting staff. @@ -36,50 +37,50 @@ * FUNC **************************************************/ /* timeout */ -void bstimeout __P((void *)); +void bstimeout (void *); /* ctrl setup */ -void bs_setup_ctrl __P((struct targ_info *, u_int, u_int)); -struct targ_info *bs_init_target_info __P((struct bs_softc *, int)); +void bs_setup_ctrl (struct targ_info *, u_int, u_int); +struct targ_info *bs_init_target_info (struct bs_softc *, int); /* msg op */ -int bs_send_msg __P((struct targ_info *, u_int, struct msgbase *, int)); -struct bsccb *bs_request_sense __P((struct targ_info *)); +int bs_send_msg (struct targ_info *, u_int, struct msgbase *, int); +struct bsccb *bs_request_sense (struct targ_info *); /* sync msg op */ -int bs_start_syncmsg __P((struct targ_info *, struct bsccb *, int)); -int bs_send_syncmsg __P((struct targ_info *)); -int bs_analyze_syncmsg __P((struct targ_info *, struct bsccb *)); +int bs_start_syncmsg (struct targ_info *, struct bsccb *, int); +int bs_send_syncmsg (struct targ_info *); +int bs_analyze_syncmsg (struct targ_info *, struct bsccb *); /* reset device */ -void bs_scsibus_start __P((struct bs_softc *)); -void bs_reset_nexus __P((struct bs_softc *)); -struct bsccb *bs_force_abort __P((struct targ_info *)); -void bs_reset_device __P((struct targ_info *)); +void bs_scsibus_start (struct bs_softc *); +void bs_reset_nexus (struct bs_softc *); +struct bsccb *bs_force_abort (struct targ_info *); +void bs_reset_device (struct targ_info *); /* ccb */ -struct bsccb *bs_make_internal_ccb __P((struct targ_info *, u_int, u_int8_t *, u_int, u_int8_t *, u_int, u_int, int)); -struct bsccb *bs_make_msg_ccb __P((struct targ_info *, u_int, struct bsccb *, struct msgbase *, u_int)); +struct bsccb *bs_make_internal_ccb (struct targ_info *, u_int, u_int8_t *, u_int, u_int8_t *, u_int, u_int, int); +struct bsccb *bs_make_msg_ccb (struct targ_info *, u_int, struct bsccb *, struct msgbase *, u_int); /* misc funcs */ -void bs_printf __P((struct targ_info *, char *, char *)); -void bs_panic __P((struct bs_softc *, u_char *)); +void bs_printf (struct targ_info *, char *, char *); +void bs_panic (struct bs_softc *, u_char *); /* misc debug */ -u_int bsr __P((u_int)); -u_int bsw __P((u_int, int)); -void bs_debug_print_all __P((struct bs_softc *)); -void bs_debug_print __P((struct bs_softc *, struct targ_info *)); +u_int bsr (u_int); +u_int bsw (u_int, int); +void bs_debug_print_all (struct bs_softc *); +void bs_debug_print (struct bs_softc *, struct targ_info *); /************************************************** * TARG FLAGS *************************************************/ -static BS_INLINE int bs_check_sat __P((struct targ_info *)); -static BS_INLINE int bs_check_smit __P((struct targ_info *)); -static BS_INLINE int bs_check_disc __P((struct targ_info *)); -static BS_INLINE int bs_check_link __P((struct targ_info *, struct bsccb *)); -static BS_INLINE u_int8_t bs_identify_msg __P((struct targ_info *)); -static BS_INLINE void bs_targ_flags __P((struct targ_info *, struct bsccb *)); +static BS_INLINE int bs_check_sat (struct targ_info *); +static BS_INLINE int bs_check_smit (struct targ_info *); +static BS_INLINE int bs_check_disc (struct targ_info *); +static BS_INLINE int bs_check_link (struct targ_info *, struct bsccb *); +static BS_INLINE u_int8_t bs_identify_msg (struct targ_info *); +static BS_INLINE void bs_targ_flags (struct targ_info *, struct bsccb *); static BS_INLINE int bs_check_disc(ti) @@ -144,10 +145,10 @@ bs_targ_flags(ti, cb) /************************************************** * QUEUE OP **************************************************/ -static BS_INLINE void bs_hostque_init __P((struct bs_softc *)); -static BS_INLINE void bs_hostque_head __P((struct bs_softc *, struct targ_info *)); -static BS_INLINE void bs_hostque_tail __P((struct bs_softc *, struct targ_info *)); -static BS_INLINE void bs_hostque_delete __P((struct bs_softc *, struct targ_info *)); +static BS_INLINE void bs_hostque_init (struct bs_softc *); +static BS_INLINE void bs_hostque_head (struct bs_softc *, struct targ_info *); +static BS_INLINE void bs_hostque_tail (struct bs_softc *, struct targ_info *); +static BS_INLINE void bs_hostque_delete (struct bs_softc *, struct targ_info *); static BS_INLINE void bs_hostque_init(bsc) @@ -202,8 +203,8 @@ bs_hostque_delete(bsc, ti) /************************************************************* * TIMEOUT ************************************************************/ -static BS_INLINE void bs_start_timeout __P((struct bs_softc *)); -static BS_INLINE void bs_terminate_timeout __P((struct bs_softc *)); +static BS_INLINE void bs_start_timeout (struct bs_softc *); +static BS_INLINE void bs_terminate_timeout (struct bs_softc *); static BS_INLINE void bs_start_timeout(bsc) diff --git a/sys/dev/disk/i386/bs/bshw.c b/sys/dev/disk/i386/bs/bshw.c index 8aef761f73..ea1c923274 100644 --- a/sys/dev/disk/i386/bs/bshw.c +++ b/sys/dev/disk/i386/bs/bshw.c @@ -1,5 +1,6 @@ /* $NecBSD: bshw.c,v 1.1 1997/07/18 09:19:03 kmatsuda Exp $ */ /* $NetBSD$ */ +/* $DragonFly: src/sys/dev/disk/i386/bs/Attic/bshw.c,v 1.4 2003/08/27 10:35:16 rob Exp $ */ /* * [NetBSD for NEC PC98 series] * Copyright (c) 1994, 1995, 1996 NetBSD/pc98 porting staff. @@ -32,7 +33,7 @@ * Copyright (c) 1994, 1995, 1996 Naofumi HONDA. All rights reserved. * * $FreeBSD: src/sys/i386/isa/bs/bshw.c,v 1.7.2.1 2001/07/26 02:32:18 nyan Exp $ - * $DragonFly: src/sys/dev/disk/i386/bs/Attic/bshw.c,v 1.3 2003/08/07 21:16:52 dillon Exp $ + * $DragonFly: src/sys/dev/disk/i386/bs/Attic/bshw.c,v 1.4 2003/08/27 10:35:16 rob Exp $ */ #ifdef __NetBSD__ @@ -54,7 +55,7 @@ static struct bs_softc *gbsc; /************************************************** * DECLARATION **************************************************/ -static void bshw_force_bsmode __P((struct bs_softc *)); +static void bshw_force_bsmode (struct bs_softc *); /************************************************** * STATIC VAL @@ -186,7 +187,7 @@ twiddle_wait(void) delay(TWIDDLEWAIT); } -static void bshw_set_vsp __P((struct bs_softc *, u_int, u_int8_t)); +static void bshw_set_vsp (struct bs_softc *, u_int, u_int8_t); static void bshw_set_vsp(bsc, chan, spva) diff --git a/sys/dev/disk/i386/bs/bshw.h b/sys/dev/disk/i386/bs/bshw.h index 8c698438a4..534453e19f 100644 --- a/sys/dev/disk/i386/bs/bshw.h +++ b/sys/dev/disk/i386/bs/bshw.h @@ -1,5 +1,6 @@ /* $NecBSD: bshw.h,v 1.2 1997/10/31 17:43:38 honda Exp $ */ /* $NetBSD$ */ +/* $DragonFly: src/sys/dev/disk/i386/bs/Attic/bshw.h,v 1.2 2003/08/27 10:35:16 rob Exp $ */ /* * [NetBSD for NEC PC98 series] * Copyright (c) 1994, 1995, 1996 NetBSD/pc98 porting staff. @@ -53,54 +54,54 @@ /********************************************************* * static inline declare. *********************************************************/ -static BS_INLINE void write_wd33c93 __P((struct bs_softc *, u_int, u_int8_t)); -static BS_INLINE u_int8_t read_wd33c93 __P((struct bs_softc *, u_int)); -static BS_INLINE u_int8_t bshw_get_auxstat __P((struct bs_softc *)); -static BS_INLINE u_int8_t bshw_get_busstat __P((struct bs_softc *)); -static BS_INLINE u_int8_t bshw_get_status_insat __P((struct bs_softc *)); -static BS_INLINE u_int8_t bshw_read_data __P((struct bs_softc *)); -static BS_INLINE void bshw_write_data __P((struct bs_softc *, u_int8_t)); -static BS_INLINE void bshw_set_count __P((struct bs_softc *, u_int)); -static BS_INLINE u_int bshw_get_count __P((struct bs_softc *)); -static BS_INLINE void bshw_set_dst_id __P((struct bs_softc *, u_int, u_int)); -static BS_INLINE void bshw_set_lun __P((struct bs_softc *, u_int)); -static BS_INLINE u_int bshw_get_src_id __P((struct bs_softc *)); -static BS_INLINE void bshw_negate_ack __P((struct bs_softc *)); -static BS_INLINE void bshw_assert_atn __P((struct bs_softc *)); -static BS_INLINE void bshw_assert_select __P((struct bs_softc *)); -static BS_INLINE void bshw_start_xfer __P((struct bs_softc *)); -static BS_INLINE void bshw_start_sxfer __P((struct bs_softc *)); -static BS_INLINE void bshw_cmd_pass __P((struct bs_softc *, u_int)); -static BS_INLINE void bshw_start_sat __P((struct bs_softc *, u_int)); -static BS_INLINE void bshw_abort_cmd __P((struct bs_softc *)); -static BS_INLINE void bshw_set_sync_reg __P((struct bs_softc *, u_int)); -static BS_INLINE void bshw_set_poll_trans __P((struct bs_softc *, u_int)); -static BS_INLINE void bshw_set_dma_trans __P((struct bs_softc *, u_int)); +static BS_INLINE void write_wd33c93 (struct bs_softc *, u_int, u_int8_t); +static BS_INLINE u_int8_t read_wd33c93 (struct bs_softc *, u_int); +static BS_INLINE u_int8_t bshw_get_auxstat (struct bs_softc *); +static BS_INLINE u_int8_t bshw_get_busstat (struct bs_softc *); +static BS_INLINE u_int8_t bshw_get_status_insat (struct bs_softc *); +static BS_INLINE u_int8_t bshw_read_data (struct bs_softc *); +static BS_INLINE void bshw_write_data (struct bs_softc *, u_int8_t); +static BS_INLINE void bshw_set_count (struct bs_softc *, u_int); +static BS_INLINE u_int bshw_get_count (struct bs_softc *); +static BS_INLINE void bshw_set_dst_id (struct bs_softc *, u_int, u_int); +static BS_INLINE void bshw_set_lun (struct bs_softc *, u_int); +static BS_INLINE u_int bshw_get_src_id (struct bs_softc *); +static BS_INLINE void bshw_negate_ack (struct bs_softc *); +static BS_INLINE void bshw_assert_atn (struct bs_softc *); +static BS_INLINE void bshw_assert_select (struct bs_softc *); +static BS_INLINE void bshw_start_xfer (struct bs_softc *); +static BS_INLINE void bshw_start_sxfer (struct bs_softc *); +static BS_INLINE void bshw_cmd_pass (struct bs_softc *, u_int); +static BS_INLINE void bshw_start_sat (struct bs_softc *, u_int); +static BS_INLINE void bshw_abort_cmd (struct bs_softc *); +static BS_INLINE void bshw_set_sync_reg (struct bs_softc *, u_int); +static BS_INLINE void bshw_set_poll_trans (struct bs_softc *, u_int); +static BS_INLINE void bshw_set_dma_trans (struct bs_softc *, u_int); /********************************************************* * global declare *********************************************************/ -void bs_dma_xfer __P((struct targ_info *, u_int)); -void bs_dma_xfer_end __P((struct targ_info *)); -void bshw_dmaabort __P((struct bs_softc *, struct targ_info *)); +void bs_dma_xfer (struct targ_info *, u_int); +void bs_dma_xfer_end (struct targ_info *); +void bshw_dmaabort (struct bs_softc *, struct targ_info *); -void bshw_adj_syncdata __P((struct syncdata *)); -void bshw_set_synchronous __P((struct bs_softc *, struct targ_info *)); +void bshw_adj_syncdata (struct syncdata *); +void bshw_set_synchronous (struct bs_softc *, struct targ_info *); -void bs_smit_xfer_end __P((struct targ_info *)); -void bshw_smitabort __P((struct bs_softc *)); +void bs_smit_xfer_end (struct targ_info *); +void bshw_smitabort (struct bs_softc *); -void bshw_setup_ctrl_reg __P((struct bs_softc *, u_int)); -int bshw_chip_reset __P((struct bs_softc *)); -void bshw_bus_reset __P((struct bs_softc *)); -int bshw_board_probe __P((struct bs_softc *, u_int *, u_int *)); -void bshw_lock __P((struct bs_softc *)); -void bshw_unlock __P((struct bs_softc *)); -void bshw_get_syncreg __P((struct bs_softc *)); -void bshw_issue_satcmd __P((struct bs_softc *, struct bsccb *, int)); -void bshw_print_port __P((struct bs_softc *)); +void bshw_setup_ctrl_reg (struct bs_softc *, u_int); +int bshw_chip_reset (struct bs_softc *); +void bshw_bus_reset (struct bs_softc *); +int bshw_board_probe (struct bs_softc *, u_int *, u_int *); +void bshw_lock (struct bs_softc *); +void bshw_unlock (struct bs_softc *); +void bshw_get_syncreg (struct bs_softc *); +void bshw_issue_satcmd (struct bs_softc *, struct bsccb *, int); +void bshw_print_port (struct bs_softc *); -void bs_lc_smit_xfer __P((struct targ_info *, u_int)); +void bs_lc_smit_xfer (struct targ_info *, u_int); extern struct dvcfg_hwsel bshw_hwsel; extern u_int8_t bshw_cmd[]; @@ -116,9 +117,9 @@ struct bshw { u_int sregaddr; - int ((*dma_init) __P((struct bs_softc *))); - void ((*dma_start) __P((struct bs_softc *))); - void ((*dma_stop) __P((struct bs_softc *))); + int ((*dma_init) (struct bs_softc *)); + void ((*dma_start) (struct bs_softc *)); + void ((*dma_stop) (struct bs_softc *)); }; /********************************************************* diff --git a/sys/dev/disk/i386/bs/bshw.lst b/sys/dev/disk/i386/bs/bshw.lst index 8446fb8755..af28150b32 100644 --- a/sys/dev/disk/i386/bs/bshw.lst +++ b/sys/dev/disk/i386/bs/bshw.lst @@ -1,5 +1,6 @@ /* $NecBSD: bshw.lst,v 1.1 1997/07/18 09:19:05 kmatsuda Exp $ */ /* $NetBSD$ */ +/* $DragonFly: src/sys/dev/disk/i386/bs/Attic/bshw.lst,v 1.2 2003/08/27 10:35:16 rob Exp $ */ /* * [NetBSD for NEC PC98 series] * Copyright (c) 1994, 1995, 1996 NetBSD/pc98 porting staff. @@ -42,9 +43,9 @@ static struct bshw bshw_generic = { NULL, }; -static int bshw_dma_init_sc98 __P((struct bs_softc *)); -static void bshw_dma_start_sc98 __P((struct bs_softc *)); -static void bshw_dma_stop_sc98 __P((struct bs_softc *)); +static int bshw_dma_init_sc98 (struct bs_softc *); +static void bshw_dma_start_sc98 (struct bs_softc *); +static void bshw_dma_stop_sc98 (struct bs_softc *); static struct bshw bshw_sc98 = { BSHW_DOUBLE_DMACHAN, @@ -55,7 +56,7 @@ static struct bshw bshw_sc98 = { bshw_dma_stop_sc98, }; -static int bshw_dma_init_texa __P((struct bs_softc *)); +static int bshw_dma_init_texa (struct bs_softc *); static struct bshw bshw_texa = { BSHW_DOUBLE_DMACHAN, @@ -66,8 +67,8 @@ static struct bshw bshw_texa = { NULL, }; -static void bshw_dma_start_elecom __P((struct bs_softc *)); -static void bshw_dma_stop_elecom __P((struct bs_softc *)); +static void bshw_dma_start_elecom (struct bs_softc *); +static void bshw_dma_stop_elecom (struct bs_softc *); static struct bshw bshw_elecom = { 0, diff --git a/sys/dev/disk/i386/bs/bshw_dma.c b/sys/dev/disk/i386/bs/bshw_dma.c index c74de24632..3f05129868 100644 --- a/sys/dev/disk/i386/bs/bshw_dma.c +++ b/sys/dev/disk/i386/bs/bshw_dma.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/i386/isa/bs/bshw_dma.c,v 1.6.6.1 2000/10/21 07:44:26 nyan Exp $ */ -/* $DragonFly: src/sys/dev/disk/i386/bs/Attic/bshw_dma.c,v 1.2 2003/06/17 04:28:37 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/i386/bs/Attic/bshw_dma.c,v 1.3 2003/08/27 10:35:16 rob Exp $ */ /* $NecBSD: bshw_dma.c,v 1.3 1997/07/26 06:03:16 honda Exp $ */ /* $NetBSD$ */ /* @@ -37,8 +37,8 @@ /********************************************************* * static declare. *********************************************************/ -static void bshw_dmastart __P((struct bs_softc *)); -static void bshw_dmadone __P((struct bs_softc *)); +static void bshw_dmastart (struct bs_softc *); +static void bshw_dmadone (struct bs_softc *); /********************************************** * UPPER INTERFACE FUNCS (all funcs exported) diff --git a/sys/dev/disk/i386/bs/bshw_pdma.c b/sys/dev/disk/i386/bs/bshw_pdma.c index 02f70a2d03..a32c07cd95 100644 --- a/sys/dev/disk/i386/bs/bshw_pdma.c +++ b/sys/dev/disk/i386/bs/bshw_pdma.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/i386/isa/bs/bshw_pdma.c,v 1.6.6.1 2000/10/21 07:44:26 nyan Exp $ */ -/* $DragonFly: src/sys/dev/disk/i386/bs/Attic/bshw_pdma.c,v 1.2 2003/06/17 04:28:37 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/i386/bs/Attic/bshw_pdma.c,v 1.3 2003/08/27 10:35:16 rob Exp $ */ /* $NecBSD: bshw_pdma.c,v 1.4 1997/10/31 17:43:39 honda Exp $ */ /* $NetBSD$ */ /* @@ -36,9 +36,9 @@ #define LC_SMIT_TIMEOUT 2 /* 2 sec: timeout for a fifo status ready */ -static BS_INLINE void bshw_lc_smit_start __P((struct bs_softc *, int, u_int)); -static int bshw_lc_smit_fstat __P((struct bs_softc *, int, int)); -static void bshw_lc_smit_stop __P((struct bs_softc *)); +static BS_INLINE void bshw_lc_smit_start (struct bs_softc *, int, u_int); +static int bshw_lc_smit_fstat (struct bs_softc *, int, int); +static void bshw_lc_smit_stop (struct bs_softc *); /********************************************************* * SM FIFO (GENERIC) diff --git a/sys/dev/disk/i386/bs/bsif.c b/sys/dev/disk/i386/bs/bsif.c index 3d25af056c..bc33efa65f 100644 --- a/sys/dev/disk/i386/bs/bsif.c +++ b/sys/dev/disk/i386/bs/bsif.c @@ -27,7 +27,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/bs/bsif.c,v 1.10.2.1 2000/08/24 08:06:08 kato Exp $ - * $DragonFly: src/sys/dev/disk/i386/bs/Attic/bsif.c,v 1.3 2003/08/07 21:16:52 dillon Exp $ + * $DragonFly: src/sys/dev/disk/i386/bs/Attic/bsif.c,v 1.4 2003/08/27 10:35:16 rob Exp $ */ #if 0 @@ -58,7 +58,7 @@ * DEVICE DECLARE **************************************************/ #ifdef __NetBSD__ -static void bs_scsi_minphys __P((struct buf *)); +static void bs_scsi_minphys (struct buf *); struct cfdriver bs_cd = { NULL, "bs", DV_DULL @@ -80,11 +80,11 @@ struct scsi_adapter pc98texa55bs = { #endif /* __NetBSD__ */ #ifdef __FreeBSD__ -static int bsprobe __P((struct isa_device *)); +static int bsprobe (struct isa_device *); static void bs_poll(struct cam_sim *sim); static int bsattach(struct isa_device *); static ointhand2_t bsintr; -static int bs_dmarangecheck __P((caddr_t, unsigned)); +static int bs_dmarangecheck (caddr_t, unsigned); struct isa_driver bsdriver = { bsprobe, diff --git a/sys/dev/disk/i386/bs/bsif.h b/sys/dev/disk/i386/bs/bsif.h index ace321b933..cd2c2f972d 100644 --- a/sys/dev/disk/i386/bs/bsif.h +++ b/sys/dev/disk/i386/bs/bsif.h @@ -1,6 +1,6 @@ /* $NecBSD: bsif.h,v 1.5 1997/10/23 20:52:34 honda Exp $ */ /* $FreeBSD: src/sys/i386/isa/bs/bsif.h,v 1.12.2.2 2001/07/26 02:32:18 nyan Exp $ */ -/* $DragonFly: src/sys/dev/disk/i386/bs/Attic/bsif.h,v 1.4 2003/08/07 21:16:52 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/i386/bs/Attic/bsif.h,v 1.5 2003/08/27 10:35:16 rob Exp $ */ /* * Copyright (c) HONDA Naofumi, KATO Takenori, 1996. All rights reserved. * @@ -188,10 +188,10 @@ * declare ***************************************************/ /* (I) common declare */ -void bs_alloc_buf __P((struct targ_info *)); +void bs_alloc_buf (struct targ_info *); #ifdef __NetBSD__ -XSBS_INT32T bs_target_open __P((struct scsi_link *, struct cfdata *)); -XSBS_INT32T bs_scsi_cmd __P((struct scsi_xfer *)); +XSBS_INT32T bs_target_open (struct scsi_link *, struct cfdata *); +XSBS_INT32T bs_scsi_cmd (struct scsi_xfer *); #endif #ifdef __FreeBSD__ void bs_scsi_cmd(struct cam_sim *sim, union ccb *ccb); @@ -200,13 +200,13 @@ extern int delaycount; /* (II) os depend declare */ #ifdef __NetBSD__ -int bsintr __P((void *)); -int bsprint __P((void *, const char *)); +int bsintr (void *); +int bsprint (void *, const char *); #endif /* __NetBSD__ */ #ifdef __FreeBSD__ -static BS_INLINE void memcopy __P((void *from, void *to, register size_t len)); -u_int32_t bs_adapter_info __P((int)); +static BS_INLINE void memcopy (void *from, void *to, register size_t len); +u_int32_t bs_adapter_info (int); #define delay(y) DELAY(y) extern int dma_init_flag; #ifdef SMP diff --git a/sys/dev/disk/i386/bs/bsvar.h b/sys/dev/disk/i386/bs/bsvar.h index a71f6b84eb..f1ab673a8a 100644 --- a/sys/dev/disk/i386/bs/bsvar.h +++ b/sys/dev/disk/i386/bs/bsvar.h @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/bs/bsvar.h,v 1.6.6.1 2000/03/22 03:36:45 nyan Exp $ - * $DragonFly: src/sys/dev/disk/i386/bs/Attic/bsvar.h,v 1.2 2003/06/17 04:28:37 dillon Exp $ + * $DragonFly: src/sys/dev/disk/i386/bs/Attic/bsvar.h,v 1.3 2003/08/27 10:35:16 rob Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Naofumi HONDA. All rights reserved. @@ -503,12 +503,12 @@ extern int bs_debug_flag; /************************************************* * Function declare *************************************************/ -int bs_scsi_cmd_internal __P((struct bsccb *, u_int)); -struct bsccb *bscmddone __P((struct targ_info *)); -int bscmdstart __P((struct targ_info *, int)); -int bs_scsi_cmd_poll __P((struct targ_info *, struct bsccb *)); -int bs_sequencer __P((struct bs_softc *)); -void bs_poll_timeout __P((struct bs_softc *, char *)); +int bs_scsi_cmd_internal (struct bsccb *, u_int); +struct bsccb *bscmddone (struct targ_info *); +int bscmdstart (struct targ_info *, int); +int bs_scsi_cmd_poll (struct targ_info *, struct bsccb *); +int bs_sequencer (struct bs_softc *); +void bs_poll_timeout (struct bs_softc *, char *); /************************************************* * XXX diff --git a/sys/dev/disk/ispfw/ispfw.c b/sys/dev/disk/ispfw/ispfw.c index ebbede5a85..4ca642b030 100644 --- a/sys/dev/disk/ispfw/ispfw.c +++ b/sys/dev/disk/ispfw/ispfw.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/ispfw/ispfw.c,v 1.2.2.5 2002/10/12 00:13:09 mjacob Exp $ */ -/* $DragonFly: src/sys/dev/disk/ispfw/ispfw.c,v 1.3 2003/08/07 21:16:53 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/ispfw/ispfw.c,v 1.4 2003/08/27 10:35:17 rob Exp $ */ /* * ISP Firmware Helper Pseudo Device for FreeBSD * @@ -56,9 +56,9 @@ #define PCI_PRODUCT_QLOGIC_ISP2300 0x2300 #define PCI_PRODUCT_QLOGIC_ISP2312 0x2312 -typedef void ispfwfunc __P((int, int, int, const u_int16_t **)); +typedef void ispfwfunc (int, int, int, const u_int16_t **); extern ispfwfunc *isp_get_firmware_p; -static void isp_get_firmware __P((int, int, int, const u_int16_t **)); +static void isp_get_firmware (int, int, int, const u_int16_t **); static int ncallers = 0; static const u_int16_t ***callp = NULL; diff --git a/sys/dev/disk/ncv/ncr53c500.c b/sys/dev/disk/ncv/ncr53c500.c index b49c71a31a..30ede6f59d 100644 --- a/sys/dev/disk/ncv/ncr53c500.c +++ b/sys/dev/disk/ncv/ncr53c500.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/ncv/ncr53c500.c,v 1.1.2.4 2001/12/17 13:30:18 non Exp $ */ -/* $DragonFly: src/sys/dev/disk/ncv/ncr53c500.c,v 1.4 2003/08/07 21:16:53 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/ncv/ncr53c500.c,v 1.5 2003/08/27 10:35:17 rob Exp $ */ /* $NecBSD: ncr53c500.c,v 1.30.12.3 2001/06/26 07:31:41 honda Exp $ */ /* $NetBSD$ */ @@ -130,35 +130,35 @@ extern struct cfdriver ncv_cd; * DECLARE **************************************************************/ /* static */ -static void ncv_pio_read __P((struct ncv_softc *, u_int8_t *, u_int)); -static void ncv_pio_write __P((struct ncv_softc *, u_int8_t *, u_int)); -static int ncv_msg __P((struct ncv_softc *, struct targ_info *, u_int)); -static int ncv_reselected __P((struct ncv_softc *)); -static int ncv_disconnected __P((struct ncv_softc *, struct targ_info *)); - -static __inline void ncvhw_set_count __P((bus_space_tag_t, bus_space_handle_t, int)); -static __inline u_int ncvhw_get_count __P((bus_space_tag_t, bus_space_handle_t)); -static __inline void ncvhw_select_register_0 __P((bus_space_tag_t, bus_space_handle_t, struct ncv_hw *)); -static __inline void ncvhw_select_register_1 __P((bus_space_tag_t, bus_space_handle_t, struct ncv_hw *)); -static __inline void ncvhw_fpush __P((bus_space_tag_t, bus_space_handle_t, u_int8_t *, int)); - -static void ncv_pdma_end __P((struct ncv_softc *sc, struct targ_info *)); -static int ncv_world_start __P((struct ncv_softc *, int)); -static void ncvhw_bus_reset __P((struct ncv_softc *)); -static void ncvhw_reset __P((bus_space_tag_t, bus_space_handle_t, struct ncv_hw *)); -static int ncvhw_check __P((bus_space_tag_t, bus_space_handle_t, struct ncv_hw *)); -static void ncvhw_init __P((bus_space_tag_t, bus_space_handle_t, struct ncv_hw *)); -static int ncvhw_start_selection __P((struct ncv_softc *sc, struct slccb *)); -static void ncvhw_attention __P((struct ncv_softc *)); -static int ncv_ccb_nexus_establish __P((struct ncv_softc *)); -static int ncv_lun_nexus_establish __P((struct ncv_softc *)); -static int ncv_target_nexus_establish __P((struct ncv_softc *)); -static int ncv_targ_init __P((struct ncv_softc *, struct targ_info *, int)); -static int ncv_catch_intr __P((struct ncv_softc *)); +static void ncv_pio_read (struct ncv_softc *, u_int8_t *, u_int); +static void ncv_pio_write (struct ncv_softc *, u_int8_t *, u_int); +static int ncv_msg (struct ncv_softc *, struct targ_info *, u_int); +static int ncv_reselected (struct ncv_softc *); +static int ncv_disconnected (struct ncv_softc *, struct targ_info *); + +static __inline void ncvhw_set_count (bus_space_tag_t, bus_space_handle_t, int); +static __inline u_int ncvhw_get_count (bus_space_tag_t, bus_space_handle_t); +static __inline void ncvhw_select_register_0 (bus_space_tag_t, bus_space_handle_t, struct ncv_hw *); +static __inline void ncvhw_select_register_1 (bus_space_tag_t, bus_space_handle_t, struct ncv_hw *); +static __inline void ncvhw_fpush (bus_space_tag_t, bus_space_handle_t, u_int8_t *, int); + +static void ncv_pdma_end (struct ncv_softc *sc, struct targ_info *); +static int ncv_world_start (struct ncv_softc *, int); +static void ncvhw_bus_reset (struct ncv_softc *); +static void ncvhw_reset (bus_space_tag_t, bus_space_handle_t, struct ncv_hw *); +static int ncvhw_check (bus_space_tag_t, bus_space_handle_t, struct ncv_hw *); +static void ncvhw_init (bus_space_tag_t, bus_space_handle_t, struct ncv_hw *); +static int ncvhw_start_selection (struct ncv_softc *sc, struct slccb *); +static void ncvhw_attention (struct ncv_softc *); +static int ncv_ccb_nexus_establish (struct ncv_softc *); +static int ncv_lun_nexus_establish (struct ncv_softc *); +static int ncv_target_nexus_establish (struct ncv_softc *); +static int ncv_targ_init (struct ncv_softc *, struct targ_info *, int); +static int ncv_catch_intr (struct ncv_softc *); #ifdef NCV_POWER_CONTROL -static int ncvhw_power __P((struct ncv_softc *, u_int)); +static int ncvhw_power (struct ncv_softc *, u_int); #endif /* NCV_POWER_CONTROL */ -static __inline void ncv_setup_and_start_pio __P((struct ncv_softc *, u_int)); +static __inline void ncv_setup_and_start_pio (struct ncv_softc *, u_int); struct scsi_low_funcs ncv_funcs = { SC_LOW_INIT_T ncv_world_start, @@ -572,7 +572,7 @@ ncv_targ_init(sc, ti, action) /************************************************************** * General probe attach **************************************************************/ -static int ncv_setup_img __P((struct ncv_hw *, u_int, int)); +static int ncv_setup_img (struct ncv_hw *, u_int, int); static int ncv_setup_img(hw, dvcfg, hostid) diff --git a/sys/dev/disk/ncv/ncr53c500_pccard.c b/sys/dev/disk/ncv/ncr53c500_pccard.c index 308d25f859..4abf390393 100644 --- a/sys/dev/disk/ncv/ncr53c500_pccard.c +++ b/sys/dev/disk/ncv/ncr53c500_pccard.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/ncv/ncr53c500_pccard.c,v 1.2.2.5 2001/12/17 13:30:18 non Exp $ */ -/* $DragonFly: src/sys/dev/disk/ncv/ncr53c500_pccard.c,v 1.3 2003/08/07 21:16:53 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/ncv/ncr53c500_pccard.c,v 1.4 2003/08/27 10:35:17 rob Exp $ */ /* $NecBSD: ncr53c500_pisa.c,v 1.28 1998/11/26 01:59:11 honda Exp $ */ /* $NetBSD$ */ @@ -78,7 +78,7 @@ static int ncvprobe(DEVPORT_PDEVICE devi); static int ncvattach(DEVPORT_PDEVICE devi); -static void ncv_card_unload __P((DEVPORT_PDEVICE)); +static void ncv_card_unload (DEVPORT_PDEVICE); /* * Additional code for FreeBSD new-bus PCCard frontend diff --git a/sys/dev/disk/ncv/ncr53c500var.h b/sys/dev/disk/ncv/ncr53c500var.h index 367001a786..605703937b 100644 --- a/sys/dev/disk/ncv/ncr53c500var.h +++ b/sys/dev/disk/ncv/ncr53c500var.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/ncv/ncr53c500var.h,v 1.1.2.4 2001/12/17 13:30:18 non Exp $ */ -/* $DragonFly: src/sys/dev/disk/ncv/ncr53c500var.h,v 1.2 2003/06/17 04:28:28 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/ncv/ncr53c500var.h,v 1.3 2003/08/27 10:35:17 rob Exp $ */ /* $NecBSD: ncr53c500var.h,v 1.11.18.1 2001/06/08 06:27:45 honda Exp $ */ /* $NetBSD$ */ @@ -91,10 +91,10 @@ struct ncv_targ_info { /***************************************************************** * Proto *****************************************************************/ -int ncvprobesubr __P((bus_space_tag_t, bus_space_handle_t ioh, u_int, int)); -void ncvattachsubr __P((struct ncv_softc *)); -int ncvprint __P((void *, const char *)); -int ncvintr __P((void *)); +int ncvprobesubr (bus_space_tag_t, bus_space_handle_t ioh, u_int, int); +void ncvattachsubr (struct ncv_softc *); +int ncvprint (void *, const char *); +int ncvintr (void *); #if defined(i386) #define SOFT_INTR_REQUIRED(slp) (softintr((slp)->sl_irq)) diff --git a/sys/dev/disk/nsp/nsp.c b/sys/dev/disk/nsp/nsp.c index 9985fa9d8f..40313b8b2e 100644 --- a/sys/dev/disk/nsp/nsp.c +++ b/sys/dev/disk/nsp/nsp.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/nsp/nsp.c,v 1.1.2.6 2001/12/17 13:30:18 non Exp $ */ -/* $DragonFly: src/sys/dev/disk/nsp/nsp.c,v 1.4 2003/08/07 21:16:53 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/nsp/nsp.c,v 1.5 2003/08/27 10:35:17 rob Exp $ */ /* $NecBSD: nsp.c,v 1.21.12.6 2001/06/29 06:27:52 honda Exp $ */ /* $NetBSD$ */ @@ -154,35 +154,35 @@ extern struct cfdriver nsp_cd; **************************************************************/ #define NSP_FIFO_ON 1 #define NSP_FIFO_OFF 0 -static void nsp_pio_read __P((struct nsp_softc *, int)); -static void nsp_pio_write __P((struct nsp_softc *, int)); -static int nsp_xfer __P((struct nsp_softc *, u_int8_t *, int, int, int)); -static int nsp_msg __P((struct nsp_softc *, struct targ_info *, u_int)); -static int nsp_reselected __P((struct nsp_softc *)); -static int nsp_disconnected __P((struct nsp_softc *, struct targ_info *)); -static void nsp_pdma_end __P((struct nsp_softc *, struct targ_info *)); -static void nsphw_init __P((struct nsp_softc *)); -static int nsp_target_nexus_establish __P((struct nsp_softc *)); -static int nsp_lun_nexus_establish __P((struct nsp_softc *)); -static int nsp_ccb_nexus_establish __P((struct nsp_softc *)); -static int nsp_world_start __P((struct nsp_softc *, int)); -static int nsphw_start_selection __P((struct nsp_softc *sc, struct slccb *)); -static void nsphw_bus_reset __P((struct nsp_softc *)); -static void nsphw_attention __P((struct nsp_softc *)); -static u_int nsp_fifo_count __P((struct nsp_softc *)); -static u_int nsp_request_count __P((struct nsp_softc *)); -static int nsp_negate_signal __P((struct nsp_softc *, u_int8_t, u_char *)); -static int nsp_expect_signal __P((struct nsp_softc *, u_int8_t, u_int8_t)); -static void nsp_start_timer __P((struct nsp_softc *, int)); -static void nsp_setup_fifo __P((struct nsp_softc *, int, int, int)); -static int nsp_targ_init __P((struct nsp_softc *, struct targ_info *, int)); -static void nsphw_selection_done_and_expect_msgout __P((struct nsp_softc *)); -static void nsp_data_padding __P((struct nsp_softc *, int, u_int)); -static int nsp_timeout __P((struct nsp_softc *)); -static int nsp_read_fifo __P((struct nsp_softc *, int)); -static int nsp_write_fifo __P((struct nsp_softc *, int)); -static int nsp_phase_match __P((struct nsp_softc *, u_int8_t, u_int8_t)); -static int nsp_wait_interrupt __P((struct nsp_softc *)); +static void nsp_pio_read (struct nsp_softc *, int); +static void nsp_pio_write (struct nsp_softc *, int); +static int nsp_xfer (struct nsp_softc *, u_int8_t *, int, int, int); +static int nsp_msg (struct nsp_softc *, struct targ_info *, u_int); +static int nsp_reselected (struct nsp_softc *); +static int nsp_disconnected (struct nsp_softc *, struct targ_info *); +static void nsp_pdma_end (struct nsp_softc *, struct targ_info *); +static void nsphw_init (struct nsp_softc *); +static int nsp_target_nexus_establish (struct nsp_softc *); +static int nsp_lun_nexus_establish (struct nsp_softc *); +static int nsp_ccb_nexus_establish (struct nsp_softc *); +static int nsp_world_start (struct nsp_softc *, int); +static int nsphw_start_selection (struct nsp_softc *sc, struct slccb *); +static void nsphw_bus_reset (struct nsp_softc *); +static void nsphw_attention (struct nsp_softc *); +static u_int nsp_fifo_count (struct nsp_softc *); +static u_int nsp_request_count (struct nsp_softc *); +static int nsp_negate_signal (struct nsp_softc *, u_int8_t, u_char *); +static int nsp_expect_signal (struct nsp_softc *, u_int8_t, u_int8_t); +static void nsp_start_timer (struct nsp_softc *, int); +static void nsp_setup_fifo (struct nsp_softc *, int, int, int); +static int nsp_targ_init (struct nsp_softc *, struct targ_info *, int); +static void nsphw_selection_done_and_expect_msgout (struct nsp_softc *); +static void nsp_data_padding (struct nsp_softc *, int, u_int); +static int nsp_timeout (struct nsp_softc *); +static int nsp_read_fifo (struct nsp_softc *, int); +static int nsp_write_fifo (struct nsp_softc *, int); +static int nsp_phase_match (struct nsp_softc *, u_int8_t, u_int8_t); +static int nsp_wait_interrupt (struct nsp_softc *); struct scsi_low_funcs nspfuncs = { SC_LOW_INIT_T nsp_world_start, @@ -206,8 +206,8 @@ struct scsi_low_funcs nspfuncs = { /**************************************************** * hwfuncs ****************************************************/ -static __inline u_int8_t nsp_cr_read_1 __P((bus_space_tag_t bst, bus_space_handle_t bsh, bus_addr_t ofs)); -static __inline void nsp_cr_write_1 __P((bus_space_tag_t bst, bus_space_handle_t bsh, bus_addr_t ofs, u_int8_t va)); +static __inline u_int8_t nsp_cr_read_1 (bus_space_tag_t bst, bus_space_handle_t bsh, bus_addr_t ofs); +static __inline void nsp_cr_write_1 (bus_space_tag_t bst, bus_space_handle_t bsh, bus_addr_t ofs, u_int8_t va); static __inline u_int8_t nsp_cr_read_1(bst, bsh, ofs) @@ -1354,7 +1354,7 @@ nsp_disconnected(sc, ti) /************************************************************** * SEQUENCER **************************************************************/ -static void nsp_error __P((struct nsp_softc *, u_char *, u_int8_t, u_int8_t, u_int8_t)); +static void nsp_error (struct nsp_softc *, u_char *, u_int8_t, u_int8_t, u_int8_t); static void nsp_error(sc, s, isrc, ph, irqphs) diff --git a/sys/dev/disk/nsp/nsp_pccard.c b/sys/dev/disk/nsp/nsp_pccard.c index a35f75b9fa..250328dc8b 100644 --- a/sys/dev/disk/nsp/nsp_pccard.c +++ b/sys/dev/disk/nsp/nsp_pccard.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/nsp/nsp_pccard.c,v 1.2.2.6 2001/12/17 13:30:19 non Exp $ */ -/* $DragonFly: src/sys/dev/disk/nsp/nsp_pccard.c,v 1.3 2003/08/07 21:16:53 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/nsp/nsp_pccard.c,v 1.4 2003/08/27 10:35:17 rob Exp $ */ /* $NecBSD: nsp_pisa.c,v 1.4 1999/04/15 01:35:54 kmatsuda Exp $ */ /* $NetBSD$ */ @@ -75,7 +75,7 @@ static int nspprobe(DEVPORT_PDEVICE devi); static int nspattach(DEVPORT_PDEVICE devi); -static void nsp_card_unload __P((DEVPORT_PDEVICE)); +static void nsp_card_unload (DEVPORT_PDEVICE); /* * Additional code for FreeBSD new-bus PCCard frontend diff --git a/sys/dev/disk/nsp/nspvar.h b/sys/dev/disk/nsp/nspvar.h index 70399f2c7c..e3b82a26e2 100644 --- a/sys/dev/disk/nsp/nspvar.h +++ b/sys/dev/disk/nsp/nspvar.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/nsp/nspvar.h,v 1.1.2.4 2001/12/17 13:30:19 non Exp $ */ -/* $DragonFly: src/sys/dev/disk/nsp/nspvar.h,v 1.2 2003/06/17 04:28:28 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/nsp/nspvar.h,v 1.3 2003/08/27 10:35:17 rob Exp $ */ /* $NecBSD: nspvar.h,v 1.7.14.5 2001/06/29 06:27:54 honda Exp $ */ /* $NetBSD$ */ @@ -101,10 +101,10 @@ struct nsp_targ_info { /***************************************************************** * Proto *****************************************************************/ -int nspprobesubr __P((bus_space_tag_t, bus_space_handle_t, u_int)); -void nspattachsubr __P((struct nsp_softc *)); -int nspprint __P((void *, const char *)); -int nspintr __P((void *)); +int nspprobesubr (bus_space_tag_t, bus_space_handle_t, u_int); +void nspattachsubr (struct nsp_softc *); +int nspprint (void *, const char *); +int nspintr (void *); #if defined(i386) #define SOFT_INTR_REQUIRED(slp) (softintr((slp)->sl_irq)) diff --git a/sys/dev/disk/sbp/sbp.c b/sys/dev/disk/sbp/sbp.c index c0af45d68b..8b56c22392 100644 --- a/sys/dev/disk/sbp/sbp.c +++ b/sys/dev/disk/sbp/sbp.c @@ -32,7 +32,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/firewire/sbp.c,v 1.5.2.19 2003/05/12 04:16:30 simokawa Exp $ - * $DragonFly: src/sys/dev/disk/sbp/sbp.c,v 1.3 2003/08/07 21:16:53 dillon Exp $ + * $DragonFly: src/sys/dev/disk/sbp/sbp.c,v 1.4 2003/08/27 10:35:17 rob Exp $ * */ @@ -312,23 +312,23 @@ struct sbp_softc { #define SBP_RESOURCE_SHORTAGE 0x10 unsigned char flags; }; -static void sbp_post_explore __P((void *)); -static void sbp_recv __P((struct fw_xfer *)); -static void sbp_mgm_callback __P((struct fw_xfer *)); -static void sbp_cmd_callback __P((struct fw_xfer *)); -static void sbp_orb_pointer __P((struct sbp_dev *, struct sbp_ocb *)); -static void sbp_execute_ocb __P((void *, bus_dma_segment_t *, int, int)); -static void sbp_free_ocb __P((struct sbp_dev *, struct sbp_ocb *)); -static void sbp_abort_ocb __P((struct sbp_ocb *, int)); -static void sbp_abort_all_ocbs __P((struct sbp_dev *, int)); -static struct fw_xfer * sbp_write_cmd __P((struct sbp_dev *, int, int)); -static struct sbp_ocb * sbp_get_ocb __P((struct sbp_dev *)); -static struct sbp_ocb * sbp_enqueue_ocb __P((struct sbp_dev *, struct sbp_ocb *)); -static struct sbp_ocb * sbp_dequeue_ocb __P((struct sbp_dev *, struct sbp_status *)); -static void sbp_cam_detach_target __P((struct sbp_target *)); -static void sbp_mgm_timeout __P((void *arg)); -static void sbp_timeout __P((void *arg)); -static void sbp_mgm_orb __P((struct sbp_dev *, int, struct sbp_ocb *)); +static void sbp_post_explore (void *); +static void sbp_recv (struct fw_xfer *); +static void sbp_mgm_callback (struct fw_xfer *); +static void sbp_cmd_callback (struct fw_xfer *); +static void sbp_orb_pointer (struct sbp_dev *, struct sbp_ocb *); +static void sbp_execute_ocb (void *, bus_dma_segment_t *, int, int); +static void sbp_free_ocb (struct sbp_dev *, struct sbp_ocb *); +static void sbp_abort_ocb (struct sbp_ocb *, int); +static void sbp_abort_all_ocbs (struct sbp_dev *, int); +static struct fw_xfer * sbp_write_cmd (struct sbp_dev *, int, int); +static struct sbp_ocb * sbp_get_ocb (struct sbp_dev *); +static struct sbp_ocb * sbp_enqueue_ocb (struct sbp_dev *, struct sbp_ocb *); +static struct sbp_ocb * sbp_dequeue_ocb (struct sbp_dev *, struct sbp_status *); +static void sbp_cam_detach_target (struct sbp_target *); +static void sbp_mgm_timeout (void *arg); +static void sbp_timeout (void *arg); +static void sbp_mgm_orb (struct sbp_dev *, int, struct sbp_ocb *); #define sbp_login(sdev) \ callout_reset(&(sdev)->login_callout, LOGIN_DELAY * hz, \ sbp_login_callout, (void *)(sdev)); diff --git a/sys/dev/disk/simos/simos.c b/sys/dev/disk/simos/simos.c index 01abe81530..55bc7dda13 100644 --- a/sys/dev/disk/simos/simos.c +++ b/sys/dev/disk/simos/simos.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pci/simos.c,v 1.7 1999/08/28 00:51:06 peter Exp $ - * $DragonFly: src/sys/dev/disk/simos/Attic/simos.c,v 1.3 2003/08/07 21:16:54 dillon Exp $ + * $DragonFly: src/sys/dev/disk/simos/Attic/simos.c,v 1.4 2003/08/27 10:35:17 rob Exp $ */ #include @@ -71,10 +71,10 @@ struct simos_softc* simosp[10]; static u_long simos_unit; -static const char *simos_probe __P((pcici_t tag, pcidi_t type)); -static void simos_attach __P((pcici_t config_d, int unit)); -static void simos_action __P((struct cam_sim *sim, union ccb *ccb)); -static void simos_poll __P((struct cam_sim *sim)); +static const char *simos_probe (pcici_t tag, pcidi_t type); +static void simos_attach (pcici_t config_d, int unit); +static void simos_action (struct cam_sim *sim, union ccb *ccb); +static void simos_poll (struct cam_sim *sim); struct pci_device simos_driver = { "simos", diff --git a/sys/dev/disk/stg/tmc18c30.c b/sys/dev/disk/stg/tmc18c30.c index 5c37dd47a2..f0fd78e86e 100644 --- a/sys/dev/disk/stg/tmc18c30.c +++ b/sys/dev/disk/stg/tmc18c30.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/stg/tmc18c30.c,v 1.1.2.5 2001/12/17 13:30:19 non Exp $ */ -/* $DragonFly: src/sys/dev/disk/stg/tmc18c30.c,v 1.4 2003/08/07 21:16:54 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/stg/tmc18c30.c,v 1.5 2003/08/27 10:35:17 rob Exp $ */ /* $NecBSD: tmc18c30.c,v 1.28.12.3 2001/06/19 04:35:48 honda Exp $ */ /* $NetBSD$ */ @@ -146,29 +146,29 @@ extern struct cfdriver stg_cd; * DECLARE **************************************************************/ /* static */ -static void stg_pio_read __P((struct stg_softc *, struct targ_info *, u_int)); -static void stg_pio_write __P((struct stg_softc *, struct targ_info *, u_int)); -static int stg_xfer __P((struct stg_softc *, u_int8_t *, int, int, int)); -static int stg_msg __P((struct stg_softc *, struct targ_info *, u_int)); -static int stg_reselected __P((struct stg_softc *)); -static int stg_disconnected __P((struct stg_softc *, struct targ_info *)); -static __inline void stg_pdma_end __P((struct stg_softc *, struct targ_info *)); -static int stghw_select_targ_wait __P((struct stg_softc *, int)); -static int stghw_check __P((struct stg_softc *)); -static void stghw_init __P((struct stg_softc *)); -static int stg_negate_signal __P((struct stg_softc *, u_int8_t, u_char *)); -static int stg_expect_signal __P((struct stg_softc *, u_int8_t, u_int8_t)); -static int stg_world_start __P((struct stg_softc *, int)); -static int stghw_start_selection __P((struct stg_softc *sc, struct slccb *)); -static void stghw_bus_reset __P((struct stg_softc *)); -static void stghw_attention __P((struct stg_softc *)); -static int stg_target_nexus_establish __P((struct stg_softc *)); -static int stg_lun_nexus_establish __P((struct stg_softc *)); -static int stg_ccb_nexus_establish __P((struct stg_softc *)); -static int stg_targ_init __P((struct stg_softc *, struct targ_info *, int)); -static __inline void stghw_bcr_write_1 __P((struct stg_softc *, u_int8_t)); -static int stg_timeout __P((struct stg_softc *)); -static void stg_selection_done_and_expect_msgout __P((struct stg_softc *)); +static void stg_pio_read (struct stg_softc *, struct targ_info *, u_int); +static void stg_pio_write (struct stg_softc *, struct targ_info *, u_int); +static int stg_xfer (struct stg_softc *, u_int8_t *, int, int, int); +static int stg_msg (struct stg_softc *, struct targ_info *, u_int); +static int stg_reselected (struct stg_softc *); +static int stg_disconnected (struct stg_softc *, struct targ_info *); +static __inline void stg_pdma_end (struct stg_softc *, struct targ_info *); +static int stghw_select_targ_wait (struct stg_softc *, int); +static int stghw_check (struct stg_softc *); +static void stghw_init (struct stg_softc *); +static int stg_negate_signal (struct stg_softc *, u_int8_t, u_char *); +static int stg_expect_signal (struct stg_softc *, u_int8_t, u_int8_t); +static int stg_world_start (struct stg_softc *, int); +static int stghw_start_selection (struct stg_softc *sc, struct slccb *); +static void stghw_bus_reset (struct stg_softc *); +static void stghw_attention (struct stg_softc *); +static int stg_target_nexus_establish (struct stg_softc *); +static int stg_lun_nexus_establish (struct stg_softc *); +static int stg_ccb_nexus_establish (struct stg_softc *); +static int stg_targ_init (struct stg_softc *, struct targ_info *, int); +static __inline void stghw_bcr_write_1 (struct stg_softc *, u_int8_t); +static int stg_timeout (struct stg_softc *); +static void stg_selection_done_and_expect_msgout (struct stg_softc *); struct scsi_low_funcs stgfuncs = { SC_LOW_INIT_T stg_world_start, diff --git a/sys/dev/disk/stg/tmc18c30_isa.c b/sys/dev/disk/stg/tmc18c30_isa.c index 83f8e1257b..0a9bc557a3 100644 --- a/sys/dev/disk/stg/tmc18c30_isa.c +++ b/sys/dev/disk/stg/tmc18c30_isa.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/stg/tmc18c30_isa.c,v 1.2.2.4 2001/09/04 04:45:23 non Exp $ */ -/* $DragonFly: src/sys/dev/disk/stg/tmc18c30_isa.c,v 1.3 2003/08/07 21:16:54 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/stg/tmc18c30_isa.c,v 1.4 2003/08/27 10:35:17 rob Exp $ */ /* $NecBSD: tmc18c30_pisa.c,v 1.22 1998/11/26 01:59:21 honda Exp $ */ /* $NetBSD$ */ @@ -82,7 +82,7 @@ static int stgprobe(device_t devi); static int stgattach(device_t devi); -static void stg_isa_unload __P((device_t)); +static void stg_isa_unload (device_t); static void stg_isa_intr(void * arg) diff --git a/sys/dev/disk/stg/tmc18c30_pccard.c b/sys/dev/disk/stg/tmc18c30_pccard.c index dcb2d7431f..709b127f5c 100644 --- a/sys/dev/disk/stg/tmc18c30_pccard.c +++ b/sys/dev/disk/stg/tmc18c30_pccard.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/stg/tmc18c30_pccard.c,v 1.2.2.6 2001/12/17 13:30:19 non Exp $ */ -/* $DragonFly: src/sys/dev/disk/stg/tmc18c30_pccard.c,v 1.3 2003/08/07 21:16:54 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/stg/tmc18c30_pccard.c,v 1.4 2003/08/27 10:35:17 rob Exp $ */ /* $NecBSD: tmc18c30_pisa.c,v 1.22 1998/11/26 01:59:21 honda Exp $ */ /* $NetBSD$ */ @@ -78,7 +78,7 @@ static int stgprobe(DEVPORT_PDEVICE devi); static int stgattach(DEVPORT_PDEVICE devi); -static void stg_card_unload __P((DEVPORT_PDEVICE)); +static void stg_card_unload (DEVPORT_PDEVICE); /* * Additional code for FreeBSD new-bus PCCard frontend diff --git a/sys/dev/disk/stg/tmc18c30var.h b/sys/dev/disk/stg/tmc18c30var.h index fe40d1baab..290cf930af 100644 --- a/sys/dev/disk/stg/tmc18c30var.h +++ b/sys/dev/disk/stg/tmc18c30var.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/stg/tmc18c30var.h,v 1.1.2.4 2001/12/17 13:30:19 non Exp $ */ -/* $DragonFly: src/sys/dev/disk/stg/tmc18c30var.h,v 1.2 2003/06/17 04:28:31 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/stg/tmc18c30var.h,v 1.3 2003/08/27 10:35:17 rob Exp $ */ /* $NecBSD: tmc18c30var.h,v 1.12.18.2 2001/06/13 05:51:23 honda Exp $ */ /* $NetBSD$ */ @@ -99,10 +99,10 @@ struct stg_targ_info { /***************************************************************** * Proto *****************************************************************/ -int stgprobesubr __P((bus_space_tag_t, bus_space_handle_t, u_int)); -void stgattachsubr __P((struct stg_softc *)); -int stgprint __P((void *, const char *)); -int stgintr __P((void *)); +int stgprobesubr (bus_space_tag_t, bus_space_handle_t, u_int); +void stgattachsubr (struct stg_softc *); +int stgprint (void *, const char *); +int stgintr (void *); #if defined(i386) #define SOFT_INTR_REQUIRED(slp) (softintr((slp)->sl_irq)) diff --git a/sys/dev/disk/wd/wdreg.h b/sys/dev/disk/wd/wdreg.h index ad5d68da2a..452db64217 100644 --- a/sys/dev/disk/wd/wdreg.h +++ b/sys/dev/disk/wd/wdreg.h @@ -35,7 +35,7 @@ * * from: @(#)wdreg.h 7.1 (Berkeley) 5/9/91 * $FreeBSD: src/sys/i386/isa/wdreg.h,v 1.30 1999/12/29 04:33:16 peter Exp $ - * $DragonFly: src/sys/dev/disk/wd/Attic/wdreg.h,v 1.2 2003/06/17 04:28:37 dillon Exp $ + * $DragonFly: src/sys/dev/disk/wd/Attic/wdreg.h,v 1.3 2003/08/27 10:35:17 rob Exp $ */ /* @@ -263,26 +263,26 @@ struct wdparams { */ struct wddma { void *(*wdd_candma) /* returns a cookie if PCI */ - __P((int iobase_wd, int ctlr, int unit)); + (int iobase_wd, int ctlr, int unit); int (*wdd_dmaverify) /* verify that request is DMA-able */ - __P((void *cookie, char *vaddr, u_long len, int direction)); + (void *cookie, char *vaddr, u_long len, int direction); int (*wdd_dmaprep) /* prepare DMA hardware */ - __P((void *cookie, char *vaddr, u_long len, int direction)); + (void *cookie, char *vaddr, u_long len, int direction); void (*wdd_dmastart) /* begin DMA transfer */ - __P((void *cookie)); + (void *cookie); int (*wdd_dmadone) /* DMA transfer completed */ - __P((void *cookie)); + (void *cookie); int (*wdd_dmastatus) /* return status of DMA */ - __P((void *cookie)); + (void *cookie); int (*wdd_dmainit) /* initialize controller and drive */ - __P((void *cookie, + (void *cookie, struct wdparams *wp, - int(wdcmd)__P((int mode, void *wdinfo)), - void *wdinfo)); + int(wdcmd)(int mode, void *wdinfo), + void *wdinfo); int (*wdd_iobase) /* returns iobase address */ - __P((void *cookie)); + (void *cookie); int (*wdd_altiobase) /* returns altiobase address */ - __P((void *cookie)); + (void *cookie); }; /* logical status bits returned by wdd_dmastatus */ @@ -316,6 +316,6 @@ void wdc_pci(int quirks); extern struct wddma wddma[]; -void wdintr __P((void *unit)); +void wdintr (void *unit); #endif /* _KERNEL */ diff --git a/sys/dev/misc/mse/mse.c b/sys/dev/misc/mse/mse.c index f56684ba71..4abd3344d1 100644 --- a/sys/dev/misc/mse/mse.c +++ b/sys/dev/misc/mse/mse.c @@ -12,7 +12,7 @@ * without express or implied warranty. * * $FreeBSD: src/sys/i386/isa/mse.c,v 1.49.2.1 2000/03/20 13:58:47 yokota Exp $ - * $DragonFly: src/sys/dev/misc/mse/mse.c,v 1.6 2003/08/07 21:16:57 dillon Exp $ + * $DragonFly: src/sys/dev/misc/mse/mse.c,v 1.7 2003/08/27 10:35:17 rob Exp $ */ /* * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and @@ -80,13 +80,13 @@ typedef struct mse_softc { bus_space_tag_t sc_iot; bus_space_handle_t sc_ioh; void *sc_ih; - void (*sc_enablemouse) __P((bus_space_tag_t t, - bus_space_handle_t h)); - void (*sc_disablemouse) __P((bus_space_tag_t t, - bus_space_handle_t h)); - void (*sc_getmouse) __P((bus_space_tag_t t, + void (*sc_enablemouse) (bus_space_tag_t t, + bus_space_handle_t h); + void (*sc_disablemouse) (bus_space_tag_t t, + bus_space_handle_t h); + void (*sc_getmouse) (bus_space_tag_t t, bus_space_handle_t h, - int *dx, int *dy, int *but)); + int *dx, int *dy, int *but); int sc_deltax; int sc_deltay; int sc_obuttons; @@ -104,9 +104,9 @@ typedef struct mse_softc { static devclass_t mse_devclass; -static int mse_probe __P((device_t dev)); -static int mse_attach __P((device_t dev)); -static int mse_detach __P((device_t dev)); +static int mse_probe (device_t dev); +static int mse_attach (device_t dev); +static int mse_detach (device_t dev); static device_method_t mse_methods[] = { DEVMETHOD(device_probe, mse_probe), @@ -159,7 +159,7 @@ static struct cdevsw mse_cdevsw = { /* psize */ nopsize }; -static void mseintr __P((void *)); +static void mseintr (void *); static timeout_t msetimeout; /* Flags */ @@ -218,14 +218,14 @@ static timeout_t msetimeout; #define MSE_DISINTR 0x10 #define MSE_INTREN 0x00 -static int mse_probelogi __P((device_t dev, mse_softc_t *sc)); -static void mse_disablelogi __P((bus_space_tag_t t, - bus_space_handle_t h)); -static void mse_getlogi __P((bus_space_tag_t t, +static int mse_probelogi (device_t dev, mse_softc_t *sc); +static void mse_disablelogi (bus_space_tag_t t, + bus_space_handle_t h); +static void mse_getlogi (bus_space_tag_t t, bus_space_handle_t h, - int *dx, int *dy, int *but)); -static void mse_enablelogi __P((bus_space_tag_t t, - bus_space_handle_t h)); + int *dx, int *dy, int *but); +static void mse_enablelogi (bus_space_tag_t t, + bus_space_handle_t h); /* * ATI Inport mouse definitions @@ -238,14 +238,14 @@ static void mse_enablelogi __P((bus_space_tag_t t, #define MSE_INPORT_HOLD 0x20 #define MSE_INPORT_INTREN 0x09 -static int mse_probeati __P((device_t dev, mse_softc_t *sc)); -static void mse_enableati __P((bus_space_tag_t t, - bus_space_handle_t h)); -static void mse_disableati __P((bus_space_tag_t t, - bus_space_handle_t h)); -static void mse_getati __P((bus_space_tag_t t, +static int mse_probeati (device_t dev, mse_softc_t *sc); +static void mse_enableati (bus_space_tag_t t, + bus_space_handle_t h); +static void mse_disableati (bus_space_tag_t t, + bus_space_handle_t h); +static void mse_getati (bus_space_tag_t t, bus_space_handle_t h, - int *dx, int *dy, int *but)); + int *dx, int *dy, int *but); /* * Table of mouse types. @@ -254,14 +254,14 @@ static void mse_getati __P((bus_space_tag_t t, */ static struct mse_types { int m_type; /* Type of bus mouse */ - int (*m_probe) __P((device_t dev, mse_softc_t *sc)); + int (*m_probe) (device_t dev, mse_softc_t *sc); /* Probe routine to test for it */ - void (*m_enable) __P((bus_space_tag_t t, bus_space_handle_t h)); + void (*m_enable) (bus_space_tag_t t, bus_space_handle_t h); /* Start routine */ - void (*m_disable) __P((bus_space_tag_t t, bus_space_handle_t h)); + void (*m_disable) (bus_space_tag_t t, bus_space_handle_t h); /* Disable interrupts routine */ - void (*m_get) __P((bus_space_tag_t t, bus_space_handle_t h, - int *dx, int *dy, int *but)); + void (*m_get) (bus_space_tag_t t, bus_space_handle_t h, + int *dx, int *dy, int *but); /* and get mouse status */ mousehw_t m_hw; /* buttons iftype type model hwid */ mousemode_t m_mode; /* proto rate res accel level size mask */ diff --git a/sys/dev/misc/nmdm/nmdm.c b/sys/dev/misc/nmdm/nmdm.c index aa29ecfe5c..277f938de0 100644 --- a/sys/dev/misc/nmdm/nmdm.c +++ b/sys/dev/misc/nmdm/nmdm.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.5.2.1 2001/08/11 00:54:14 mp Exp $ - * $DragonFly: src/sys/dev/misc/nmdm/nmdm.c,v 1.7 2003/07/26 14:25:23 rob Exp $ + * $DragonFly: src/sys/dev/misc/nmdm/nmdm.c,v 1.8 2003/08/27 10:35:17 rob Exp $ */ /* @@ -55,10 +55,10 @@ MALLOC_DEFINE(M_NLMDM, "nullmodem", "nullmodem data structures"); -static void nmdmstart __P((struct tty *tp)); -static void nmdmstop __P((struct tty *tp, int rw)); -static void wakeup_other __P((struct tty *tp, int flag)); -static void nmdminit __P((int n)); +static void nmdmstart (struct tty *tp); +static void nmdmstop (struct tty *tp, int rw); +static void wakeup_other (struct tty *tp, int flag); +static void nmdminit (int n); static d_open_t nmdmopen; static d_close_t nmdmclose; @@ -559,7 +559,7 @@ nmdm_crossover(struct nm_softc *pti, -static void nmdm_drvinit __P((void *unused)); +static void nmdm_drvinit (void *unused); static void nmdm_drvinit(unused) diff --git a/sys/dev/misc/psm/psm.c b/sys/dev/misc/psm/psm.c index 4b723052bb..9895d90f45 100644 --- a/sys/dev/misc/psm/psm.c +++ b/sys/dev/misc/psm/psm.c @@ -21,7 +21,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/isa/psm.c,v 1.23.2.6 2002/03/27 16:53:35 pb Exp $ - * $DragonFly: src/sys/dev/misc/psm/psm.c,v 1.7 2003/08/07 21:16:58 dillon Exp $ + * $DragonFly: src/sys/dev/misc/psm/psm.c,v 1.8 2003/08/27 10:35:18 rob Exp $ */ /* @@ -230,14 +230,14 @@ typedef struct old_mousemode { } old_mousemode_t; /* packet formatting function */ -typedef int packetfunc_t __P((struct psm_softc *, unsigned char *, - int *, int, mousestatus_t *)); +typedef int packetfunc_t (struct psm_softc *, unsigned char *, + int *, int, mousestatus_t *); /* function prototypes */ -static int psmprobe __P((device_t)); -static int psmattach __P((device_t)); -static int psmdetach __P((device_t)); -static int psmresume __P((device_t)); +static int psmprobe (device_t); +static int psmattach (device_t); +static int psmdetach (device_t); +static int psmresume (device_t); static d_open_t psmopen; static d_close_t psmclose; @@ -245,30 +245,30 @@ static d_read_t psmread; static d_ioctl_t psmioctl; static d_poll_t psmpoll; -static int enable_aux_dev __P((KBDC)); -static int disable_aux_dev __P((KBDC)); -static int get_mouse_status __P((KBDC, int *, int, int)); -static int get_aux_id __P((KBDC)); -static int set_mouse_sampling_rate __P((KBDC, int)); -static int set_mouse_scaling __P((KBDC, int)); -static int set_mouse_resolution __P((KBDC, int)); -static int set_mouse_mode __P((KBDC)); -static int get_mouse_buttons __P((KBDC)); -static int is_a_mouse __P((int)); -static void recover_from_error __P((KBDC)); -static int restore_controller __P((KBDC, int)); -static int doinitialize __P((struct psm_softc *, mousemode_t *)); -static int doopen __P((struct psm_softc *, int)); -static int reinitialize __P((struct psm_softc *, int)); -static char *model_name __P((int)); -static void psmintr __P((void *)); -static void psmtimeout __P((void *)); +static int enable_aux_dev (KBDC); +static int disable_aux_dev (KBDC); +static int get_mouse_status (KBDC, int *, int, int); +static int get_aux_id (KBDC); +static int set_mouse_sampling_rate (KBDC, int); +static int set_mouse_scaling (KBDC, int); +static int set_mouse_resolution (KBDC, int); +static int set_mouse_mode (KBDC); +static int get_mouse_buttons (KBDC); +static int is_a_mouse (int); +static void recover_from_error (KBDC); +static int restore_controller (KBDC, int); +static int doinitialize (struct psm_softc *, mousemode_t *); +static int doopen (struct psm_softc *, int); +static int reinitialize (struct psm_softc *, int); +static char *model_name (int); +static void psmintr (void *); +static void psmtimeout (void *); /* vendor specific features */ -typedef int probefunc_t __P((struct psm_softc *)); +typedef int probefunc_t (struct psm_softc *); -static int mouse_id_proc1 __P((KBDC, int, int, int *)); -static int mouse_ext_command __P((KBDC, int)); +static int mouse_id_proc1 (KBDC, int, int, int *); +static int mouse_ext_command (KBDC, int); static probefunc_t enable_groller; static probefunc_t enable_gmouse; static probefunc_t enable_aglide; @@ -279,7 +279,7 @@ static probefunc_t enable_4dmouse; static probefunc_t enable_4dplus; static probefunc_t enable_mmanplus; static probefunc_t enable_versapad; -static int tame_mouse __P((struct psm_softc *, mousestatus_t *, unsigned char *)); +static int tame_mouse (struct psm_softc *, mousestatus_t *, unsigned char *); static struct { int model; diff --git a/sys/dev/misc/puc/puc.c b/sys/dev/misc/puc/puc.c index 1f01ca24a7..11988e44f0 100644 --- a/sys/dev/misc/puc/puc.c +++ b/sys/dev/misc/puc/puc.c @@ -1,7 +1,7 @@ /* * $NetBSD: puc.c,v 1.7 2000/07/29 17:43:38 jlam Exp $ * $FreeBSD: src/sys/dev/puc/puc.c,v 1.3.2.5 2003/04/04 08:42:17 sobomax Exp $ - * $DragonFly: src/sys/dev/misc/puc/puc.c,v 1.3 2003/08/07 21:16:58 dillon Exp $ + * $DragonFly: src/sys/dev/misc/puc/puc.c,v 1.4 2003/08/27 10:35:18 rob Exp $ */ /*- @@ -119,7 +119,7 @@ struct puc_softc { struct { struct device *dev; /* filled in by bus_setup_intr() */ - void (*ihand) __P((void *)); + void (*ihand) (void *); void *ihandarg; } sc_ports[PUC_MAX_PORTS]; }; diff --git a/sys/dev/misc/snp/snp.c b/sys/dev/misc/snp/snp.c index 93f336eed4..8f2d8223aa 100644 --- a/sys/dev/misc/snp/snp.c +++ b/sys/dev/misc/snp/snp.c @@ -13,7 +13,7 @@ * Snoop stuff. * * $FreeBSD: src/sys/dev/snp/snp.c,v 1.69.2.2 2002/05/06 07:30:02 dd Exp $ - * $DragonFly: src/sys/dev/misc/snp/snp.c,v 1.7 2003/07/23 02:30:17 dillon Exp $ + * $DragonFly: src/sys/dev/misc/snp/snp.c,v 1.8 2003/08/27 10:35:18 rob Exp $ */ #include @@ -112,11 +112,11 @@ static int snooplinedisc; static LIST_HEAD(, snoop) snp_sclist = LIST_HEAD_INITIALIZER(&snp_sclist); -static struct tty *snpdevtotty __P((dev_t dev)); -static int snp_detach __P((struct snoop *snp)); -static int snp_down __P((struct snoop *snp)); -static int snp_in __P((struct snoop *snp, char *buf, int n)); -static int snp_modevent __P((module_t mod, int what, void *arg)); +static struct tty *snpdevtotty (dev_t dev); +static int snp_detach (struct snoop *snp); +static int snp_down (struct snoop *snp); +static int snp_in (struct snoop *snp, char *buf, int n); +static int snp_modevent (module_t mod, int what, void *arg); static int snplclose(tp, flag) diff --git a/sys/dev/misc/streams/streams.c b/sys/dev/misc/streams/streams.c index 23bc146133..9ff6212845 100644 --- a/sys/dev/misc/streams/streams.c +++ b/sys/dev/misc/streams/streams.c @@ -31,7 +31,7 @@ * in 3.0-980524-SNAP then hacked a bit (but probably not enough :-). * * $FreeBSD: src/sys/dev/streams/streams.c,v 1.16.2.1 2001/02/26 04:23:07 jlemon Exp $ - * $DragonFly: src/sys/dev/misc/streams/Attic/streams.c,v 1.9 2003/08/07 21:16:59 dillon Exp $ + * $DragonFly: src/sys/dev/misc/streams/Attic/streams.c,v 1.10 2003/08/27 10:35:18 rob Exp $ */ #include @@ -62,8 +62,8 @@ #include #include -static int svr4_soo_close __P((struct file *, struct thread *)); -static int svr4_ptm_alloc __P((struct thread *)); +static int svr4_soo_close (struct file *, struct thread *); +static int svr4_ptm_alloc (struct thread *); static d_open_t streamsopen; struct svr4_sockcache_entry { diff --git a/sys/dev/misc/syscons/apm/apm_saver.c b/sys/dev/misc/syscons/apm/apm_saver.c index d977f999bf..e9bace4b88 100644 --- a/sys/dev/misc/syscons/apm/apm_saver.c +++ b/sys/dev/misc/syscons/apm/apm_saver.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/modules/syscons/apm/apm_saver.c,v 1.1.4.2 2001/03/07 21:47:24 nsayer Exp $ - * $DragonFly: src/sys/dev/misc/syscons/apm/apm_saver.c,v 1.3 2003/08/15 08:32:29 dillon Exp $ + * $DragonFly: src/sys/dev/misc/syscons/apm/apm_saver.c,v 1.4 2003/08/27 10:35:18 rob Exp $ */ #include @@ -50,7 +50,7 @@ #include #endif -extern int apm_display __P((int newstate)); +extern int apm_display (int newstate); extern struct apm_softc apm_softc;