diff options
| author | perry <perry@NetBSD.org> | 2005-02-04 02:10:35 +0000 |
|---|---|---|
| committer | perry <perry@NetBSD.org> | 2005-02-04 02:10:35 +0000 |
| commit | 18db93c7f6e04c73970314e3f3dfebecea8dfaae (patch) | |
| tree | 22a71e5c95e2f0760a97e178f1de62f5b10ac547 /sys/dev | |
| parent | f57592cd95af1e1bf8790618f6e35f74d55cff4d (diff) | |
de-__P
Diffstat (limited to 'sys/dev')
438 files changed, 4920 insertions, 5015 deletions
diff --git a/sys/dev/bi/bi.c b/sys/dev/bi/bi.c index ae6df350402..2630ffe5480 100644 --- a/sys/dev/bi/bi.c +++ b/sys/dev/bi/bi.c @@ -1,4 +1,4 @@ -/* $NetBSD: bi.c,v 1.18 2003/01/01 00:10:16 thorpej Exp $ */ +/* $NetBSD: bi.c,v 1.19 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bi.c,v 1.18 2003/01/01 00:10:16 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bi.c,v 1.19 2005/02/04 02:10:36 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: bi.c,v 1.18 2003/01/01 00:10:16 thorpej Exp $"); #include <dev/bi/bireg.h> #include <dev/bi/bivar.h> -static int bi_print __P((void *, const char *)); +static int bi_print(void *, const char *); struct bi_list bi_list[] = { {BIDT_MS820, DT_HAVDRV, "ms820"}, diff --git a/sys/dev/bi/if_ni.c b/sys/dev/bi/if_ni.c index 70f6c41132d..3fff178a9d4 100644 --- a/sys/dev/bi/if_ni.c +++ b/sys/dev/bi/if_ni.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ni.c,v 1.23 2004/10/30 18:08:35 thorpej Exp $ */ +/* $NetBSD: if_ni.c,v 1.24 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved. * @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ni.c,v 1.23 2004/10/30 18:08:35 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ni.c,v 1.24 2005/02/04 02:10:36 perry Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -140,15 +140,15 @@ struct ni_softc { u_int8_t sc_enaddr[ETHER_ADDR_LEN]; }; -static int nimatch __P((struct device *, struct cfdata *, void *)); -static void niattach __P((struct device *, struct device *, void *)); -static void niinit __P((struct ni_softc *)); -static void nistart __P((struct ifnet *)); -static void niintr __P((void *)); -static int niioctl __P((struct ifnet *, u_long, caddr_t)); +static int nimatch(struct device *, struct cfdata *, void *); +static void niattach(struct device *, struct device *, void *); +static void niinit(struct ni_softc *); +static void nistart(struct ifnet *); +static void niintr(void *); +static int niioctl(struct ifnet *, u_long, caddr_t); static int ni_add_rxbuf(struct ni_softc *, struct ni_dg *, int); -static void ni_setup __P((struct ni_softc *)); -static void nitimeout __P((struct ifnet *)); +static void ni_setup(struct ni_softc *); +static void nitimeout(struct ifnet *); static void ni_shutdown(void *); static void ni_getpgs(struct ni_softc *sc, int size, caddr_t *v, paddr_t *p); static int failtest(struct ni_softc *, int, int, int, char *); diff --git a/sys/dev/bi/kdb.c b/sys/dev/bi/kdb.c index e790c7d306f..e1b84ae31cc 100644 --- a/sys/dev/bi/kdb.c +++ b/sys/dev/bi/kdb.c @@ -1,4 +1,4 @@ -/* $NetBSD: kdb.c,v 1.35 2004/10/31 12:52:55 he Exp $ */ +/* $NetBSD: kdb.c,v 1.36 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kdb.c,v 1.35 2004/10/31 12:52:55 he Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kdb.c,v 1.36 2005/02/04 02:10:36 perry Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -90,14 +90,14 @@ struct kdb_softc { bus_space_handle_t sc_ioh; }; -int kdbmatch __P((struct device *, struct cfdata *, void *)); -void kdbattach __P((struct device *, struct device *, void *)); -void kdbreset __P((int)); -void kdbintr __P((void *)); -void kdbctlrdone __P((struct device *)); -int kdbprint __P((void *, const char *)); -void kdbsaerror __P((struct device *, int)); -void kdbgo __P((struct device *, struct mscp_xi *)); +int kdbmatch(struct device *, struct cfdata *, void *); +void kdbattach(struct device *, struct device *, void *); +void kdbreset(int); +void kdbintr(void *); +void kdbctlrdone(struct device *); +int kdbprint(void *, const char *); +void kdbsaerror(struct device *, int); +void kdbgo(struct device *, struct mscp_xi *); CFATTACH_DECL(kdb, sizeof(struct kdb_softc), kdbmatch, kdbattach, NULL, NULL); diff --git a/sys/dev/bi/uba_bi.c b/sys/dev/bi/uba_bi.c index e5d33649919..7e3fb680519 100644 --- a/sys/dev/bi/uba_bi.c +++ b/sys/dev/bi/uba_bi.c @@ -1,4 +1,4 @@ -/* $NetBSD: uba_bi.c,v 1.8 2002/10/02 16:33:39 thorpej Exp $ */ +/* $NetBSD: uba_bi.c,v 1.9 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1998 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uba_bi.c,v 1.8 2002/10/02 16:33:39 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uba_bi.c,v 1.9 2005/02/04 02:10:36 perry Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -62,10 +62,10 @@ __KERNEL_RCSID(0, "$NetBSD: uba_bi.c,v 1.8 2002/10/02 16:33:39 thorpej Exp $"); #define BUA(uba) ((struct dwbua_regs *)(uba)) -static int uba_bi_match __P((struct device *, struct cfdata *, void *)); -static void uba_bi_attach __P((struct device *, struct device *, void *)); -static void bua_init __P((struct uba_softc *)); -static void bua_purge __P((struct uba_softc *, int)); +static int uba_bi_match(struct device *, struct cfdata *, void *); +static void uba_bi_attach(struct device *, struct device *, void *); +static void bua_init(struct uba_softc *); +static void bua_purge(struct uba_softc *, int); /* bua_csr */ #define BUACSR_ERR 0x80000000 /* composite error */ diff --git a/sys/dev/cardbus/adv_cardbus.c b/sys/dev/cardbus/adv_cardbus.c index 67a04d9fa14..cdfb66da0f0 100644 --- a/sys/dev/cardbus/adv_cardbus.c +++ b/sys/dev/cardbus/adv_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: adv_cardbus.c,v 1.9 2004/08/02 19:14:28 mycroft Exp $ */ +/* $NetBSD: adv_cardbus.c,v 1.10 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: adv_cardbus.c,v 1.9 2004/08/02 19:14:28 mycroft Exp $"); +__KERNEL_RCSID(0, "$NetBSD: adv_cardbus.c,v 1.10 2005/02/04 02:10:36 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -89,9 +89,9 @@ struct adv_cardbus_softc { bus_size_t sc_size; }; -int adv_cardbus_match __P((struct device *, struct cfdata *, void *)); -void adv_cardbus_attach __P((struct device *, struct device *, void *)); -int adv_cardbus_detach __P((struct device *, int)); +int adv_cardbus_match(struct device *, struct cfdata *, void *); +void adv_cardbus_attach(struct device *, struct device *, void *); +int adv_cardbus_detach(struct device *, int); CFATTACH_DECL(adv_cardbus, sizeof(struct adv_cardbus_softc), adv_cardbus_match, adv_cardbus_attach, adv_cardbus_detach, NULL); diff --git a/sys/dev/cardbus/ahc_cardbus.c b/sys/dev/cardbus/ahc_cardbus.c index 0f2c0f88344..41880541af2 100644 --- a/sys/dev/cardbus/ahc_cardbus.c +++ b/sys/dev/cardbus/ahc_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: ahc_cardbus.c,v 1.14 2004/08/02 19:14:28 mycroft Exp $ */ +/* $NetBSD: ahc_cardbus.c,v 1.15 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ahc_cardbus.c,v 1.14 2004/08/02 19:14:28 mycroft Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ahc_cardbus.c,v 1.15 2005/02/04 02:10:36 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -86,9 +86,9 @@ struct ahc_cardbus_softc { bus_size_t sc_size; }; -int ahc_cardbus_match __P((struct device *, struct cfdata *, void *)); -void ahc_cardbus_attach __P((struct device *, struct device *, void *)); -int ahc_cardbus_detach __P((struct device *, int)); +int ahc_cardbus_match(struct device *, struct cfdata *, void *); +void ahc_cardbus_attach(struct device *, struct device *, void *); +int ahc_cardbus_detach(struct device *, int); int ahc_activate(struct device *self, enum devact act); CFATTACH_DECL(ahc_cardbus, sizeof(struct ahc_cardbus_softc), diff --git a/sys/dev/cardbus/cardbus_map.c b/sys/dev/cardbus/cardbus_map.c index 4357ec6db79..ce192c8ec15 100644 --- a/sys/dev/cardbus/cardbus_map.c +++ b/sys/dev/cardbus/cardbus_map.c @@ -1,4 +1,4 @@ -/* $NetBSD: cardbus_map.c,v 1.14 2001/11/15 09:48:02 lukem Exp $ */ +/* $NetBSD: cardbus_map.c,v 1.15 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1999 and 2000 @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cardbus_map.c,v 1.14 2001/11/15 09:48:02 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cardbus_map.c,v 1.15 2005/02/04 02:10:36 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -58,12 +58,12 @@ __KERNEL_RCSID(0, "$NetBSD: cardbus_map.c,v 1.14 2001/11/15 09:48:02 lukem Exp $ #endif -static int cardbus_io_find __P((cardbus_chipset_tag_t, cardbus_function_tag_t, +static int cardbus_io_find(cardbus_chipset_tag_t, cardbus_function_tag_t, cardbustag_t, int, cardbusreg_t, - bus_addr_t *, bus_size_t *, int *)); -static int cardbus_mem_find __P((cardbus_chipset_tag_t, cardbus_function_tag_t, + bus_addr_t *, bus_size_t *, int *); +static int cardbus_mem_find(cardbus_chipset_tag_t, cardbus_function_tag_t, cardbustag_t, int, cardbusreg_t, - bus_addr_t *, bus_size_t *, int *)); + bus_addr_t *, bus_size_t *, int *); /* * static int cardbus_io_find(cardbus_chipset_tag_t cc, diff --git a/sys/dev/cardbus/cardbusvar.h b/sys/dev/cardbus/cardbusvar.h index ce8ce12cca2..b0df71bf32e 100644 --- a/sys/dev/cardbus/cardbusvar.h +++ b/sys/dev/cardbus/cardbusvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: cardbusvar.h,v 1.30 2004/12/14 02:34:15 chs Exp $ */ +/* $NetBSD: cardbusvar.h,v 1.31 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1998, 1999 and 2000 @@ -84,47 +84,47 @@ typedef int cardbus_intr_handle_t; * cardbustag_t tag, int offs, cardbusreg_t val); */ typedef struct cardbus_functions { - int (*cardbus_space_alloc) __P((cardbus_chipset_tag_t, rbus_tag_t, + int (*cardbus_space_alloc)(cardbus_chipset_tag_t, rbus_tag_t, bus_addr_t, bus_size_t, bus_addr_t, bus_size_t, - int, bus_addr_t *, bus_space_handle_t *)); - int (*cardbus_space_free) __P((cardbus_chipset_tag_t, rbus_tag_t, - bus_space_handle_t, bus_size_t)); - void *(*cardbus_intr_establish) __P((cardbus_chipset_tag_t, int, int, - int (*)(void *), void *)); - void (*cardbus_intr_disestablish) __P((cardbus_chipset_tag_t, void *)); - int (*cardbus_ctrl) __P((cardbus_chipset_tag_t, int)); - int (*cardbus_power) __P((cardbus_chipset_tag_t, int)); - - cardbustag_t (*cardbus_make_tag) __P((cardbus_chipset_tag_t, int, int, - int)); - void (*cardbus_free_tag) __P((cardbus_chipset_tag_t, cardbustag_t)); - cardbusreg_t (*cardbus_conf_read) __P((cardbus_chipset_tag_t, - cardbustag_t, int)); - void (*cardbus_conf_write) __P((cardbus_chipset_tag_t, cardbustag_t, - int, cardbusreg_t)); + int, bus_addr_t *, bus_space_handle_t *); + int (*cardbus_space_free)(cardbus_chipset_tag_t, rbus_tag_t, + bus_space_handle_t, bus_size_t); + void *(*cardbus_intr_establish)(cardbus_chipset_tag_t, int, int, + int (*)(void *), void *); + void (*cardbus_intr_disestablish)(cardbus_chipset_tag_t, void *); + int (*cardbus_ctrl)(cardbus_chipset_tag_t, int); + int (*cardbus_power)(cardbus_chipset_tag_t, int); + + cardbustag_t (*cardbus_make_tag)(cardbus_chipset_tag_t, int, int, + int); + void (*cardbus_free_tag)(cardbus_chipset_tag_t, cardbustag_t); + cardbusreg_t (*cardbus_conf_read)(cardbus_chipset_tag_t, + cardbustag_t, int); + void (*cardbus_conf_write)(cardbus_chipset_tag_t, cardbustag_t, + int, cardbusreg_t); } cardbus_function_t, *cardbus_function_tag_t; #else typedef struct cardbus_functions { - int (*cardbus_ctrl) __P((cardbus_chipset_tag_t, int)); - int (*cardbus_power) __P((cardbus_chipset_tag_t, int)); - int (*cardbus_mem_open) __P((cardbus_chipset_tag_t, int, u_int32_t, - u_int32_t)); - int (*cardbus_mem_close) __P((cardbus_chipset_tag_t, int)); - int (*cardbus_io_open) __P((cardbus_chipset_tag_t, int, u_int32_t, - u_int32_t)); - int (*cardbus_io_close) __P((cardbus_chipset_tag_t, int)); - void *(*cardbus_intr_establish) __P((cardbus_chipset_tag_t, int, int, - int (*)(void *), void *)); - void (*cardbus_intr_disestablish) __P((cardbus_chipset_tag_t, void *)); - - cardbustag_t (*cardbus_make_tag) __P((cardbus_chipset_tag_t, int, int, - int)); - cardbusreg_t (*cardbus_conf_read) __P((cardbus_chipset_tag_t, - cardbustag_t, int)); - void (*cardbus_conf_write) __P((cardbus_chipset_tag_t, cardbustag_t, - int, cardbusreg_t)); + int (*cardbus_ctrl)(cardbus_chipset_tag_t, int); + int (*cardbus_power)(cardbus_chipset_tag_t, int); + int (*cardbus_mem_open)(cardbus_chipset_tag_t, int, u_int32_t, + u_int32_t); + int (*cardbus_mem_close)(cardbus_chipset_tag_t, int); + int (*cardbus_io_open)(cardbus_chipset_tag_t, int, u_int32_t, + u_int32_t); + int (*cardbus_io_close)(cardbus_chipset_tag_t, int); + void *(*cardbus_intr_establish)(cardbus_chipset_tag_t, int, int, + int (*)(void *), void *); + void (*cardbus_intr_disestablish)(cardbus_chipset_tag_t, void *); + + cardbustag_t (*cardbus_make_tag)(cardbus_chipset_tag_t, int, int, + int); + cardbusreg_t (*cardbus_conf_read)(cardbus_chipset_tag_t, + cardbustag_t, int); + void (*cardbus_conf_write)(cardbus_chipset_tag_t, cardbustag_t, + int, cardbusreg_t); } cardbus_function_t, *cardbus_function_tag_t; #endif /* rbus */ @@ -298,28 +298,28 @@ struct cardbus_attach_args { #define CARDBUS_VPPMASK 0x00f0 -int cardbus_attach_card __P((struct cardbus_softc *)); -void cardbus_detach_card __P((struct cardbus_softc *)); -void *cardbus_intr_establish __P((cardbus_chipset_tag_t, cardbus_function_tag_t, - cardbus_intr_handle_t, int, int (*) (void *), void *arg)); -void cardbus_intr_disestablish __P((cardbus_chipset_tag_t, - cardbus_function_tag_t, void *)); +int cardbus_attach_card(struct cardbus_softc *); +void cardbus_detach_card(struct cardbus_softc *); +void *cardbus_intr_establish(cardbus_chipset_tag_t, cardbus_function_tag_t, + cardbus_intr_handle_t, int, int (*) (void *), void *arg); +void cardbus_intr_disestablish(cardbus_chipset_tag_t, + cardbus_function_tag_t, void *); -int cardbus_mapreg_map __P((struct cardbus_softc *, int, int, cardbusreg_t, - int, bus_space_tag_t *, bus_space_handle_t *, bus_addr_t *, bus_size_t *)); -int cardbus_mapreg_unmap __P((struct cardbus_softc *, int, int, - bus_space_tag_t, bus_space_handle_t, bus_size_t)); +int cardbus_mapreg_map(struct cardbus_softc *, int, int, cardbusreg_t, + int, bus_space_tag_t *, bus_space_handle_t *, bus_addr_t *, bus_size_t *); +int cardbus_mapreg_unmap(struct cardbus_softc *, int, int, + bus_space_tag_t, bus_space_handle_t, bus_size_t); -int cardbus_save_bar __P((cardbus_devfunc_t)); -int cardbus_restore_bar __P((cardbus_devfunc_t)); +int cardbus_save_bar(cardbus_devfunc_t); +int cardbus_restore_bar(cardbus_devfunc_t); -int cardbus_function_enable __P((struct cardbus_softc *, int)); -int cardbus_function_disable __P((struct cardbus_softc *, int)); +int cardbus_function_enable(struct cardbus_softc *, int); +int cardbus_function_disable(struct cardbus_softc *, int); -int cardbus_get_capability __P((cardbus_chipset_tag_t, cardbus_function_tag_t, - cardbustag_t, int, int *, cardbusreg_t *)); -int cardbus_powerstate __P((cardbus_devfunc_t, pcitag_t, const int *, int *)); -int cardbus_setpowerstate __P((const char *, cardbus_devfunc_t, pcitag_t, int)); +int cardbus_get_capability(cardbus_chipset_tag_t, cardbus_function_tag_t, + cardbustag_t, int, int *, cardbusreg_t *); +int cardbus_powerstate(cardbus_devfunc_t, pcitag_t, const int *, int *); +int cardbus_setpowerstate(const char *, cardbus_devfunc_t, pcitag_t, int); #define Cardbus_function_enable(ct) cardbus_function_enable((ct)->ct_sc, (ct)->ct_func) #define Cardbus_function_disable(ct) cardbus_function_disable((ct)->ct_sc, (ct)->ct_func) diff --git a/sys/dev/cardbus/cardslot.c b/sys/dev/cardbus/cardslot.c index 823b6e8fa8c..2e6c4e7c8ba 100644 --- a/sys/dev/cardbus/cardslot.c +++ b/sys/dev/cardbus/cardslot.c @@ -1,4 +1,4 @@ -/* $NetBSD: cardslot.c,v 1.25 2004/09/13 12:55:47 drochner Exp $ */ +/* $NetBSD: cardslot.c,v 1.26 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1999 and 2000 @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.25 2004/09/13 12:55:47 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.26 2005/02/04 02:10:36 perry Exp $"); #include "opt_cardslot.h" @@ -65,16 +65,16 @@ __KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.25 2004/09/13 12:55:47 drochner Exp $ -STATIC void cardslotattach __P((struct device *, struct device *, void *)); +STATIC void cardslotattach(struct device *, struct device *, void *); -STATIC int cardslotmatch __P((struct device *, struct cfdata *, void *)); -static void create_slot_manager __P((void *)); -static void cardslot_event_thread __P((void *arg)); +STATIC int cardslotmatch(struct device *, struct cfdata *, void *); +static void create_slot_manager(void *); +static void cardslot_event_thread(void *arg); -STATIC int cardslot_cb_print __P((void *aux, const char *pcic)); -static int cardslot_16_print __P((void *, const char *)); -static int cardslot_16_submatch __P((struct device *, struct cfdata *, - const locdesc_t *, void *)); +STATIC int cardslot_cb_print(void *aux, const char *pcic); +static int cardslot_16_print(void *, const char *); +static int cardslot_16_submatch(struct device *, struct cfdata *, + const locdesc_t *, void *); CFATTACH_DECL(cardslot, sizeof(struct cardslot_softc), cardslotmatch, cardslotattach, NULL, NULL); diff --git a/sys/dev/cardbus/cardslotvar.h b/sys/dev/cardbus/cardslotvar.h index 4a695fd5226..dc76b0dd2b4 100644 --- a/sys/dev/cardbus/cardslotvar.h +++ b/sys/dev/cardbus/cardslotvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: cardslotvar.h,v 1.8 2004/09/13 12:55:47 drochner Exp $ */ +/* $NetBSD: cardslotvar.h,v 1.9 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1999 @@ -122,6 +122,6 @@ typedef struct cardslot_softc *cardslot_t; #define IS_CARDSLOT_INSERT_REMOVE_EV(x) (0 <= (x) && (x) <= 3) -void cardslot_event_throw __P((cardslot_t, int)); +void cardslot_event_throw(cardslot_t, int); #endif /* !_DEV_CARDBUS_CARDSLOTVAR_H_ */ diff --git a/sys/dev/cardbus/if_ex_cardbus.c b/sys/dev/cardbus/if_ex_cardbus.c index dc4aa781a16..7c366b781a7 100644 --- a/sys/dev/cardbus/if_ex_cardbus.c +++ b/sys/dev/cardbus/if_ex_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ex_cardbus.c,v 1.33 2004/08/02 19:14:28 mycroft Exp $ */ +/* $NetBSD: if_ex_cardbus.c,v 1.34 2005/02/04 02:10:36 perry Exp $ */ /* * CardBus specific routines for 3Com 3C575-family CardBus ethernet adapter @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.33 2004/08/02 19:14:28 mycroft Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.34 2005/02/04 02:10:36 perry Exp $"); /* #define EX_DEBUG 4 */ /* define to report information for debugging */ @@ -83,14 +83,14 @@ __KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.33 2004/08/02 19:14:28 mycroft E #define EX_CB_INTR 4 /* intr acknowledge reg. CardBus only */ #define EX_CB_INTR_ACK 0x8000 /* intr acknowledge bit */ -int ex_cardbus_match __P((struct device *, struct cfdata *, void *)); -void ex_cardbus_attach __P((struct device *, struct device *,void *)); -int ex_cardbus_detach __P((struct device *, int)); -void ex_cardbus_intr_ack __P((struct ex_softc *)); +int ex_cardbus_match(struct device *, struct cfdata *, void *); +void ex_cardbus_attach(struct device *, struct device *,void *); +int ex_cardbus_detach(struct device *, int); +void ex_cardbus_intr_ack(struct ex_softc *); -int ex_cardbus_enable __P((struct ex_softc *)); -void ex_cardbus_disable __P((struct ex_softc *)); -void ex_cardbus_power __P((struct ex_softc *, int)); +int ex_cardbus_enable(struct ex_softc *); +void ex_cardbus_disable(struct ex_softc *); +void ex_cardbus_power(struct ex_softc *, int); struct ex_cardbus_softc { struct ex_softc sc_softc; @@ -185,10 +185,10 @@ const struct ex_cardbus_product { }; -void ex_cardbus_setup __P((struct ex_cardbus_softc *)); +void ex_cardbus_setup(struct ex_cardbus_softc *); const struct ex_cardbus_product *ex_cardbus_lookup - __P((const struct cardbus_attach_args *)); + (const struct cardbus_attach_args *); const struct ex_cardbus_product * ex_cardbus_lookup(ca) diff --git a/sys/dev/cardbus/if_fxp_cardbus.c b/sys/dev/cardbus/if_fxp_cardbus.c index 60887d51357..e6e043fe7cc 100644 --- a/sys/dev/cardbus/if_fxp_cardbus.c +++ b/sys/dev/cardbus/if_fxp_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_fxp_cardbus.c,v 1.18 2004/08/02 19:14:28 mycroft Exp $ */ +/* $NetBSD: if_fxp_cardbus.c,v 1.19 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.18 2004/08/02 19:14:28 mycroft Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.19 2005/02/04 02:10:36 perry Exp $"); #include "opt_inet.h" #include "opt_ns.h" @@ -98,12 +98,12 @@ __KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.18 2004/08/02 19:14:28 mycroft #include <dev/cardbus/cardbusvar.h> #include <dev/pci/pcidevs.h> -static int fxp_cardbus_match __P((struct device *, struct cfdata *, void *)); -static void fxp_cardbus_attach __P((struct device *, struct device *, void *)); -static int fxp_cardbus_detach __P((struct device * self, int flags)); -static void fxp_cardbus_setup __P((struct fxp_softc * sc)); -static int fxp_cardbus_enable __P((struct fxp_softc * sc)); -static void fxp_cardbus_disable __P((struct fxp_softc * sc)); +static int fxp_cardbus_match(struct device *, struct cfdata *, void *); +static void fxp_cardbus_attach(struct device *, struct device *, void *); +static int fxp_cardbus_detach(struct device * self, int flags); +static void fxp_cardbus_setup(struct fxp_softc * sc); +static int fxp_cardbus_enable(struct fxp_softc * sc); +static void fxp_cardbus_disable(struct fxp_softc * sc); struct fxp_cardbus_softc { struct fxp_softc sc; diff --git a/sys/dev/cardbus/if_rtk_cardbus.c b/sys/dev/cardbus/if_rtk_cardbus.c index 40a130005cd..f44c569e6b2 100644 --- a/sys/dev/cardbus/if_rtk_cardbus.c +++ b/sys/dev/cardbus/if_rtk_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_rtk_cardbus.c,v 1.23 2004/08/02 19:26:51 mycroft Exp $ */ +/* $NetBSD: if_rtk_cardbus.c,v 1.24 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 2000 Masanori Kanaoka @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_rtk_cardbus.c,v 1.23 2004/08/02 19:26:51 mycroft Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_rtk_cardbus.c,v 1.24 2005/02/04 02:10:36 perry Exp $"); #include "opt_inet.h" #include "opt_ns.h" @@ -125,9 +125,9 @@ static const struct rtk_type rtk_cardbus_devs[] = { { 0, 0, 0, NULL } }; -static int rtk_cardbus_match __P((struct device *, struct cfdata *, void *)); -static void rtk_cardbus_attach __P((struct device *, struct device *, void *)); -static int rtk_cardbus_detach __P((struct device *, int)); +static int rtk_cardbus_match(struct device *, struct cfdata *, void *); +static void rtk_cardbus_attach(struct device *, struct device *, void *); +static int rtk_cardbus_detach(struct device *, int); struct rtk_cardbus_softc { struct rtk_softc sc_rtk; /* real rtk softc */ @@ -148,13 +148,13 @@ CFATTACH_DECL(rtk_cardbus, sizeof(struct rtk_cardbus_softc), rtk_cardbus_match, rtk_cardbus_attach, rtk_cardbus_detach, rtk_activate); const struct rtk_type *rtk_cardbus_lookup - __P((const struct cardbus_attach_args *)); + (const struct cardbus_attach_args *); -void rtk_cardbus_setup __P((struct rtk_cardbus_softc *)); +void rtk_cardbus_setup (struct rtk_cardbus_softc *); -int rtk_cardbus_enable __P((struct rtk_softc *)); -void rtk_cardbus_disable __P((struct rtk_softc *)); -void rtk_cardbus_power __P((struct rtk_softc *, int)); +int rtk_cardbus_enable (struct rtk_softc *); +void rtk_cardbus_disable(struct rtk_softc *); +void rtk_cardbus_power (struct rtk_softc *, int); const struct rtk_type * rtk_cardbus_lookup(ca) const struct cardbus_attach_args *ca; diff --git a/sys/dev/cardbus/if_tlp_cardbus.c b/sys/dev/cardbus/if_tlp_cardbus.c index 49cb5fbc630..0cbef8cdcd3 100644 --- a/sys/dev/cardbus/if_tlp_cardbus.c +++ b/sys/dev/cardbus/if_tlp_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_tlp_cardbus.c,v 1.43 2004/08/02 19:31:52 mycroft Exp $ */ +/* $NetBSD: if_tlp_cardbus.c,v 1.44 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_tlp_cardbus.c,v 1.43 2004/08/02 19:31:52 mycroft Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_tlp_cardbus.c,v 1.44 2005/02/04 02:10:36 perry Exp $"); #include "opt_inet.h" #include "opt_ns.h" @@ -124,9 +124,9 @@ struct tulip_cardbus_softc { int sc_intrline; /* interrupt line */ }; -int tlp_cardbus_match __P((struct device *, struct cfdata *, void *)); -void tlp_cardbus_attach __P((struct device *, struct device *, void *)); -int tlp_cardbus_detach __P((struct device *, int)); +int tlp_cardbus_match(struct device *, struct cfdata *, void *); +void tlp_cardbus_attach(struct device *, struct device *, void *); +int tlp_cardbus_detach(struct device *, int); CFATTACH_DECL(tlp_cardbus, sizeof(struct tulip_cardbus_softc), tlp_cardbus_match, tlp_cardbus_attach, tlp_cardbus_detach, tlp_activate); @@ -171,31 +171,31 @@ const struct tulip_cardbus_product { }; struct tlp_cardbus_quirks { - void (*tpq_func) __P((struct tulip_cardbus_softc *, - const u_int8_t *)); + void (*tpq_func)(struct tulip_cardbus_softc *, + const u_int8_t *); u_int8_t tpq_oui[3]; }; -void tlp_cardbus_lxt_quirks __P((struct tulip_cardbus_softc *, - const u_int8_t *)); +void tlp_cardbus_lxt_quirks(struct tulip_cardbus_softc *, + const u_int8_t *); const struct tlp_cardbus_quirks tlp_cardbus_21142_quirks[] = { { tlp_cardbus_lxt_quirks, { 0x00, 0x40, 0x05 } }, { NULL, { 0, 0, 0 } } }; -void tlp_cardbus_setup __P((struct tulip_cardbus_softc *)); +void tlp_cardbus_setup(struct tulip_cardbus_softc *); -int tlp_cardbus_enable __P((struct tulip_softc *)); -void tlp_cardbus_disable __P((struct tulip_softc *)); -void tlp_cardbus_power __P((struct tulip_softc *, int)); +int tlp_cardbus_enable(struct tulip_softc *); +void tlp_cardbus_disable(struct tulip_softc *); +void tlp_cardbus_power(struct tulip_softc *, int); -void tlp_cardbus_x3201_reset __P((struct tulip_softc *)); +void tlp_cardbus_x3201_reset(struct tulip_softc *); const struct tulip_cardbus_product *tlp_cardbus_lookup - __P((const struct cardbus_attach_args *)); -void tlp_cardbus_get_quirks __P((struct tulip_cardbus_softc *, - const u_int8_t *, const struct tlp_cardbus_quirks *)); + (const struct cardbus_attach_args *); +void tlp_cardbus_get_quirks(struct tulip_cardbus_softc *, + const u_int8_t *, const struct tlp_cardbus_quirks *); const struct tulip_cardbus_product * tlp_cardbus_lookup(ca) diff --git a/sys/dev/cardbus/rbus.c b/sys/dev/cardbus/rbus.c index 91f4e00c0a6..c102dca68c2 100644 --- a/sys/dev/cardbus/rbus.c +++ b/sys/dev/cardbus/rbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: rbus.c,v 1.20 2004/05/16 21:32:31 skd Exp $ */ +/* $NetBSD: rbus.c,v 1.21 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1999 and 2000 * HAYAKAWA Koichi. All rights reserved. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rbus.c,v 1.20 2004/05/16 21:32:31 skd Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rbus.c,v 1.21 2005/02/04 02:10:36 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -54,10 +54,10 @@ __KERNEL_RCSID(0, "$NetBSD: rbus.c,v 1.20 2004/05/16 21:32:31 skd Exp $"); -static rbus_tag_t rbus_new_body __P((bus_space_tag_t bt, rbus_tag_t parent, +static rbus_tag_t rbus_new_body(bus_space_tag_t bt, rbus_tag_t parent, struct extent *ex, bus_addr_t start, bus_addr_t end, bus_addr_t offset, - int flags)); + int flags); int diff --git a/sys/dev/cardbus/rbus.h b/sys/dev/cardbus/rbus.h index 858e2fea7b6..479c3629e08 100644 --- a/sys/dev/cardbus/rbus.h +++ b/sys/dev/cardbus/rbus.h @@ -1,4 +1,4 @@ -/* $NetBSD: rbus.h,v 1.6 2003/07/08 10:06:30 itojun Exp $ */ +/* $NetBSD: rbus.h,v 1.7 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1999 * HAYAKAWA Koichi. All rights reserved. @@ -90,11 +90,11 @@ struct rbustag { bus_addr_t rb_end; bus_addr_t rb_offset; #if notyet - int (*rb_space_alloc) __P((struct rbustag *, bus_addr_t, bus_addr_t, + int (*rb_space_alloc)(struct rbustag *, bus_addr_t, bus_addr_t, bus_addr_t, bus_size_t, bus_addr_t, bus_addr_t, - int, bus_addr_t *, bus_space_handle_t *)); - int (*rbus_space_free) __P((struct rbustag *, bus_space_handle_t, - bus_size_t, bus_addr_t *)); + int, bus_addr_t *, bus_space_handle_t *); + int (*rbus_space_free)(struct rbustag *, bus_space_handle_t, + bus_size_t, bus_addr_t *); #endif int rb_flags; #define RBUS_SPACE_INVALID 0x00 @@ -116,15 +116,15 @@ typedef struct rbustag *rbus_tag_t; * easier. These functions should be member functions of rbus * `class'. */ -int rbus_space_alloc __P((rbus_tag_t, bus_addr_t, bus_size_t, bus_addr_t, - bus_addr_t, int, bus_addr_t *, bus_space_handle_t *)); +int rbus_space_alloc(rbus_tag_t, bus_addr_t, bus_size_t, bus_addr_t, + bus_addr_t, int, bus_addr_t *, bus_space_handle_t *); -int rbus_space_alloc_subregion __P((rbus_tag_t, bus_addr_t, bus_addr_t, +int rbus_space_alloc_subregion(rbus_tag_t, bus_addr_t, bus_addr_t, bus_addr_t, bus_size_t, bus_addr_t, bus_addr_t, int, - bus_addr_t *, bus_space_handle_t *)); + bus_addr_t *, bus_space_handle_t *); -int rbus_space_free __P((rbus_tag_t, bus_space_handle_t, bus_size_t, - bus_addr_t *)); +int rbus_space_free(rbus_tag_t, bus_space_handle_t, bus_size_t, + bus_addr_t *); /* @@ -134,18 +134,18 @@ int rbus_space_free __P((rbus_tag_t, bus_space_handle_t, bus_size_t, * rbus_new is a constructor which make an rbus instance from a parent * rbus. */ -rbus_tag_t rbus_new __P((rbus_tag_t, bus_addr_t, bus_size_t, bus_addr_t, int)); +rbus_tag_t rbus_new(rbus_tag_t, bus_addr_t, bus_size_t, bus_addr_t, int); -rbus_tag_t rbus_new_root_delegate __P((bus_space_tag_t, bus_addr_t, bus_size_t, - bus_addr_t)); -rbus_tag_t rbus_new_root_share __P((bus_space_tag_t, struct extent *, - bus_addr_t, bus_size_t, bus_addr_t)); +rbus_tag_t rbus_new_root_delegate(bus_space_tag_t, bus_addr_t, bus_size_t, + bus_addr_t); +rbus_tag_t rbus_new_root_share(bus_space_tag_t, struct extent *, + bus_addr_t, bus_size_t, bus_addr_t); /* * This function release bus-space used by the argument. This * function is so-called-as a destructor. */ -int rbus_delete __P((rbus_tag_t)); +int rbus_delete(rbus_tag_t); /* diff --git a/sys/dev/cardbus/rbus_ppb.c b/sys/dev/cardbus/rbus_ppb.c index 5107823be50..f0f6e3f8704 100644 --- a/sys/dev/cardbus/rbus_ppb.c +++ b/sys/dev/cardbus/rbus_ppb.c @@ -1,4 +1,4 @@ -/* $NetBSD: rbus_ppb.c,v 1.13 2004/08/30 15:05:19 drochner Exp $ */ +/* $NetBSD: rbus_ppb.c,v 1.14 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.13 2004/08/30 15:05:19 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.14 2005/02/04 02:10:36 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -83,44 +83,44 @@ __KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.13 2004/08/30 15:05:19 drochner Exp $ struct ppb_softc; -static int ppb_cardbus_match __P((struct device *, struct cfdata *, void *)); -static void ppb_cardbus_attach __P((struct device *, struct device *, void *)); -static int ppb_cardbus_detach __P((struct device * self, int flags)); -/*static*/ void ppb_cardbus_setup __P((struct ppb_softc * sc)); -/*static*/ int ppb_cardbus_enable __P((struct ppb_softc * sc)); -/*static*/ void ppb_cardbus_disable __P((struct ppb_softc * sc)); -static int ppb_activate __P((struct device *self, enum devact act)); -int rppbprint __P((void *aux, const char *pnp)); -int rbus_intr_fixup __P((pci_chipset_tag_t pc, int minbus, - int maxbus, int line)); -void rbus_do_header_fixup __P((pci_chipset_tag_t pc, pcitag_t tag, - void *context)); - -static void rbus_pci_phys_allocate __P((pci_chipset_tag_t pc, - pcitag_t tag, - void *context)); - -static int rbus_do_phys_allocate __P((pci_chipset_tag_t pc, - pcitag_t tag, +static int ppb_cardbus_match(struct device *, struct cfdata *, void *); +static void ppb_cardbus_attach(struct device *, struct device *, void *); +static int ppb_cardbus_detach(struct device * self, int flags); +/*static*/ void ppb_cardbus_setup(struct ppb_softc * sc); +/*static*/ int ppb_cardbus_enable(struct ppb_softc * sc); +/*static*/ void ppb_cardbus_disable(struct ppb_softc * sc); +static int ppb_activate(struct device *self, enum devact act); +int rppbprint(void *aux, const char *pnp); +int rbus_intr_fixup(pci_chipset_tag_t pc, int minbus, + int maxbus, int line); +void rbus_do_header_fixup(pci_chipset_tag_t pc, pcitag_t tag, + void *context); + +static void rbus_pci_phys_allocate(pci_chipset_tag_t pc, + pcitag_t tag, + void *context); + +static int rbus_do_phys_allocate(pci_chipset_tag_t pc, + pcitag_t tag, int mapreg, - void *ctx, + void *ctx, int type, bus_addr_t *addr, - bus_size_t size)); + bus_size_t size); -static void rbus_pci_phys_countspace __P((pci_chipset_tag_t pc, - pcitag_t tag, - void *context)); +static void rbus_pci_phys_countspace(pci_chipset_tag_t pc, + pcitag_t tag, + void *context); -static int rbus_do_phys_countspace __P((pci_chipset_tag_t pc, - pcitag_t tag, +static int rbus_do_phys_countspace(pci_chipset_tag_t pc, + pcitag_t tag, int mapreg, - void *ctx, + void *ctx, int type, bus_addr_t *addr, - bus_size_t size)); + bus_size_t size); -unsigned int rbus_round_up __P((unsigned int size, unsigned int min)); +unsigned int rbus_round_up(unsigned int size, unsigned int min); struct ppb_cardbus_softc { diff --git a/sys/dev/clock_subr.c b/sys/dev/clock_subr.c index e03fd9d176f..43e56267001 100644 --- a/sys/dev/clock_subr.c +++ b/sys/dev/clock_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: clock_subr.c,v 1.10 2004/12/29 20:55:57 bjh21 Exp $ */ +/* $NetBSD: clock_subr.c,v 1.11 2005/02/04 02:10:35 perry Exp $ */ /* * Copyright (c) 1982, 1990, 1993 @@ -84,14 +84,14 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clock_subr.c,v 1.10 2004/12/29 20:55:57 bjh21 Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clock_subr.c,v 1.11 2005/02/04 02:10:35 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <dev/clock_subr.h> -static inline int leapyear __P((int year)); +static inline int leapyear(int year); #define FEBRUARY 2 #define days_in_year(a) (leapyear(a) ? 366 : 365) #define days_in_month(a) (month_days[(a) - 1]) diff --git a/sys/dev/clock_subr.h b/sys/dev/clock_subr.h index 55efd8cc555..8f215cbc912 100644 --- a/sys/dev/clock_subr.h +++ b/sys/dev/clock_subr.h @@ -1,4 +1,4 @@ -/* $NetBSD: clock_subr.h,v 1.10 2003/07/18 21:41:24 thorpej Exp $ */ +/* $NetBSD: clock_subr.h,v 1.11 2005/02/04 02:10:35 perry Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -52,8 +52,8 @@ struct clock_ymdhms { u_char dt_sec; }; -time_t clock_ymdhms_to_secs __P((struct clock_ymdhms *)); -void clock_secs_to_ymdhms __P((time_t, struct clock_ymdhms *)); +time_t clock_ymdhms_to_secs(struct clock_ymdhms *); +void clock_secs_to_ymdhms(time_t, struct clock_ymdhms *); /* * BCD to decimal and decimal to BCD. diff --git a/sys/dev/cons.h b/sys/dev/cons.h index a0e07d4cb5b..83ac9e2d61c 100644 --- a/sys/dev/cons.h +++ b/sys/dev/cons.h @@ -1,4 +1,4 @@ -/* $NetBSD: cons.h,v 1.22 2003/10/17 18:16:43 cdi Exp $ */ +/* $NetBSD: cons.h,v 1.23 2005/02/04 02:10:35 perry Exp $ */ /* * Copyright (c) 1990, 1993 @@ -82,21 +82,21 @@ struct consdev { void (*cn_probe) /* probe hardware and fill in consdev info */ - __P((struct consdev *)); + (struct consdev *); void (*cn_init) /* turn on as console */ - __P((struct consdev *)); + (struct consdev *); int (*cn_getc) /* kernel getchar interface */ - __P((dev_t)); + (dev_t); void (*cn_putc) /* kernel putchar interface */ - __P((dev_t, int)); + (dev_t, int); void (*cn_pollc) /* turn on and off polling */ - __P((dev_t, int)); + (dev_t, int); void (*cn_bell) /* ring bell */ - __P((dev_t, u_int, u_int, u_int)); + (dev_t, u_int, u_int, u_int); void (*cn_halt) /* stop device */ - __P((dev_t)); + (dev_t); void (*cn_flush) /* flush output */ - __P((dev_t)); + (dev_t); dev_t cn_dev; /* major/minor of device */ int cn_pri; /* pecking order; the higher the better */ }; @@ -113,29 +113,29 @@ struct consdev { extern struct consdev constab[]; extern struct consdev *cn_tab; -void cninit __P((void)); -int cngetc __P((void)); -int cngetsn __P((char *, int)); -void cnputc __P((int)); -void cnpollc __P((int)); -void cnbell __P((u_int, u_int, u_int)); -void cnflush __P((void)); -void cnhalt __P((void)); -void cnrint __P((void)); -void nullcnprobe __P((struct consdev *)); -void nullcninit __P((struct consdev *)); -void nullcnpollc __P((dev_t, int)); -void nullconsattach __P((int)); +void cninit(void); +int cngetc(void); +int cngetsn(char *, int); +void cnputc(int); +void cnpollc(int); +void cnbell(u_int, u_int, u_int); +void cnflush(void); +void cnhalt(void); +void cnrint(void); +void nullcnprobe(struct consdev *); +void nullcninit(struct consdev *); +void nullcnpollc(dev_t, int); +void nullconsattach(int); /* console-specific types */ -#define dev_type_cnprobe(n) void n __P((struct consdev *)) -#define dev_type_cninit(n) void n __P((struct consdev *)) -#define dev_type_cngetc(n) int n __P((dev_t)) -#define dev_type_cnputc(n) void n __P((dev_t, int)) -#define dev_type_cnpollc(n) void n __P((dev_t, int)) -#define dev_type_cnbell(n) void n __P((dev_t, u_int, u_int, u_int)); -#define dev_type_cnhalt(n) void n __P((dev_t)) -#define dev_type_cnflush(n) void n __P((dev_t)) +#define dev_type_cnprobe(n) void n(struct consdev *) +#define dev_type_cninit(n) void n(struct consdev *) +#define dev_type_cngetc(n) int n(dev_t) +#define dev_type_cnputc(n) void n(dev_t, int) +#define dev_type_cnpollc(n) void n(dev_t, int) +#define dev_type_cnbell(n) void n(dev_t, u_int, u_int, u_int); +#define dev_type_cnhalt(n) void n(dev_t) +#define dev_type_cnflush(n) void n(dev_t) #define dev_decl(n,t) __CONCAT(dev_type_,t)(__CONCAT(n,t)) #define dev_init(n,t) __CONCAT(n,t) diff --git a/sys/dev/dec/clockvar.h b/sys/dev/dec/clockvar.h index e960559b5bb..46f1266d832 100644 --- a/sys/dev/dec/clockvar.h +++ b/sys/dev/dec/clockvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: clockvar.h,v 1.5 2004/02/13 11:36:21 wiz Exp $ */ +/* $NetBSD: clockvar.h,v 1.6 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -54,9 +54,9 @@ struct clocktime { * chip-dependent routines. */ struct clockfns { - void (*cf_init) __P((struct device *)); - void (*cf_get) __P((struct device *, time_t, struct clocktime *)); - void (*cf_set) __P((struct device *, struct clocktime *)); + void (*cf_init)(struct device *); + void (*cf_get)(struct device *, time_t, struct clocktime *); + void (*cf_set)(struct device *, struct clocktime *); }; -void clockattach __P((struct device *, const struct clockfns *)); +void clockattach(struct device *, const struct clockfns *); diff --git a/sys/dev/dec/dzkbd.c b/sys/dev/dec/dzkbd.c index 652226db907..cd90ab83b4a 100644 --- a/sys/dev/dec/dzkbd.c +++ b/sys/dev/dec/dzkbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: dzkbd.c,v 1.12 2003/08/07 16:30:54 agc Exp $ */ +/* $NetBSD: dzkbd.c,v 1.13 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1992, 1993 @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.12 2003/08/07 16:30:54 agc Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.13 2005/02/04 02:10:36 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -88,17 +88,17 @@ struct dzkbd_softc { struct device *sc_wskbddev; }; -static int dzkbd_input __P((void *, int)); +static int dzkbd_input(void *, int); -static int dzkbd_match __P((struct device *, struct cfdata *, void *)); -static void dzkbd_attach __P((struct device *, struct device *, void *)); +static int dzkbd_match(struct device *, struct cfdata *, void *); +static void dzkbd_attach(struct device *, struct device *, void *); CFATTACH_DECL(dzkbd, sizeof(struct dzkbd_softc), dzkbd_match, dzkbd_attach, NULL, NULL); -static int dzkbd_enable __P((void *, int)); -static void dzkbd_set_leds __P((void *, int)); -static int dzkbd_ioctl __P((void *, u_long, caddr_t, int, struct proc *)); +static int dzkbd_enable(void *, int); +static void dzkbd_set_leds(void *, int); +static int dzkbd_ioctl(void *, u_long, caddr_t, int, struct proc *); const struct wskbd_accessops dzkbd_accessops = { dzkbd_enable, @@ -114,7 +114,7 @@ const struct wskbd_consops dzkbd_consops = { dzkbd_cnpollc, }; -static int dzkbd_sendchar __P((void *, u_char)); +static int dzkbd_sendchar(void *, u_char); const struct wskbd_mapdata dzkbd_keymapdata = { lkkbd_keydesctab, diff --git a/sys/dev/dec/dzms.c b/sys/dev/dec/dzms.c index 900701cb41c..5825371c1e2 100644 --- a/sys/dev/dec/dzms.c +++ b/sys/dev/dec/dzms.c @@ -1,4 +1,4 @@ -/* $NetBSD: dzms.c,v 1.10 2003/08/07 16:30:54 agc Exp $ */ +/* $NetBSD: dzms.c,v 1.11 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1992, 1993 @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dzms.c,v 1.10 2003/08/07 16:30:54 agc Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dzms.c,v 1.11 2005/02/04 02:10:36 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -82,16 +82,16 @@ struct dzms_softc { /* driver status information */ struct device *sc_wsmousedev; }; -static int dzms_match __P((struct device *, struct cfdata *, void *)); -static void dzms_attach __P((struct device *, struct device *, void *)); -static int dzms_input __P((void *, int)); +static int dzms_match(struct device *, struct cfdata *, void *); +static void dzms_attach(struct device *, struct device *, void *); +static int dzms_input(void *, int); CFATTACH_DECL(dzms, sizeof(struct dzms_softc), dzms_match, dzms_attach, NULL, NULL); -static int dzms_enable __P((void *)); -static int dzms_ioctl __P((void *, u_long, caddr_t, int, struct proc *)); -static void dzms_disable __P((void *)); +static int dzms_enable(void *); +static int dzms_ioctl(void *, u_long, caddr_t, int, struct proc *); +static void dzms_disable(void *); const struct wsmouse_accessops dzms_accessops = { dzms_enable, diff --git a/sys/dev/dec/dzvar.h b/sys/dev/dec/dzvar.h index 4f07358ce8e..e2f0dac6471 100644 --- a/sys/dev/dec/dzvar.h +++ b/sys/dev/dec/dzvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: dzvar.h,v 1.6 2003/08/07 16:30:55 agc Exp $ */ +/* $NetBSD: dzvar.h,v 1.7 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -97,7 +97,7 @@ struct dz_softc { struct dz_softc *dz_sc; /* backpointer to softc */ int dz_line; /* channel number */ void *dz_private; /* sub-driver data pointer */ - int (*dz_catch) __P((void *, int)); /* Fast catch recv */ + int (*dz_catch)(void *, int); /* Fast catch recv */ struct tty * dz_tty; /* what we work on */ #ifdef notyet caddr_t dz_mem; /* pointers to clist output */ diff --git a/sys/dev/dec/if_le_dec.c b/sys/dev/dec/if_le_dec.c index e63050c4a23..47a5f1732f6 100644 --- a/sys/dev/dec/if_le_dec.c +++ b/sys/dev/dec/if_le_dec.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_le_dec.c,v 1.13 2003/08/07 16:30:55 agc Exp $ */ +/* $NetBSD: if_le_dec.c,v 1.14 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_le_dec.c,v 1.13 2003/08/07 16:30:55 agc Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_le_dec.c,v 1.14 2005/02/04 02:10:36 perry Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -105,7 +105,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_dec.c,v 1.13 2003/08/07 16:30:55 agc Exp $"); #include <machine/bus.h> /* access LANCE registers */ -void le_dec_writereg __P((volatile u_short *regptr, u_short val)); +void le_dec_writereg(volatile u_short *regptr, u_short val); #define LERDWR(cntl, src, dst) { (dst) = (src); tc_mb(); } #define LEWREG(src, dst) le_dec_writereg(&(dst), (src)) @@ -121,8 +121,8 @@ void le_dec_writereg __P((volatile u_short *regptr, u_short val)); #define hide static #endif -hide void le_dec_wrcsr __P((struct lance_softc *, u_int16_t, u_int16_t)); -hide u_int16_t le_dec_rdcsr __P((struct lance_softc *, u_int16_t)); +hide void le_dec_wrcsr(struct lance_softc *, u_int16_t, u_int16_t); +hide u_int16_t le_dec_rdcsr(struct lance_softc *, u_int16_t); void dec_le_common_attach(sc, eap) diff --git a/sys/dev/dec/lk201.h b/sys/dev/dec/lk201.h index e91f6005c03..7e93ac6025e 100644 --- a/sys/dev/dec/lk201.h +++ b/sys/dev/dec/lk201.h @@ -1,4 +1,4 @@ -/* $NetBSD: lk201.h,v 1.7 1999/03/19 18:34:01 ad Exp $ */ +/* $NetBSD: lk201.h,v 1.8 2005/02/04 02:10:36 perry Exp $ */ /* @@ -140,6 +140,6 @@ #define LEFT_BUTTON 0x04 #ifdef _KERNEL -extern int LKgetc __P((dev_t dev)); -extern void lkdivert __P ((int (*getc_fn)(dev_t dev), dev_t dev)); +extern int LKgetc(dev_t dev); +extern void lkdivert(int (*getc_fn)(dev_t dev), dev_t dev); #endif diff --git a/sys/dev/dec/lk201var.h b/sys/dev/dec/lk201var.h index 4dc67972247..924173813c3 100644 --- a/sys/dev/dec/lk201var.h +++ b/sys/dev/dec/lk201var.h @@ -1,4 +1,4 @@ -/* $NetBSD: lk201var.h,v 1.4 2004/03/24 17:26:53 drochner Exp $ */ +/* $NetBSD: lk201var.h,v 1.5 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1998 @@ -27,7 +27,7 @@ */ struct lk201_attachment { - int (*sendchar) __P((void *, u_char)); + int (*sendchar)(void *, u_char); void *cookie; }; @@ -40,8 +40,8 @@ struct lk201_state { int kcvol; }; -int lk201_init __P((struct lk201_state *)); -int lk201_decode __P((struct lk201_state *, int, u_int *, int *)); -void lk201_bell __P((struct lk201_state *, struct wskbd_bell_data *)); -void lk201_set_leds __P((struct lk201_state *, int)); -void lk201_set_keyclick __P((struct lk201_state *, int)); +int lk201_init(struct lk201_state *); +int lk201_decode(struct lk201_state *, int, u_int *, int *); +void lk201_bell(struct lk201_state *, struct wskbd_bell_data *); +void lk201_set_leds(struct lk201_state *, int); +void lk201_set_keyclick(struct lk201_state *, int); diff --git a/sys/dev/dec/mcclock.c b/sys/dev/dec/mcclock.c index 34ce40982d0..0a2633e4641 100644 --- a/sys/dev/dec/mcclock.c +++ b/sys/dev/dec/mcclock.c @@ -1,4 +1,4 @@ -/* $NetBSD: mcclock.c,v 1.15 2001/12/05 10:54:51 simonb Exp $ */ +/* $NetBSD: mcclock.c,v 1.16 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mcclock.c,v 1.15 2001/12/05 10:54:51 simonb Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mcclock.c,v 1.16 2005/02/04 02:10:36 perry Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -50,9 +50,9 @@ __KERNEL_RCSID(0, "$NetBSD: mcclock.c,v 1.15 2001/12/05 10:54:51 simonb Exp $"); #endif -void mcclock_init __P((struct device *)); -void mcclock_get __P((struct device *, time_t, struct clocktime *)); -void mcclock_set __P((struct device *, struct clocktime *)); +void mcclock_init(struct device *); +void mcclock_get(struct device *, time_t, struct clocktime *); +void mcclock_set(struct device *, struct clocktime *); const struct clockfns mcclock_clockfns = { mcclock_init, mcclock_get, mcclock_set, diff --git a/sys/dev/dec/mcclock_pad32.c b/sys/dev/dec/mcclock_pad32.c index 033d6323b8c..6dbba962393 100644 --- a/sys/dev/dec/mcclock_pad32.c +++ b/sys/dev/dec/mcclock_pad32.c @@ -1,4 +1,4 @@ -/* $NetBSD: mcclock_pad32.c,v 1.10 2001/11/13 12:49:45 lukem Exp $ */ +/* $NetBSD: mcclock_pad32.c,v 1.11 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mcclock_pad32.c,v 1.10 2001/11/13 12:49:45 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mcclock_pad32.c,v 1.11 2005/02/04 02:10:36 perry Exp $"); /* @@ -58,8 +58,8 @@ __KERNEL_RCSID(0, "$NetBSD: mcclock_pad32.c,v 1.10 2001/11/13 12:49:45 lukem Exp #include <dev/dec/mcclock_pad32.h> -void mcclock_pad32_write __P((struct mcclock_softc *, u_int, u_int)); -u_int mcclock_pad32_read __P((struct mcclock_softc *, u_int)); +void mcclock_pad32_write(struct mcclock_softc *, u_int, u_int); +u_int mcclock_pad32_read(struct mcclock_softc *, u_int); const struct mcclock_busfns mcclock_pad32_busfns = { mcclock_pad32_write, mcclock_pad32_read, diff --git a/sys/dev/dec/mcclockvar.h b/sys/dev/dec/mcclockvar.h index 2d962e6d8ee..b974bf3fb1a 100644 --- a/sys/dev/dec/mcclockvar.h +++ b/sys/dev/dec/mcclockvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: mcclockvar.h,v 1.4 1997/06/22 08:02:19 jonathan Exp $ */ +/* $NetBSD: mcclockvar.h,v 1.5 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1996 Carnegie-Mellon University. @@ -33,9 +33,8 @@ struct mcclock_softc { }; struct mcclock_busfns { - void (*mc_bf_write) __P((struct mcclock_softc *, u_int, u_int)); - u_int (*mc_bf_read) __P((struct mcclock_softc *, u_int)); + void (*mc_bf_write)(struct mcclock_softc *, u_int, u_int); + u_int (*mc_bf_read)(struct mcclock_softc *, u_int); }; -void mcclock_attach __P((struct mcclock_softc *, - const struct mcclock_busfns *)); +void mcclock_attach(struct mcclock_softc *, const struct mcclock_busfns *); diff --git a/sys/dev/dec/vsxxx.c b/sys/dev/dec/vsxxx.c index 6213d2e5aeb..c9015c356cd 100644 --- a/sys/dev/dec/vsxxx.c +++ b/sys/dev/dec/vsxxx.c @@ -1,4 +1,4 @@ -/* $NetBSD: vsxxx.c,v 1.4 2002/03/17 19:40:55 atatat Exp $ */ +/* $NetBSD: vsxxx.c,v 1.5 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1999 Tohru Nishimura. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vsxxx.c,v 1.4 2002/03/17 19:40:55 atatat Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vsxxx.c,v 1.5 2005/02/04 02:10:36 perry Exp $"); /* * Common machinary for VSXXX mice and tablet @@ -76,9 +76,9 @@ __KERNEL_RCSID(0, "$NetBSD: vsxxx.c,v 1.4 2002/03/17 19:40:55 atatat Exp $"); extern struct cfdriver vsms_cd; -static int vsxxx_enable __P((void *)); -static int vsxxx_ioctl __P((void *, u_long, caddr_t, int, struct proc *)); -static void vsxxx_disable __P((void *)); +static int vsxxx_enable(void *); +static int vsxxx_ioctl(void *, u_long, caddr_t, int, struct proc *); +static void vsxxx_disable(void *); struct wsmouse_accessops vsxxx_accessops = { /* EXPORT */ vsxxx_enable, /* MD? */ diff --git a/sys/dev/dec/vsxxxvar.h b/sys/dev/dec/vsxxxvar.h index 03528774a2e..e4eeb157ff8 100644 --- a/sys/dev/dec/vsxxxvar.h +++ b/sys/dev/dec/vsxxxvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: vsxxxvar.h,v 1.1 1999/11/20 04:55:30 nisimura Exp $ */ +/* $NetBSD: vsxxxvar.h,v 1.2 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1999 Tohru Nishimura. All rights reserved. @@ -52,4 +52,4 @@ struct vsxxx_softc { }; extern struct wsmouse_accessops vsxxx_accessops; -void vsxxx_input __P((int)); +void vsxxx_input(int); diff --git a/sys/dev/gpib/gpib.c b/sys/dev/gpib/gpib.c index a5ed21ddf8b..f59ebb1b3ce 100644 --- a/sys/dev/gpib/gpib.c +++ b/sys/dev/gpib/gpib.c @@ -1,4 +1,4 @@ -/* $NetBSD: gpib.c,v 1.2 2004/09/13 12:55:47 drochner Exp $ */ +/* $NetBSD: gpib.c,v 1.3 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gpib.c,v 1.2 2004/09/13 12:55:47 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gpib.c,v 1.3 2005/02/04 02:10:36 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -65,8 +65,8 @@ int gpibdebug = 0xff; #define DPRINTF(mask, str) /* nothing */ #endif -int gpibmatch __P((struct device *, struct cfdata *, void *)); -void gpibattach __P((struct device *, struct device *, void *)); +int gpibmatch(struct device *, struct cfdata *, void *); +void gpibattach(struct device *, struct device *, void *); CFATTACH_DECL(gpib, sizeof(struct gpib_softc), gpibmatch, gpibattach, NULL, NULL); diff --git a/sys/dev/ic/adv.c b/sys/dev/ic/adv.c index 78a1c4d3eca..525e237c72c 100644 --- a/sys/dev/ic/adv.c +++ b/sys/dev/ic/adv.c @@ -1,4 +1,4 @@ -/* $NetBSD: adv.c,v 1.33 2003/05/03 18:11:11 wiz Exp $ */ +/* $NetBSD: adv.c,v 1.34 2005/02/04 02:10:36 perry Exp $ */ /* * Generic driver for the Advanced Systems Inc. Narrow SCSI controllers @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: adv.c,v 1.33 2003/05/03 18:11:11 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: adv.c,v 1.34 2005/02/04 02:10:36 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -74,25 +74,25 @@ __KERNEL_RCSID(0, "$NetBSD: adv.c,v 1.33 2003/05/03 18:11:11 wiz Exp $"); /******************************************************************************/ -static int adv_alloc_control_data __P((ASC_SOFTC *)); -static void adv_free_control_data __P((ASC_SOFTC *)); -static int adv_create_ccbs __P((ASC_SOFTC *, ADV_CCB *, int)); -static void adv_free_ccb __P((ASC_SOFTC *, ADV_CCB *)); -static void adv_reset_ccb __P((ADV_CCB *)); -static int adv_init_ccb __P((ASC_SOFTC *, ADV_CCB *)); -static ADV_CCB *adv_get_ccb __P((ASC_SOFTC *)); -static void adv_queue_ccb __P((ASC_SOFTC *, ADV_CCB *)); -static void adv_start_ccbs __P((ASC_SOFTC *)); +static int adv_alloc_control_data(ASC_SOFTC *); +static void adv_free_control_data(ASC_SOFTC *); +static int adv_create_ccbs(ASC_SOFTC *, ADV_CCB *, int); +static void adv_free_ccb(ASC_SOFTC *, ADV_CCB *); +static void adv_reset_ccb(ADV_CCB *); +static int adv_init_ccb(ASC_SOFTC *, ADV_CCB *); +static ADV_CCB *adv_get_ccb(ASC_SOFTC *); +static void adv_queue_ccb(ASC_SOFTC *, ADV_CCB *); +static void adv_start_ccbs(ASC_SOFTC *); -static void adv_scsipi_request __P((struct scsipi_channel *, - scsipi_adapter_req_t, void *)); -static void advminphys __P((struct buf *)); -static void adv_narrow_isr_callback __P((ASC_SOFTC *, ASC_QDONE_INFO *)); +static void adv_scsipi_request(struct scsipi_channel *, + scsipi_adapter_req_t, void *); +static void advminphys(struct buf *); +static void adv_narrow_isr_callback(ASC_SOFTC *, ASC_QDONE_INFO *); -static int adv_poll __P((ASC_SOFTC *, struct scsipi_xfer *, int)); -static void adv_timeout __P((void *)); -static void adv_watchdog __P((void *)); +static int adv_poll(ASC_SOFTC *, struct scsipi_xfer *, int); +static void adv_timeout(void *); +static void adv_watchdog(void *); /******************************************************************************/ diff --git a/sys/dev/ic/adv.h b/sys/dev/ic/adv.h index 14069e12385..a52af9c9253 100644 --- a/sys/dev/ic/adv.h +++ b/sys/dev/ic/adv.h @@ -1,4 +1,4 @@ -/* $NetBSD: adv.h,v 1.9 2003/07/08 10:06:30 itojun Exp $ */ +/* $NetBSD: adv.h,v 1.10 2005/02/04 02:10:36 perry Exp $ */ /* * Generic driver definitions and exported functions for the Advanced @@ -92,11 +92,11 @@ struct adv_control /******************************************************************************/ -int adv_init __P((ASC_SOFTC *)); -void adv_attach __P((ASC_SOFTC *)); -int adv_detach __P((ASC_SOFTC *, int)); -int adv_intr __P((void *)); -ADV_CCB *adv_ccb_phys_kv __P((ASC_SOFTC *, u_long)); +int adv_init(ASC_SOFTC *); +void adv_attach(ASC_SOFTC *); +int adv_detach(ASC_SOFTC *, int); +int adv_intr(void *); +ADV_CCB *adv_ccb_phys_kv(ASC_SOFTC *, u_long); /******************************************************************************/ diff --git a/sys/dev/ic/advlib.h b/sys/dev/ic/advlib.h index 5b08ef994fa..aa8d7684b3f 100644 --- a/sys/dev/ic/advlib.h +++ b/sys/dev/ic/advlib.h @@ -1,4 +1,4 @@ -/* $NetBSD: advlib.h,v 1.14 2004/02/13 18:02:05 wiz Exp $ */ +/* $NetBSD: advlib.h,v 1.15 2005/02/04 02:10:36 perry Exp $ */ /* * Definitions for low level routines and data structures @@ -1329,20 +1329,20 @@ typedef struct asceep_config /******************************************************************************/ -void AscInitASC_SOFTC __P((ASC_SOFTC *)); -int16_t AscInitFromEEP __P((ASC_SOFTC *)); -u_int16_t AscInitFromASC_SOFTC __P((ASC_SOFTC *)); -int AscInitDriver __P((ASC_SOFTC *)); -void AscReInitLram __P((ASC_SOFTC *)); -int AscFindSignature __P((bus_space_tag_t, bus_space_handle_t)); -u_int8_t AscGetChipIRQ __P((bus_space_tag_t, bus_space_handle_t, u_int16_t)); -u_int16_t AscGetIsaDmaChannel __P((bus_space_tag_t, bus_space_handle_t)); -int AscISR __P((ASC_SOFTC *)); -int AscExeScsiQueue __P((ASC_SOFTC *, ASC_SCSI_Q *)); -void AscInquiryHandling __P((ASC_SOFTC *, u_int8_t, ASC_SCSI_INQUIRY *)); -int AscAbortCCB __P((ASC_SOFTC *, struct adv_ccb *)); -int AscResetBus __P((ASC_SOFTC *)); -int AscResetDevice __P((ASC_SOFTC *, u_char)); +void AscInitASC_SOFTC(ASC_SOFTC *); +int16_t AscInitFromEEP(ASC_SOFTC *); +u_int16_t AscInitFromASC_SOFTC(ASC_SOFTC *); +int AscInitDriver(ASC_SOFTC *); +void AscReInitLram(ASC_SOFTC *); +int AscFindSignature(bus_space_tag_t, bus_space_handle_t); +u_int8_t AscGetChipIRQ(bus_space_tag_t, bus_space_handle_t, u_int16_t); +u_int16_t AscGetIsaDmaChannel(bus_space_tag_t, bus_space_handle_t); +int AscISR(ASC_SOFTC *); +int AscExeScsiQueue(ASC_SOFTC *, ASC_SCSI_Q *); +void AscInquiryHandling(ASC_SOFTC *, u_int8_t, ASC_SCSI_INQUIRY *); +int AscAbortCCB(ASC_SOFTC *, struct adv_ccb *); +int AscResetBus(ASC_SOFTC *); +int AscResetDevice(ASC_SOFTC *, u_char); /******************************************************************************/ diff --git a/sys/dev/ic/adw.h b/sys/dev/ic/adw.h index 8c5c9a75ef9..ada22f0548b 100644 --- a/sys/dev/ic/adw.h +++ b/sys/dev/ic/adw.h @@ -1,4 +1,4 @@ -/* $NetBSD: adw.h,v 1.10 2003/07/08 10:06:30 itojun Exp $ */ +/* $NetBSD: adw.h,v 1.11 2005/02/04 02:10:36 perry Exp $ */ /* * Generic driver definitions and exported functions for the Advanced @@ -107,10 +107,10 @@ struct adw_control { /******************************************************************************/ -int adw_init __P((ADW_SOFTC *)); -void adw_attach __P((ADW_SOFTC *)); -int adw_intr __P((void *)); -ADW_CCB *adw_ccb_phys_kv __P((ADW_SOFTC *, u_int32_t)); +int adw_init(ADW_SOFTC *); +void adw_attach(ADW_SOFTC *); +int adw_intr(void *); +ADW_CCB *adw_ccb_phys_kv(ADW_SOFTC *, u_int32_t); /******************************************************************************/ diff --git a/sys/dev/ic/adwlib.c b/sys/dev/ic/adwlib.c index 1dfe9495ba9..22d0856508e 100644 --- a/sys/dev/ic/adwlib.c +++ b/sys/dev/ic/adwlib.c @@ -1,4 +1,4 @@ -/* $NetBSD: adwlib.c,v 1.31 2003/11/02 11:07:44 wiz Exp $ */ +/* $NetBSD: adwlib.c,v 1.32 2005/02/04 02:10:36 perry Exp $ */ /* * Low level routines for the Advanced Systems Inc. SCSI controllers chips @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: adwlib.c,v 1.31 2003/11/02 11:07:44 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: adwlib.c,v 1.32 2005/02/04 02:10:36 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -79,26 +79,23 @@ __KERNEL_RCSID(0, "$NetBSD: adwlib.c,v 1.31 2003/11/02 11:07:44 wiz Exp $"); /* Static Functions */ -int AdwRamSelfTest __P((bus_space_tag_t, bus_space_handle_t, u_int8_t)); -int AdwLoadMCode __P((bus_space_tag_t, bus_space_handle_t, u_int16_t *, - u_int8_t)); -int AdwASC3550Cabling __P((bus_space_tag_t, bus_space_handle_t, ADW_DVC_CFG *)); -int AdwASC38C0800Cabling __P((bus_space_tag_t, bus_space_handle_t, - ADW_DVC_CFG *)); -int AdwASC38C1600Cabling __P((bus_space_tag_t, bus_space_handle_t, - ADW_DVC_CFG *)); - -static u_int16_t AdwGetEEPROMConfig __P((bus_space_tag_t, bus_space_handle_t, - ADW_EEPROM *)); -static void AdwSetEEPROMConfig __P((bus_space_tag_t, bus_space_handle_t, - ADW_EEPROM *)); -static u_int16_t AdwReadEEPWord __P((bus_space_tag_t, bus_space_handle_t, int)); -static void AdwWaitEEPCmd __P((bus_space_tag_t, bus_space_handle_t)); - -static void AdwInquiryHandling __P((ADW_SOFTC *, ADW_SCSI_REQ_Q *)); - -static void AdwSleepMilliSecond __P((u_int32_t)); -static void AdwDelayMicroSecond __P((u_int32_t)); +int AdwRamSelfTest(bus_space_tag_t, bus_space_handle_t, u_int8_t); +int AdwLoadMCode(bus_space_tag_t, bus_space_handle_t, u_int16_t *, u_int8_t); +int AdwASC3550Cabling(bus_space_tag_t, bus_space_handle_t, ADW_DVC_CFG *); +int AdwASC38C0800Cabling(bus_space_tag_t, bus_space_handle_t, ADW_DVC_CFG *); +int AdwASC38C1600Cabling(bus_space_tag_t, bus_space_handle_t, ADW_DVC_CFG *); + +static u_int16_t AdwGetEEPROMConfig(bus_space_tag_t, bus_space_handle_t, + ADW_EEPROM *); +static void AdwSetEEPROMConfig(bus_space_tag_t, bus_space_handle_t, + ADW_EEPROM *); +static u_int16_t AdwReadEEPWord(bus_space_tag_t, bus_space_handle_t, int); +static void AdwWaitEEPCmd(bus_space_tag_t, bus_space_handle_t); + +static void AdwInquiryHandling(ADW_SOFTC *, ADW_SCSI_REQ_Q *); + +static void AdwSleepMilliSecond(u_int32_t); +static void AdwDelayMicroSecond(u_int32_t); /* diff --git a/sys/dev/ic/adwlib.h b/sys/dev/ic/adwlib.h index 07ebd8ebfd3..e95b96957b9 100644 --- a/sys/dev/ic/adwlib.h +++ b/sys/dev/ic/adwlib.h @@ -1,4 +1,4 @@ -/* $NetBSD: adwlib.h,v 1.15 2001/04/25 17:53:29 bouyer Exp $ */ +/* $NetBSD: adwlib.h,v 1.16 2005/02/04 02:10:36 perry Exp $ */ /* * Definitions for low level routines and data structures @@ -1057,13 +1057,13 @@ do { \ * Adv Library functions available to drivers. */ -int AdwInitFromEEPROM __P((ADW_SOFTC *)); -int AdwInitDriver __P((ADW_SOFTC *)); -int AdwExeScsiQueue __P((ADW_SOFTC *, ADW_SCSI_REQ_Q *)); -int AdwISR __P((ADW_SOFTC *)); -void AdwResetChip __P((bus_space_tag_t, bus_space_handle_t)); -int AdwSendIdleCmd __P((ADW_SOFTC *, u_int16_t, u_int32_t)); -int AdwResetSCSIBus __P((ADW_SOFTC *)); -int AdwResetCCB __P((ADW_SOFTC *)); +int AdwInitFromEEPROM(ADW_SOFTC *); +int AdwInitDriver(ADW_SOFTC *); +int AdwExeScsiQueue(ADW_SOFTC *, ADW_SCSI_REQ_Q *); +int AdwISR(ADW_SOFTC *); +void AdwResetChip(bus_space_tag_t, bus_space_handle_t); +int AdwSendIdleCmd(ADW_SOFTC *, u_int16_t, u_int32_t); +int AdwResetSCSIBus(ADW_SOFTC *); +int AdwResetCCB(ADW_SOFTC *); #endif /* _ADVANSYS_WIDE_LIBRARY_H_ */ diff --git a/sys/dev/ic/adwmcode.h b/sys/dev/ic/adwmcode.h index 92da06848f5..d29f8d00c53 100644 --- a/sys/dev/ic/adwmcode.h +++ b/sys/dev/ic/adwmcode.h @@ -1,4 +1,4 @@ -/* $NetBSD: adwmcode.h,v 1.8 2003/02/21 17:14:06 tsutsui Exp $ */ +/* $NetBSD: adwmcode.h,v 1.9 2005/02/04 02:10:36 perry Exp $ */ /* * Generic driver definitions and exported functions for the Advanced @@ -203,7 +203,7 @@ struct adw_mcode { /******************************************************************************/ -ADW_CARRIER *AdwInitCarriers __P((bus_dmamap_t, ADW_CARRIER *)); +ADW_CARRIER *AdwInitCarriers(bus_dmamap_t, ADW_CARRIER *); extern const struct adw_mcode adw_asc3550_mcode_data; extern const struct adw_mcode adw_asc38C0800_mcode_data; diff --git a/sys/dev/ic/aic77xxvar.h b/sys/dev/ic/aic77xxvar.h index f41330ca4f5..f06581d2f06 100644 --- a/sys/dev/ic/aic77xxvar.h +++ b/sys/dev/ic/aic77xxvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: aic77xxvar.h,v 1.1 2000/03/15 02:06:19 fvdl Exp $ */ +/* $NetBSD: aic77xxvar.h,v 1.2 2005/02/04 02:10:36 perry Exp $ */ /* * Common routines for AHA-27/284X and aic7770 motherboard SCSI controllers. @@ -30,5 +30,5 @@ * $FreeBSD: src/sys/dev/aic7xxx/ahc_eisa.c,v 1.15 2000/01/29 14:22:19 peter Exp $ */ -int ahc_aic77xx_irq __P((bus_space_tag_t, bus_space_handle_t)); -int ahc_aic77xx_attach __P((struct ahc_softc *ahc)); +int ahc_aic77xx_irq(bus_space_tag_t, bus_space_handle_t); +int ahc_aic77xx_attach(struct ahc_softc *ahc); diff --git a/sys/dev/ic/atppcvar.h b/sys/dev/ic/atppcvar.h index e3e7b9370d8..4ae39963e57 100644 --- a/sys/dev/ic/atppcvar.h +++ b/sys/dev/ic/atppcvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: atppcvar.h,v 1.4 2004/04/21 17:38:48 drochner Exp $ */ +/* $NetBSD: atppcvar.h,v 1.5 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 2001 Alcove - Nicolas Souchu @@ -246,14 +246,14 @@ struct atppc_softc { /* Function prototypes */ /* Soft config attach/detach routines */ -void atppc_sc_attach __P((struct atppc_softc *)); -int atppc_sc_detach __P((struct atppc_softc *, int)); +void atppc_sc_attach(struct atppc_softc *); +int atppc_sc_detach(struct atppc_softc *, int); /* Detection routines */ -int atppc_detect_port __P((bus_space_tag_t, bus_space_handle_t)); +int atppc_detect_port(bus_space_tag_t, bus_space_handle_t); /* Interrupt handler for atppc device */ -int atppcintr __P((void *)); +int atppcintr(void *); #endif /* _KERNEL */ diff --git a/sys/dev/ic/bt463.c b/sys/dev/ic/bt463.c index 2fd25a29d34..1e280852c02 100644 --- a/sys/dev/ic/bt463.c +++ b/sys/dev/ic/bt463.c @@ -1,4 +1,4 @@ -/* $NetBSD: bt463.c,v 1.9 2003/11/13 03:09:29 chs Exp $ */ +/* $NetBSD: bt463.c,v 1.10 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -69,7 +69,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bt463.c,v 1.9 2003/11/13 03:09:29 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bt463.c,v 1.10 2005/02/04 02:10:36 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -91,33 +91,26 @@ __KERNEL_RCSID(0, "$NetBSD: bt463.c,v 1.9 2003/11/13 03:09:29 chs Exp $"); /* * Functions exported via the RAMDAC configuration table. */ -void bt463_init __P((struct ramdac_cookie *)); -int bt463_set_cmap __P((struct ramdac_cookie *, - struct wsdisplay_cmap *)); -int bt463_get_cmap __P((struct ramdac_cookie *, - struct wsdisplay_cmap *)); -int bt463_set_cursor __P((struct ramdac_cookie *, - struct wsdisplay_cursor *)); -int bt463_get_cursor __P((struct ramdac_cookie *, - struct wsdisplay_cursor *)); -int bt463_set_curpos __P((struct ramdac_cookie *, - struct wsdisplay_curpos *)); -int bt463_get_curpos __P((struct ramdac_cookie *, - struct wsdisplay_curpos *)); -int bt463_get_curmax __P((struct ramdac_cookie *, - struct wsdisplay_curpos *)); -int bt463_check_curcmap __P((struct ramdac_cookie *, - struct wsdisplay_cursor *cursorp)); -void bt463_set_curcmap __P((struct ramdac_cookie *, - struct wsdisplay_cursor *cursorp)); -int bt463_get_curcmap __P((struct ramdac_cookie *, - struct wsdisplay_cursor *cursorp)); +void bt463_init(struct ramdac_cookie *); +int bt463_set_cmap(struct ramdac_cookie *, struct wsdisplay_cmap *); +int bt463_get_cmap(struct ramdac_cookie *, struct wsdisplay_cmap *); +int bt463_set_cursor(struct ramdac_cookie *, struct wsdisplay_cursor *); +int bt463_get_cursor(struct ramdac_cookie *, struct wsdisplay_cursor *); +int bt463_set_curpos(struct ramdac_cookie *, struct wsdisplay_curpos *); +int bt463_get_curpos(struct ramdac_cookie *, struct wsdisplay_curpos *); +int bt463_get_curmax(struct ramdac_cookie *, struct wsdisplay_curpos *); +int bt463_check_curcmap(struct ramdac_cookie *, + struct wsdisplay_cursor *cursorp); +void bt463_set_curcmap(struct ramdac_cookie *, + struct wsdisplay_cursor *cursorp); +int bt463_get_curcmap(struct ramdac_cookie *, + struct wsdisplay_cursor *cursorp); #ifdef BT463_DEBUG -int bt463_store __P((void *)); -int bt463_debug __P((void *)); -int bt463_readback __P((void *)); -void bt463_copyback __P((void *)); +int bt463_store(void *); +int bt463_debug(void *); +int bt463_readback(void *); +void bt463_copyback(void *); #endif struct ramdac_funcs bt463_funcsstruct = { @@ -146,9 +139,9 @@ struct bt463data { * struct tga_devconfig * */ - int (*ramdac_sched_update) __P((void *, void (*)(void *))); - void (*ramdac_wr) __P((void *, u_int, u_int8_t)); - u_int8_t (*ramdac_rd) __P((void *, u_int)); + int (*ramdac_sched_update)(void *, void (*)(void *)); + void (*ramdac_wr)(void *, u_int, u_int8_t); + u_int8_t (*ramdac_rd)(void *, u_int); int changed; /* what changed; see below */ char curcmap_r[2]; /* cursor colormap */ @@ -187,9 +180,9 @@ static struct bt463data *console_data; /* * Internal functions. */ -inline void bt463_wraddr __P((struct bt463data *, u_int16_t)); +inline void bt463_wraddr(struct bt463data *, u_int16_t); -void bt463_update __P((void *)); +void bt463_update(void *); /*****************************************************************************/ diff --git a/sys/dev/ic/bt463var.h b/sys/dev/ic/bt463var.h index 028005a7aae..3356fdac711 100644 --- a/sys/dev/ic/bt463var.h +++ b/sys/dev/ic/bt463var.h @@ -1,4 +1,4 @@ -/* $NetBSD: bt463var.h,v 1.1 2000/04/02 18:57:36 nathanw Exp $ */ +/* $NetBSD: bt463var.h,v 1.2 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -38,11 +38,11 @@ struct ramdac_funcs *bt463_funcs(void); -struct ramdac_cookie *bt463_register __P((void *, +struct ramdac_cookie *bt463_register(void *, int (*)(void *, void (*)(void *)), void (*)(void *, u_int, u_int8_t), - u_int8_t (*)(void *, u_int))); -void bt463_cninit __P((void *, + u_int8_t (*)(void *, u_int)); +void bt463_cninit(void *, int (*)(void *, void (*)(void *)), void (*)(void *, u_int, u_int8_t), - u_int8_t (*)(void *, u_int))); + u_int8_t (*)(void *, u_int)); diff --git a/sys/dev/ic/bt485.c b/sys/dev/ic/bt485.c index 3b08d47d036..c749723290b 100644 --- a/sys/dev/ic/bt485.c +++ b/sys/dev/ic/bt485.c @@ -1,4 +1,4 @@ -/* $NetBSD: bt485.c,v 1.10 2003/11/13 03:09:29 chs Exp $ */ +/* $NetBSD: bt485.c,v 1.11 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bt485.c,v 1.10 2003/11/13 03:09:29 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bt485.c,v 1.11 2005/02/04 02:10:36 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -53,21 +53,14 @@ __KERNEL_RCSID(0, "$NetBSD: bt485.c,v 1.10 2003/11/13 03:09:29 chs Exp $"); /* * Functions exported via the RAMDAC configuration table. */ -void bt485_init __P((struct ramdac_cookie *)); -int bt485_set_cmap __P((struct ramdac_cookie *, - struct wsdisplay_cmap *)); -int bt485_get_cmap __P((struct ramdac_cookie *, - struct wsdisplay_cmap *)); -int bt485_set_cursor __P((struct ramdac_cookie *, - struct wsdisplay_cursor *)); -int bt485_get_cursor __P((struct ramdac_cookie *, - struct wsdisplay_cursor *)); -int bt485_set_curpos __P((struct ramdac_cookie *, - struct wsdisplay_curpos *)); -int bt485_get_curpos __P((struct ramdac_cookie *, - struct wsdisplay_curpos *)); -int bt485_get_curmax __P((struct ramdac_cookie *, - struct wsdisplay_curpos *)); +void bt485_init(struct ramdac_cookie *); +int bt485_set_cmap(struct ramdac_cookie *, struct wsdisplay_cmap *); +int bt485_get_cmap(struct ramdac_cookie *, struct wsdisplay_cmap *); +int bt485_set_cursor(struct ramdac_cookie *, struct wsdisplay_cursor *); +int bt485_get_cursor(struct ramdac_cookie *, struct wsdisplay_cursor *); +int bt485_set_curpos(struct ramdac_cookie *, struct wsdisplay_curpos *); +int bt485_get_curpos(struct ramdac_cookie *, struct wsdisplay_curpos *); +int bt485_get_curmax(struct ramdac_cookie *, struct wsdisplay_curpos *); /* XXX const */ struct ramdac_funcs bt485_funcsstruct = { @@ -96,9 +89,9 @@ struct bt485data { * struct tga_devconfig * */ - int (*ramdac_sched_update) __P((void *, void (*)(void *))); - void (*ramdac_wr) __P((void *, u_int, u_int8_t)); - u_int8_t (*ramdac_rd) __P((void *, u_int)); + int (*ramdac_sched_update)(void *, void (*)(void *)); + void (*ramdac_wr)(void *, u_int, u_int8_t); + u_int8_t (*ramdac_rd)(void *, u_int); int changed; /* what changed; see below */ int curenb; /* cursor enabled */ @@ -126,10 +119,10 @@ struct bt485data { /* * Internal functions. */ -inline void bt485_wr_i __P((struct bt485data *, u_int8_t, u_int8_t)); -inline u_int8_t bt485_rd_i __P((struct bt485data *, u_int8_t)); -void bt485_update __P((void *)); -void bt485_update_curpos __P((struct bt485data *)); +inline void bt485_wr_i (struct bt485data *, u_int8_t, u_int8_t); +inline u_int8_t bt485_rd_i(struct bt485data *, u_int8_t); +void bt485_update(void *); +void bt485_update_curpos(struct bt485data *); /*****************************************************************************/ diff --git a/sys/dev/ic/bt485var.h b/sys/dev/ic/bt485var.h index 2f25d03e43b..308bd401269 100644 --- a/sys/dev/ic/bt485var.h +++ b/sys/dev/ic/bt485var.h @@ -1,4 +1,4 @@ -/* $NetBSD: bt485var.h,v 1.1 2000/03/04 10:25:57 elric Exp $ */ +/* $NetBSD: bt485var.h,v 1.2 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -38,11 +38,11 @@ struct ramdac_funcs *bt485_funcs(void); -struct ramdac_cookie *bt485_register __P((void *, +struct ramdac_cookie *bt485_register(void *, int (*)(void *, void (*)(void *)), void (*)(void *, u_int, u_int8_t), - u_int8_t (*)(void *, u_int))); -void bt485_cninit __P((void *, + u_int8_t (*)(void *, u_int)); +void bt485_cninit(void *, int (*)(void *, void (*)(void *)), void (*)(void *, u_int, u_int8_t), - u_int8_t (*)(void *, u_int))); + u_int8_t (*)(void *, u_int)); diff --git a/sys/dev/ic/clmpcc.c b/sys/dev/ic/clmpcc.c index 07619751499..a298f30a2fd 100644 --- a/sys/dev/ic/clmpcc.c +++ b/sys/dev/ic/clmpcc.c @@ -1,4 +1,4 @@ -/* $NetBSD: clmpcc.c,v 1.22 2002/10/23 09:13:14 jdolecek Exp $ */ +/* $NetBSD: clmpcc.c,v 1.23 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clmpcc.c,v 1.22 2002/10/23 09:13:14 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clmpcc.c,v 1.23 2005/02/04 02:10:36 perry Exp $"); #include "opt_ddb.h" @@ -74,14 +74,13 @@ __KERNEL_RCSID(0, "$NetBSD: clmpcc.c,v 1.22 2002/10/23 09:13:14 jdolecek Exp $") #endif -static int clmpcc_init __P((struct clmpcc_softc *sc)); -static void clmpcc_shutdown __P((struct clmpcc_chan *)); -static int clmpcc_speed __P((struct clmpcc_softc *, speed_t, - int *, int *)); -static int clmpcc_param __P((struct tty *, struct termios *)); -static void clmpcc_set_params __P((struct clmpcc_chan *)); -static void clmpcc_start __P((struct tty *)); -static int clmpcc_modem_control __P((struct clmpcc_chan *, int, int)); +static int clmpcc_init(struct clmpcc_softc *sc); +static void clmpcc_shutdown(struct clmpcc_chan *); +static int clmpcc_speed(struct clmpcc_softc *, speed_t, int *, int *); +static int clmpcc_param(struct tty *, struct termios *); +static void clmpcc_set_params(struct clmpcc_chan *); +static void clmpcc_start(struct tty *); +static int clmpcc_modem_control(struct clmpcc_chan *, int, int); #define CLMPCCUNIT(x) (minor(x) & 0x7fffc) #define CLMPCCCHAN(x) (minor(x) & 0x00003) @@ -125,25 +124,25 @@ static struct clmpcc_softc *cons_sc = NULL; static int cons_chan; static int cons_rate; -static int clmpcc_common_getc __P((struct clmpcc_softc *, int)); -static void clmpcc_common_putc __P((struct clmpcc_softc *, int, int)); -int clmpcccngetc __P((dev_t)); -void clmpcccnputc __P((dev_t, int)); +static int clmpcc_common_getc(struct clmpcc_softc *, int); +static void clmpcc_common_putc(struct clmpcc_softc *, int, int); +int clmpcccngetc(dev_t); +void clmpcccnputc(dev_t, int); /* * Convenience functions, inlined for speed */ #define integrate static inline -integrate u_int8_t clmpcc_rdreg __P((struct clmpcc_softc *, u_int)); -integrate void clmpcc_wrreg __P((struct clmpcc_softc *, u_int, u_int)); -integrate u_int8_t clmpcc_rdreg_odd __P((struct clmpcc_softc *, u_int)); -integrate void clmpcc_wrreg_odd __P((struct clmpcc_softc *, u_int, u_int)); -integrate void clmpcc_wrtx_multi __P((struct clmpcc_softc *, u_int8_t *, - u_int)); -integrate u_int8_t clmpcc_select_channel __P((struct clmpcc_softc *, u_int)); -integrate void clmpcc_channel_cmd __P((struct clmpcc_softc *,int,int)); -integrate void clmpcc_enable_transmitter __P((struct clmpcc_chan *)); +integrate u_int8_t clmpcc_rdreg(struct clmpcc_softc *, u_int); +integrate void clmpcc_wrreg(struct clmpcc_softc *, u_int, u_int); +integrate u_int8_t clmpcc_rdreg_odd(struct clmpcc_softc *, u_int); +integrate void clmpcc_wrreg_odd(struct clmpcc_softc *, u_int, u_int); +integrate void clmpcc_wrtx_multi(struct clmpcc_softc *, u_int8_t *, + u_int); +integrate u_int8_t clmpcc_select_channel(struct clmpcc_softc *, u_int); +integrate void clmpcc_channel_cmd(struct clmpcc_softc *,int,int); +integrate void clmpcc_enable_transmitter(struct clmpcc_chan *); #define clmpcc_rd_msvr(s) clmpcc_rdreg_odd(s,CLMPCC_REG_MSVR) #define clmpcc_wr_msvr(s,r,v) clmpcc_wrreg_odd(s,r,v) @@ -1443,7 +1442,7 @@ clmpcc_softintr(arg) struct clmpcc_softc *sc = (struct clmpcc_softc *)arg; struct clmpcc_chan *ch; struct tty *tp; - int (*rint) __P((int, struct tty *)); + int (*rint)(int, struct tty *); u_char *get; u_char reg; u_int c; diff --git a/sys/dev/ic/clmpccvar.h b/sys/dev/ic/clmpccvar.h index 78079a7c03e..d24bca63bba 100644 --- a/sys/dev/ic/clmpccvar.h +++ b/sys/dev/ic/clmpccvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: clmpccvar.h,v 1.8 2003/11/02 11:07:45 wiz Exp $ */ +/* $NetBSD: clmpccvar.h,v 1.9 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -118,14 +118,14 @@ struct clmpcc_softc { #ifndef __HAVE_GENERIC_SOFT_INTERRUPTS /* Called to request a soft interrupt callback to clmpcc_softintr */ - void (*sc_softhook) __P((struct clmpcc_softc *)); + void (*sc_softhook)(struct clmpcc_softc *); volatile int sc_soft_running; #else void *sc_softintr_cookie; #endif /* Called when an interrupt has to be acknowledged in polled mode. */ - void (*sc_iackhook) __P((struct clmpcc_softc *, int)); + void (*sc_iackhook)(struct clmpcc_softc *, int); /* * No user-serviceable parts below @@ -133,11 +133,11 @@ struct clmpcc_softc { struct clmpcc_chan sc_chans[CLMPCC_NUM_CHANS]; }; -extern void clmpcc_attach __P((struct clmpcc_softc *)); -extern int clmpcc_cnattach __P((struct clmpcc_softc *, int, int)); -extern int clmpcc_rxintr __P((void *)); -extern int clmpcc_txintr __P((void *)); -extern int clmpcc_mdintr __P((void *)); -extern void clmpcc_softintr __P((void *)); +extern void clmpcc_attach(struct clmpcc_softc *); +extern int clmpcc_cnattach(struct clmpcc_softc *, int, int); +extern int clmpcc_rxintr(void *); +extern int clmpcc_txintr(void *); +extern int clmpcc_mdintr(void *); +extern void clmpcc_softintr(void *); #endif /* __clmpccvar_h */ diff --git a/sys/dev/ic/comvar.h b/sys/dev/ic/comvar.h index 808f1d757dd..146b74fade5 100644 --- a/sys/dev/ic/comvar.h +++ b/sys/dev/ic/comvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: comvar.h,v 1.47 2003/11/08 01:59:38 simonb Exp $ */ +/* $NetBSD: comvar.h,v 1.48 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -46,13 +46,13 @@ #include <sys/lock.h> #endif -int comcnattach __P((bus_space_tag_t, bus_addr_t, int, int, int, tcflag_t)); +int comcnattach(bus_space_tag_t, bus_addr_t, int, int, int, tcflag_t); #ifdef KGDB -int com_kgdb_attach __P((bus_space_tag_t, bus_addr_t, int, int, int, tcflag_t)); +int com_kgdb_attach(bus_space_tag_t, bus_addr_t, int, int, int, tcflag_t); #endif -int com_is_console __P((bus_space_tag_t, bus_addr_t, bus_space_handle_t *)); +int com_is_console(bus_space_tag_t, bus_addr_t, bus_space_handle_t *); /* Hardware flag masks */ #define COM_HW_NOIEN 0x01 @@ -135,8 +135,8 @@ struct com_softc { #define COM_TYPE_AU1x00 3 /* AMD/Alchemy Au1x000 proc. built-in */ /* power management hooks */ - int (*enable) __P((struct com_softc *)); - void (*disable) __P((struct com_softc *)); + int (*enable)(struct com_softc *); + void (*disable)(struct com_softc *); int enabled; /* PPS signal on DCD, with or without inkernel clock disciplining */ @@ -159,11 +159,11 @@ struct com_softc { #define CLR(t, f) (t) &= ~(f) #define ISSET(t, f) ((t) & (f)) -int comprobe1 __P((bus_space_tag_t, bus_space_handle_t)); -int comintr __P((void *)); -void com_attach_subr __P((struct com_softc *)); -int com_detach __P((struct device *, int)); -int com_activate __P((struct device *, enum devact)); +int comprobe1(bus_space_tag_t, bus_space_handle_t); +int comintr(void *); +void com_attach_subr(struct com_softc *); +int com_detach(struct device *, int); +int com_activate(struct device *, enum devact); #ifndef __HAVE_GENERIC_SOFT_INTERRUPTS #ifdef __NO_SOFT_SERIAL_INTERRUPT diff --git a/sys/dev/ic/daic.c b/sys/dev/ic/daic.c index a07f41373f5..823a63ada85 100644 --- a/sys/dev/ic/daic.c +++ b/sys/dev/ic/daic.c @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: daic.c,v 1.20 2004/08/13 11:25:58 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: daic.c,v 1.21 2005/02/04 02:10:36 perry Exp $"); /* * daic.c: MI driver for Diehl active ISDN cards (S, SX, SXn, SCOM, QUADRO) @@ -76,14 +76,14 @@ struct cfdriver daic_cd = { #endif /* local function prototypes */ -static char * cardtypename __P((int cardtype)); -static int daic_download __P((void *, int portcount, struct isdn_dr_prot *data)); -static int daic_diagnostic __P((void *, struct isdn_diagnostic_request *req)); +static char * cardtypename(int cardtype); +static int daic_download(void *, int portcount, struct isdn_dr_prot *data); +static int daic_diagnostic(void *, struct isdn_diagnostic_request *req); static void daic_connect_request(struct call_desc *cd); static void daic_connect_response(struct call_desc *cd, int, int); static void daic_disconnect_request(struct call_desc *cd, int); -static int daic_reset __P((bus_space_tag_t bus, bus_space_handle_t io, int port, int *memsize)); -static int daic_handle_intr __P((struct daic_softc *sc, int port)); +static int daic_reset(bus_space_tag_t bus, bus_space_handle_t io, int port, int *memsize); +static int daic_handle_intr(struct daic_softc *sc, int port); static void daic_register_port(struct daic_softc *sc, int port); static void daic_request(struct daic_softc *sc, int port, u_int req, u_int id, bus_size_t parmsize, const u_int8_t *parms); static u_int daic_assign(struct daic_softc *sc, int port, u_int instance, bus_size_t parmsize, const u_int8_t *parms); diff --git a/sys/dev/ic/daicvar.h b/sys/dev/ic/daicvar.h index 7e5563990ce..96fb2204bf5 100644 --- a/sys/dev/ic/daicvar.h +++ b/sys/dev/ic/daicvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: daicvar.h,v 1.6 2003/12/04 13:57:30 keihan Exp $ */ +/* $NetBSD: daicvar.h,v 1.7 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -119,9 +119,9 @@ struct daic_softc { /* * functions exported from MI part */ -extern int daic_probe __P((bus_space_tag_t bus, bus_space_handle_t io)); -extern void daic_attach __P((struct device *self, struct daic_softc *sc)); -extern int daic_intr __P((struct daic_softc *)); +extern int daic_probe(bus_space_tag_t bus, bus_space_handle_t io); +extern void daic_attach(struct device *self, struct daic_softc *sc); +extern int daic_intr(struct daic_softc *); #endif #endif diff --git a/sys/dev/ic/dp8390.c b/sys/dev/ic/dp8390.c index dc2faee962d..c7d3c0627a6 100644 --- a/sys/dev/ic/dp8390.c +++ b/sys/dev/ic/dp8390.c @@ -1,4 +1,4 @@ -/* $NetBSD: dp8390.c,v 1.54 2004/10/30 18:08:36 thorpej Exp $ */ +/* $NetBSD: dp8390.c,v 1.55 2005/02/04 02:10:36 perry Exp $ */ /* * Device driver for National Semiconductor DS8390/WD83C690 based ethernet @@ -14,7 +14,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1.54 2004/10/30 18:08:36 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1.55 2005/02/04 02:10:36 perry Exp $"); #include "opt_ipkdb.h" #include "opt_inet.h" @@ -73,16 +73,16 @@ __KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1.54 2004/10/30 18:08:36 thorpej Exp $"); int dp8390_debug = 0; #endif -static __inline__ void dp8390_xmit __P((struct dp8390_softc *)); +static __inline__ void dp8390_xmit(struct dp8390_softc *); -static __inline__ void dp8390_read_hdr __P((struct dp8390_softc *, - int, struct dp8390_ring *)); -static __inline__ int dp8390_ring_copy __P((struct dp8390_softc *, - int, caddr_t, u_short)); -static __inline__ int dp8390_write_mbuf __P((struct dp8390_softc *, - struct mbuf *, int)); +static __inline__ void dp8390_read_hdr(struct dp8390_softc *, + int, struct dp8390_ring *); +static __inline__ int dp8390_ring_copy(struct dp8390_softc *, + int, caddr_t, u_short); +static __inline__ int dp8390_write_mbuf(struct dp8390_softc *, + struct mbuf *, int); -static int dp8390_test_mem __P((struct dp8390_softc *)); +static int dp8390_test_mem(struct dp8390_softc *); /* * Standard media init routine for the dp8390. @@ -1353,11 +1353,11 @@ dp8390_detach(sc, flags) } #ifdef IPKDB_DP8390 -static void dp8390_ipkdb_hwinit __P((struct ipkdb_if *)); -static void dp8390_ipkdb_init __P((struct ipkdb_if *)); -static void dp8390_ipkdb_leave __P((struct ipkdb_if *)); -static int dp8390_ipkdb_rcv __P((struct ipkdb_if *, u_char *, int)); -static void dp8390_ipkdb_send __P((struct ipkdb_if *, u_char *, int)); +static void dp8390_ipkdb_hwinit(struct ipkdb_if *); +static void dp8390_ipkdb_init(struct ipkdb_if *); +static void dp8390_ipkdb_leave(struct ipkdb_if *); +static int dp8390_ipkdb_rcv(struct ipkdb_if *, u_char *, int); +static void dp8390_ipkdb_send(struct ipkdb_if *, u_char *, int); /* * This is essentially similar to dp8390_config above. diff --git a/sys/dev/ic/dp8390var.h b/sys/dev/ic/dp8390var.h index 09ee65a8509..a90c1c1c2ec 100644 --- a/sys/dev/ic/dp8390var.h +++ b/sys/dev/ic/dp8390var.h @@ -1,4 +1,4 @@ -/* $NetBSD: dp8390var.h,v 1.24 2003/11/02 11:07:45 wiz Exp $ */ +/* $NetBSD: dp8390var.h,v 1.25 2005/02/04 02:10:36 perry Exp $ */ /* * Device driver for National Semiconductor DS8390/WD83C690 based ethernet @@ -75,25 +75,22 @@ struct dp8390_softc { rndsource_element_t rnd_source; /* random source */ #endif - int (*test_mem) __P((struct dp8390_softc *)); - void (*init_card) __P((struct dp8390_softc *)); - void (*stop_card) __P((struct dp8390_softc *)); - void (*read_hdr) __P((struct dp8390_softc *, - int, struct dp8390_ring *)); - void (*recv_int) __P((struct dp8390_softc *)); - int (*ring_copy) __P((struct dp8390_softc *, - int, caddr_t, u_short)); - int (*write_mbuf) __P((struct dp8390_softc *, struct mbuf *, int)); - - int (*sc_enable) __P((struct dp8390_softc *)); - void (*sc_disable) __P((struct dp8390_softc *)); - - void (*sc_media_init) __P((struct dp8390_softc *)); - void (*sc_media_fini) __P((struct dp8390_softc *)); - - int (*sc_mediachange) __P((struct dp8390_softc *)); - void (*sc_mediastatus) __P((struct dp8390_softc *, - struct ifmediareq *)); + int (*test_mem)(struct dp8390_softc *); + void (*init_card)(struct dp8390_softc *); + void (*stop_card)(struct dp8390_softc *); + void (*read_hdr)(struct dp8390_softc *, int, struct dp8390_ring *); + void (*recv_int)(struct dp8390_softc *); + int (*ring_copy)(struct dp8390_softc *, int, caddr_t, u_short); + int (*write_mbuf)(struct dp8390_softc *, struct mbuf *, int); + + int (*sc_enable)(struct dp8390_softc *); + void (*sc_disable)(struct dp8390_softc *); + + void (*sc_media_init)(struct dp8390_softc *); + void (*sc_media_fini)(struct dp8390_softc *); + + int (*sc_mediachange)(struct dp8390_softc *); + void (*sc_mediastatus)(struct dp8390_softc *, struct ifmediareq *); }; /* @@ -155,33 +152,33 @@ struct dp8390_softc { #define NIC_BARRIER(t, h) bus_space_barrier(t, h, 0, 0x10, \ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE) -int dp8390_config __P((struct dp8390_softc *)); -int dp8390_intr __P((void *)); -int dp8390_ioctl __P((struct ifnet *, u_long, caddr_t)); -void dp8390_start __P((struct ifnet *)); -void dp8390_watchdog __P((struct ifnet *)); -void dp8390_reset __P((struct dp8390_softc *)); -void dp8390_init __P((struct dp8390_softc *)); -void dp8390_stop __P((struct dp8390_softc *)); +int dp8390_config(struct dp8390_softc *); +int dp8390_intr(void *); +int dp8390_ioctl(struct ifnet *, u_long, caddr_t); +void dp8390_start(struct ifnet *); +void dp8390_watchdog(struct ifnet *); +void dp8390_reset(struct dp8390_softc *); +void dp8390_init(struct dp8390_softc *); +void dp8390_stop(struct dp8390_softc *); -void dp8390_rint __P((struct dp8390_softc *)); +void dp8390_rint(struct dp8390_softc *); -void dp8390_getmcaf __P((struct ethercom *, u_int8_t *)); -struct mbuf *dp8390_get __P((struct dp8390_softc *, int, u_short)); -void dp8390_read __P((struct dp8390_softc *, int, u_short)); +void dp8390_getmcaf(struct ethercom *, u_int8_t *); +struct mbuf *dp8390_get(struct dp8390_softc *, int, u_short); +void dp8390_read(struct dp8390_softc *, int, u_short); -int dp8390_enable __P((struct dp8390_softc *)); -void dp8390_disable __P((struct dp8390_softc *)); +int dp8390_enable(struct dp8390_softc *); +void dp8390_disable(struct dp8390_softc *); -int dp8390_activate __P((struct device *, enum devact)); +int dp8390_activate(struct device *, enum devact); -int dp8390_detach __P((struct dp8390_softc *, int)); +int dp8390_detach(struct dp8390_softc *, int); -int dp8390_mediachange __P((struct ifnet *)); -void dp8390_mediastatus __P((struct ifnet *, struct ifmediareq *)); +int dp8390_mediachange(struct ifnet *); +void dp8390_mediastatus(struct ifnet *, struct ifmediareq *); -void dp8390_media_init __P((struct dp8390_softc *)); +void dp8390_media_init(struct dp8390_softc *); #ifdef IPKDB_DP8390 -int dp8390_ipkdb_attach __P((struct ipkdb_if *)); +int dp8390_ipkdb_attach(struct ipkdb_if *); #endif diff --git a/sys/dev/ic/ds.h b/sys/dev/ic/ds.h index f5529aab5e9..ddcf6d929aa 100644 --- a/sys/dev/ic/ds.h +++ b/sys/dev/ic/ds.h @@ -1,4 +1,4 @@ -/* $NetBSD: ds.h,v 1.4 2002/03/24 15:51:45 bjh21 Exp $ */ +/* $NetBSD: ds.h,v 1.5 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -90,9 +90,9 @@ */ struct ds_handle { - int (*ds_read_bit) __P((void *)); - void (*ds_write_bit) __P((void *, int)); - void (*ds_reset) __P((void *)); + int (*ds_read_bit)(void *); + void (*ds_write_bit)(void *, int); + void (*ds_reset)(void *); void *ds_hw_handle; }; @@ -101,8 +101,8 @@ struct ds_handle { * the same 1-wire bus as the DS2404 RTC. */ -static u_int8_t ds_read_byte __P((struct ds_handle *)); -static void ds_write_byte __P((struct ds_handle *, unsigned int)); +static u_int8_t ds_read_byte(struct ds_handle *); +static void ds_write_byte(struct ds_handle *, unsigned int); static inline u_int8_t ds_read_byte(dsh) diff --git a/sys/dev/ic/ds1286reg.h b/sys/dev/ic/ds1286reg.h index 9ec7b8d7594..27e509fe741 100644 --- a/sys/dev/ic/ds1286reg.h +++ b/sys/dev/ic/ds1286reg.h @@ -1,4 +1,4 @@ -/* $NetBSD: ds1286reg.h,v 1.5 2003/07/08 10:06:30 itojun Exp $ */ +/* $NetBSD: ds1286reg.h,v 1.6 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 2001 Rafal K. Boni @@ -130,8 +130,8 @@ * RTC register/NVRAM read and write functions -- machine-dependent. * Appropriately manipulate RTC registers to get/put data values. */ -u_int ds1286_read __P((void *, u_int)); -void ds1286_write __P((void *, u_int, u_int)); +u_int ds1286_read(void *, u_int); +void ds1286_write(void *, u_int, u_int); /* * A collection of TOD/Alarm registers. diff --git a/sys/dev/ic/ds1687reg.h b/sys/dev/ic/ds1687reg.h index 07e99fc2e18..1aafe48410a 100644 --- a/sys/dev/ic/ds1687reg.h +++ b/sys/dev/ic/ds1687reg.h @@ -1,4 +1,4 @@ -/* $NetBSD: ds1687reg.h,v 1.5 2005/02/01 16:16:22 he Exp $ */ +/* $NetBSD: ds1687reg.h,v 1.6 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -188,8 +188,8 @@ * RTC register/NVRAM read and write functions -- machine-dependent. * Appropriately manipulate RTC registers to get/put data values. */ -u_int ds1687_read __P((void *, u_int)); -void ds1687_write __P((void *, u_int, u_int)); +u_int ds1687_read(void *, u_int); +void ds1687_write(void *, u_int, u_int); /* * A collection of TOD/Alarm registers. diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c index 9d32b8a30ca..2b8410061d8 100644 --- a/sys/dev/ic/elink3.c +++ b/sys/dev/ic/elink3.c @@ -1,4 +1,4 @@ -/* $NetBSD: elink3.c,v 1.109 2005/01/11 04:16:27 briggs Exp $ */ +/* $NetBSD: elink3.c,v 1.110 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc. @@ -69,7 +69,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.109 2005/01/11 04:16:27 briggs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.110 2005/02/04 02:10:36 perry Exp $"); #include "opt_inet.h" #include "opt_ns.h" @@ -188,51 +188,50 @@ const struct ep_media ep_509_media[] = { 0 }, }; -void ep_internalconfig __P((struct ep_softc *sc)); -void ep_vortex_probemedia __P((struct ep_softc *sc)); -void ep_509_probemedia __P((struct ep_softc *sc)); - -static void eptxstat __P((struct ep_softc *)); -static int epstatus __P((struct ep_softc *)); -int epinit __P((struct ifnet *)); -void epstop __P((struct ifnet *, int)); -int epioctl __P((struct ifnet *, u_long, caddr_t)); -void epstart __P((struct ifnet *)); -void epwatchdog __P((struct ifnet *)); -void epreset __P((struct ep_softc *)); -static void epshutdown __P((void *)); -void epread __P((struct ep_softc *)); -struct mbuf *epget __P((struct ep_softc *, int)); -void epmbuffill __P((void *)); -void epmbufempty __P((struct ep_softc *)); -void epsetfilter __P((struct ep_softc *)); -void ep_roadrunner_mii_enable __P((struct ep_softc *)); -void epsetmedia __P((struct ep_softc *)); +void ep_internalconfig(struct ep_softc *sc); +void ep_vortex_probemedia(struct ep_softc *sc); +void ep_509_probemedia(struct ep_softc *sc); + +static void eptxstat(struct ep_softc *); +static int epstatus(struct ep_softc *); +int epinit(struct ifnet *); +void epstop(struct ifnet *, int); +int epioctl(struct ifnet *, u_long, caddr_t); +void epstart(struct ifnet *); +void epwatchdog(struct ifnet *); +void epreset(struct ep_softc *); +static void epshutdown(void *); +void epread(struct ep_softc *); +struct mbuf *epget(struct ep_softc *, int); +void epmbuffill(void *); +void epmbufempty(struct ep_softc *); +void epsetfilter(struct ep_softc *); +void ep_roadrunner_mii_enable(struct ep_softc *); +void epsetmedia(struct ep_softc *); /* ifmedia callbacks */ -int ep_media_change __P((struct ifnet *ifp)); -void ep_media_status __P((struct ifnet *ifp, struct ifmediareq *req)); +int ep_media_change(struct ifnet *ifp); +void ep_media_status(struct ifnet *ifp, struct ifmediareq *req); /* MII callbacks */ -int ep_mii_readreg __P((struct device *, int, int)); -void ep_mii_writereg __P((struct device *, int, int, int)); -void ep_statchg __P((struct device *)); +int ep_mii_readreg(struct device *, int, int); +void ep_mii_writereg(struct device *, int, int, int); +void ep_statchg(struct device *); -void ep_tick __P((void *)); +void ep_tick(void *); -static int epbusyeeprom __P((struct ep_softc *)); -u_int16_t ep_read_eeprom __P((struct ep_softc *, u_int16_t)); -static inline void ep_reset_cmd __P((struct ep_softc *sc, - u_int cmd, u_int arg)); -static inline void ep_finish_reset __P((bus_space_tag_t, bus_space_handle_t)); -static inline void ep_discard_rxtop __P((bus_space_tag_t, bus_space_handle_t)); -static __inline int ep_w1_reg __P((struct ep_softc *, int)); +static int epbusyeeprom(struct ep_softc *); +u_int16_t ep_read_eeprom(struct ep_softc *, u_int16_t); +static inline void ep_reset_cmd(struct ep_softc *sc, u_int cmd, u_int arg); +static inline void ep_finish_reset(bus_space_tag_t, bus_space_handle_t); +static inline void ep_discard_rxtop(bus_space_tag_t, bus_space_handle_t); +static __inline int ep_w1_reg(struct ep_softc *, int); /* * MII bit-bang glue. */ -u_int32_t ep_mii_bitbang_read __P((struct device *)); -void ep_mii_bitbang_write __P((struct device *, u_int32_t)); +u_int32_t ep_mii_bitbang_read(struct device *); +void ep_mii_bitbang_write(struct device *, u_int32_t); const struct mii_bitbang_ops ep_mii_bitbang_ops = { ep_mii_bitbang_read, diff --git a/sys/dev/ic/elink3var.h b/sys/dev/ic/elink3var.h index 1a7a317e4f7..9974b2d0aaf 100644 --- a/sys/dev/ic/elink3var.h +++ b/sys/dev/ic/elink3var.h @@ -1,4 +1,4 @@ -/* $NetBSD: elink3var.h,v 1.31 2003/07/08 10:06:31 itojun Exp $ */ +/* $NetBSD: elink3var.h,v 1.32 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1994 Herb Peyerl <hpeyerl@beer.org> @@ -108,19 +108,19 @@ struct ep_softc { void *sd_hook; /* power management hooks */ - int (*enable) __P((struct ep_softc *)); - void (*disable) __P((struct ep_softc *)); + int (*enable)(struct ep_softc *); + void (*disable)(struct ep_softc *); int enabled; }; -u_int16_t epreadeeprom __P((bus_space_tag_t, bus_space_handle_t, int)); -int epconfig __P((struct ep_softc *, u_short, u_int8_t *)); +u_int16_t epreadeeprom(bus_space_tag_t, bus_space_handle_t, int); +int epconfig(struct ep_softc *, u_short, u_int8_t *); -int epintr __P((void *)); +int epintr(void *); -int epenable __P((struct ep_softc *)); -void epdisable __P((struct ep_softc *)); +int epenable(struct ep_softc *); +void epdisable(struct ep_softc *); -int ep_activate __P((struct device *, enum devact)); -int ep_detach __P((struct device *, int)); +int ep_activate(struct device *, enum devact); +int ep_detach(struct device *, int); diff --git a/sys/dev/ic/elinkxl.c b/sys/dev/ic/elinkxl.c index 359f45125c8..d686ed57448 100644 --- a/sys/dev/ic/elinkxl.c +++ b/sys/dev/ic/elinkxl.c @@ -1,4 +1,4 @@ -/* $NetBSD: elinkxl.c,v 1.75 2004/10/30 18:08:36 thorpej Exp $ */ +/* $NetBSD: elinkxl.c,v 1.76 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.75 2004/10/30 18:08:36 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.76 2005/02/04 02:10:36 perry Exp $"); #include "bpfilter.h" #include "rnd.h" @@ -88,38 +88,38 @@ int exdebug = 0; #endif /* ifmedia callbacks */ -int ex_media_chg __P((struct ifnet *ifp)); -void ex_media_stat __P((struct ifnet *ifp, struct ifmediareq *req)); - -void ex_probe_media __P((struct ex_softc *)); -void ex_set_filter __P((struct ex_softc *)); -void ex_set_media __P((struct ex_softc *)); -void ex_set_xcvr __P((struct ex_softc *, u_int16_t)); -struct mbuf *ex_get __P((struct ex_softc *, int)); -u_int16_t ex_read_eeprom __P((struct ex_softc *, int)); -int ex_init __P((struct ifnet *)); -void ex_read __P((struct ex_softc *)); -void ex_reset __P((struct ex_softc *)); -void ex_set_mc __P((struct ex_softc *)); -void ex_getstats __P((struct ex_softc *)); -void ex_printstats __P((struct ex_softc *)); -void ex_tick __P((void *)); - -void ex_power __P((int, void *)); - -static int ex_eeprom_busy __P((struct ex_softc *)); -static int ex_add_rxbuf __P((struct ex_softc *, struct ex_rxdesc *)); -static void ex_init_txdescs __P((struct ex_softc *)); - -static void ex_shutdown __P((void *)); -static void ex_start __P((struct ifnet *)); -static void ex_txstat __P((struct ex_softc *)); - -int ex_mii_readreg __P((struct device *, int, int)); -void ex_mii_writereg __P((struct device *, int, int, int)); -void ex_mii_statchg __P((struct device *)); - -void ex_probemedia __P((struct ex_softc *)); +int ex_media_chg(struct ifnet *ifp); +void ex_media_stat(struct ifnet *ifp, struct ifmediareq *req); + +void ex_probe_media(struct ex_softc *); +void ex_set_filter(struct ex_softc *); +void ex_set_media(struct ex_softc *); +void ex_set_xcvr(struct ex_softc *, u_int16_t); +struct mbuf *ex_get(struct ex_softc *, int); +u_int16_t ex_read_eeprom(struct ex_softc *, int); +int ex_init(struct ifnet *); +void ex_read(struct ex_softc *); +void ex_reset(struct ex_softc *); +void ex_set_mc(struct ex_softc *); +void ex_getstats(struct ex_softc *); +void ex_printstats(struct ex_softc *); +void ex_tick(void *); + +void ex_power(int, void *); + +static int ex_eeprom_busy(struct ex_softc *); +static int ex_add_rxbuf(struct ex_softc *, struct ex_rxdesc *); +static void ex_init_txdescs(struct ex_softc *); + +static void ex_shutdown(void *); +static void ex_start(struct ifnet *); +static void ex_txstat(struct ex_softc *); + +int ex_mii_readreg(struct device *, int, int); +void ex_mii_writereg(struct device *, int, int, int); +void ex_mii_statchg(struct device *); + +void ex_probemedia(struct ex_softc *); /* * Structure to map media-present bits in boards to ifmedia codes and @@ -162,8 +162,8 @@ struct ex_media ex_native_media[] = { /* * MII bit-bang glue. */ -u_int32_t ex_mii_bitbang_read __P((struct device *)); -void ex_mii_bitbang_write __P((struct device *, u_int32_t)); +u_int32_t ex_mii_bitbang_read(struct device *); +void ex_mii_bitbang_write(struct device *, u_int32_t); const struct mii_bitbang_ops ex_mii_bitbang_ops = { ex_mii_bitbang_read, diff --git a/sys/dev/ic/elinkxlvar.h b/sys/dev/ic/elinkxlvar.h index 9901e2b52b4..0ca1ae21832 100644 --- a/sys/dev/ic/elinkxlvar.h +++ b/sys/dev/ic/elinkxlvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: elinkxlvar.h,v 1.14 2003/06/05 22:11:22 dogcow Exp $ */ +/* $NetBSD: elinkxlvar.h,v 1.15 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -124,13 +124,13 @@ struct ex_softc { #endif /* power management hooks */ - int (*enable) __P((struct ex_softc *)); - void (*disable) __P((struct ex_softc *)); - void (*power) __P((struct ex_softc *, int)); + int (*enable)(struct ex_softc *); + void (*disable)(struct ex_softc *); + void (*power)(struct ex_softc *, int); int enabled; /* interrupt acknowledge hook */ - void (*intr_ack) __P((struct ex_softc *)); + void (*intr_ack)(struct ex_softc *); void *sc_sdhook; void *sc_powerhook; @@ -148,15 +148,15 @@ struct ex_softc { } while ((stat & COMMAND_IN_PROGRESS) && (stat != 0xffff)); \ } while (0)\ -u_int16_t exreadeeprom __P((bus_space_tag_t, bus_space_handle_t, int)); -void ex_config __P((struct ex_softc *)); +u_int16_t exreadeeprom(bus_space_tag_t, bus_space_handle_t, int); +void ex_config(struct ex_softc *); -int ex_intr __P((void *)); -void ex_stop __P((struct ifnet *, int)); -void ex_watchdog __P((struct ifnet *)); -int ex_ioctl __P((struct ifnet *ifp, u_long, caddr_t)); -int ex_activate __P((struct device *, enum devact)); -int ex_detach __P((struct ex_softc *)); +int ex_intr(void *); +void ex_stop(struct ifnet *, int); +void ex_watchdog(struct ifnet *); +int ex_ioctl(struct ifnet *ifp, u_long, caddr_t); +int ex_activate(struct device *, enum devact); +int ex_detach(struct ex_softc *); -int ex_enable __P((struct ex_softc *)); -void ex_disable __P((struct ex_softc *)); +int ex_enable(struct ex_softc *); +void ex_disable(struct ex_softc *); diff --git a/sys/dev/ic/esiop.c b/sys/dev/ic/esiop.c index 67c053177aa..c21d6b850de 100644 --- a/sys/dev/ic/esiop.c +++ b/sys/dev/ic/esiop.c @@ -1,4 +1,4 @@ -/* $NetBSD: esiop.c,v 1.31 2004/05/20 20:57:50 bouyer Exp $ */ +/* $NetBSD: esiop.c,v 1.32 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 2002 Manuel Bouyer. @@ -33,7 +33,7 @@ /* SYM53c7/8xx PCI-SCSI I/O Processors driver */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: esiop.c,v 1.31 2004/05/20 20:57:50 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: esiop.c,v 1.32 2005/02/04 02:10:36 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -79,24 +79,23 @@ __KERNEL_RCSID(0, "$NetBSD: esiop.c,v 1.31 2004/05/20 20:57:50 bouyer Exp $"); /* number of cmd descriptors per block */ #define SIOP_NCMDPB (PAGE_SIZE / sizeof(struct esiop_xfer)) -void esiop_reset __P((struct esiop_softc *)); -void esiop_checkdone __P((struct esiop_softc *)); -void esiop_handle_reset __P((struct esiop_softc *)); -void esiop_scsicmd_end __P((struct esiop_cmd *, int)); -void esiop_unqueue __P((struct esiop_softc *, int, int)); -int esiop_handle_qtag_reject __P((struct esiop_cmd *)); -static void esiop_start __P((struct esiop_softc *, struct esiop_cmd *)); -void esiop_timeout __P((void *)); -void esiop_scsipi_request __P((struct scsipi_channel *, - scsipi_adapter_req_t, void *)); -void esiop_dump_script __P((struct esiop_softc *)); -void esiop_morecbd __P((struct esiop_softc *)); -void esiop_moretagtbl __P((struct esiop_softc *)); -void siop_add_reselsw __P((struct esiop_softc *, int)); -void esiop_target_register __P((struct esiop_softc *, u_int32_t)); - -void esiop_update_scntl3 __P((struct esiop_softc *, - struct siop_common_target *)); +void esiop_reset(struct esiop_softc *); +void esiop_checkdone(struct esiop_softc *); +void esiop_handle_reset(struct esiop_softc *); +void esiop_scsicmd_end(struct esiop_cmd *, int); +void esiop_unqueue(struct esiop_softc *, int, int); +int esiop_handle_qtag_reject(struct esiop_cmd *); +static void esiop_start(struct esiop_softc *, struct esiop_cmd *); +void esiop_timeout(void *); +void esiop_scsipi_request(struct scsipi_channel *, + scsipi_adapter_req_t, void *); +void esiop_dump_script(struct esiop_softc *); +void esiop_morecbd(struct esiop_softc *); +void esiop_moretagtbl(struct esiop_softc *); +void siop_add_reselsw(struct esiop_softc *, int); +void esiop_target_register(struct esiop_softc *, u_int32_t); + +void esiop_update_scntl3(struct esiop_softc *, struct siop_common_target *); #ifdef SIOP_STATS static int esiop_stat_intr = 0; @@ -106,13 +105,13 @@ static int esiop_stat_intr_done = 0; static int esiop_stat_intr_xferdisc = 0; static int esiop_stat_intr_lunresel = 0; static int esiop_stat_intr_qfull = 0; -void esiop_printstats __P((void)); +void esiop_printstats(void); #define INCSTAT(x) x++ #else #define INCSTAT(x) #endif -static __inline__ void esiop_script_sync __P((struct esiop_softc *, int)); +static __inline__ void esiop_script_sync(struct esiop_softc *, int); static __inline__ void esiop_script_sync(sc, ops) struct esiop_softc *sc; @@ -123,7 +122,7 @@ esiop_script_sync(sc, ops) PAGE_SIZE, ops); } -static __inline__ u_int32_t esiop_script_read __P((struct esiop_softc *, u_int)); +static __inline__ u_int32_t esiop_script_read(struct esiop_softc *, u_int); static __inline__ u_int32_t esiop_script_read(sc, offset) struct esiop_softc *sc; @@ -137,8 +136,8 @@ esiop_script_read(sc, offset) } } -static __inline__ void esiop_script_write __P((struct esiop_softc *, u_int, - u_int32_t)); +static __inline__ void esiop_script_write(struct esiop_softc *, u_int, + u_int32_t); static __inline__ void esiop_script_write(sc, offset, val) struct esiop_softc *sc; diff --git a/sys/dev/ic/esiopvar.h b/sys/dev/ic/esiopvar.h index 8612ea6dfa4..50a98278e6c 100644 --- a/sys/dev/ic/esiopvar.h +++ b/sys/dev/ic/esiopvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: esiopvar.h,v 1.10 2004/05/17 18:37:02 bouyer Exp $ */ +/* $NetBSD: esiopvar.h,v 1.11 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 2002 Manuel Bouyer. @@ -119,7 +119,7 @@ struct esiop_target { u_int32_t lun_table_offset; /* pointer to our DSA table */ }; -static __inline__ void esiop_table_sync __P((struct esiop_cmd *, int)); +static __inline__ void esiop_table_sync(struct esiop_cmd *, int); static __inline__ void esiop_table_sync(esiop_cmd, ops) struct esiop_cmd *esiop_cmd; @@ -159,7 +159,7 @@ struct esiop_softc { #define SCF_CHAN_NOSLOT 0x0001 /* channel out of scheduler slot */ #define SCF_CHAN_ADAPTREQ 0x0002 /* esiop_scsipi_request() is running */ -void esiop_attach __P((struct esiop_softc *)); -int esiop_intr __P((void *)); -void esiop_add_dev __P((struct esiop_softc *, int, int)); -void esiop_del_dev __P((struct esiop_softc *, int, int)); +void esiop_attach(struct esiop_softc *); +int esiop_intr(void *); +void esiop_add_dev(struct esiop_softc *, int, int); +void esiop_del_dev(struct esiop_softc *, int, int); diff --git a/sys/dev/ic/gem.c b/sys/dev/ic/gem.c index 0440f35cadc..8a19f784797 100644 --- a/sys/dev/ic/gem.c +++ b/sys/dev/ic/gem.c @@ -1,4 +1,4 @@ -/* $NetBSD: gem.c,v 1.33 2005/01/31 02:53:19 thorpej Exp $ */ +/* $NetBSD: gem.c,v 1.34 2005/02/04 02:10:36 perry Exp $ */ /* * @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.33 2005/01/31 02:53:19 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.34 2005/02/04 02:10:36 perry Exp $"); #include "bpfilter.h" @@ -75,41 +75,41 @@ __KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.33 2005/01/31 02:53:19 thorpej Exp $"); #define TRIES 10000 -void gem_start __P((struct ifnet *)); -void gem_stop __P((struct ifnet *, int)); -int gem_ioctl __P((struct ifnet *, u_long, caddr_t)); -void gem_tick __P((void *)); -void gem_watchdog __P((struct ifnet *)); -void gem_shutdown __P((void *)); -int gem_init __P((struct ifnet *)); +void gem_start(struct ifnet *); +void gem_stop(struct ifnet *, int); +int gem_ioctl(struct ifnet *, u_long, caddr_t); +void gem_tick(void *); +void gem_watchdog(struct ifnet *); +void gem_shutdown(void *); +int gem_init(struct ifnet *); void gem_init_regs(struct gem_softc *sc); static int gem_ringsize(int sz); -int gem_meminit __P((struct gem_softc *)); -void gem_mifinit __P((struct gem_softc *)); -void gem_reset __P((struct gem_softc *)); +int gem_meminit(struct gem_softc *); +void gem_mifinit(struct gem_softc *); +void gem_reset(struct gem_softc *); int gem_reset_rx(struct gem_softc *sc); int gem_reset_tx(struct gem_softc *sc); int gem_disable_rx(struct gem_softc *sc); int gem_disable_tx(struct gem_softc *sc); void gem_rxdrain(struct gem_softc *sc); int gem_add_rxbuf(struct gem_softc *sc, int idx); -void gem_setladrf __P((struct gem_softc *)); +void gem_setladrf(struct gem_softc *); /* MII methods & callbacks */ -static int gem_mii_readreg __P((struct device *, int, int)); -static void gem_mii_writereg __P((struct device *, int, int, int)); -static void gem_mii_statchg __P((struct device *)); - -int gem_mediachange __P((struct ifnet *)); -void gem_mediastatus __P((struct ifnet *, struct ifmediareq *)); - -struct mbuf *gem_get __P((struct gem_softc *, int, int)); -int gem_put __P((struct gem_softc *, int, struct mbuf *)); -void gem_read __P((struct gem_softc *, int, int)); -int gem_eint __P((struct gem_softc *, u_int)); -int gem_rint __P((struct gem_softc *)); -int gem_tint __P((struct gem_softc *)); -void gem_power __P((int, void *)); +static int gem_mii_readreg(struct device *, int, int); +static void gem_mii_writereg(struct device *, int, int, int); +static void gem_mii_statchg(struct device *); + +int gem_mediachange(struct ifnet *); +void gem_mediastatus(struct ifnet *, struct ifmediareq *); + +struct mbuf *gem_get(struct gem_softc *, int, int); +int gem_put(struct gem_softc *, int, struct mbuf *); +void gem_read(struct gem_softc *, int, int); +int gem_eint(struct gem_softc *, u_int); +int gem_rint(struct gem_softc *); +int gem_tint(struct gem_softc *); +void gem_power(int, void *); #ifdef GEM_DEBUG #define DPRINTF(sc, x) if ((sc)->sc_ethercom.ec_if.if_flags & IFF_DEBUG) \ diff --git a/sys/dev/ic/gemvar.h b/sys/dev/ic/gemvar.h index c39578895da..4a5b6b9cdd4 100644 --- a/sys/dev/ic/gemvar.h +++ b/sys/dev/ic/gemvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: gemvar.h,v 1.10 2004/10/17 21:49:08 heas Exp $ */ +/* $NetBSD: gemvar.h,v 1.11 2005/02/04 02:10:36 perry Exp $ */ /* * @@ -179,8 +179,8 @@ struct gem_softc { void *sc_sh; /* shutdownhook cookie */ /* Special hardware hooks */ - void (*sc_hwreset) __P((struct gem_softc *)); - void (*sc_hwinit) __P((struct gem_softc *)); + void (*sc_hwreset)(struct gem_softc *); + void (*sc_hwinit)(struct gem_softc *); #if NRND > 0 rndsource_element_t rnd_source; @@ -257,10 +257,10 @@ do { \ } while (0) #ifdef _KERNEL -void gem_attach __P((struct gem_softc *, const uint8_t *)); -int gem_intr __P((void *)); +void gem_attach(struct gem_softc *, const uint8_t *); +int gem_intr(void *); -void gem_reset __P((struct gem_softc *)); +void gem_reset(struct gem_softc *); #endif /* _KERNEL */ diff --git a/sys/dev/ic/hd64570.c b/sys/dev/ic/hd64570.c index 971a5761d18..4724e137db7 100644 --- a/sys/dev/ic/hd64570.c +++ b/sys/dev/ic/hd64570.c @@ -1,4 +1,4 @@ -/* $NetBSD: hd64570.c,v 1.27 2004/04/22 00:17:11 itojun Exp $ */ +/* $NetBSD: hd64570.c,v 1.28 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1999 Christian E. Hopps @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.27 2004/04/22 00:17:11 itojun Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.28 2005/02/04 02:10:36 perry Exp $"); #include "bpfilter.h" #include "opt_inet.h" @@ -169,11 +169,11 @@ static void sca_port_starttx(sca_port_t *); static void sca_port_up(sca_port_t *); static void sca_port_down(sca_port_t *); -static int sca_output __P((struct ifnet *, struct mbuf *, struct sockaddr *, - struct rtentry *)); -static int sca_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void sca_start __P((struct ifnet *)); -static void sca_watchdog __P((struct ifnet *)); +static int sca_output(struct ifnet *, struct mbuf *, struct sockaddr *, + struct rtentry *); +static int sca_ioctl(struct ifnet *, u_long, caddr_t); +static void sca_start(struct ifnet *); +static void sca_watchdog(struct ifnet *); static struct mbuf *sca_mbuf_alloc(struct sca_softc *, caddr_t, u_int); diff --git a/sys/dev/ic/hme.c b/sys/dev/ic/hme.c index 28889876497..73aaf749a92 100644 --- a/sys/dev/ic/hme.c +++ b/sys/dev/ic/hme.c @@ -1,4 +1,4 @@ -/* $NetBSD: hme.c,v 1.43 2004/10/30 18:08:37 thorpej Exp $ */ +/* $NetBSD: hme.c,v 1.44 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.43 2004/10/30 18:08:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.44 2005/02/04 02:10:36 perry Exp $"); /* #define HMEDEBUG */ @@ -95,39 +95,39 @@ __KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.43 2004/10/30 18:08:37 thorpej Exp $"); #include <dev/ic/hmereg.h> #include <dev/ic/hmevar.h> -void hme_start __P((struct ifnet *)); -void hme_stop __P((struct hme_softc *)); -int hme_ioctl __P((struct ifnet *, u_long, caddr_t)); -void hme_tick __P((void *)); -void hme_watchdog __P((struct ifnet *)); -void hme_shutdown __P((void *)); -void hme_init __P((struct hme_softc *)); -void hme_meminit __P((struct hme_softc *)); -void hme_mifinit __P((struct hme_softc *)); -void hme_reset __P((struct hme_softc *)); -void hme_setladrf __P((struct hme_softc *)); +void hme_start(struct ifnet *); +void hme_stop(struct hme_softc *); +int hme_ioctl(struct ifnet *, u_long, caddr_t); +void hme_tick(void *); +void hme_watchdog(struct ifnet *); +void hme_shutdown(void *); +void hme_init(struct hme_softc *); +void hme_meminit(struct hme_softc *); +void hme_mifinit(struct hme_softc *); +void hme_reset(struct hme_softc *); +void hme_setladrf(struct hme_softc *); /* MII methods & callbacks */ -static int hme_mii_readreg __P((struct device *, int, int)); -static void hme_mii_writereg __P((struct device *, int, int, int)); -static void hme_mii_statchg __P((struct device *)); +static int hme_mii_readreg(struct device *, int, int); +static void hme_mii_writereg(struct device *, int, int, int); +static void hme_mii_statchg(struct device *); -int hme_mediachange __P((struct ifnet *)); -void hme_mediastatus __P((struct ifnet *, struct ifmediareq *)); +int hme_mediachange(struct ifnet *); +void hme_mediastatus(struct ifnet *, struct ifmediareq *); -struct mbuf *hme_get __P((struct hme_softc *, int, int)); -int hme_put __P((struct hme_softc *, int, struct mbuf *)); -void hme_read __P((struct hme_softc *, int, int)); -int hme_eint __P((struct hme_softc *, u_int)); -int hme_rint __P((struct hme_softc *)); -int hme_tint __P((struct hme_softc *)); +struct mbuf *hme_get(struct hme_softc *, int, int); +int hme_put(struct hme_softc *, int, struct mbuf *); +void hme_read(struct hme_softc *, int, int); +int hme_eint(struct hme_softc *, u_int); +int hme_rint(struct hme_softc *); +int hme_tint(struct hme_softc *); -static int ether_cmp __P((u_char *, u_char *)); +static int ether_cmp(u_char *, u_char *); /* Default buffer copy routines */ -void hme_copytobuf_contig __P((struct hme_softc *, void *, int, int)); -void hme_copyfrombuf_contig __P((struct hme_softc *, void *, int, int)); -void hme_zerobuf_contig __P((struct hme_softc *, int, int)); +void hme_copytobuf_contig(struct hme_softc *, void *, int, int); +void hme_copyfrombuf_contig(struct hme_softc *, void *, int, int); +void hme_zerobuf_contig(struct hme_softc *, int, int); void diff --git a/sys/dev/ic/hmevar.h b/sys/dev/ic/hmevar.h index aa610c819a3..bc7ccb2469a 100644 --- a/sys/dev/ic/hmevar.h +++ b/sys/dev/ic/hmevar.h @@ -1,4 +1,4 @@ -/* $NetBSD: hmevar.h,v 1.11 2004/06/28 20:50:52 heas Exp $ */ +/* $NetBSD: hmevar.h,v 1.12 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -87,10 +87,10 @@ struct hme_softc { /* Ring descriptor */ struct hme_ring sc_rb; #if notused - void (*sc_copytobuf) __P((struct hme_softc *, - void *, void *, size_t)); - void (*sc_copyfrombuf) __P((struct hme_softc *, - void *, void *, size_t)); + void (*sc_copytobuf)(struct hme_softc *, + void *, void *, size_t); + void (*sc_copyfrombuf)(struct hme_softc *, + void *, void *, size_t); #endif int sc_debug; @@ -99,8 +99,8 @@ struct hme_softc { u_int8_t sc_enaddr[ETHER_ADDR_LEN]; /* MAC address */ /* Special hardware hooks */ - void (*sc_hwreset) __P((struct hme_softc *)); - void (*sc_hwinit) __P((struct hme_softc *)); + void (*sc_hwreset)(struct hme_softc *); + void (*sc_hwinit)(struct hme_softc *); #if NRND > 0 rndsource_element_t rnd_source; @@ -108,6 +108,6 @@ struct hme_softc { }; -void hme_config __P((struct hme_softc *)); -void hme_reset __P((struct hme_softc *)); -int hme_intr __P((void *)); +void hme_config(struct hme_softc *); +void hme_reset(struct hme_softc *); +int hme_intr(void *); diff --git a/sys/dev/ic/i82365.c b/sys/dev/ic/i82365.c index c509d4c1489..2d399fc9b19 100644 --- a/sys/dev/ic/i82365.c +++ b/sys/dev/ic/i82365.c @@ -1,4 +1,4 @@ -/* $NetBSD: i82365.c,v 1.87 2004/09/13 12:34:00 drochner Exp $ */ +/* $NetBSD: i82365.c,v 1.88 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 2004 Charles M. Hannum. All rights reserved. @@ -49,7 +49,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.87 2004/09/13 12:34:00 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.88 2005/02/04 02:10:36 perry Exp $"); #define PCICDEBUG @@ -86,33 +86,33 @@ int pcic_debug = 0; #define PCIC_MEM_ALIGN PCIC_MEM_PAGESIZE -void pcic_attach_socket __P((struct pcic_handle *)); -void pcic_attach_socket_finish __P((struct pcic_handle *)); +void pcic_attach_socket(struct pcic_handle *); +void pcic_attach_socket_finish(struct pcic_handle *); -int pcic_submatch __P((struct device *, struct cfdata *, - const locdesc_t *, void *)); -int pcic_print __P((void *arg, const char *pnp)); -int pcic_intr_socket __P((struct pcic_handle *)); -void pcic_poll_intr __P((void *)); +int pcic_submatch(struct device *, struct cfdata *, + const locdesc_t *, void *); +int pcic_print (void *arg, const char *pnp); +int pcic_intr_socket(struct pcic_handle *); +void pcic_poll_intr(void *); -void pcic_attach_card __P((struct pcic_handle *)); -void pcic_detach_card __P((struct pcic_handle *, int)); -void pcic_deactivate_card __P((struct pcic_handle *)); +void pcic_attach_card(struct pcic_handle *); +void pcic_detach_card(struct pcic_handle *, int); +void pcic_deactivate_card(struct pcic_handle *); -void pcic_chip_do_mem_map __P((struct pcic_handle *, int)); -void pcic_chip_do_io_map __P((struct pcic_handle *, int)); +void pcic_chip_do_mem_map(struct pcic_handle *, int); +void pcic_chip_do_io_map(struct pcic_handle *, int); -void pcic_create_event_thread __P((void *)); -void pcic_event_thread __P((void *)); +void pcic_create_event_thread(void *); +void pcic_event_thread(void *); -void pcic_queue_event __P((struct pcic_handle *, int)); -void pcic_power __P((int, void *)); +void pcic_queue_event(struct pcic_handle *, int); +void pcic_power(int, void *); -static int pcic_wait_ready __P((struct pcic_handle *)); -static void pcic_delay __P((struct pcic_handle *, int, const char *)); +static int pcic_wait_ready(struct pcic_handle *); +static void pcic_delay(struct pcic_handle *, int, const char *); -static u_int8_t st_pcic_read __P((struct pcic_handle *, int)); -static void st_pcic_write __P((struct pcic_handle *, int, u_int8_t)); +static u_int8_t st_pcic_read(struct pcic_handle *, int); +static void st_pcic_write(struct pcic_handle *, int, u_int8_t); int pcic_ident_ok(ident) diff --git a/sys/dev/ic/i82365var.h b/sys/dev/ic/i82365var.h index fced09adf49..ca0f23871c0 100644 --- a/sys/dev/ic/i82365var.h +++ b/sys/dev/ic/i82365var.h @@ -1,4 +1,4 @@ -/* $NetBSD: i82365var.h,v 1.21 2004/09/13 12:34:00 drochner Exp $ */ +/* $NetBSD: i82365var.h,v 1.22 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1997 Marc Horowitz. All rights reserved. @@ -53,8 +53,8 @@ struct pcic_handle { struct device *ph_parent; bus_space_tag_t ph_bus_t; /* I/O or MEM? I don't mind */ bus_space_handle_t ph_bus_h; - u_int8_t (*ph_read) __P((struct pcic_handle *, int)); - void (*ph_write) __P((struct pcic_handle *, int, u_int8_t)); + u_int8_t (*ph_read)(struct pcic_handle *, int); + void (*ph_write)(struct pcic_handle *, int, u_int8_t); int vendor; /* vendor of chip */ int chip; /* chip index 0 or 1 */ @@ -159,43 +159,43 @@ struct pcic_softc { }; -int pcic_ident_ok __P((int)); -int pcic_vendor __P((struct pcic_handle *)); -char *pcic_vendor_to_string __P((int)); +int pcic_ident_ok(int); +int pcic_vendor(struct pcic_handle *); +char *pcic_vendor_to_string(int); -void pcic_attach __P((struct pcic_softc *)); -void pcic_attach_sockets __P((struct pcic_softc *)); -void pcic_attach_sockets_finish __P((struct pcic_softc *)); -int pcic_intr __P((void *arg)); +void pcic_attach(struct pcic_softc *); +void pcic_attach_sockets(struct pcic_softc *); +void pcic_attach_sockets_finish(struct pcic_softc *); +int pcic_intr(void *arg); /* -static inline int pcic_read __P((struct pcic_handle *, int)); -static inline void pcic_write __P((struct pcic_handle *, int, u_int8_t)); +static inline int pcic_read(struct pcic_handle *, int); +static inline void pcic_write(struct pcic_handle *, int, u_int8_t); */ -int pcic_chip_mem_alloc __P((pcmcia_chipset_handle_t, bus_size_t, - struct pcmcia_mem_handle *)); -void pcic_chip_mem_free __P((pcmcia_chipset_handle_t, - struct pcmcia_mem_handle *)); -int pcic_chip_mem_map __P((pcmcia_chipset_handle_t, int, bus_addr_t, - bus_size_t, struct pcmcia_mem_handle *, bus_size_t *, int *)); -void pcic_chip_mem_unmap __P((pcmcia_chipset_handle_t, int)); - -int pcic_chip_io_alloc __P((pcmcia_chipset_handle_t, bus_addr_t, - bus_size_t, bus_size_t, struct pcmcia_io_handle *)); -void pcic_chip_io_free __P((pcmcia_chipset_handle_t, - struct pcmcia_io_handle *)); -int pcic_chip_io_map __P((pcmcia_chipset_handle_t, int, bus_addr_t, - bus_size_t, struct pcmcia_io_handle *, int *)); -void pcic_chip_io_unmap __P((pcmcia_chipset_handle_t, int)); - -void pcic_chip_socket_enable __P((pcmcia_chipset_handle_t)); -void pcic_chip_socket_disable __P((pcmcia_chipset_handle_t)); -void pcic_chip_socket_settype __P((pcmcia_chipset_handle_t, int)); +int pcic_chip_mem_alloc(pcmcia_chipset_handle_t, bus_size_t, + struct pcmcia_mem_handle *); +void pcic_chip_mem_free(pcmcia_chipset_handle_t, + struct pcmcia_mem_handle *); +int pcic_chip_mem_map(pcmcia_chipset_handle_t, int, bus_addr_t, + bus_size_t, struct pcmcia_mem_handle *, bus_size_t *, int *); +void pcic_chip_mem_unmap(pcmcia_chipset_handle_t, int); + +int pcic_chip_io_alloc(pcmcia_chipset_handle_t, bus_addr_t, + bus_size_t, bus_size_t, struct pcmcia_io_handle *); +void pcic_chip_io_free(pcmcia_chipset_handle_t, + struct pcmcia_io_handle *); +int pcic_chip_io_map(pcmcia_chipset_handle_t, int, bus_addr_t, + bus_size_t, struct pcmcia_io_handle *, int *); +void pcic_chip_io_unmap(pcmcia_chipset_handle_t, int); + +void pcic_chip_socket_enable(pcmcia_chipset_handle_t); +void pcic_chip_socket_disable(pcmcia_chipset_handle_t); +void pcic_chip_socket_settype(pcmcia_chipset_handle_t, int); #if 0 -static __inline int pcic_read __P((struct pcic_handle *, int)); +static __inline int pcic_read(struct pcic_handle *, int); static __inline int pcic_read(h, idx) struct pcic_handle *h; @@ -207,7 +207,7 @@ pcic_read(h, idx) return (bus_space_read_1(h->sc->iot, h->sc->ioh, PCIC_REG_DATA)); } -static __inline void pcic_write __P((struct pcic_handle *, int, int)); +static __inline void pcic_write(struct pcic_handle *, int, int); static __inline void pcic_write(h, idx, data) struct pcic_handle *h; diff --git a/sys/dev/ic/i82586.c b/sys/dev/ic/i82586.c index 67ad8d8543a..6ea51e8d23e 100644 --- a/sys/dev/ic/i82586.c +++ b/sys/dev/ic/i82586.c @@ -1,4 +1,4 @@ -/* $NetBSD: i82586.c,v 1.49 2004/10/30 18:08:37 thorpej Exp $ */ +/* $NetBSD: i82586.c,v 1.50 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -144,7 +144,7 @@ Mode of operation: */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i82586.c,v 1.49 2004/10/30 18:08:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i82586.c,v 1.50 2005/02/04 02:10:36 perry Exp $"); #include "bpfilter.h" @@ -173,50 +173,47 @@ __KERNEL_RCSID(0, "$NetBSD: i82586.c,v 1.49 2004/10/30 18:08:37 thorpej Exp $"); #include <dev/ic/i82586reg.h> #include <dev/ic/i82586var.h> -void i82586_reset __P((struct ie_softc *, int)); -void i82586_watchdog __P((struct ifnet *)); -int i82586_init __P((struct ifnet *)); -int i82586_ioctl __P((struct ifnet *, u_long, caddr_t)); -void i82586_start __P((struct ifnet *)); -void i82586_stop __P((struct ifnet *, int)); - - -int i82586_rint __P((struct ie_softc *, int)); -int i82586_tint __P((struct ie_softc *, int)); - -int i82586_mediachange __P((struct ifnet *)); -void i82586_mediastatus __P((struct ifnet *, - struct ifmediareq *)); - -static int ie_readframe __P((struct ie_softc *, int)); -static struct mbuf *ieget __P((struct ie_softc *, int, int)); -static int i82586_get_rbd_list __P((struct ie_softc *, - u_int16_t *, u_int16_t *, int *)); -static void i82586_release_rbd_list __P((struct ie_softc *, - u_int16_t, u_int16_t)); -static int i82586_drop_frames __P((struct ie_softc *)); -static int i82586_chk_rx_ring __P((struct ie_softc *)); - -static __inline__ void ie_ack __P((struct ie_softc *, u_int)); -static __inline__ void iexmit __P((struct ie_softc *)); -static void i82586_start_transceiver - __P((struct ie_softc *)); - -static void i82586_count_errors __P((struct ie_softc *)); -static void i82586_rx_errors __P((struct ie_softc *, int, int)); -static void i82586_setup_bufs __P((struct ie_softc *)); -static void setup_simple_command __P((struct ie_softc *, int, int)); -static int ie_cfg_setup __P((struct ie_softc *, int, int, int)); -static int ie_ia_setup __P((struct ie_softc *, int)); -static void ie_run_tdr __P((struct ie_softc *, int)); -static int ie_mc_setup __P((struct ie_softc *, int)); -static void ie_mc_reset __P((struct ie_softc *)); -static int i82586_start_cmd __P((struct ie_softc *, - int, int, int, int)); -static int i82586_cmd_wait __P((struct ie_softc *)); +void i82586_reset(struct ie_softc *, int); +void i82586_watchdog(struct ifnet *); +int i82586_init(struct ifnet *); +int i82586_ioctl(struct ifnet *, u_long, caddr_t); +void i82586_start(struct ifnet *); +void i82586_stop(struct ifnet *, int); + + +int i82586_rint(struct ie_softc *, int); +int i82586_tint(struct ie_softc *, int); + +int i82586_mediachange(struct ifnet *); +void i82586_mediastatus(struct ifnet *, struct ifmediareq *); + +static int ie_readframe(struct ie_softc *, int); +static struct mbuf *ieget(struct ie_softc *, int, int); +static int i82586_get_rbd_list(struct ie_softc *, + u_int16_t *, u_int16_t *, int *); +static void i82586_release_rbd_list(struct ie_softc *, + u_int16_t, u_int16_t); +static int i82586_drop_frames(struct ie_softc *); +static int i82586_chk_rx_ring(struct ie_softc *); + +static __inline__ void ie_ack(struct ie_softc *, u_int); +static __inline__ void iexmit(struct ie_softc *); +static void i82586_start_transceiver(struct ie_softc *); + +static void i82586_count_errors(struct ie_softc *); +static void i82586_rx_errors(struct ie_softc *, int, int); +static void i82586_setup_bufs(struct ie_softc *); +static void setup_simple_command(struct ie_softc *, int, int); +static int ie_cfg_setup(struct ie_softc *, int, int, int); +static int ie_ia_setup(struct ie_softc *, int); +static void ie_run_tdr(struct ie_softc *, int); +static int ie_mc_setup(struct ie_softc *, int); +static void ie_mc_reset(struct ie_softc *); +static int i82586_start_cmd(struct ie_softc *, int, int, int, int); +static int i82586_cmd_wait(struct ie_softc *); #if I82586_DEBUG -void print_rbd __P((struct ie_softc *, int)); +void print_rbd(struct ie_softc *, int); #endif static char* padbuf = NULL; diff --git a/sys/dev/ic/i82586var.h b/sys/dev/ic/i82586var.h index 47f6ad06d58..9693dd25dd1 100644 --- a/sys/dev/ic/i82586var.h +++ b/sys/dev/ic/i82586var.h @@ -1,4 +1,4 @@ -/* $NetBSD: i82586var.h,v 1.18 2003/11/02 11:07:45 wiz Exp $ */ +/* $NetBSD: i82586var.h,v 1.19 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -190,23 +190,22 @@ struct ie_softc { struct ifmedia sc_media; /* supported media information */ /* Bus glue */ - void (*hwreset) __P((struct ie_softc *, int)); - void (*hwinit) __P((struct ie_softc *)); - void (*chan_attn) __P((struct ie_softc *, int)); - int (*intrhook) __P((struct ie_softc *, int)); + void (*hwreset)(struct ie_softc *, int); + void (*hwinit)(struct ie_softc *); + void (*chan_attn)(struct ie_softc *, int); + int (*intrhook)(struct ie_softc *, int); - void (*memcopyin) __P((struct ie_softc *, void *, int, size_t)); - void (*memcopyout) __P((struct ie_softc *, const void *, - int, size_t)); - u_int16_t (*ie_bus_read16) __P((struct ie_softc *, int)); - void (*ie_bus_write16) __P((struct ie_softc *, int, u_int16_t)); - void (*ie_bus_write24) __P((struct ie_softc *, int, int)); - void (*ie_bus_barrier) __P((struct ie_softc *, int, int, int)); + void (*memcopyin)(struct ie_softc *, void *, int, size_t); + void (*memcopyout)(struct ie_softc *, const void *, int, size_t); + u_int16_t (*ie_bus_read16)(struct ie_softc *, int); + void (*ie_bus_write16)(struct ie_softc *, int, u_int16_t); + void (*ie_bus_write24)(struct ie_softc *, int, int); + void (*ie_bus_barrier)(struct ie_softc *, int, int, int); /* Media management */ - int (*sc_mediachange) __P((struct ie_softc *)); + int (*sc_mediachange)(struct ie_softc *); /* card dependent media change */ - void (*sc_mediastatus) __P((struct ie_softc *, struct ifmediareq *)); + void (*sc_mediastatus)(struct ie_softc *, struct ifmediareq *); /* card dependent media status */ @@ -263,10 +262,9 @@ struct ie_softc { }; /* Exported functions */ -int i82586_intr __P((void *)); -int i82586_proberam __P((struct ie_softc *)); -void i82586_attach __P((struct ie_softc *, char *, u_int8_t *, - int*, int, int)); +int i82586_intr(void *); +int i82586_proberam(struct ie_softc *); +void i82586_attach(struct ie_softc *, char *, u_int8_t *, int*, int, int); /* Shortcut macros to optional (driver uses default if unspecified) callbacks */ #define IE_BUS_BARRIER(sc, offset, length, flags) \ diff --git a/sys/dev/ic/ibm561.c b/sys/dev/ic/ibm561.c index eb404a63619..ef6f5b66c51 100644 --- a/sys/dev/ic/ibm561.c +++ b/sys/dev/ic/ibm561.c @@ -1,4 +1,4 @@ -/* $NetBSD: ibm561.c,v 1.5 2003/11/13 03:09:29 chs Exp $ */ +/* $NetBSD: ibm561.c,v 1.6 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ibm561.c,v 1.5 2003/11/13 03:09:29 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ibm561.c,v 1.6 2005/02/04 02:10:36 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -58,23 +58,15 @@ __KERNEL_RCSID(0, "$NetBSD: ibm561.c,v 1.5 2003/11/13 03:09:29 chs Exp $"); /* * Functions exported via the RAMDAC configuration table. */ -void ibm561_init __P((struct ramdac_cookie *)); -int ibm561_set_cmap __P((struct ramdac_cookie *, - struct wsdisplay_cmap *)); -int ibm561_get_cmap __P((struct ramdac_cookie *, - struct wsdisplay_cmap *)); -int ibm561_set_cursor __P((struct ramdac_cookie *, - struct wsdisplay_cursor *)); -int ibm561_get_cursor __P((struct ramdac_cookie *, - struct wsdisplay_cursor *)); -int ibm561_set_curpos __P((struct ramdac_cookie *, - struct wsdisplay_curpos *)); -int ibm561_get_curpos __P((struct ramdac_cookie *, - struct wsdisplay_curpos *)); -int ibm561_get_curmax __P((struct ramdac_cookie *, - struct wsdisplay_curpos *)); -int ibm561_set_dotclock __P((struct ramdac_cookie *, - unsigned)); +void ibm561_init(struct ramdac_cookie *); +int ibm561_set_cmap(struct ramdac_cookie *, struct wsdisplay_cmap *); +int ibm561_get_cmap(struct ramdac_cookie *, struct wsdisplay_cmap *); +int ibm561_set_cursor(struct ramdac_cookie *, struct wsdisplay_cursor *); +int ibm561_get_cursor(struct ramdac_cookie *, struct wsdisplay_cursor *); +int ibm561_set_curpos(struct ramdac_cookie *, struct wsdisplay_curpos *); +int ibm561_get_curpos(struct ramdac_cookie *, struct wsdisplay_curpos *); +int ibm561_get_curmax(struct ramdac_cookie *, struct wsdisplay_curpos *); +int ibm561_set_dotclock(struct ramdac_cookie *, unsigned); /* XXX const */ struct ramdac_funcs ibm561_funcsstruct = { @@ -100,9 +92,9 @@ struct ramdac_funcs ibm561_funcsstruct = { struct ibm561data { void *cookie; - int (*ramdac_sched_update) __P((void *, void (*)(void *))); - void (*ramdac_wr) __P((void *, u_int, u_int8_t)); - u_int8_t (*ramdac_rd) __P((void *, u_int)); + int (*ramdac_sched_update)(void *, void (*)(void *)); + void (*ramdac_wr)(void *, u_int, u_int8_t); + u_int8_t (*ramdac_rd)(void *, u_int); #define CHANGED_CURCMAP 0x0001 /* cursor cmap */ #define CHANGED_CMAP 0x0002 /* color map */ @@ -135,7 +127,7 @@ struct ibm561data { /* * private functions */ -void ibm561_update __P((void *)); +void ibm561_update(void *); static void ibm561_load_cmap(struct ibm561data *); static void ibm561_load_dotclock(struct ibm561data *); static void ibm561_regbegin(struct ibm561data *, u_int16_t); diff --git a/sys/dev/ic/ibm561var.h b/sys/dev/ic/ibm561var.h index a863b772a59..4abc8a2c1c7 100644 --- a/sys/dev/ic/ibm561var.h +++ b/sys/dev/ic/ibm561var.h @@ -1,4 +1,4 @@ -/* $NetBSD: ibm561var.h,v 1.2 2001/12/22 01:38:21 elric Exp $ */ +/* $NetBSD: ibm561var.h,v 1.3 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -37,11 +37,11 @@ */ struct ramdac_funcs *ibm561_funcs(void); -struct ramdac_cookie *ibm561_register __P((void *, +struct ramdac_cookie *ibm561_register(void *, int (*)(void *, void (*)(void *)), void (*)(void *, u_int, u_int8_t), - u_int8_t (*)(void *, u_int))); -void ibm561_cninit __P((void *, + u_int8_t (*)(void *, u_int)); +void ibm561_cninit(void *, int (*)(void *, void (*)(void *)), void (*)(void *, u_int, u_int8_t), - u_int8_t (*)(void *, u_int), u_int)); + u_int8_t (*)(void *, u_int), u_int); diff --git a/sys/dev/ic/isic_l1.h b/sys/dev/ic/isic_l1.h index 01da9a29f51..dd2b222eb85 100644 --- a/sys/dev/ic/isic_l1.h +++ b/sys/dev/ic/isic_l1.h @@ -1,4 +1,4 @@ -/* $NetBSD: isic_l1.h,v 1.16 2003/10/03 16:38:44 pooka Exp $ */ +/* $NetBSD: isic_l1.h,v 1.17 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1997, 2000 Hellmuth Michaelis. All rights reserved. @@ -264,15 +264,14 @@ struct isic_softc #define ISIC_WHAT_HSCXB 2 #define ISIC_WHAT_IPAC 3 - u_int8_t (*readreg) __P((struct isic_softc *, int, bus_size_t)); - void (*writereg) __P((struct isic_softc *, int, bus_size_t, u_int8_t)); - void (*readfifo) __P((struct isic_softc *, int, void *, - size_t)); - void (*writefifo) __P((struct isic_softc *, int what, - const void *, size_t)); - void (*clearirq) __P((struct isic_softc *)); + u_int8_t (*readreg)(struct isic_softc *, int, bus_size_t); + void (*writereg)(struct isic_softc *, int, bus_size_t, u_int8_t); + void (*readfifo)(struct isic_softc *, int, void *, size_t); + void (*writefifo)(struct isic_softc *, int what, + const void *, size_t); + void (*clearirq)(struct isic_softc *); - void (*drv_command) __P((struct isic_softc *, int, void *)); + void (*drv_command)(struct isic_softc *, int, void *); #define ISAC_READ(r) (*sc->readreg)(sc, ISIC_WHAT_ISAC, (r)) #define ISAC_WRITE(r,v) (*sc->writereg)(sc, ISIC_WHAT_ISAC, (r), (v)) @@ -333,40 +332,40 @@ enum I430commands { #define N_COMMANDS CMD_ILL -extern void isic_recover __P((struct isic_softc *)); -extern int isicintr __P((void *)); -extern int isicprobe __P((struct isic_attach_args *)); -extern int isic_attach_avma1 __P((struct isic_softc *)); -extern int isic_attach_s016 __P((struct isic_softc *)); -extern int isic_attach_s0163 __P((struct isic_softc *)); -extern int isic_attach_s08 __P((struct isic_softc *)); -extern int isic_attach_usrtai __P((struct isic_softc *)); -extern int isic_attach_itkix1 __P((struct isic_softc *)); -extern void isic_bchannel_setup __P((void *, int, int, int)); -extern void isic_hscx_init __P((struct isic_softc *, int, int)); -extern void isic_hscx_irq __P((struct isic_softc *, u_char ista, int, u_char)); -extern void isic_hscx_cmd __P(( struct isic_softc *, int, unsigned char)); -extern void isic_hscx_waitxfw __P(( struct isic_softc *, int)); -extern void isic_init_linktab __P((struct isic_softc *)); -extern int isic_isac_init __P((struct isic_softc *)); -extern void isic_isac_irq __P((struct isic_softc *, int)); -extern void isic_isac_l1_cmd __P((struct isic_softc *, int)); -extern void isic_next_state __P((struct isic_softc *, int)); -extern char * isic_printstate __P((struct isic_softc *)); -extern int isic_probe_avma1 __P((struct isic_attach_args *)); -extern int isic_probe_s016 __P((struct isic_attach_args *)); -extern int isic_probe_s0163 __P((struct isic_attach_args *)); -extern int isic_probe_s08 __P((struct isic_attach_args *ia)); -extern int isic_probe_usrtai __P((struct isic_attach_args *ia)); -extern int isic_probe_itkix1 __P((struct isic_attach_args *ia)); +extern void isic_recover(struct isic_softc *); +extern int isicintr(void *); +extern int isicprobe(struct isic_attach_args *); +extern int isic_attach_avma1(struct isic_softc *); +extern int isic_attach_s016(struct isic_softc *); +extern int isic_attach_s0163(struct isic_softc *); +extern int isic_attach_s08(struct isic_softc *); +extern int isic_attach_usrtai(struct isic_softc *); +extern int isic_attach_itkix1(struct isic_softc *); +extern void isic_bchannel_setup(void *, int, int, int); +extern void isic_hscx_init(struct isic_softc *, int, int); +extern void isic_hscx_irq(struct isic_softc *, u_char ista, int, u_char); +extern void isic_hscx_cmd( struct isic_softc *, int, unsigned char); +extern void isic_hscx_waitxfw( struct isic_softc *, int); +extern void isic_init_linktab(struct isic_softc *); +extern int isic_isac_init(struct isic_softc *); +extern void isic_isac_irq(struct isic_softc *, int); +extern void isic_isac_l1_cmd(struct isic_softc *, int); +extern void isic_next_state(struct isic_softc *, int); +extern char * isic_printstate(struct isic_softc *); +extern int isic_probe_avma1(struct isic_attach_args *); +extern int isic_probe_s016(struct isic_attach_args *); +extern int isic_probe_s0163(struct isic_attach_args *); +extern int isic_probe_s08(struct isic_attach_args *ia); +extern int isic_probe_usrtai(struct isic_attach_args *ia); +extern int isic_probe_itkix1(struct isic_attach_args *ia); extern int isic_attach_bri(struct isic_softc *sc, const char *cardname, const struct isdn_layer1_isdnif_driver *dchan_driver); extern int isic_detach_bri(struct isic_softc *sc); -extern void isic_isacsx_disable_intr __P((struct isic_softc *sc)); -extern void isic_isacsx_recover __P((struct isic_softc *sc)); -extern void isic_isacsx_irq __P((struct isic_softc *sc, int r)); -extern void isic_isacsx_l1_cmd __P((struct isic_softc *sc, int command)); -extern int isic_isacsx_init __P((struct isic_softc *sc)); +extern void isic_isacsx_disable_intr(struct isic_softc *sc); +extern void isic_isacsx_recover(struct isic_softc *sc); +extern void isic_isacsx_irq(struct isic_softc *sc, int r); +extern void isic_isacsx_l1_cmd(struct isic_softc *sc, int command); +extern int isic_isacsx_init(struct isic_softc *sc); #endif /* !_ISIC_L1_H */ diff --git a/sys/dev/ic/joyvar.h b/sys/dev/ic/joyvar.h index f5d48413a8e..f4c04c4f331 100644 --- a/sys/dev/ic/joyvar.h +++ b/sys/dev/ic/joyvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: joyvar.h,v 1.3 2004/08/03 18:35:21 drochner Exp $ */ +/* $NetBSD: joyvar.h,v 1.4 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 1995 Jean-Marc Zucconi @@ -46,7 +46,7 @@ struct joy_softc { int timeout[2]; }; -void joyattach __P((struct joy_softc *)); -int joydetach __P((struct joy_softc *, int)); +void joyattach(struct joy_softc *); +int joydetach(struct joy_softc *, int); #endif /* ! _JOYVAR_H_ */ diff --git a/sys/dev/ic/lance.c b/sys/dev/ic/lance.c index 07014db171d..191809d18f4 100644 --- a/sys/dev/ic/lance.c +++ b/sys/dev/ic/lance.c @@ -1,4 +1,4 @@ -/* $NetBSD: lance.c,v 1.30 2004/10/30 18:08:37 thorpej Exp $ */ +/* $NetBSD: lance.c,v 1.31 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -72,7 +72,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lance.c,v 1.30 2004/10/30 18:08:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lance.c,v 1.31 2005/02/04 02:10:36 perry Exp $"); #include "opt_ccitt.h" #include "opt_llc.h" @@ -125,18 +125,18 @@ __KERNEL_RCSID(0, "$NetBSD: lance.c,v 1.30 2004/10/30 18:08:37 thorpej Exp $"); #define hide static #endif -integrate struct mbuf *lance_get __P((struct lance_softc *, int, int)); +integrate struct mbuf *lance_get(struct lance_softc *, int, int); -hide void lance_shutdown __P((void *)); +hide void lance_shutdown(void *); -int lance_mediachange __P((struct ifnet *)); -void lance_mediastatus __P((struct ifnet *, struct ifmediareq *)); +int lance_mediachange(struct ifnet *); +void lance_mediastatus(struct ifnet *, struct ifmediareq *); -static inline u_int16_t ether_cmp __P((void *, void *)); +static inline u_int16_t ether_cmp(void *, void *); -void lance_stop __P((struct ifnet *, int)); -int lance_ioctl __P((struct ifnet *, u_long, caddr_t)); -void lance_watchdog __P((struct ifnet *)); +void lance_stop(struct ifnet *, int); +int lance_ioctl(struct ifnet *, u_long, caddr_t); +void lance_watchdog(struct ifnet *); /* * Compare two Ether/802 addresses for equality, inlined and diff --git a/sys/dev/ic/lancevar.h b/sys/dev/ic/lancevar.h index 69134fab896..4c82817e77f 100644 --- a/sys/dev/ic/lancevar.h +++ b/sys/dev/ic/lancevar.h @@ -1,4 +1,4 @@ -/* $NetBSD: lancevar.h,v 1.7 2004/02/13 11:36:22 wiz Exp $ */ +/* $NetBSD: lancevar.h,v 1.8 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -56,15 +56,15 @@ struct lance_softc { * zero bytes in buffer */ void (*sc_copytodesc) - __P((struct lance_softc *, void *, int, int)); + (struct lance_softc *, void *, int, int); void (*sc_copyfromdesc) - __P((struct lance_softc *, void *, int, int)); + (struct lance_softc *, void *, int, int); void (*sc_copytobuf) - __P((struct lance_softc *, void *, int, int)); + (struct lance_softc *, void *, int, int); void (*sc_copyfrombuf) - __P((struct lance_softc *, void *, int, int)); + (struct lance_softc *, void *, int, int); void (*sc_zerobuf) - __P((struct lance_softc *, int, int)); + (struct lance_softc *, int, int); /* * Machine-dependent functions: @@ -76,15 +76,14 @@ struct lance_softc { * media change hook - may be NULL */ u_int16_t (*sc_rdcsr) - __P((struct lance_softc *, u_int16_t)); + (struct lance_softc *, u_int16_t); void (*sc_wrcsr) - __P((struct lance_softc *, u_int16_t, u_int16_t)); - void (*sc_hwreset) __P((struct lance_softc *)); - void (*sc_hwinit) __P((struct lance_softc *)); - void (*sc_nocarrier) __P((struct lance_softc *)); - int (*sc_mediachange) __P((struct lance_softc *)); - void (*sc_mediastatus) __P((struct lance_softc *, - struct ifmediareq *)); + (struct lance_softc *, u_int16_t, u_int16_t); + void (*sc_hwreset)(struct lance_softc *); + void (*sc_hwinit)(struct lance_softc *); + void (*sc_nocarrier)(struct lance_softc *); + int (*sc_mediachange)(struct lance_softc *); + void (*sc_mediastatus)(struct lance_softc *, struct ifmediareq *); /* * Media-supported by this interface. If this is NULL, @@ -129,16 +128,16 @@ struct lance_softc { rndsource_element_t rnd_source; #endif - void (*sc_meminit) __P((struct lance_softc *)); - void (*sc_start) __P((struct ifnet *)); + void (*sc_meminit)(struct lance_softc *); + void (*sc_start)(struct ifnet *); }; -void lance_config __P((struct lance_softc *)); -void lance_reset __P((struct lance_softc *)); -int lance_init __P((struct ifnet *)); -int lance_put __P((struct lance_softc *, int, struct mbuf *)); -void lance_read __P((struct lance_softc *, int, int)); -void lance_setladrf __P((struct ethercom *, u_int16_t *)); +void lance_config(struct lance_softc *); +void lance_reset(struct lance_softc *); +int lance_init(struct ifnet *); +int lance_put(struct lance_softc *, int, struct mbuf *); +void lance_read(struct lance_softc *, int, int); +void lance_setladrf(struct ethercom *, u_int16_t *); /* * The following functions are only useful on certain CPU/bus @@ -146,16 +145,16 @@ void lance_setladrf __P((struct ethercom *, u_int16_t *)); * maximum efficiency, but machine-independent versions are provided * for drivers that have not yet been optimized. */ -void lance_copytobuf_contig __P((struct lance_softc *, void *, int, int)); -void lance_copyfrombuf_contig __P((struct lance_softc *, void *, int, int)); -void lance_zerobuf_contig __P((struct lance_softc *, int, int)); +void lance_copytobuf_contig(struct lance_softc *, void *, int, int); +void lance_copyfrombuf_contig(struct lance_softc *, void *, int, int); +void lance_zerobuf_contig(struct lance_softc *, int, int); #if 0 /* Example only - see lance.c */ -void lance_copytobuf_gap2 __P((struct lance_softc *, void *, int, int)); -void lance_copyfrombuf_gap2 __P((struct lance_softc *, void *, int, int)); -void lance_zerobuf_gap2 __P((struct lance_softc *, int, int)); +void lance_copytobuf_gap2(struct lance_softc *, void *, int, int); +void lance_copyfrombuf_gap2(struct lance_softc *, void *, int, int); +void lance_zerobuf_gap2(struct lance_softc *, int, int); -void lance_copytobuf_gap16 __P((struct lance_softc *, void *, int, int)); -void lance_copyfrombuf_gap16 __P((struct lance_softc *, void *, int, int)); -void lance_zerobuf_gap16 __P((struct lance_softc *, int, int)); +void lance_copytobuf_gap16(struct lance_softc *, void *, int, int); +void lance_copyfrombuf_gap16(struct lance_softc *, void *, int, int); +void lance_zerobuf_gap16(struct lance_softc *, int, int); #endif /* Example only */ diff --git a/sys/dev/ic/lptvar.h b/sys/dev/ic/lptvar.h index d69109abf7b..27ee4bbcb63 100644 --- a/sys/dev/ic/lptvar.h +++ b/sys/dev/ic/lptvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: lptvar.h,v 1.50 2000/03/23 07:01:31 thorpej Exp $ */ +/* $NetBSD: lptvar.h,v 1.51 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1993, 1994 Charles M. Hannum. @@ -86,11 +86,11 @@ struct lpt_softc { #define NOT_READY() ((bus_space_read_1(iot, ioh, lpt_status) ^ LPS_INVERT) & LPS_MASK) #define NOT_READY_ERR() lptnotready(bus_space_read_1(iot, ioh, lpt_status), sc) -int lptnotready __P((u_char, struct lpt_softc *)); -void lptwakeup __P((void *arg)); -int lptpushbytes __P((struct lpt_softc *)); +int lptnotready(u_char, struct lpt_softc *); +void lptwakeup(void *arg); +int lptpushbytes(struct lpt_softc *); -void lpt_attach_subr __P((struct lpt_softc *)); -int lptintr __P((void *)); +void lpt_attach_subr(struct lpt_softc *); +int lptintr(void *); #endif /* _LPT_VAR_H_ */ diff --git a/sys/dev/ic/lsi64854.c b/sys/dev/ic/lsi64854.c index ac0f9cf0b7d..2b4bd4624d8 100644 --- a/sys/dev/ic/lsi64854.c +++ b/sys/dev/ic/lsi64854.c @@ -1,4 +1,4 @@ -/* $NetBSD: lsi64854.c,v 1.23 2003/05/03 18:11:21 wiz Exp $ */ +/* $NetBSD: lsi64854.c,v 1.24 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lsi64854.c,v 1.23 2003/05/03 18:11:21 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lsi64854.c,v 1.24 2005/02/04 02:10:36 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -62,11 +62,11 @@ __KERNEL_RCSID(0, "$NetBSD: lsi64854.c,v 1.23 2003/05/03 18:11:21 wiz Exp $"); #include <dev/ic/ncr53c9xreg.h> #include <dev/ic/ncr53c9xvar.h> -void lsi64854_reset __P((struct lsi64854_softc *)); -int lsi64854_setup __P((struct lsi64854_softc *, caddr_t *, size_t *, - int, size_t *)); -int lsi64854_setup_pp __P((struct lsi64854_softc *, caddr_t *, size_t *, - int, size_t *)); +void lsi64854_reset(struct lsi64854_softc *); +int lsi64854_setup(struct lsi64854_softc *, caddr_t *, size_t *, + int, size_t *); +int lsi64854_setup_pp(struct lsi64854_softc *, caddr_t *, size_t *, + int, size_t *); #ifdef DEBUG #define LDB_SCSI 1 diff --git a/sys/dev/ic/lsi64854var.h b/sys/dev/ic/lsi64854var.h index 8202e7ff167..03ede3dc89f 100644 --- a/sys/dev/ic/lsi64854var.h +++ b/sys/dev/ic/lsi64854var.h @@ -1,4 +1,4 @@ -/* $NetBSD: lsi64854var.h,v 1.5 2003/05/03 18:11:21 wiz Exp $ */ +/* $NetBSD: lsi64854var.h,v 1.6 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -58,12 +58,12 @@ struct lsi64854_softc { caddr_t *sc_dmaaddr; size_t *sc_dmalen; - void (*reset) __P((struct lsi64854_softc *));/* reset routine */ - int (*setup) __P((struct lsi64854_softc *, caddr_t *, size_t *, - int, size_t *)); /* DMA setup */ - int (*intr) __P((void *)); /* interrupt handler */ + void (*reset)(struct lsi64854_softc *);/* reset routine */ + int (*setup)(struct lsi64854_softc *, caddr_t *, size_t *, + int, size_t *); /* DMA setup */ + int (*intr)(void *); /* interrupt handler */ - int (*sc_intrchain) __P((void *)); /* next handler in intr chain */ + int (*sc_intrchain)(void *); /* next handler in intr chain */ void *sc_intrchainarg; /* arg for next intr handler */ u_int sc_dmactl; @@ -101,7 +101,7 @@ struct lsi64854_softc { } while (0) -void lsi64854_attach __P((struct lsi64854_softc *)); -int lsi64854_scsi_intr __P((void *)); -int lsi64854_enet_intr __P((void *)); -int lsi64854_pp_intr __P((void *)); +void lsi64854_attach(struct lsi64854_softc *); +int lsi64854_scsi_intr(void *); +int lsi64854_enet_intr(void *); +int lsi64854_pp_intr(void *); diff --git a/sys/dev/ic/mc146818reg.h b/sys/dev/ic/mc146818reg.h index a07dd8913ef..1da2b7d4418 100644 --- a/sys/dev/ic/mc146818reg.h +++ b/sys/dev/ic/mc146818reg.h @@ -1,4 +1,4 @@ -/* $NetBSD: mc146818reg.h,v 1.5 2003/11/02 11:07:45 wiz Exp $ */ +/* $NetBSD: mc146818reg.h,v 1.6 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. @@ -152,8 +152,8 @@ * RTC register/NVRAM read and write functions -- machine-dependent. * Appropriately manipulate RTC registers to get/put data values. */ -u_int mc146818_read __P((void *, u_int)); -void mc146818_write __P((void *, u_int, u_int)); +u_int mc146818_read(void *, u_int); +void mc146818_write(void *, u_int, u_int); /* * A collection of TOD/Alarm registers. diff --git a/sys/dev/ic/midway.c b/sys/dev/ic/midway.c index bd730c67e3f..e6afd84439e 100644 --- a/sys/dev/ic/midway.c +++ b/sys/dev/ic/midway.c @@ -1,4 +1,4 @@ -/* $NetBSD: midway.c,v 1.64 2004/04/22 00:17:11 itojun Exp $ */ +/* $NetBSD: midway.c,v 1.65 2005/02/04 02:10:36 perry Exp $ */ /* (sync'd to midway.c 1.68) */ /* @@ -68,7 +68,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.64 2004/04/22 00:17:11 itojun Exp $"); +__KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.65 2005/02/04 02:10:36 perry Exp $"); #include "opt_natm.h" @@ -334,46 +334,44 @@ static struct en_dmatab *en_dmaplan = en_dma_planA; * 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)); #ifdef ATM_PVCEXT -static void rrp_add __P((struct en_softc *, struct ifnet *)); -static struct ifnet *en_pvcattach __P((struct ifnet *)); -static int en_txctl __P((struct en_softc *, int, int, int)); -static int en_pvctx __P((struct en_softc *, struct pvctxreq *)); -static int en_pvctxget __P((struct en_softc *, struct pvctxreq *)); -static int en_pcr2txspeed __P((int)); -static int en_txspeed2pcr __P((int)); -static struct ifnet *en_vci2ifp __P((struct en_softc *, int)); +static void rrp_add(struct en_softc *, struct ifnet *); +static struct ifnet *en_pvcattach(struct ifnet *); +static int en_txctl(struct en_softc *, int, int, int); +static int en_pvctx(struct en_softc *, struct pvctxreq *); +static int en_pvctxget(struct en_softc *, struct pvctxreq *); +static int en_pcr2txspeed(int); +static int en_txspeed2pcr(int); +static struct ifnet *en_vci2ifp(struct en_softc *, int); #endif /* diff --git a/sys/dev/ic/midwayvar.h b/sys/dev/ic/midwayvar.h index 412d39642cf..f8a77200126 100644 --- a/sys/dev/ic/midwayvar.h +++ b/sys/dev/ic/midwayvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: midwayvar.h,v 1.13 2003/11/02 11:07:45 wiz Exp $ */ +/* $NetBSD: midwayvar.h,v 1.14 2005/02/04 02:10:36 perry Exp $ */ /* * @@ -114,7 +114,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 */ @@ -220,6 +220,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/ic/mm58167.c b/sys/dev/ic/mm58167.c index 908297ef06d..ab8a7e35ce7 100644 --- a/sys/dev/ic/mm58167.c +++ b/sys/dev/ic/mm58167.c @@ -1,4 +1,4 @@ -/* $NetBSD: mm58167.c,v 1.3 2001/11/13 13:14:41 lukem Exp $ */ +/* $NetBSD: mm58167.c,v 1.4 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mm58167.c,v 1.3 2001/11/13 13:14:41 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mm58167.c,v 1.4 2005/02/04 02:10:36 perry Exp $"); #include <sys/param.h> #include <sys/malloc.h> @@ -53,10 +53,10 @@ __KERNEL_RCSID(0, "$NetBSD: mm58167.c,v 1.3 2001/11/13 13:14:41 lukem Exp $"); #include <dev/clock_subr.h> #include <dev/ic/mm58167var.h> -int mm58167_gettime __P((todr_chip_handle_t, struct timeval *)); -int mm58167_settime __P((todr_chip_handle_t, struct timeval *)); -int mm58167_getcal __P((todr_chip_handle_t, int *)); -int mm58167_setcal __P((todr_chip_handle_t, int)); +int mm58167_gettime(todr_chip_handle_t, struct timeval *); +int mm58167_settime(todr_chip_handle_t, struct timeval *); +int mm58167_getcal(todr_chip_handle_t, int *); +int mm58167_setcal(todr_chip_handle_t, int); /* * To quote SunOS's todreg.h: diff --git a/sys/dev/ic/mm58167var.h b/sys/dev/ic/mm58167var.h index 255ec7d0768..ac0c82786c5 100644 --- a/sys/dev/ic/mm58167var.h +++ b/sys/dev/ic/mm58167var.h @@ -1,4 +1,4 @@ -/* $NetBSD: mm58167var.h,v 1.1 2001/04/10 12:50:18 fredette Exp $ */ +/* $NetBSD: mm58167var.h,v 1.2 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -87,6 +87,6 @@ struct mm58167_softc { struct todr_chip_handle _mm58167_todr_handle; }; -todr_chip_handle_t mm58167_attach __P((struct mm58167_softc *)); +todr_chip_handle_t mm58167_attach(struct mm58167_softc *); #endif /* _MM58167VAR_H */ diff --git a/sys/dev/ic/mpu.c b/sys/dev/ic/mpu.c index e03798e2224..219593ded27 100644 --- a/sys/dev/ic/mpu.c +++ b/sys/dev/ic/mpu.c @@ -1,4 +1,4 @@ -/* $NetBSD: mpu.c,v 1.8 2004/12/02 09:50:41 xtraeme Exp $ */ +/* $NetBSD: mpu.c,v 1.9 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mpu.c,v 1.8 2004/12/02 09:50:41 xtraeme Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpu.c,v 1.9 2005/02/04 02:10:36 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -82,12 +82,12 @@ int mpu_reset(struct mpu_softc *); static __inline int mpu_waitready(struct mpu_softc *); void mpu_readinput(struct mpu_softc *); -int mpu_open __P((void *, int, - void (*iintr)__P((void *, int)), - void (*ointr)__P((void *)), void *arg)); -void mpu_close __P((void *)); -int mpu_output __P((void *, int)); -void mpu_getinfo __P((void *, struct midi_info *)); +int mpu_open(void *, int, + void (*iintr)(void *, int), + void (*ointr)(void *), void *arg); +void mpu_close(void *); +int mpu_output(void *, int); +void mpu_getinfo(void *, struct midi_info *); const struct midi_hw_if mpu_midi_hw_if = { mpu_open, @@ -165,8 +165,8 @@ int mpu_open(addr, flags, iintr, ointr, arg) void *addr; int flags; - void (*iintr)__P((void *, int)); - void (*ointr)__P((void *)); + void (*iintr)(void *, int); + void (*ointr)(void *); void *arg; { struct mpu_softc *sc = addr; diff --git a/sys/dev/ic/mpuvar.h b/sys/dev/ic/mpuvar.h index 34384cb8088..1128c61437e 100644 --- a/sys/dev/ic/mpuvar.h +++ b/sys/dev/ic/mpuvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: mpuvar.h,v 1.5 2004/10/29 12:57:17 yamt Exp $ */ +/* $NetBSD: mpuvar.h,v 1.6 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -42,11 +42,11 @@ struct mpu_softc { bus_space_handle_t ioh; /* handle */ char *model; int open; - void (*intr)__P((void *, int)); /* midi input intr handler */ + void (*intr)(void *, int); /* midi input intr handler */ void *arg; /* arg for intr() */ #ifndef AUDIO_NO_POWER_CTL - int (*powerctl)__P((void *, int)); + int (*powerctl)(void *, int); void *powerarg; #endif }; @@ -54,9 +54,9 @@ struct mpu_softc { #ifdef _KERNEL extern const struct midi_hw_if mpu_midi_hw_if; -int mpu_find __P((struct mpu_softc *)); -void mpu_attach __P((struct mpu_softc *)); -int mpu_intr __P((void *)); +int mpu_find(struct mpu_softc *); +void mpu_attach(struct mpu_softc *); +int mpu_intr(void *); #endif #define MPU401_NPORT 2 diff --git a/sys/dev/ic/mtd803.c b/sys/dev/ic/mtd803.c index 70069ba6aca..0c5484b3fb0 100644 --- a/sys/dev/ic/mtd803.c +++ b/sys/dev/ic/mtd803.c @@ -1,4 +1,4 @@ -/* $NetBSD: mtd803.c,v 1.6 2004/10/30 18:08:37 thorpej Exp $ */ +/* $NetBSD: mtd803.c,v 1.7 2005/02/04 02:10:36 perry Exp $ */ /*- * @@ -51,7 +51,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mtd803.c,v 1.6 2004/10/30 18:08:37 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mtd803.c,v 1.7 2005/02/04 02:10:36 perry Exp $"); #include "bpfilter.h" @@ -116,28 +116,28 @@ __KERNEL_RCSID(0, "$NetBSD: mtd803.c,v 1.6 2004/10/30 18:08:37 thorpej Exp $"); #define ETHER_CRC32(buf, len) (ether_crc32_be((buf), (len))) -int mtd_mii_readreg __P((struct device *, int, int)); -void mtd_mii_writereg __P((struct device *, int, int, int)); -void mtd_mii_statchg __P((struct device *)); - -void mtd_start __P((struct ifnet *)); -void mtd_stop __P((struct ifnet *, int)); -int mtd_ioctl __P((struct ifnet *, u_long, caddr_t)); -void mtd_setmulti __P((struct mtd_softc *)); -void mtd_watchdog __P((struct ifnet *)); -int mtd_mediachange __P((struct ifnet *)); -void mtd_mediastatus __P((struct ifnet *, struct ifmediareq *)); - -int mtd_init __P((struct ifnet *)); -void mtd_reset __P((struct mtd_softc *)); -void mtd_shutdown __P((void *)); -int mtd_init_desc __P((struct mtd_softc *)); -int mtd_put __P((struct mtd_softc *, int, struct mbuf *)); -struct mbuf *mtd_get __P((struct mtd_softc *, int, int)); - -int mtd_rxirq __P((struct mtd_softc *)); -int mtd_txirq __P((struct mtd_softc *)); -int mtd_bufirq __P((struct mtd_softc *)); +int mtd_mii_readreg(struct device *, int, int); +void mtd_mii_writereg(struct device *, int, int, int); +void mtd_mii_statchg(struct device *); + +void mtd_start(struct ifnet *); +void mtd_stop(struct ifnet *, int); +int mtd_ioctl(struct ifnet *, u_long, caddr_t); +void mtd_setmulti(struct mtd_softc *); +void mtd_watchdog(struct ifnet *); +int mtd_mediachange(struct ifnet *); +void mtd_mediastatus(struct ifnet *, struct ifmediareq *); + +int mtd_init(struct ifnet *); +void mtd_reset(struct mtd_softc *); +void mtd_shutdown(void *); +int mtd_init_desc(struct mtd_softc *); +int mtd_put(struct mtd_softc *, int, struct mbuf *); +struct mbuf *mtd_get(struct mtd_softc *, int, int); + +int mtd_rxirq(struct mtd_softc *); +int mtd_txirq(struct mtd_softc *); +int mtd_bufirq(struct mtd_softc *); int diff --git a/sys/dev/ic/mtd803var.h b/sys/dev/ic/mtd803var.h index a85e77e42a4..a3d77d6cd98 100644 --- a/sys/dev/ic/mtd803var.h +++ b/sys/dev/ic/mtd803var.h @@ -1,4 +1,4 @@ -/* $NetBSD: mtd803var.h,v 1.2 2003/09/23 19:37:39 martin Exp $ */ +/* $NetBSD: mtd803var.h,v 1.3 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -137,5 +137,5 @@ struct mtd_softc { #define MTD_RXD_FLEN_SHIFT 16 -extern int mtd_config __P((struct mtd_softc *)); -extern int mtd_irq_h __P((void *)); +extern int mtd_config(struct mtd_softc *); +extern int mtd_irq_h(void *); diff --git a/sys/dev/ic/ncr5380sbc.c b/sys/dev/ic/ncr5380sbc.c index 5850686805a..8beef959caf 100644 --- a/sys/dev/ic/ncr5380sbc.c +++ b/sys/dev/ic/ncr5380sbc.c @@ -1,4 +1,4 @@ -/* $NetBSD: ncr5380sbc.c,v 1.53 2004/09/12 18:05:46 he Exp $ */ +/* $NetBSD: ncr5380sbc.c,v 1.54 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1995 David Jones, Gordon W. Ross @@ -71,7 +71,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ncr5380sbc.c,v 1.53 2004/09/12 18:05:46 he Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ncr5380sbc.c,v 1.54 2005/02/04 02:10:36 perry Exp $"); #include "opt_ddb.h" @@ -98,23 +98,23 @@ __KERNEL_RCSID(0, "$NetBSD: ncr5380sbc.c,v 1.53 2004/09/12 18:05:46 he Exp $"); #include <dev/ic/ncr5380var.h> #include <dev/ic/ncr53c400reg.h> -static void ncr5380_reset_scsibus __P((struct ncr5380_softc *)); -static void ncr5380_sched __P((struct ncr5380_softc *)); -static void ncr5380_done __P((struct ncr5380_softc *)); +static void ncr5380_reset_scsibus(struct ncr5380_softc *); +static void ncr5380_sched(struct ncr5380_softc *); +static void ncr5380_done(struct ncr5380_softc *); static int ncr5380_select - __P((struct ncr5380_softc *, struct sci_req *)); -static void ncr5380_reselect __P((struct ncr5380_softc *)); - -static int ncr5380_msg_in __P((struct ncr5380_softc *)); -static int ncr5380_msg_out __P((struct ncr5380_softc *)); -static int ncr5380_data_xfer __P((struct ncr5380_softc *, int)); -static int ncr5380_command __P((struct ncr5380_softc *)); -static int ncr5380_status __P((struct ncr5380_softc *)); -static void ncr5380_machine __P((struct ncr5380_softc *)); - -void ncr5380_abort __P((struct ncr5380_softc *)); -void ncr5380_cmd_timeout __P((void *)); + (struct ncr5380_softc *, struct sci_req *); +static void ncr5380_reselect(struct ncr5380_softc *); + +static int ncr5380_msg_in(struct ncr5380_softc *); +static int ncr5380_msg_out(struct ncr5380_softc *); +static int ncr5380_data_xfer(struct ncr5380_softc *, int); +static int ncr5380_command(struct ncr5380_softc *); +static int ncr5380_status(struct ncr5380_softc *); +static void ncr5380_machine(struct ncr5380_softc *); + +void ncr5380_abort(struct ncr5380_softc *); +void ncr5380_cmd_timeout(void *); /* * Action flags returned by the info_transfer functions: * (These determine what happens next.) @@ -143,12 +143,12 @@ void ncr5380_cmd_timeout __P((void *)); int ncr5380_debug = 0; #define NCR_BREAK() \ do { if (ncr5380_debug & NCR_DBG_BREAK) Debugger(); } while (0) -static void ncr5380_show_scsi_cmd __P((struct scsipi_xfer *)); +static void ncr5380_show_scsi_cmd(struct scsipi_xfer *); #ifdef DDB -void ncr5380_clear_trace __P((void)); -void ncr5380_show_trace __P((void)); -void ncr5380_show_req __P((struct sci_req *)); -void ncr5380_show_state __P((void)); +void ncr5380_clear_trace(void); +void ncr5380_show_trace(void); +void ncr5380_show_req(struct sci_req *); +void ncr5380_show_state(void); #endif /* DDB */ #else /* NCR5380_DEBUG */ @@ -184,9 +184,9 @@ int ncr5380_wait_phase_timo = 1000 * 10 * 300; /* 5 min. */ int ncr5380_wait_req_timo = 1000 * 50; /* X2 = 100 mS. */ int ncr5380_wait_nrq_timo = 1000 * 25; /* X2 = 50 mS. */ -static __inline int ncr5380_wait_req __P((struct ncr5380_softc *)); -static __inline int ncr5380_wait_not_req __P((struct ncr5380_softc *)); -static __inline void ncr_sched_msgout __P((struct ncr5380_softc *, int)); +static __inline int ncr5380_wait_req(struct ncr5380_softc *); +static __inline int ncr5380_wait_not_req(struct ncr5380_softc *); +static __inline void ncr_sched_msgout(struct ncr5380_softc *, int); /* Return zero on success. */ static __inline int ncr5380_wait_req(sc) diff --git a/sys/dev/ic/ncr5380var.h b/sys/dev/ic/ncr5380var.h index 818ab849a69..623fa8ebb1e 100644 --- a/sys/dev/ic/ncr5380var.h +++ b/sys/dev/ic/ncr5380var.h @@ -1,4 +1,4 @@ -/* $NetBSD: ncr5380var.h,v 1.27 2004/08/13 12:59:20 tsutsui Exp $ */ +/* $NetBSD: ncr5380var.h,v 1.28 2005/02/04 02:10:36 perry Exp $ */ /* * Copyright (c) 1995 David Jones, Gordon W. Ross @@ -143,21 +143,21 @@ struct ncr5380_softc { #endif /* Functions set from MD code */ - int (*sc_pio_out) __P((struct ncr5380_softc *, - int, int, u_char *)); - int (*sc_pio_in) __P((struct ncr5380_softc *, - int, int, u_char *)); - void (*sc_dma_alloc) __P((struct ncr5380_softc *)); - void (*sc_dma_free) __P((struct ncr5380_softc *)); - - void (*sc_dma_setup) __P((struct ncr5380_softc *)); - void (*sc_dma_start) __P((struct ncr5380_softc *)); - void (*sc_dma_poll) __P((struct ncr5380_softc *)); - void (*sc_dma_eop) __P((struct ncr5380_softc *)); - void (*sc_dma_stop) __P((struct ncr5380_softc *)); - - void (*sc_intr_on) __P((struct ncr5380_softc *)); - void (*sc_intr_off) __P((struct ncr5380_softc *)); + int (*sc_pio_out)(struct ncr5380_softc *, + int, int, u_char *); + int (*sc_pio_in)(struct ncr5380_softc *, + int, int, u_char *); + void (*sc_dma_alloc)(struct ncr5380_softc *); + void (*sc_dma_free)(struct ncr5380_softc *); + + void (*sc_dma_setup)(struct ncr5380_softc *); + void (*sc_dma_start)(struct ncr5380_softc *); + void (*sc_dma_poll)(struct ncr5380_softc *); + void (*sc_dma_eop)(struct ncr5380_softc *); + void (*sc_dma_stop)(struct ncr5380_softc *); + + void (*sc_intr_on)(struct ncr5380_softc *); + void (*sc_intr_off)(struct ncr5380_softc *); int sc_flags; /* Misc. flags and capabilities */ #define NCR5380_FORCE_POLLING 1 /* Do not use interrupts. */ @@ -226,18 +226,18 @@ struct ncr5380_softc { }; -void ncr5380_attach __P((struct ncr5380_softc *)); -int ncr5380_detach __P((struct ncr5380_softc *, int)); -int ncr5380_intr __P((void *)); -void ncr5380_scsipi_request __P((struct scsipi_channel *, - scsipi_adapter_req_t, void *)); -int ncr5380_pio_in __P((struct ncr5380_softc *, int, int, u_char *)); -int ncr5380_pio_out __P((struct ncr5380_softc *, int, int, u_char *)); -void ncr5380_init __P((struct ncr5380_softc *)); +void ncr5380_attach(struct ncr5380_softc *); +int ncr5380_detach(struct ncr5380_softc *, int); +int ncr5380_intr(void *); +void ncr5380_scsipi_request(struct scsipi_channel *, + scsipi_adapter_req_t, void *); +int ncr5380_pio_in(struct ncr5380_softc *, int, int, u_char *); +int ncr5380_pio_out(struct ncr5380_softc *, int, int, u_char *); +void ncr5380_init(struct ncr5380_softc *); #ifdef NCR5380_DEBUG struct ncr5380_softc *ncr5380_debug_sc; -void ncr5380_trace __P((char *msg, long val)); +void ncr5380_trace(char *msg, long val); #define NCR_TRACE(msg, val) ncr5380_trace(msg, val) #else /* NCR5380_DEBUG */ #define NCR_TRACE(msg, val) /* nada */ diff --git a/sys/dev/ic/ncr53c9xvar.h b/sys/dev/ic/ncr53c9xvar.h index 8207eb36b86..e88966f900e 100644 --- a/sys/dev/ic/ncr53c9xvar.h +++ b/sys/dev/ic/ncr53c9xvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: ncr53c9xvar.h,v 1.45 2004/12/07 22:23:45 thorpej Exp $ */ +/* $NetBSD: ncr53c9xvar.h,v 1.46 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -443,12 +443,12 @@ struct ncr53c9x_softc { #define ncr53c9x_cpb2stp(sc, cpb) \ ((250 * (cpb)) / (sc)->sc_freq) -void ncr53c9x_attach __P((struct ncr53c9x_softc *)); -int ncr53c9x_detach __P((struct ncr53c9x_softc *, int)); -void ncr53c9x_scsipi_request __P((struct scsipi_channel *chan, - scsipi_adapter_req_t req, void *)); -void ncr53c9x_reset __P((struct ncr53c9x_softc *)); -int ncr53c9x_intr __P((void *)); -void ncr53c9x_init __P((struct ncr53c9x_softc *, int)); +void ncr53c9x_attach(struct ncr53c9x_softc *); +int ncr53c9x_detach(struct ncr53c9x_softc *, int); +void ncr53c9x_scsipi_request(struct scsipi_channel *chan, + scsipi_adapter_req_t req, void *); +void ncr53c9x_reset(struct ncr53c9x_softc *); +int ncr53c9x_intr(void *); +void ncr53c9x_init(struct ncr53c9x_softc *, int); #endif /* _DEV_IC_NCR53C9XVAR_H_ */ diff --git a/sys/dev/ic/ne2000.c b/sys/dev/ic/ne2000.c index 0a4e8042653..a421f1ab151 100644 --- a/sys/dev/ic/ne2000.c +++ b/sys/dev/ic/ne2000.c @@ -1,4 +1,4 @@ -/* $NetBSD: ne2000.c,v 1.44 2004/08/09 00:26:15 mycroft Exp $ */ +/* $NetBSD: ne2000.c,v 1.45 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -55,7 +55,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ne2000.c,v 1.44 2004/08/09 00:26:15 mycroft Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ne2000.c,v 1.45 2005/02/04 02:10:36 perry Exp $"); #include "opt_ipkdb.h" @@ -98,16 +98,16 @@ __KERNEL_RCSID(0, "$NetBSD: ne2000.c,v 1.44 2004/08/09 00:26:15 mycroft Exp $"); #include <machine/bswap.h> #endif -int ne2000_write_mbuf __P((struct dp8390_softc *, struct mbuf *, int)); -int ne2000_ring_copy __P((struct dp8390_softc *, int, caddr_t, u_short)); -void ne2000_read_hdr __P((struct dp8390_softc *, int, struct dp8390_ring *)); -int ne2000_test_mem __P((struct dp8390_softc *)); +int ne2000_write_mbuf(struct dp8390_softc *, struct mbuf *, int); +int ne2000_ring_copy(struct dp8390_softc *, int, caddr_t, u_short); +void ne2000_read_hdr(struct dp8390_softc *, int, struct dp8390_ring *); +int ne2000_test_mem(struct dp8390_softc *); -void ne2000_writemem __P((bus_space_tag_t, bus_space_handle_t, +void ne2000_writemem(bus_space_tag_t, bus_space_handle_t, bus_space_tag_t, bus_space_handle_t, u_int8_t *, int, size_t, - int, int)); -void ne2000_readmem __P((bus_space_tag_t, bus_space_handle_t, - bus_space_tag_t, bus_space_handle_t, int, u_int8_t *, size_t, int)); + int, int); +void ne2000_readmem(bus_space_tag_t, bus_space_handle_t, + bus_space_tag_t, bus_space_handle_t, int, u_int8_t *, size_t, int); #define ASIC_BARRIER(asict, asich) \ bus_space_barrier((asict), (asich), 0, 0x10, \ diff --git a/sys/dev/ic/ne2000var.h b/sys/dev/ic/ne2000var.h index 532c664ee5d..d10a9845ac2 100644 --- a/sys/dev/ic/ne2000var.h +++ b/sys/dev/ic/ne2000var.h @@ -1,4 +1,4 @@ -/* $NetBSD: ne2000var.h,v 1.15 2004/03/17 23:47:16 mycroft Exp $ */ +/* $NetBSD: ne2000var.h,v 1.16 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -58,13 +58,13 @@ struct ne2000_softc { int sc_useword; }; -int ne2000_attach __P((struct ne2000_softc *, u_int8_t *)); -int ne2000_detect __P((bus_space_tag_t, bus_space_handle_t, - bus_space_tag_t, bus_space_handle_t)); -int ne2000_detach __P((struct ne2000_softc *, int)); +int ne2000_attach(struct ne2000_softc *, u_int8_t *); +int ne2000_detect(bus_space_tag_t, bus_space_handle_t, + bus_space_tag_t, bus_space_handle_t); +int ne2000_detach(struct ne2000_softc *, int); #ifdef IPKDB_NE -int ne2000_ipkdb_attach __P((struct ipkdb_if *)); +int ne2000_ipkdb_attach(struct ipkdb_if *); #endif #endif /* _DEV_IC_NE2000VAR_H_ */ diff --git a/sys/dev/ic/nslm7x.c b/sys/dev/ic/nslm7x.c index 12176e08a11..b801192ef3f 100644 --- a/sys/dev/ic/nslm7x.c +++ b/sys/dev/ic/nslm7x.c @@ -1,4 +1,4 @@ -/* $NetBSD: nslm7x.c,v 1.19 2004/07/24 18:59:16 christos Exp $ */ +/* $NetBSD: nslm7x.c,v 1.20 2005/02/04 02:10:36 perry Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.19 2004/07/24 18:59:16 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.20 2005/02/04 02:10:36 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -82,50 +82,50 @@ const struct envsys_range lm_ranges[] = { /* sc->sensors sub-intervals */ }; -static void setup_fan __P((struct lm_softc *, int, int)); -static void setup_temp __P((struct lm_softc *, int, int)); -static void wb_setup_volt __P((struct lm_softc *)); +static void setup_fan(struct lm_softc *, int, int); +static void setup_temp(struct lm_softc *, int, int); +static void wb_setup_volt(struct lm_softc *); -int lm_match __P((struct lm_softc *)); -int wb_match __P((struct lm_softc *)); -int itec_match __P((struct lm_softc *)); -int def_match __P((struct lm_softc *)); -void lm_common_match __P((struct lm_softc *)); -static int lm_generic_banksel __P((struct lm_softc *, int)); +int lm_match(struct lm_softc *); +int wb_match(struct lm_softc *); +int itec_match(struct lm_softc *); +int def_match(struct lm_softc *); +void lm_common_match(struct lm_softc *); +static int lm_generic_banksel(struct lm_softc *, int); -static void generic_stemp __P((struct lm_softc *, struct envsys_tre_data *)); -static void generic_svolt __P((struct lm_softc *, struct envsys_tre_data *, - struct envsys_basic_info *)); -static void generic_fanrpm __P((struct lm_softc *, struct envsys_tre_data *)); +static void generic_stemp(struct lm_softc *, struct envsys_tre_data *); +static void generic_svolt(struct lm_softc *, struct envsys_tre_data *, + struct envsys_basic_info *); +static void generic_fanrpm(struct lm_softc *, struct envsys_tre_data *); -void lm_refresh_sensor_data __P((struct lm_softc *)); +void lm_refresh_sensor_data(struct lm_softc *); -static void wb_svolt __P((struct lm_softc *)); -static void wb_stemp __P((struct lm_softc *, struct envsys_tre_data *, int)); -static void wb781_fanrpm __P((struct lm_softc *, struct envsys_tre_data *)); -static void wb_fanrpm __P((struct lm_softc *, struct envsys_tre_data *)); +static void wb_svolt(struct lm_softc *); +static void wb_stemp(struct lm_softc *, struct envsys_tre_data *, int); +static void wb781_fanrpm(struct lm_softc *, struct envsys_tre_data *); +static void wb_fanrpm(struct lm_softc *, struct envsys_tre_data *); -void wb781_refresh_sensor_data __P((struct lm_softc *)); -void wb782_refresh_sensor_data __P((struct lm_softc *)); -void wb697_refresh_sensor_data __P((struct lm_softc *)); +void wb781_refresh_sensor_data(struct lm_softc *); +void wb782_refresh_sensor_data(struct lm_softc *); +void wb697_refresh_sensor_data(struct lm_softc *); -static void itec_svolt __P((struct lm_softc *, struct envsys_tre_data *, - struct envsys_basic_info *)); -static void itec_stemp __P((struct lm_softc *, struct envsys_tre_data *)); -static void itec_fanrpm __P((struct lm_softc *, struct envsys_tre_data *)); -void itec_refresh_sensor_data __P((struct lm_softc *)); +static void itec_svolt(struct lm_softc *, struct envsys_tre_data *, + struct envsys_basic_info *); +static void itec_stemp(struct lm_softc *, struct envsys_tre_data *); +static void itec_fanrpm(struct lm_softc *, struct envsys_tre_data *); +void itec_refresh_sensor_data(struct lm_softc *); -int lm_gtredata __P((struct sysmon_envsys *, struct envsys_tre_data *)); +int lm_gtredata(struct sysmon_envsys *, struct envsys_tre_data *); -int generic_streinfo_fan __P((struct lm_softc *, struct envsys_basic_info *, - int, struct envsys_basic_info *)); -int lm_streinfo __P((struct sysmon_envsys *, struct envsys_basic_info *)); -int wb781_streinfo __P((struct sysmon_envsys *, struct envsys_basic_info *)); -int wb782_streinfo __P((struct sysmon_envsys *, struct envsys_basic_info *)); -int itec_streinfo __P((struct sysmon_envsys *, struct envsys_basic_info *)); +int generic_streinfo_fan(struct lm_softc *, struct envsys_basic_info *, + int, struct envsys_basic_info *); +int lm_streinfo(struct sysmon_envsys *, struct envsys_basic_info *); +int wb781_streinfo(struct sysmon_envsys *, struct envsys_basic_info *); +int wb782_streinfo(struct sysmon_envsys *, struct envsys_basic_info *); +int itec_streinfo(struct sysmon_envsys *, struct envsys_basic_info *); struct lm_chip { - int (*chip_match) __P((struct lm_softc *)); + int (*chip_match)(struct lm_softc *); }; struct lm_chip lm_chips[] = { diff --git a/sys/dev/ic/nslm7xvar.h b/sys/dev/ic/nslm7xvar.h index d0ae3bb0b52..27d290c4f0d 100644 --- a/sys/dev/ic/nslm7xvar.h +++ b/sys/dev/ic/nslm7xvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: nslm7xvar.h,v 1.12 2004/07/24 18:59:16 christos Exp $ */ +/* $NetBSD: nslm7xvar.h,v 1.13 2005/02/04 02:10:37 perry Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -162,7 +162,7 @@ struct lm_softc { struct envsys_tre_data sensors[WB_NUM_SENSORS]; struct envsys_basic_info info[WB_NUM_SENSORS]; u_int numsensors; - void (*refresh_sensor_data) __P((struct lm_softc *)); + void (*refresh_sensor_data)(struct lm_softc *); int (*lm_banksel)(struct lm_softc *, int); u_int8_t (*lm_readreg)(struct lm_softc *, int); @@ -171,7 +171,7 @@ struct lm_softc { struct sysmon_envsys sc_sysmon; }; -void lm_attach __P((struct lm_softc *)); -int lm_probe __P((bus_space_tag_t, bus_space_handle_t)); +void lm_attach(struct lm_softc *); +int lm_probe(bus_space_tag_t, bus_space_handle_t); #endif /* _DEV_ISA_NSLM7XVAR_H_ */ diff --git a/sys/dev/ic/opl.c b/sys/dev/ic/opl.c index c4f44d3f3c2..d3f3bab7c25 100644 --- a/sys/dev/ic/opl.c +++ b/sys/dev/ic/opl.c @@ -1,4 +1,4 @@ -/* $NetBSD: opl.c,v 1.21 2004/04/22 00:17:11 itojun Exp $ */ +/* $NetBSD: opl.c,v 1.22 2005/02/04 02:10:37 perry Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: opl.c,v 1.21 2004/04/22 00:17:11 itojun Exp $"); +__KERNEL_RCSID(0, "$NetBSD: opl.c,v 1.22 2005/02/04 02:10:37 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -113,23 +113,23 @@ static void opl_command(struct opl_softc *, int, int, int); void opl_reset(struct opl_softc *); void opl_freq_to_fnum (int freq, int *block, int *fnum); -int oplsyn_open __P((midisyn *ms, int)); -void oplsyn_close __P((midisyn *)); -void oplsyn_reset __P((void *)); -void oplsyn_noteon __P((midisyn *, u_int32_t, u_int32_t, u_int32_t)); -void oplsyn_noteoff __P((midisyn *, u_int32_t, u_int32_t, u_int32_t)); -void oplsyn_keypressure __P((midisyn *, u_int32_t, u_int32_t, u_int32_t)); -void oplsyn_ctlchange __P((midisyn *, u_int32_t, u_int32_t, u_int32_t)); -void oplsyn_programchange __P((midisyn *, u_int32_t, u_int32_t)); -void oplsyn_pitchbend __P((midisyn *, u_int32_t, u_int32_t, u_int32_t)); -void oplsyn_loadpatch __P((midisyn *, struct sysex_info *, struct uio *)); - - -void opl_set_op_reg __P((struct opl_softc *, int, int, int, u_char)); -void opl_set_ch_reg __P((struct opl_softc *, int, int, u_char)); -void opl_load_patch __P((struct opl_softc *, int)); -u_int32_t opl_get_block_fnum __P((int freq)); -int opl_calc_vol __P((int regbyte, int volume, int main_vol)); +int oplsyn_open(midisyn *ms, int); +void oplsyn_close(midisyn *); +void oplsyn_reset(void *); +void oplsyn_noteon(midisyn *, u_int32_t, u_int32_t, u_int32_t); +void oplsyn_noteoff(midisyn *, u_int32_t, u_int32_t, u_int32_t); +void oplsyn_keypressure(midisyn *, u_int32_t, u_int32_t, u_int32_t); +void oplsyn_ctlchange(midisyn *, u_int32_t, u_int32_t, u_int32_t); +void oplsyn_programchange(midisyn *, u_int32_t, u_int32_t); +void oplsyn_pitchbend(midisyn *, u_int32_t, u_int32_t, u_int32_t); +void oplsyn_loadpatch(midisyn *, struct sysex_info *, struct uio *); + + +void opl_set_op_reg(struct opl_softc *, int, int, int, u_char); +void opl_set_ch_reg(struct opl_softc *, int, int, u_char); +void opl_load_patch(struct opl_softc *, int); +u_int32_t opl_get_block_fnum(int freq); +int opl_calc_vol(int regbyte, int volume, int main_vol); struct midisyn_methods opl3_midi = { oplsyn_open, diff --git a/sys/dev/ic/oplvar.h b/sys/dev/ic/oplvar.h index 4e63de484d3..ba833cd9065 100644 --- a/sys/dev/ic/oplvar.h +++ b/sys/dev/ic/oplvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: oplvar.h,v 1.9 2003/12/04 13:57:30 keihan Exp $ */ +/* $NetBSD: oplvar.h,v 1.10 2005/02/04 02:10:37 perry Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -63,11 +63,11 @@ struct opl_softc { u_int8_t pan[MIDI_MAX_CHANS]; u_int8_t panl, panr; - int (*spkrctl)__P((void *, int)); + int (*spkrctl)(void *, int); void *spkrarg; #ifndef AUDIO_NO_POWER_CTL - int (*powerctl)__P((void *, int)); + int (*powerctl)(void *, int); void *powerarg; #endif }; @@ -104,7 +104,7 @@ struct opl_operators { extern const struct opl_operators opl2_instrs[]; extern const struct opl_operators opl3_instrs[]; -int opl_find __P((struct opl_softc *)); -void opl_attach __P((struct opl_softc *)); -int opl_detach __P((struct opl_softc *, int)); +int opl_find(struct opl_softc *); +void opl_attach(struct opl_softc *); +int opl_detach(struct opl_softc *, int); #endif diff --git a/sys/dev/ic/pckbc.c b/sys/dev/ic/pckbc.c index f11d4072aac..adaec14d886 100644 --- a/sys/dev/ic/pckbc.c +++ b/sys/dev/ic/pckbc.c @@ -1,4 +1,4 @@ -/* $NetBSD: pckbc.c,v 1.32 2004/03/24 17:26:53 drochner Exp $ */ +/* $NetBSD: pckbc.c,v 1.33 2005/02/04 02:10:37 perry Exp $ */ /* * Copyright (c) 2004 Ben Harris. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.32 2004/03/24 17:26:53 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.33 2005/02/04 02:10:37 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -64,8 +64,8 @@ struct pckbc_slotdata { #endif }; -static void pckbc_init_slotdata __P((struct pckbc_slotdata *)); -static int pckbc_attach_slot __P((struct pckbc_softc *, pckbc_slot_t)); +static void pckbc_init_slotdata(struct pckbc_slotdata *); +static int pckbc_attach_slot(struct pckbc_softc *, pckbc_slot_t); struct pckbc_internal pckbc_consdata; int pckbc_console_attached; @@ -73,21 +73,21 @@ int pckbc_console_attached; static int pckbc_console; static struct pckbc_slotdata pckbc_cons_slotdata; -static int pckbc_xt_translation __P((void *, pckbport_slot_t, int)); -static int pckbc_send_devcmd __P((void *, pckbport_slot_t, u_char)); -static void pckbc_slot_enable __P((void *, pckbport_slot_t, int)); -static void pckbc_intr_establish __P((void *, pckbport_slot_t)); -static void pckbc_set_poll __P((void *, pckbc_slot_t, int on)); +static int pckbc_xt_translation(void *, pckbport_slot_t, int); +static int pckbc_send_devcmd(void *, pckbport_slot_t, u_char); +static void pckbc_slot_enable(void *, pckbport_slot_t, int); +static void pckbc_intr_establish(void *, pckbport_slot_t); +static void pckbc_set_poll(void *, pckbc_slot_t, int on); -static int pckbc_wait_output __P((bus_space_tag_t, bus_space_handle_t)); +static int pckbc_wait_output(bus_space_tag_t, bus_space_handle_t); -static int pckbc_get8042cmd __P((struct pckbc_internal *)); -static int pckbc_put8042cmd __P((struct pckbc_internal *)); +static int pckbc_get8042cmd(struct pckbc_internal *); +static int pckbc_put8042cmd(struct pckbc_internal *); -void pckbc_cleanqueue __P((struct pckbc_slotdata *)); -void pckbc_cleanup __P((void *)); -int pckbc_cmdresponse __P((struct pckbc_internal *, pckbc_slot_t, u_char)); -void pckbc_start __P((struct pckbc_internal *, pckbc_slot_t)); +void pckbc_cleanqueue(struct pckbc_slotdata *); +void pckbc_cleanup(void *); +int pckbc_cmdresponse(struct pckbc_internal *, pckbc_slot_t, u_char); +void pckbc_start(struct pckbc_internal *, pckbc_slot_t); const char * const pckbc_slot_names[] = { "kbd", "aux" }; diff --git a/sys/dev/ic/pckbcvar.h b/sys/dev/ic/pckbcvar.h index 2db2cdef0e4..5dc52640697 100644 --- a/sys/dev/ic/pckbcvar.h +++ b/sys/dev/ic/pckbcvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: pckbcvar.h,v 1.9 2004/03/24 17:26:53 drochner Exp $ */ +/* $NetBSD: pckbcvar.h,v 1.10 2005/02/04 02:10:37 perry Exp $ */ /* * Copyright (c) 1998 @@ -75,7 +75,7 @@ struct pckbc_internal { int rbuf_write; }; -typedef void (*pckbc_inputfcn) __P((void *, int)); +typedef void (*pckbc_inputfcn)(void *, int); /* * State per device. @@ -84,7 +84,7 @@ struct pckbc_softc { struct device sc_dv; struct pckbc_internal *id; - void (*intr_establish) __P((struct pckbc_softc *, pckbc_slot_t)); + void (*intr_establish)(struct pckbc_softc *, pckbc_slot_t); }; struct pckbc_attach_args { @@ -97,19 +97,18 @@ extern struct pckbc_internal pckbc_consdata; extern int pckbc_console_attached; /* These functions are sometimes called by match routines */ -int pckbc_send_cmd __P((bus_space_tag_t, bus_space_handle_t, u_char)); -int pckbc_poll_data1 __P((void *, pckbc_slot_t)); +int pckbc_send_cmd(bus_space_tag_t, bus_space_handle_t, u_char); +int pckbc_poll_data1(void *, pckbc_slot_t); /* More normal calls from attach routines */ -void pckbc_attach __P((struct pckbc_softc *)); -int pckbc_cnattach __P((bus_space_tag_t, bus_addr_t, bus_size_t, - pckbc_slot_t)); -int pckbc_is_console __P((bus_space_tag_t, bus_addr_t)); -int pckbcintr __P((void *)); -int pckbcintr_hard __P((void *)); -void pckbcintr_soft __P((void *)); +void pckbc_attach(struct pckbc_softc *); +int pckbc_cnattach(bus_space_tag_t, bus_addr_t, bus_size_t, pckbc_slot_t); +int pckbc_is_console(bus_space_tag_t, bus_addr_t); +int pckbcintr(void *); +int pckbcintr_hard(void *); +void pckbcintr_soft(void *); /* md hook for use without mi wscons */ -int pckbc_machdep_cnattach __P((pckbc_tag_t, pckbc_slot_t)); +int pckbc_machdep_cnattach(pckbc_tag_t, pckbc_slot_t); #endif /* _DEV_IC_PCKBCVAR_H_ */ diff --git a/sys/dev/ic/ramdac.h b/sys/dev/ic/ramdac.h index 0c65826f98f..73e2e58191e 100644 --- a/sys/dev/ic/ramdac.h +++ b/sys/dev/ic/ramdac.h @@ -1,4 +1,4 @@ -/* $NetBSD: ramdac.h,v 1.3 2001/12/12 07:47:46 elric Exp $ */ +/* $NetBSD: ramdac.h,v 1.4 2005/02/04 02:10:37 perry Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -47,38 +47,38 @@ struct ramdac_cookie; struct ramdac_funcs { char *ramdac_name; - struct ramdac_cookie *(*ramdac_register) __P((void *, + struct ramdac_cookie *(*ramdac_register)(void *, int (*)(void *, void (*)(void *)), void (*)(void *, u_int, u_int8_t), - u_int8_t (*)(void *, u_int))); - void (*ramdac_init) __P((struct ramdac_cookie *)); + u_int8_t (*)(void *, u_int)); + void (*ramdac_init)(struct ramdac_cookie *); - int (*ramdac_set_cmap) __P((struct ramdac_cookie *, - struct wsdisplay_cmap *)); - int (*ramdac_get_cmap) __P((struct ramdac_cookie *, - struct wsdisplay_cmap *)); - int (*ramdac_set_cursor) __P((struct ramdac_cookie *, - struct wsdisplay_cursor *)); - int (*ramdac_get_cursor) __P((struct ramdac_cookie *, - struct wsdisplay_cursor *)); - int (*ramdac_set_curpos) __P((struct ramdac_cookie *, - struct wsdisplay_curpos *)); - int (*ramdac_get_curpos) __P((struct ramdac_cookie *, - struct wsdisplay_curpos *)); - int (*ramdac_get_curmax) __P((struct ramdac_cookie *, - struct wsdisplay_curpos *)); + int (*ramdac_set_cmap)(struct ramdac_cookie *, + struct wsdisplay_cmap *); + int (*ramdac_get_cmap)(struct ramdac_cookie *, + struct wsdisplay_cmap *); + int (*ramdac_set_cursor)(struct ramdac_cookie *, + struct wsdisplay_cursor *); + int (*ramdac_get_cursor)(struct ramdac_cookie *, + struct wsdisplay_cursor *); + int (*ramdac_set_curpos)(struct ramdac_cookie *, + struct wsdisplay_curpos *); + int (*ramdac_get_curpos)(struct ramdac_cookie *, + struct wsdisplay_curpos *); + int (*ramdac_get_curmax)(struct ramdac_cookie *, + struct wsdisplay_curpos *); /* Only called from the TGA built-in cursor handling code. */ - int (*ramdac_check_curcmap) __P((struct ramdac_cookie *, - struct wsdisplay_cursor *)); - void (*ramdac_set_curcmap) __P((struct ramdac_cookie *, - struct wsdisplay_cursor *)); - int (*ramdac_get_curcmap) __P((struct ramdac_cookie *, - struct wsdisplay_cursor *)); + int (*ramdac_check_curcmap)(struct ramdac_cookie *, + struct wsdisplay_cursor *); + void (*ramdac_set_curcmap)(struct ramdac_cookie *, + struct wsdisplay_cursor *); + int (*ramdac_get_curcmap)(struct ramdac_cookie *, + struct wsdisplay_cursor *); /* XXXrcd: new test code for setting the DOTCLOCK */ - int (*ramdac_set_dotclock) __P((struct ramdac_cookie *, - unsigned)); + int (*ramdac_set_dotclock)(struct ramdac_cookie *, + unsigned); }; #endif diff --git a/sys/dev/ic/rrunner.c b/sys/dev/ic/rrunner.c index 2f310bd88ce..448a107d2fe 100644 --- a/sys/dev/ic/rrunner.c +++ b/sys/dev/ic/rrunner.c @@ -1,4 +1,4 @@ -/* $NetBSD: rrunner.c,v 1.46 2004/10/28 07:07:40 yamt Exp $ */ +/* $NetBSD: rrunner.c,v 1.47 2005/02/04 02:10:37 perry Exp $ */ /* * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rrunner.c,v 1.46 2004/10/28 07:07:40 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rrunner.c,v 1.47 2005/02/04 02:10:37 perry Exp $"); #include "opt_inet.h" #include "opt_ns.h" @@ -114,13 +114,13 @@ u_int32_t max_write_len; /* Network device driver and initialization framework routines */ -void eshinit __P((struct esh_softc *)); -int eshioctl __P((struct ifnet *, u_long, caddr_t)); -void eshreset __P((struct esh_softc *)); -void eshstart __P((struct ifnet *)); -static int eshstatus __P((struct esh_softc *)); -void eshstop __P((struct esh_softc *)); -void eshwatchdog __P((struct ifnet *)); +void eshinit(struct esh_softc *); +int eshioctl(struct ifnet *, u_long, caddr_t); +void eshreset(struct esh_softc *); +void eshstart(struct ifnet *); +static int eshstatus(struct esh_softc *); +void eshstop(struct esh_softc *); +void eshwatchdog(struct ifnet *); /* Routines to support FP operation */ @@ -146,38 +146,35 @@ const struct cdevsw esh_cdevsw = { /* General routines, not externally visable */ -static struct mbuf *esh_adjust_mbufs __P((struct esh_softc *, struct mbuf *m)); -static void esh_dma_sync __P((struct esh_softc *, void *, - int, int, int, int, int, int)); -static void esh_fill_snap_ring __P((struct esh_softc *)); -static void esh_init_snap_ring __P((struct esh_softc *)); -static void esh_close_snap_ring __P((struct esh_softc *)); -static void esh_read_snap_ring __P((struct esh_softc *, u_int16_t, int)); -static void esh_fill_fp_ring __P((struct esh_softc *, - struct esh_fp_ring_ctl *)); -static void esh_flush_fp_ring __P((struct esh_softc *, +static struct mbuf *esh_adjust_mbufs(struct esh_softc *, struct mbuf *m); +static void esh_dma_sync(struct esh_softc *, void *, + int, int, int, int, int, int); +static void esh_fill_snap_ring(struct esh_softc *); +static void esh_init_snap_ring(struct esh_softc *); +static void esh_close_snap_ring(struct esh_softc *); +static void esh_read_snap_ring(struct esh_softc *, u_int16_t, int); +static void esh_fill_fp_ring(struct esh_softc *, struct esh_fp_ring_ctl *); +static void esh_flush_fp_ring(struct esh_softc *, struct esh_fp_ring_ctl *, - struct esh_dmainfo *)); -static void esh_init_fp_rings __P((struct esh_softc *)); -static void esh_read_fp_ring __P((struct esh_softc *, u_int16_t, int, int)); -static void esh_reset_runcode __P((struct esh_softc *)); -static void esh_send __P((struct esh_softc *)); -static void esh_send_cmd __P((struct esh_softc *, - u_int8_t, u_int8_t, u_int8_t)); -static u_int32_t esh_read_eeprom __P((struct esh_softc *, u_int32_t)); -static void esh_write_addr __P((bus_space_tag_t, bus_space_handle_t, - bus_addr_t, bus_addr_t)); -static int esh_write_eeprom __P((struct esh_softc *, - u_int32_t, u_int32_t)); -static void eshstart_cleanup __P((struct esh_softc *, u_int16_t, int)); - -static struct esh_dmainfo *esh_new_dmainfo __P((struct esh_softc *)); -static void esh_free_dmainfo __P((struct esh_softc *, struct esh_dmainfo *)); -static int esh_generic_ioctl __P((struct esh_softc *, u_long, caddr_t, u_long, - struct proc *)); + struct esh_dmainfo *); +static void esh_init_fp_rings(struct esh_softc *); +static void esh_read_fp_ring(struct esh_softc *, u_int16_t, int, int); +static void esh_reset_runcode(struct esh_softc *); +static void esh_send(struct esh_softc *); +static void esh_send_cmd(struct esh_softc *, u_int8_t, u_int8_t, u_int8_t); +static u_int32_t esh_read_eeprom(struct esh_softc *, u_int32_t); +static void esh_write_addr(bus_space_tag_t, bus_space_handle_t, + bus_addr_t, bus_addr_t); +static int esh_write_eeprom(struct esh_softc *, u_int32_t, u_int32_t); +static void eshstart_cleanup(struct esh_softc *, u_int16_t, int); + +static struct esh_dmainfo *esh_new_dmainfo(struct esh_softc *); +static void esh_free_dmainfo(struct esh_softc *, struct esh_dmainfo *); +static int esh_generic_ioctl(struct esh_softc *, u_long, caddr_t, u_long, + struct proc *); #ifdef ESH_PRINTF -static int esh_check __P((struct esh_softc *)); +static int esh_check(struct esh_softc *); #endif #define ESHUNIT(x) ((minor(x) & 0xff00) >> 8) diff --git a/sys/dev/ic/rrunnervar.h b/sys/dev/ic/rrunnervar.h index db6b36249fd..193adcf2656 100644 --- a/sys/dev/ic/rrunnervar.h +++ b/sys/dev/ic/rrunnervar.h @@ -1,4 +1,4 @@ -/* $NetBSD: rrunnervar.h,v 1.7 2002/07/24 19:34:57 hannken Exp $ */ +/* $NetBSD: rrunnervar.h,v 1.8 2005/02/04 02:10:37 perry Exp $ */ /* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -172,8 +172,8 @@ struct esh_softc { caddr_t sc_dma_addr; /* address in kernel of DMA mem */ bus_size_t sc_dma_size; /* size of dma-able region */ - u_int8_t (*sc_bist_read) __P((struct esh_softc *)); - void (*sc_bist_write) __P((struct esh_softc *, u_int8_t)); + u_int8_t (*sc_bist_read)(struct esh_softc *); + void (*sc_bist_write)(struct esh_softc *, u_int8_t); /* * Definitions for the various driver structures that sit in host @@ -252,8 +252,8 @@ struct esh_softc { u_int sc_fp_rings; }; -void eshconfig __P((struct esh_softc *)); -int eshintr __P((void *)); +void eshconfig(struct esh_softc *); +int eshintr(void *); #endif /* _KERNEL */ /* Define a few constants for future use */ diff --git a/sys/dev/ic/rtl80x9var.h b/sys/dev/ic/rtl80x9var.h index 615fd541cb1..9ee9a839131 100644 --- a/sys/dev/ic/rtl80x9var.h +++ b/sys/dev/ic/rtl80x9var.h @@ -1,4 +1,4 @@ -/* $NetBSD: rtl80x9var.h,v 1.3 2004/02/13 10:05:50 wiz Exp $ */ +/* $NetBSD: rtl80x9var.h,v 1.4 2005/02/04 02:10:37 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -49,12 +49,11 @@ #define _DEV_IC_RTL80x9_VAR_H_ #ifdef _KERNEL -int rtl80x9_mediachange __P((struct dp8390_softc *)); -void rtl80x9_mediastatus __P((struct dp8390_softc *, - struct ifmediareq *)); -void rtl80x9_init_card __P((struct dp8390_softc *)); +int rtl80x9_mediachange(struct dp8390_softc *); +void rtl80x9_mediastatus(struct dp8390_softc *, struct ifmediareq *); +void rtl80x9_init_card(struct dp8390_softc *); -void rtl80x9_media_init __P((struct dp8390_softc *)); +void rtl80x9_media_init(struct dp8390_softc *); #endif /* _KERNEL */ #endif /* _DEV_IC_RTL80x9_VAR_H_ */ diff --git a/sys/dev/ic/rtl81x9.c b/sys/dev/ic/rtl81x9.c index 8b580ac17c5..468363a0115 100644 --- a/sys/dev/ic/rtl81x9.c +++ b/sys/dev/ic/rtl81x9.c @@ -1,4 +1,4 @@ -/* $NetBSD: rtl81x9.c,v 1.48 2005/01/23 10:26:06 dan Exp $ */ +/* $NetBSD: rtl81x9.c,v 1.49 2005/02/04 02:10:37 perry Exp $ */ /* * Copyright (c) 1997, 1998 @@ -86,7 +86,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rtl81x9.c,v 1.48 2005/01/23 10:26:06 dan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtl81x9.c,v 1.49 2005/02/04 02:10:37 perry Exp $"); #include "bpfilter.h" #include "rnd.h" @@ -131,35 +131,35 @@ __KERNEL_RCSID(0, "$NetBSD: rtl81x9.c,v 1.48 2005/01/23 10:26:06 dan Exp $"); #define STATIC static #endif -STATIC void rtk_reset __P((struct rtk_softc *)); -STATIC void rtk_rxeof __P((struct rtk_softc *)); -STATIC void rtk_txeof __P((struct rtk_softc *)); -STATIC void rtk_start __P((struct ifnet *)); -STATIC int rtk_ioctl __P((struct ifnet *, u_long, caddr_t)); -STATIC int rtk_init __P((struct ifnet *)); -STATIC void rtk_stop __P((struct ifnet *, int)); - -STATIC void rtk_watchdog __P((struct ifnet *)); -STATIC void rtk_shutdown __P((void *)); -STATIC int rtk_ifmedia_upd __P((struct ifnet *)); -STATIC void rtk_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); - -STATIC void rtk_eeprom_putbyte __P((struct rtk_softc *, int, int)); -STATIC void rtk_mii_sync __P((struct rtk_softc *)); -STATIC void rtk_mii_send __P((struct rtk_softc *, u_int32_t, int)); -STATIC int rtk_mii_readreg __P((struct rtk_softc *, struct rtk_mii_frame *)); -STATIC int rtk_mii_writereg __P((struct rtk_softc *, struct rtk_mii_frame *)); - -STATIC int rtk_phy_readreg __P((struct device *, int, int)); -STATIC void rtk_phy_writereg __P((struct device *, int, int, int)); -STATIC void rtk_phy_statchg __P((struct device *)); -STATIC void rtk_tick __P((void *)); - -STATIC int rtk_enable __P((struct rtk_softc *)); -STATIC void rtk_disable __P((struct rtk_softc *)); -STATIC void rtk_power __P((int, void *)); - -STATIC int rtk_list_tx_init __P((struct rtk_softc *)); +STATIC void rtk_reset (struct rtk_softc *); +STATIC void rtk_rxeof (struct rtk_softc *); +STATIC void rtk_txeof (struct rtk_softc *); +STATIC void rtk_start (struct ifnet *); +STATIC int rtk_ioctl (struct ifnet *, u_long, caddr_t); +STATIC int rtk_init (struct ifnet *); +STATIC void rtk_stop (struct ifnet *, int); + +STATIC void rtk_watchdog(struct ifnet *); +STATIC void rtk_shutdown(void *); +STATIC int rtk_ifmedia_upd(struct ifnet *); +STATIC void rtk_ifmedia_sts(struct ifnet *, struct ifmediareq *); + +STATIC void rtk_eeprom_putbyte(struct rtk_softc *, int, int); +STATIC void rtk_mii_sync(struct rtk_softc *); +STATIC void rtk_mii_send(struct rtk_softc *, u_int32_t, int); +STATIC int rtk_mii_readreg(struct rtk_softc *, struct rtk_mii_frame *); +STATIC int rtk_mii_writereg(struct rtk_softc *, struct rtk_mii_frame *); + +STATIC int rtk_phy_readreg(struct device *, int, int); +STATIC void rtk_phy_writereg(struct device *, int, int, int); +STATIC void rtk_phy_statchg(struct device *); +STATIC void rtk_tick (void *); + +STATIC int rtk_enable (struct rtk_softc *); +STATIC void rtk_disable (struct rtk_softc *); +STATIC void rtk_power (int, void *); + +STATIC int rtk_list_tx_init(struct rtk_softc *); #define EE_SET(x) \ CSR_WRITE_1(sc, RTK_EECMD, \ diff --git a/sys/dev/ic/rtl81x9var.h b/sys/dev/ic/rtl81x9var.h index 9f9e7b593d2..33edfab2030 100644 --- a/sys/dev/ic/rtl81x9var.h +++ b/sys/dev/ic/rtl81x9var.h @@ -1,4 +1,4 @@ -/* $NetBSD: rtl81x9var.h,v 1.16 2005/01/23 10:26:06 dan Exp $ */ +/* $NetBSD: rtl81x9var.h,v 1.17 2005/02/04 02:10:37 perry Exp $ */ /* * Copyright (c) 1997, 1998 @@ -146,9 +146,9 @@ struct rtk_softc { void *sc_powerhook; /* power management hook */ /* Power management hooks. */ - int (*sc_enable) __P((struct rtk_softc *)); - void (*sc_disable) __P((struct rtk_softc *)); - void (*sc_power) __P((struct rtk_softc *, int)); + int (*sc_enable) (struct rtk_softc *); + void (*sc_disable) (struct rtk_softc *); + void (*sc_power) (struct rtk_softc *, int); #if NRND > 0 rndsource_element_t rnd_source; #endif @@ -202,10 +202,10 @@ struct rtk_softc { #define RTK_PME_STATUS 0x8000 #ifdef _KERNEL -u_int16_t rtk_read_eeprom __P((struct rtk_softc *, int, int)); -void rtk_setmulti __P((struct rtk_softc *)); -void rtk_attach __P((struct rtk_softc *)); -int rtk_detach __P((struct rtk_softc *)); -int rtk_activate __P((struct device *, enum devact)); -int rtk_intr __P((void *)); +u_int16_t rtk_read_eeprom(struct rtk_softc *, int, int); +void rtk_setmulti(struct rtk_softc *); +void rtk_attach(struct rtk_softc *); +int rtk_detach(struct rtk_softc *); +int rtk_activate(struct device *, enum devact); +int rtk_intr(void *); #endif /* _KERNEL */ diff --git a/sys/dev/ic/rtwvar.h b/sys/dev/ic/rtwvar.h index 0a64bcde973..41e93bc7ff3 100644 --- a/sys/dev/ic/rtwvar.h +++ b/sys/dev/ic/rtwvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: rtwvar.h,v 1.19 2005/01/16 11:50:43 dyoung Exp $ */ +/* $NetBSD: rtwvar.h,v 1.20 2005/02/04 02:10:37 perry Exp $ */ /*- * Copyright (c) 2004, 2005 David Young. All rights reserved. * @@ -436,7 +436,7 @@ struct rtw_softc { uint16_t sc_inten; /* interrupt acknowledge hook */ - void (*sc_intr_ack) __P((struct rtw_regs *)); + void (*sc_intr_ack)(struct rtw_regs *); int (*sc_enable)(struct rtw_softc *); void (*sc_disable)(struct rtw_softc *); diff --git a/sys/dev/ic/sgec.c b/sys/dev/ic/sgec.c index a1fdf086c59..a51775d7c57 100644 --- a/sys/dev/ic/sgec.c +++ b/sys/dev/ic/sgec.c @@ -1,4 +1,4 @@ -/* $NetBSD: sgec.c,v 1.24 2005/01/31 03:02:27 thorpej Exp $ */ +/* $NetBSD: sgec.c,v 1.25 2005/02/04 02:10:37 perry Exp $ */ /* * Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved. * @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sgec.c,v 1.24 2005/01/31 03:02:27 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sgec.c,v 1.25 2005/02/04 02:10:37 perry Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -76,13 +76,13 @@ __KERNEL_RCSID(0, "$NetBSD: sgec.c,v 1.24 2005/01/31 03:02:27 thorpej Exp $"); #include <dev/ic/sgecreg.h> #include <dev/ic/sgecvar.h> -static void zeinit __P((struct ze_softc *)); -static void zestart __P((struct ifnet *)); -static int zeioctl __P((struct ifnet *, u_long, caddr_t)); -static int ze_add_rxbuf __P((struct ze_softc *, int)); -static void ze_setup __P((struct ze_softc *)); -static void zetimeout __P((struct ifnet *)); -static int zereset __P((struct ze_softc *)); +static void zeinit(struct ze_softc *); +static void zestart(struct ifnet *); +static int zeioctl(struct ifnet *, u_long, caddr_t); +static int ze_add_rxbuf(struct ze_softc *, int); +static void ze_setup(struct ze_softc *); +static void zetimeout(struct ifnet *); +static int zereset(struct ze_softc *); #define ZE_WCSR(csr, val) \ bus_space_write_4(sc->sc_iot, sc->sc_ioh, csr, val) diff --git a/sys/dev/ic/sgecvar.h b/sys/dev/ic/sgecvar.h index f2a316d2a4b..5347f27b9ba 100644 --- a/sys/dev/ic/sgecvar.h +++ b/sys/dev/ic/sgecvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: sgecvar.h,v 1.3 2003/01/06 21:05:38 matt Exp $ */ +/* $NetBSD: sgecvar.h,v 1.4 2005/02/04 02:10:37 perry Exp $ */ /* * Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved. * @@ -68,7 +68,7 @@ struct ze_softc { u_int8_t sc_enaddr[ETHER_ADDR_LEN]; }; -void sgec_attach __P((struct ze_softc *)); -int sgec_intr __P((struct ze_softc *)); +void sgec_attach(struct ze_softc *); +int sgec_intr(struct ze_softc *); #endif /* _DEV_IC_SGECVAR_H_ */ diff --git a/sys/dev/ic/siop.c b/sys/dev/ic/siop.c index a03a11acfc7..ec17c736c36 100644 --- a/sys/dev/ic/siop.c +++ b/sys/dev/ic/siop.c @@ -1,4 +1,4 @@ -/* $NetBSD: siop.c,v 1.76 2004/10/03 14:52:53 bouyer Exp $ */ +/* $NetBSD: siop.c,v 1.77 2005/02/04 02:10:37 perry Exp $ */ /* * Copyright (c) 2000 Manuel Bouyer. @@ -33,7 +33,7 @@ /* SYM53c7/8xx PCI-SCSI I/O Processors driver */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: siop.c,v 1.76 2004/10/03 14:52:53 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: siop.c,v 1.77 2005/02/04 02:10:37 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -82,22 +82,22 @@ __KERNEL_RCSID(0, "$NetBSD: siop.c,v 1.76 2004/10/03 14:52:53 bouyer Exp $"); /* Number of scheduler slot (needs to match script) */ #define SIOP_NSLOTS 40 -void siop_reset __P((struct siop_softc *)); -void siop_handle_reset __P((struct siop_softc *)); -int siop_handle_qtag_reject __P((struct siop_cmd *)); -void siop_scsicmd_end __P((struct siop_cmd *)); -void siop_unqueue __P((struct siop_softc *, int, int)); -static void siop_start __P((struct siop_softc *, struct siop_cmd *)); -void siop_timeout __P((void *)); -int siop_scsicmd __P((struct scsipi_xfer *)); -void siop_scsipi_request __P((struct scsipi_channel *, - scsipi_adapter_req_t, void *)); -void siop_dump_script __P((struct siop_softc *)); -void siop_morecbd __P((struct siop_softc *)); -struct siop_lunsw *siop_get_lunsw __P((struct siop_softc *)); -void siop_add_reselsw __P((struct siop_softc *, int)); -void siop_update_scntl3 __P((struct siop_softc *, - struct siop_common_target *)); +void siop_reset(struct siop_softc *); +void siop_handle_reset(struct siop_softc *); +int siop_handle_qtag_reject(struct siop_cmd *); +void siop_scsicmd_end(struct siop_cmd *); +void siop_unqueue(struct siop_softc *, int, int); +static void siop_start(struct siop_softc *, struct siop_cmd *); +void siop_timeout(void *); +int siop_scsicmd(struct scsipi_xfer *); +void siop_scsipi_request(struct scsipi_channel *, + scsipi_adapter_req_t, void *); +void siop_dump_script(struct siop_softc *); +void siop_morecbd(struct siop_softc *); +struct siop_lunsw *siop_get_lunsw(struct siop_softc *); +void siop_add_reselsw(struct siop_softc *, int); +void siop_update_scntl3(struct siop_softc *, + struct siop_common_target *); #ifdef SIOP_STATS static int siop_stat_intr = 0; @@ -107,13 +107,13 @@ static int siop_stat_intr_done = 0; static int siop_stat_intr_xferdisc = 0; static int siop_stat_intr_lunresel = 0; static int siop_stat_intr_qfull = 0; -void siop_printstats __P((void)); +void siop_printstats(void); #define INCSTAT(x) x++ #else #define INCSTAT(x) #endif -static __inline__ void siop_script_sync __P((struct siop_softc *, int)); +static __inline__ void siop_script_sync(struct siop_softc *, int); static __inline__ void siop_script_sync(sc, ops) struct siop_softc *sc; @@ -124,7 +124,7 @@ siop_script_sync(sc, ops) PAGE_SIZE, ops); } -static __inline__ u_int32_t siop_script_read __P((struct siop_softc *, u_int)); +static __inline__ u_int32_t siop_script_read(struct siop_softc *, u_int); static __inline__ u_int32_t siop_script_read(sc, offset) struct siop_softc *sc; @@ -138,8 +138,8 @@ siop_script_read(sc, offset) } } -static __inline__ void siop_script_write __P((struct siop_softc *, u_int, - u_int32_t)); +static __inline__ void siop_script_write(struct siop_softc *, u_int, + u_int32_t); static __inline__ void siop_script_write(sc, offset, val) struct siop_softc *sc; diff --git a/sys/dev/ic/siopvar.h b/sys/dev/ic/siopvar.h index 17e4a97fcd1..dbce0ba18ac 100644 --- a/sys/dev/ic/siopvar.h +++ b/sys/dev/ic/siopvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: siopvar.h,v 1.19 2003/11/02 11:07:46 wiz Exp $ */ +/* $NetBSD: siopvar.h,v 1.20 2005/02/04 02:10:37 perry Exp $ */ /* * Copyright (c) 2000 Manuel Bouyer. @@ -97,7 +97,7 @@ struct siop_lunsw { u_int32_t lunsw_size; /* size of this lun sw */ }; -static __inline__ void siop_table_sync __P((struct siop_cmd *, int)); +static __inline__ void siop_table_sync(struct siop_cmd *, int); static __inline__ void siop_table_sync(siop_cmd, ops) struct siop_cmd *siop_cmd; @@ -134,7 +134,7 @@ struct siop_softc { /* defs for sc_flags */ #define SCF_CHAN_NOSLOT 0x0001 /* channel out of scheduler slot */ -void siop_attach __P((struct siop_softc *)); -int siop_intr __P((void *)); -void siop_add_dev __P((struct siop_softc *, int, int)); -void siop_del_dev __P((struct siop_softc *, int, int)); +void siop_attach(struct siop_softc *); +int siop_intr(void *); +void siop_add_dev(struct siop_softc *, int, int); +void siop_del_dev(struct siop_softc *, int, int); diff --git a/sys/dev/ic/siopvar_common.h b/sys/dev/ic/siopvar_common.h index c35a1b29f6e..61aab7a6d1d 100644 --- a/sys/dev/ic/siopvar_common.h +++ b/sys/dev/ic/siopvar_common.h @@ -1,4 +1,4 @@ -/* $NetBSD: siopvar_common.h,v 1.30 2004/07/01 21:12:44 drochner Exp $ */ +/* $NetBSD: siopvar_common.h,v 1.31 2005/02/04 02:10:37 perry Exp $ */ /* * Copyright (c) 2000 Manuel Bouyer. @@ -146,7 +146,7 @@ struct siop_common_softc { bus_space_tag_t sc_ramt; /* bus_space ram tag */ bus_space_handle_t sc_ramh; /* bus_space ram handle */ bus_dma_tag_t sc_dmat; /* bus DMA tag */ - void (*sc_reset) __P((struct siop_common_softc*)); /* reset callback */ + void (*sc_reset)(struct siop_common_softc*); /* reset callback */ bus_dmamap_t sc_scriptdma; /* DMA map for script */ bus_addr_t sc_scriptaddr; /* on-board ram or physical address */ u_int32_t *sc_script; /* script location in memory */ @@ -180,29 +180,29 @@ struct siop_common_softc { #define SF_PCI_CLS 0x08000000 /* PCI cache line size */ #define SF_PCI_WRI 0x10000000 /* PCI write and invalidate */ -int siop_common_attach __P((struct siop_common_softc *)); -void siop_common_reset __P((struct siop_common_softc *)); -void siop_setuptables __P((struct siop_common_cmd *)); -int siop_modechange __P((struct siop_common_softc *)); - -int siop_wdtr_neg __P((struct siop_common_cmd *)); -int siop_sdtr_neg __P((struct siop_common_cmd *)); -int siop_ppr_neg __P((struct siop_common_cmd *)); -void siop_sdtr_msg __P((struct siop_common_cmd *, int, int, int)); -void siop_wdtr_msg __P((struct siop_common_cmd *, int, int)); -void siop_ppr_msg __P((struct siop_common_cmd *, int, int, int)); -void siop_update_xfer_mode __P((struct siop_common_softc *, int)); -int siop_iwr __P((struct siop_common_cmd *)); +int siop_common_attach(struct siop_common_softc *); +void siop_common_reset(struct siop_common_softc *); +void siop_setuptables(struct siop_common_cmd *); +int siop_modechange(struct siop_common_softc *); + +int siop_wdtr_neg(struct siop_common_cmd *); +int siop_sdtr_neg(struct siop_common_cmd *); +int siop_ppr_neg(struct siop_common_cmd *); +void siop_sdtr_msg(struct siop_common_cmd *, int, int, int); +void siop_wdtr_msg(struct siop_common_cmd *, int, int); +void siop_ppr_msg(struct siop_common_cmd *, int, int, int); +void siop_update_xfer_mode(struct siop_common_softc *, int); +int siop_iwr(struct siop_common_cmd *); /* actions to take at return of siop_wdtr_neg(), siop_sdtr_neg() and siop_iwr */ #define SIOP_NEG_NOP 0x0 #define SIOP_NEG_MSGOUT 0x1 #define SIOP_NEG_ACK 0x2 -void siop_minphys __P((struct buf *)); -int siop_ioctl __P((struct scsipi_channel *, u_long, - caddr_t, int, struct proc *)); -void siop_ma __P((struct siop_common_cmd *)); -void siop_sdp __P((struct siop_common_cmd *, int)); -void siop_update_resid __P((struct siop_common_cmd *, int)); -void siop_clearfifo __P((struct siop_common_softc *)); -void siop_resetbus __P((struct siop_common_softc *)); +void siop_minphys(struct buf *); +int siop_ioctl(struct scsipi_channel *, u_long, + caddr_t, int, struct proc *); +void siop_ma (struct siop_common_cmd *); +void siop_sdp(struct siop_common_cmd *, int); +void siop_update_resid(struct siop_common_cmd *, int); +void siop_clearfifo(struct siop_common_softc *); +void siop_resetbus(struct siop_common_softc *); diff --git a/sys/dev/ic/smc83c170.c b/sys/dev/ic/smc83c170.c index 7d3a71cb9ad..f568fa07deb 100644 --- a/sys/dev/ic/smc83c170.c +++ b/sys/dev/ic/smc83c170.c @@ -1,4 +1,4 @@ -/* $NetBSD: smc83c170.c,v 1.57 2005/01/30 17:23:45 thorpej Exp $ */ +/* $NetBSD: smc83c170.c,v 1.58 2005/02/04 02:10:37 perry Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: smc83c170.c,v 1.57 2005/01/30 17:23:45 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: smc83c170.c,v 1.58 2005/02/04 02:10:37 perry Exp $"); #include "bpfilter.h" @@ -78,28 +78,28 @@ __KERNEL_RCSID(0, "$NetBSD: smc83c170.c,v 1.57 2005/01/30 17:23:45 thorpej Exp $ #include <dev/ic/smc83c170reg.h> #include <dev/ic/smc83c170var.h> -void epic_start __P((struct ifnet *)); -void epic_watchdog __P((struct ifnet *)); -int epic_ioctl __P((struct ifnet *, u_long, caddr_t)); -int epic_init __P((struct ifnet *)); -void epic_stop __P((struct ifnet *, int)); - -void epic_shutdown __P((void *)); - -void epic_reset __P((struct epic_softc *)); -void epic_rxdrain __P((struct epic_softc *)); -int epic_add_rxbuf __P((struct epic_softc *, int)); -void epic_read_eeprom __P((struct epic_softc *, int, int, u_int16_t *)); -void epic_set_mchash __P((struct epic_softc *)); -void epic_fixup_clock_source __P((struct epic_softc *)); -int epic_mii_read __P((struct device *, int, int)); -void epic_mii_write __P((struct device *, int, int, int)); -int epic_mii_wait __P((struct epic_softc *, u_int32_t)); -void epic_tick __P((void *)); - -void epic_statchg __P((struct device *)); -int epic_mediachange __P((struct ifnet *)); -void epic_mediastatus __P((struct ifnet *, struct ifmediareq *)); +void epic_start(struct ifnet *); +void epic_watchdog(struct ifnet *); +int epic_ioctl(struct ifnet *, u_long, caddr_t); +int epic_init(struct ifnet *); +void epic_stop(struct ifnet *, int); + +void epic_shutdown(void *); + +void epic_reset(struct epic_softc *); +void epic_rxdrain(struct epic_softc *); +int epic_add_rxbuf(struct epic_softc *, int); +void epic_read_eeprom(struct epic_softc *, int, int, u_int16_t *); +void epic_set_mchash(struct epic_softc *); +void epic_fixup_clock_source(struct epic_softc *); +int epic_mii_read(struct device *, int, int); +void epic_mii_write(struct device *, int, int, int); +int epic_mii_wait(struct epic_softc *, u_int32_t); +void epic_tick(void *); + +void epic_statchg(struct device *); +int epic_mediachange(struct ifnet *); +void epic_mediastatus(struct ifnet *, struct ifmediareq *); #define INTMASK (INTSTAT_FATAL_INT | INTSTAT_TXU | \ INTSTAT_TXC | INTSTAT_RXE | INTSTAT_RQE | INTSTAT_RCC) diff --git a/sys/dev/ic/smc83c170var.h b/sys/dev/ic/smc83c170var.h index ac4a3993c1e..6d9b3eaa31a 100644 --- a/sys/dev/ic/smc83c170var.h +++ b/sys/dev/ic/smc83c170var.h @@ -1,4 +1,4 @@ -/* $NetBSD: smc83c170var.h,v 1.8 2003/11/08 16:08:13 tsutsui Exp $ */ +/* $NetBSD: smc83c170var.h,v 1.9 2005/02/04 02:10:37 perry Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -183,8 +183,8 @@ do { \ } while (/* CONSTCOND */ 0) #ifdef _KERNEL -void epic_attach __P((struct epic_softc *)); -int epic_intr __P((void *)); +void epic_attach(struct epic_softc *); +int epic_intr(void *); #endif /* _KERNEL */ #endif /* _DEV_IC_SMC83C170VAR_H_ */ diff --git a/sys/dev/ic/smc90cx6.c b/sys/dev/ic/smc90cx6.c index 0c8160c2e0b..659af5f35cc 100644 --- a/sys/dev/ic/smc90cx6.c +++ b/sys/dev/ic/smc90cx6.c @@ -1,4 +1,4 @@ -/* $NetBSD: smc90cx6.c,v 1.41 2003/11/02 11:07:46 wiz Exp $ */ +/* $NetBSD: smc90cx6.c,v 1.42 2005/02/04 02:10:37 perry Exp $ */ /*- * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: smc90cx6.c,v 1.41 2003/11/02 11:07:46 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: smc90cx6.c,v 1.42 2005/02/04 02:10:37 perry Exp $"); /* #define BAHSOFTCOPY */ #define BAHRETRANSMIT /**/ @@ -132,15 +132,15 @@ __KERNEL_RCSID(0, "$NetBSD: smc90cx6.c,v 1.41 2003/11/02 11:07:46 wiz Exp $"); * #define fill(i) get mbuf && copy mbuf to chip(i) */ -void bah_init __P((struct bah_softc *)); -void bah_reset __P((struct bah_softc *)); -void bah_stop __P((struct bah_softc *)); -void bah_start __P((struct ifnet *)); -int bahintr __P((void *)); -int bah_ioctl __P((struct ifnet *, unsigned long, caddr_t)); -void bah_watchdog __P((struct ifnet *)); -void bah_srint __P((void *vsc)); -static void bah_tint __P((struct bah_softc *, int)); +void bah_init(struct bah_softc *); +void bah_reset(struct bah_softc *); +void bah_stop(struct bah_softc *); +void bah_start(struct ifnet *); +int bahintr(void *); +int bah_ioctl(struct ifnet *, unsigned long, caddr_t); +void bah_watchdog(struct ifnet *); +void bah_srint(void *vsc); +static void bah_tint(struct bah_softc *, int); void bah_reconwatch(void *); /* short notation */ @@ -217,7 +217,7 @@ bah_attach_subr(sc) #ifdef BAHSOFTCOPY sc->sc_rxcookie = softintr_establish(IPL_SOFTNET, bah_srint, sc); sc->sc_txcookie = softintr_establish(IPL_SOFTNET, - (void (*) __P((void *)))bah_start, ifp); + (void (*)(void *))bah_start, ifp); #endif callout_init(&sc->sc_recon_ch); diff --git a/sys/dev/ic/smc90cx6var.h b/sys/dev/ic/smc90cx6var.h index 573acfd2bc4..40dc04f21a6 100644 --- a/sys/dev/ic/smc90cx6var.h +++ b/sys/dev/ic/smc90cx6var.h @@ -1,4 +1,4 @@ -/* $NetBSD: smc90cx6var.h,v 1.5 2000/03/23 07:01:32 thorpej Exp $ */ +/* $NetBSD: smc90cx6var.h,v 1.6 2005/02/04 02:10:37 perry Exp $ */ /*- * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc. @@ -77,7 +77,7 @@ struct bah_softc { u_char sc_retransmits[2]; /* unused at the moment */ }; -void bah_attach_subr __P((struct bah_softc *)); -int bahintr __P((void *)); +void bah_attach_subr(struct bah_softc *); +int bahintr(void *); #endif diff --git a/sys/dev/ic/smc91cxx.c b/sys/dev/ic/smc91cxx.c index be261c87031..ae796d2263a 100644 --- a/sys/dev/ic/smc91cxx.c +++ b/sys/dev/ic/smc91cxx.c @@ -1,4 +1,4 @@ -/* $NetBSD: smc91cxx.c,v 1.49 2004/10/30 18:08:40 thorpej Exp $ */ +/* $NetBSD: smc91cxx.c,v 1.50 2005/02/04 02:10:37 perry Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -78,7 +78,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.49 2004/10/30 18:08:40 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.50 2005/02/04 02:10:37 perry Exp $"); #include "opt_inet.h" #include "opt_ccitt.h" @@ -184,8 +184,8 @@ const int smc91cxx_media[] = { /* * MII bit-bang glue. */ -u_int32_t smc91cxx_mii_bitbang_read __P((struct device *)); -void smc91cxx_mii_bitbang_write __P((struct device *, u_int32_t)); +u_int32_t smc91cxx_mii_bitbang_read(struct device *); +void smc91cxx_mii_bitbang_write(struct device *, u_int32_t); const struct mii_bitbang_ops smc91cxx_mii_bitbang_ops = { smc91cxx_mii_bitbang_read, @@ -200,27 +200,27 @@ const struct mii_bitbang_ops smc91cxx_mii_bitbang_ops = { }; /* MII callbacks */ -int smc91cxx_mii_readreg __P((struct device *, int, int)); -void smc91cxx_mii_writereg __P((struct device *, int, int, int)); -void smc91cxx_statchg __P((struct device *)); -void smc91cxx_tick __P((void *)); - -int smc91cxx_mediachange __P((struct ifnet *)); -void smc91cxx_mediastatus __P((struct ifnet *, struct ifmediareq *)); - -int smc91cxx_set_media __P((struct smc91cxx_softc *, int)); - -void smc91cxx_init __P((struct smc91cxx_softc *)); -void smc91cxx_read __P((struct smc91cxx_softc *)); -void smc91cxx_reset __P((struct smc91cxx_softc *)); -void smc91cxx_start __P((struct ifnet *)); -void smc91cxx_copy_tx_frame __P((struct smc91cxx_softc *, struct mbuf *)); -void smc91cxx_resume __P((struct smc91cxx_softc *)); -void smc91cxx_stop __P((struct smc91cxx_softc *)); -void smc91cxx_watchdog __P((struct ifnet *)); -int smc91cxx_ioctl __P((struct ifnet *, u_long, caddr_t)); - -static __inline int ether_cmp __P((void *, void *)); +int smc91cxx_mii_readreg(struct device *, int, int); +void smc91cxx_mii_writereg(struct device *, int, int, int); +void smc91cxx_statchg(struct device *); +void smc91cxx_tick(void *); + +int smc91cxx_mediachange(struct ifnet *); +void smc91cxx_mediastatus(struct ifnet *, struct ifmediareq *); + +int smc91cxx_set_media(struct smc91cxx_softc *, int); + +void smc91cxx_init(struct smc91cxx_softc *); +void smc91cxx_read(struct smc91cxx_softc *); +void smc91cxx_reset(struct smc91cxx_softc *); +void smc91cxx_start(struct ifnet *); +void smc91cxx_copy_tx_frame(struct smc91cxx_softc *, struct mbuf *); +void smc91cxx_resume(struct smc91cxx_softc *); +void smc91cxx_stop(struct smc91cxx_softc *); +void smc91cxx_watchdog(struct ifnet *); +int smc91cxx_ioctl(struct ifnet *, u_long, caddr_t); + +static __inline int ether_cmp(void *, void *); static __inline int ether_cmp(va, vb) void *va, *vb; diff --git a/sys/dev/ic/smc91cxxvar.h b/sys/dev/ic/smc91cxxvar.h index 9527f5c866d..2d462ff0a06 100644 --- a/sys/dev/ic/smc91cxxvar.h +++ b/sys/dev/ic/smc91cxxvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: smc91cxxvar.h,v 1.11 2003/04/29 08:47:30 scw Exp $ */ +/* $NetBSD: smc91cxxvar.h,v 1.12 2005/02/04 02:10:37 perry Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -54,8 +54,8 @@ struct smc91cxx_softc { bus_space_handle_t sc_bsh; /* Power management hooks and state. */ - int (*sc_enable) __P((struct smc91cxx_softc *)); - void (*sc_disable) __P((struct smc91cxx_softc *)); + int (*sc_enable)(struct smc91cxx_softc *); + void (*sc_disable)(struct smc91cxx_softc *); u_int32_t sc_flags; /* misc. flags*/ #define SMC_FLAGS_ENABLED 0x0001 #define SMC_FLAGS_ATTACHED 0x0002 /* attach was successful */ @@ -74,9 +74,9 @@ struct smc91cxx_softc { bus_space_write_2((sc)->sc_bst, (sc)->sc_bsh, \ BANK_SELECT_REG_W, (x)) -void smc91cxx_attach __P((struct smc91cxx_softc *, u_int8_t *)); -int smc91cxx_intr __P((void *)); -int smc91cxx_enable __P((struct smc91cxx_softc *)); -void smc91cxx_disable __P((struct smc91cxx_softc *)); -int smc91cxx_activate __P((struct device *, enum devact)); -int smc91cxx_detach __P((struct device *, int)); +void smc91cxx_attach(struct smc91cxx_softc *, u_int8_t *); +int smc91cxx_intr(void *); +int smc91cxx_enable(struct smc91cxx_softc *); +void smc91cxx_disable(struct smc91cxx_softc *); +int smc91cxx_activate(struct device *, enum devact); +int smc91cxx_detach(struct device *, int); diff --git a/sys/dev/ic/sunscpal.c b/sys/dev/ic/sunscpal.c index 62a41da4379..b031fde1431 100644 --- a/sys/dev/ic/sunscpal.c +++ b/sys/dev/ic/sunscpal.c @@ -1,4 +1,4 @@ -/* $NetBSD: sunscpal.c,v 1.15 2004/09/18 02:18:39 mycroft Exp $ */ +/* $NetBSD: sunscpal.c,v 1.16 2005/02/04 02:10:37 perry Exp $ */ /* * Copyright (c) 2001 Matthew Fredette @@ -76,7 +76,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sunscpal.c,v 1.15 2004/09/18 02:18:39 mycroft Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunscpal.c,v 1.16 2005/02/04 02:10:37 perry Exp $"); #include "opt_ddb.h" @@ -103,23 +103,23 @@ __KERNEL_RCSID(0, "$NetBSD: sunscpal.c,v 1.15 2004/09/18 02:18:39 mycroft Exp $" #include <dev/ic/sunscpalreg.h> #include <dev/ic/sunscpalvar.h> -static void sunscpal_reset_scsibus __P((struct sunscpal_softc *)); -static void sunscpal_sched __P((struct sunscpal_softc *)); -static void sunscpal_done __P((struct sunscpal_softc *)); +static void sunscpal_reset_scsibus(struct sunscpal_softc *); +static void sunscpal_sched(struct sunscpal_softc *); +static void sunscpal_done(struct sunscpal_softc *); static int sunscpal_select - __P((struct sunscpal_softc *, struct sunscpal_req *)); -static void sunscpal_reselect __P((struct sunscpal_softc *)); - -static int sunscpal_msg_in __P((struct sunscpal_softc *)); -static int sunscpal_msg_out __P((struct sunscpal_softc *)); -static int sunscpal_data_xfer __P((struct sunscpal_softc *, int)); -static int sunscpal_command __P((struct sunscpal_softc *)); -static int sunscpal_status __P((struct sunscpal_softc *)); -static void sunscpal_machine __P((struct sunscpal_softc *)); - -void sunscpal_abort __P((struct sunscpal_softc *)); -void sunscpal_cmd_timeout __P((void *)); + (struct sunscpal_softc *, struct sunscpal_req *); +static void sunscpal_reselect(struct sunscpal_softc *); + +static int sunscpal_msg_in(struct sunscpal_softc *); +static int sunscpal_msg_out(struct sunscpal_softc *); +static int sunscpal_data_xfer(struct sunscpal_softc *, int); +static int sunscpal_command(struct sunscpal_softc *); +static int sunscpal_status(struct sunscpal_softc *); +static void sunscpal_machine(struct sunscpal_softc *); + +void sunscpal_abort(struct sunscpal_softc *); +void sunscpal_cmd_timeout(void *); /* * Action flags returned by the info_transfer functions: * (These determine what happens next.) @@ -149,12 +149,12 @@ void sunscpal_cmd_timeout __P((void *)); int sunscpal_debug = 0; #define SUNSCPAL_BREAK() \ do { if (sunscpal_debug & SUNSCPAL_DBG_BREAK) Debugger(); } while (0) -static void sunscpal_show_scsi_cmd __P((struct scsipi_xfer *)); +static void sunscpal_show_scsi_cmd(struct scsipi_xfer *); #ifdef DDB -void sunscpal_clear_trace __P((void)); -void sunscpal_show_trace __P((void)); -void sunscpal_show_req __P((struct sunscpal_req *)); -void sunscpal_show_state __P((void)); +void sunscpal_clear_trace(void); +void sunscpal_show_trace(void); +void sunscpal_show_req(struct sunscpal_req *); +void sunscpal_show_state(void); #endif /* DDB */ #else /* SUNSCPAL_DEBUG */ @@ -176,15 +176,15 @@ phase_names[8] = { }; #ifdef SUNSCPAL_USE_BUS_DMA -static void sunscpal_dma_alloc __P((struct sunscpal_softc *)); -static void sunscpal_dma_free __P((struct sunscpal_softc *)); -static void sunscpal_dma_setup __P((struct sunscpal_softc *)); +static void sunscpal_dma_alloc(struct sunscpal_softc *); +static void sunscpal_dma_free(struct sunscpal_softc *); +static void sunscpal_dma_setup(struct sunscpal_softc *); #else #define sunscpal_dma_alloc(sc) (*sc->sc_dma_alloc)(sc) #define sunscpal_dma_free(sc) (*sc->sc_dma_free)(sc) #define sunscpal_dma_setup(sc) (*sc->sc_dma_setup)(sc) #endif -static void sunscpal_minphys __P((struct buf *)); +static void sunscpal_minphys(struct buf *); /***************************************************************** * Actual chip control @@ -201,9 +201,9 @@ int sunscpal_wait_phase_timo = 1000 * 10 * 300; /* 5 min. */ int sunscpal_wait_req_timo = 1000 * 50; /* X2 = 100 mS. */ int sunscpal_wait_nrq_timo = 1000 * 25; /* X2 = 50 mS. */ -static __inline int sunscpal_wait_req __P((struct sunscpal_softc *)); -static __inline int sunscpal_wait_not_req __P((struct sunscpal_softc *)); -static __inline void sunscpal_sched_msgout __P((struct sunscpal_softc *, int)); +static __inline int sunscpal_wait_req(struct sunscpal_softc *); +static __inline int sunscpal_wait_not_req(struct sunscpal_softc *); +static __inline void sunscpal_sched_msgout(struct sunscpal_softc *, int); /* Return zero on success. */ static __inline int sunscpal_wait_req(sc) @@ -243,9 +243,9 @@ static __inline int sunscpal_wait_not_req(sc) * These functions control DMA functions in the chipset independent of * the host DMA implementation. */ -static void sunscpal_dma_start __P((struct sunscpal_softc *)); -static void sunscpal_dma_poll __P((struct sunscpal_softc *)); -static void sunscpal_dma_stop __P((struct sunscpal_softc *)); +static void sunscpal_dma_start(struct sunscpal_softc *); +static void sunscpal_dma_poll(struct sunscpal_softc *); +static void sunscpal_dma_stop(struct sunscpal_softc *); static void sunscpal_dma_start(sc) diff --git a/sys/dev/ic/sunscpalvar.h b/sys/dev/ic/sunscpalvar.h index 031be15e859..ce1c8f7c706 100644 --- a/sys/dev/ic/sunscpalvar.h +++ b/sys/dev/ic/sunscpalvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: sunscpalvar.h,v 1.4 2004/09/18 02:18:39 mycroft Exp $ */ +/* $NetBSD: sunscpalvar.h,v 1.5 2005/02/04 02:10:37 perry Exp $ */ /* * Copyright (c) 2001 Matthew Fredette @@ -193,14 +193,14 @@ struct sunscpal_softc { /* Functions set from MD code */ #ifndef SUNSCPAL_USE_BUS_DMA - void (*sc_dma_alloc) __P((struct sunscpal_softc *)); - void (*sc_dma_free) __P((struct sunscpal_softc *)); + void (*sc_dma_alloc)(struct sunscpal_softc *); + void (*sc_dma_free)(struct sunscpal_softc *); - void (*sc_dma_setup) __P((struct sunscpal_softc *)); + void (*sc_dma_setup)(struct sunscpal_softc *); #endif - void (*sc_intr_on) __P((struct sunscpal_softc *)); - void (*sc_intr_off) __P((struct sunscpal_softc *)); + void (*sc_intr_on)(struct sunscpal_softc *); + void (*sc_intr_off)(struct sunscpal_softc *); int sc_flags; /* Misc. flags and capabilities */ #define SUNSCPAL_DISABLE_DMA 1 /* Do not use DMA. */ @@ -264,14 +264,14 @@ struct sunscpal_softc { }; -void sunscpal_attach __P((struct sunscpal_softc *, int)); -int sunscpal_detach __P((struct sunscpal_softc *, int)); -int sunscpal_intr __P((void *)); -void sunscpal_scsipi_request __P((struct scsipi_channel *, - scsipi_adapter_req_t, void *)); -int sunscpal_pio_in __P((struct sunscpal_softc *, int, int, u_char *)); -int sunscpal_pio_out __P((struct sunscpal_softc *, int, int, u_char *)); -void sunscpal_init __P((struct sunscpal_softc *)); +void sunscpal_attach(struct sunscpal_softc *, int); +int sunscpal_detach(struct sunscpal_softc *, int); +int sunscpal_intr(void *); +void sunscpal_scsipi_request(struct scsipi_channel *, + scsipi_adapter_req_t, void *); +int sunscpal_pio_in(struct sunscpal_softc *, int, int, u_char *); +int sunscpal_pio_out(struct sunscpal_softc *, int, int, u_char *); +void sunscpal_init(struct sunscpal_softc *); /* Options for no-parity, DMA, and interrupts. */ #define SUNSCPAL_OPT_NO_PARITY_CHK 0xff @@ -280,7 +280,7 @@ void sunscpal_init __P((struct sunscpal_softc *)); #ifdef SUNSCPAL_DEBUG struct sunscpal_softc *sunscpal_debug_sc; -void sunscpal_trace __P((char *msg, long val)); +void sunscpal_trace(char *msg, long val); #define SUNSCPAL_TRACE(msg, val) sunscpal_trace(msg, val) #else /* SUNSCPAL_DEBUG */ #define SUNSCPAL_TRACE(msg, val) /* nada */ diff --git a/sys/dev/ic/tcic2.c b/sys/dev/ic/tcic2.c index a3077be6a36..dc81cb36fa3 100644 --- a/sys/dev/ic/tcic2.c +++ b/sys/dev/ic/tcic2.c @@ -1,4 +1,4 @@ -/* $NetBSD: tcic2.c,v 1.17 2004/09/13 12:34:00 drochner Exp $ */ +/* $NetBSD: tcic2.c,v 1.18 2005/02/04 02:10:37 perry Exp $ */ /* * Copyright (c) 1998, 1999 Christoph Badura. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tcic2.c,v 1.17 2004/09/13 12:34:00 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tcic2.c,v 1.18 2005/02/04 02:10:37 perry Exp $"); #undef TCICDEBUG @@ -67,25 +67,25 @@ int tcic_debug = 1; #define TCIC_MEM_ALIGN TCIC_MEM_PAGESIZE -void tcic_attach_socket __P((struct tcic_handle *)); -void tcic_init_socket __P((struct tcic_handle *)); +void tcic_attach_socket(struct tcic_handle *); +void tcic_init_socket(struct tcic_handle *); -int tcic_submatch __P((struct device *, struct cfdata *, - const locdesc_t *, void *)); -int tcic_print __P((void *arg, const char *pnp)); -int tcic_intr_socket __P((struct tcic_handle *)); +int tcic_submatch(struct device *, struct cfdata *, + const locdesc_t *, void *); +int tcic_print(void *arg, const char *pnp); +int tcic_intr_socket(struct tcic_handle *); -void tcic_attach_card __P((struct tcic_handle *)); -void tcic_detach_card __P((struct tcic_handle *, int)); -void tcic_deactivate_card __P((struct tcic_handle *)); +void tcic_attach_card(struct tcic_handle *); +void tcic_detach_card(struct tcic_handle *, int); +void tcic_deactivate_card(struct tcic_handle *); -void tcic_chip_do_mem_map __P((struct tcic_handle *, int)); -void tcic_chip_do_io_map __P((struct tcic_handle *, int)); +void tcic_chip_do_mem_map(struct tcic_handle *, int); +void tcic_chip_do_io_map(struct tcic_handle *, int); -void tcic_create_event_thread __P((void *)); -void tcic_event_thread __P((void *)); +void tcic_create_event_thread(void *); +void tcic_event_thread(void *); -void tcic_queue_event __P((struct tcic_handle *, int)); +void tcic_queue_event(struct tcic_handle *, int); /* Map between irq numbers and internal representation */ #if 1 diff --git a/sys/dev/ic/tcic2var.h b/sys/dev/ic/tcic2var.h index bf929db5dc1..f996f5e3b8c 100644 --- a/sys/dev/ic/tcic2var.h +++ b/sys/dev/ic/tcic2var.h @@ -1,4 +1,4 @@ -/* $NetBSD: tcic2var.h,v 1.3 2004/08/11 06:56:57 mycroft Exp $ */ +/* $NetBSD: tcic2var.h,v 1.4 2005/02/04 02:10:37 perry Exp $ */ /* * Copyright (c) 1998, 1999 Christoph Badura. All rights reserved. @@ -135,55 +135,55 @@ struct tcic_softc { struct tcic_handle handle[TCIC_NSLOTS]; }; -int tcic_log2 __P((u_int)); -int tcic_ns2wscnt __P((int)); - -int tcic_check_reserved_bits __P((bus_space_tag_t, bus_space_handle_t)); -int tcic_chipid __P((bus_space_tag_t, bus_space_handle_t)); -int tcic_chipid_known __P((int)); -char *tcic_chipid_to_string __P((int)); -int tcic_validirqs __P((int)); - -void tcic_attach __P((struct tcic_softc *)); -void tcic_attach_sockets __P((struct tcic_softc *)); -int tcic_intr __P((void *arg)); - -static __inline__ int tcic_read_1 __P((struct tcic_handle *, int)); -static __inline__ int tcic_read_2 __P((struct tcic_handle *, int)); -static __inline__ int tcic_read_4 __P((struct tcic_handle *, int)); -static __inline__ void tcic_write_1 __P((struct tcic_handle *, int, int)); -static __inline__ void tcic_write_2 __P((struct tcic_handle *, int, int)); -static __inline__ void tcic_write_4 __P((struct tcic_handle *, int, int)); -static __inline__ int tcic_read_ind_2 __P((struct tcic_handle *, int)); -static __inline__ void tcic_write_ind_2 __P((struct tcic_handle *, int, int)); -static __inline__ void tcic_sel_sock __P((struct tcic_handle *)); -static __inline__ void tcic_wait_ready __P((struct tcic_handle *)); -static __inline__ int tcic_read_aux_1 __P((bus_space_tag_t, bus_space_handle_t, int, int)); -static __inline__ int tcic_read_aux_2 __P((bus_space_tag_t, bus_space_handle_t, int)); -static __inline__ void tcic_write_aux_1 __P((bus_space_tag_t, bus_space_handle_t, int, int, int)); -static __inline__ void tcic_write_aux_2 __P((bus_space_tag_t, bus_space_handle_t, int, int)); - -int tcic_chip_mem_alloc __P((pcmcia_chipset_handle_t, bus_size_t, - struct pcmcia_mem_handle *)); -void tcic_chip_mem_free __P((pcmcia_chipset_handle_t, - struct pcmcia_mem_handle *)); -int tcic_chip_mem_map __P((pcmcia_chipset_handle_t, int, bus_addr_t, - bus_size_t, struct pcmcia_mem_handle *, bus_size_t *, int *)); -void tcic_chip_mem_unmap __P((pcmcia_chipset_handle_t, int)); - -int tcic_chip_io_alloc __P((pcmcia_chipset_handle_t, bus_addr_t, - bus_size_t, bus_size_t, struct pcmcia_io_handle *)); -void tcic_chip_io_free __P((pcmcia_chipset_handle_t, - struct pcmcia_io_handle *)); -int tcic_chip_io_map __P((pcmcia_chipset_handle_t, int, bus_addr_t, - bus_size_t, struct pcmcia_io_handle *, int *)); -void tcic_chip_io_unmap __P((pcmcia_chipset_handle_t, int)); - -void tcic_chip_socket_enable __P((pcmcia_chipset_handle_t)); -void tcic_chip_socket_disable __P((pcmcia_chipset_handle_t)); -void tcic_chip_socket_settype __P((pcmcia_chipset_handle_t, int)); - -static __inline__ int tcic_read_1 __P((struct tcic_handle *, int)); +int tcic_log2(u_int); +int tcic_ns2wscnt(int); + +int tcic_check_reserved_bits(bus_space_tag_t, bus_space_handle_t); +int tcic_chipid(bus_space_tag_t, bus_space_handle_t); +int tcic_chipid_known(int); +char *tcic_chipid_to_string(int); +int tcic_validirqs(int); + +void tcic_attach(struct tcic_softc *); +void tcic_attach_sockets(struct tcic_softc *); +int tcic_intr(void *arg); + +static __inline__ int tcic_read_1(struct tcic_handle *, int); +static __inline__ int tcic_read_2(struct tcic_handle *, int); +static __inline__ int tcic_read_4(struct tcic_handle *, int); +static __inline__ void tcic_write_1(struct tcic_handle *, int, int); +static __inline__ void tcic_write_2(struct tcic_handle *, int, int); +static __inline__ void tcic_write_4(struct tcic_handle *, int, int); +static __inline__ int tcic_read_ind_2(struct tcic_handle *, int); +static __inline__ void tcic_write_ind_2(struct tcic_handle *, int, int); +static __inline__ void tcic_sel_sock(struct tcic_handle *); +static __inline__ void tcic_wait_ready(struct tcic_handle *); +static __inline__ int tcic_read_aux_1(bus_space_tag_t, bus_space_handle_t, int, int); +static __inline__ int tcic_read_aux_2(bus_space_tag_t, bus_space_handle_t, int); +static __inline__ void tcic_write_aux_1(bus_space_tag_t, bus_space_handle_t, int, int, int); +static __inline__ void tcic_write_aux_2(bus_space_tag_t, bus_space_handle_t, int, int); + +int tcic_chip_mem_alloc(pcmcia_chipset_handle_t, bus_size_t, + struct pcmcia_mem_handle *); +void tcic_chip_mem_free(pcmcia_chipset_handle_t, + struct pcmcia_mem_handle *); +int tcic_chip_mem_map(pcmcia_chipset_handle_t, int, bus_addr_t, + bus_size_t, struct pcmcia_mem_handle *, bus_size_t *, int *); +void tcic_chip_mem_unmap(pcmcia_chipset_handle_t, int); + +int tcic_chip_io_alloc(pcmcia_chipset_handle_t, bus_addr_t, + bus_size_t, bus_size_t, struct pcmcia_io_handle *); +void tcic_chip_io_free(pcmcia_chipset_handle_t, + struct pcmcia_io_handle *); +int tcic_chip_io_map(pcmcia_chipset_handle_t, int, bus_addr_t, + bus_size_t, struct pcmcia_io_handle *, int *); +void tcic_chip_io_unmap(pcmcia_chipset_handle_t, int); + +void tcic_chip_socket_enable(pcmcia_chipset_handle_t); +void tcic_chip_socket_disable(pcmcia_chipset_handle_t); +void tcic_chip_socket_settype(pcmcia_chipset_handle_t, int); + +static __inline__ int tcic_read_1(struct tcic_handle *, int); static __inline__ int tcic_read_1(h, reg) struct tcic_handle *h; @@ -192,7 +192,7 @@ tcic_read_1(h, reg) return (bus_space_read_1(h->sc->iot, h->sc->ioh, reg)); } -static __inline__ int tcic_read_2 __P((struct tcic_handle *, int)); +static __inline__ int tcic_read_2(struct tcic_handle *, int); static __inline__ int tcic_read_2(h, reg) struct tcic_handle *h; @@ -201,7 +201,7 @@ tcic_read_2(h, reg) return (bus_space_read_2(h->sc->iot, h->sc->ioh, reg)); } -static __inline__ int tcic_read_4 __P((struct tcic_handle *, int)); +static __inline__ int tcic_read_4(struct tcic_handle *, int); static __inline__ int tcic_read_4(h, reg) struct tcic_handle *h; @@ -213,7 +213,7 @@ tcic_read_4(h, reg) return val; } -static __inline__ void tcic_write_1 __P((struct tcic_handle *, int, int)); +static __inline__ void tcic_write_1(struct tcic_handle *, int, int); static __inline__ void tcic_write_1(h, reg, data) struct tcic_handle *h; @@ -223,7 +223,7 @@ tcic_write_1(h, reg, data) bus_space_write_1(h->sc->iot, h->sc->ioh, reg, (data)); } -static __inline__ void tcic_write_2 __P((struct tcic_handle *, int, int)); +static __inline__ void tcic_write_2(struct tcic_handle *, int, int); static __inline__ void tcic_write_2(h, reg, data) struct tcic_handle *h; @@ -233,7 +233,7 @@ tcic_write_2(h, reg, data) bus_space_write_2(h->sc->iot, h->sc->ioh, reg, (data)); } -static __inline__ void tcic_write_4 __P((struct tcic_handle *, int, int)); +static __inline__ void tcic_write_4(struct tcic_handle *, int, int); static __inline__ void tcic_write_4(h, reg, data) struct tcic_handle *h; @@ -244,7 +244,7 @@ tcic_write_4(h, reg, data) bus_space_write_2(h->sc->iot, h->sc->ioh, reg+2, (data)>>16); } -static __inline__ int tcic_read_ind_2 __P((struct tcic_handle *, int)); +static __inline__ int tcic_read_ind_2(struct tcic_handle *, int); static __inline__ int tcic_read_ind_2(h, reg) struct tcic_handle *h; @@ -258,7 +258,7 @@ tcic_read_ind_2(h, reg) return val; } -static __inline__ void tcic_write_ind_2 __P((struct tcic_handle *, int, int)); +static __inline__ void tcic_write_ind_2(struct tcic_handle *, int, int); static __inline__ void tcic_write_ind_2(h, reg, data) struct tcic_handle *h; @@ -272,7 +272,7 @@ tcic_write_ind_2(h, reg, data) tcic_write_4(h, TCIC_R_ADDR, r_addr); } -static __inline__ void tcic_sel_sock __P((struct tcic_handle *)); +static __inline__ void tcic_sel_sock(struct tcic_handle *); static __inline__ void tcic_sel_sock(h) struct tcic_handle *h; @@ -283,7 +283,7 @@ tcic_sel_sock(h) (h->sock<<TCIC_ADDR2_SS_SHFT)|(r_addr & ~TCIC_ADDR2_SS_MASK)); } -static __inline__ void tcic_wait_ready __P((struct tcic_handle *)); +static __inline__ void tcic_wait_ready(struct tcic_handle *); static __inline__ void tcic_wait_ready(h) struct tcic_handle *h; @@ -302,7 +302,7 @@ tcic_wait_ready(h) #endif } -static __inline__ int tcic_read_aux_1 __P((bus_space_tag_t, bus_space_handle_t, int, int)); +static __inline__ int tcic_read_aux_1(bus_space_tag_t, bus_space_handle_t, int, int); static __inline__ int tcic_read_aux_1(iot, ioh, auxreg, reg) bus_space_tag_t iot; @@ -316,7 +316,7 @@ tcic_read_aux_1(iot, ioh, auxreg, reg) return val; } -static __inline__ int tcic_read_aux_2 __P((bus_space_tag_t, bus_space_handle_t, int)); +static __inline__ int tcic_read_aux_2(bus_space_tag_t, bus_space_handle_t, int); static __inline__ int tcic_read_aux_2(iot, ioh, auxreg) bus_space_tag_t iot; @@ -330,7 +330,7 @@ tcic_read_aux_2(iot, ioh, auxreg) return val; } -static __inline__ void tcic_write_aux_1 __P((bus_space_tag_t, bus_space_handle_t, int, int, int)); +static __inline__ void tcic_write_aux_1(bus_space_tag_t, bus_space_handle_t, int, int, int); static __inline__ void tcic_write_aux_1(iot, ioh, auxreg, reg, val) bus_space_tag_t iot; @@ -343,7 +343,7 @@ tcic_write_aux_1(iot, ioh, auxreg, reg, val) bus_space_write_1(iot, ioh, reg, val); } -static __inline__ void tcic_write_aux_2 __P((bus_space_tag_t, bus_space_handle_t, int, int)); +static __inline__ void tcic_write_aux_2(bus_space_tag_t, bus_space_handle_t, int, int); static __inline__ void tcic_write_aux_2(iot, ioh, auxreg, val) bus_space_tag_t iot; diff --git a/sys/dev/ic/tropic.c b/sys/dev/ic/tropic.c index af34094872f..8f8f912fee2 100644 --- a/sys/dev/ic/tropic.c +++ b/sys/dev/ic/tropic.c @@ -1,4 +1,4 @@ -/* $NetBSD: tropic.c,v 1.22 2003/11/02 11:07:46 wiz Exp $ */ +/* $NetBSD: tropic.c,v 1.23 2005/02/04 02:10:37 perry Exp $ */ /* * Ported to NetBSD by Onno van der Linden @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tropic.c,v 1.22 2003/11/02 11:07:46 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tropic.c,v 1.23 2005/02/04 02:10:37 perry Exp $"); #include "opt_inet.h" #include "opt_ns.h" @@ -85,24 +85,24 @@ __KERNEL_RCSID(0, "$NetBSD: tropic.c,v 1.22 2003/11/02 11:07:46 wiz Exp $"); #include <dev/ic/tropicreg.h> #include <dev/ic/tropicvar.h> -static void tr_shutdown __P((void *)); -static void tr_reopen __P((void *)); - -void tr_rint __P((struct tr_softc *)); -void tr_xint __P((struct tr_softc *)); -void tr_oldxint __P((struct tr_softc *)); -struct mbuf *tr_get __P((struct tr_softc *, int, struct ifnet *)); -void tr_opensap __P((struct tr_softc *, u_char)); -int tr_mbcopy __P((struct tr_softc *, bus_size_t, struct mbuf *)); -void tr_bcopy __P((struct tr_softc *, u_char *, int)); -void tr_start __P((struct ifnet *)); -void tr_oldstart __P((struct ifnet *)); -void tr_watchdog __P((struct ifnet *)); -int tr_mediachange __P((struct ifnet *)); -void tr_mediastatus __P((struct ifnet *, struct ifmediareq *)); -int tropic_mediachange __P((struct tr_softc *)); -void tropic_mediastatus __P((struct tr_softc *, struct ifmediareq *)); -void tr_reinit __P((void *)); +static void tr_shutdown(void *); +static void tr_reopen(void *); + +void tr_rint(struct tr_softc *); +void tr_xint(struct tr_softc *); +void tr_oldxint(struct tr_softc *); +struct mbuf *tr_get(struct tr_softc *, int, struct ifnet *); +void tr_opensap(struct tr_softc *, u_char); +int tr_mbcopy(struct tr_softc *, bus_size_t, struct mbuf *); +void tr_bcopy(struct tr_softc *, u_char *, int); +void tr_start(struct ifnet *); +void tr_oldstart(struct ifnet *); +void tr_watchdog(struct ifnet *); +int tr_mediachange(struct ifnet *); +void tr_mediastatus(struct ifnet *, struct ifmediareq *); +int tropic_mediachange(struct tr_softc *); +void tropic_mediastatus(struct tr_softc *, struct ifmediareq *); +void tr_reinit(void *); /* * TODO: diff --git a/sys/dev/ic/tropicvar.h b/sys/dev/ic/tropicvar.h index d7c5c7d56e8..7da814b4e23 100644 --- a/sys/dev/ic/tropicvar.h +++ b/sys/dev/ic/tropicvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: tropicvar.h,v 1.8 2000/06/13 20:00:03 soren Exp $ */ +/* $NetBSD: tropicvar.h,v 1.9 2005/02/04 02:10:37 perry Exp $ */ /* * Mach Operating System @@ -74,8 +74,8 @@ struct tr_softc { struct callout sc_init_callout; struct callout sc_reinit_callout; - int (*sc_mediachange) __P((struct tr_softc *)); - void (*sc_mediastatus) __P((struct tr_softc *, struct ifmediareq *)); + int (*sc_mediachange)(struct tr_softc *); + void (*sc_mediastatus)(struct tr_softc *, struct ifmediareq *); struct rbcb rbc; /* receiver buffer control block */ bus_size_t sc_aca; /* offset of adapter ACA */ bus_size_t sc_ssb; /* offset of System Status Block */ @@ -97,21 +97,21 @@ struct tr_softc { void *sc_sdhook; /* Power management hooks */ - int (*sc_enable) __P((struct tr_softc *)); - void (*sc_disable) __P((struct tr_softc *)); + int (*sc_enable)(struct tr_softc *); + void (*sc_disable)(struct tr_softc *); int sc_enabled; }; -int tr_config __P((struct tr_softc *)); -int tr_attach __P((struct tr_softc *)); -int tr_intr __P((void *)); -void tr_init __P((void *)); -int tr_ioctl __P((struct ifnet *, u_long, caddr_t)); -void tr_stop __P((struct tr_softc *)); -int tr_reset __P((struct tr_softc *)); -void tr_sleep __P((struct tr_softc *)); -int tr_setspeed __P((struct tr_softc *, u_int8_t)); -int tr_enable __P((struct tr_softc *)); -void tr_disable __P((struct tr_softc *)); -int tr_activate __P((struct device *, enum devact)); -int tr_detach __P((struct device *, int flags)); +int tr_config(struct tr_softc *); +int tr_attach(struct tr_softc *); +int tr_intr(void *); +void tr_init(void *); +int tr_ioctl(struct ifnet *, u_long, caddr_t); +void tr_stop(struct tr_softc *); +int tr_reset(struct tr_softc *); +void tr_sleep(struct tr_softc *); +int tr_setspeed(struct tr_softc *, u_int8_t); +int tr_enable(struct tr_softc *); +void tr_disable(struct tr_softc *); +int tr_activate(struct device *, enum devact); +int tr_detach(struct device *, int flags); diff --git a/sys/dev/ic/tulip.c b/sys/dev/ic/tulip.c index f98146ca1c9..834ed7aff6e 100644 --- a/sys/dev/ic/tulip.c +++ b/sys/dev/ic/tulip.c @@ -1,4 +1,4 @@ -/* $NetBSD: tulip.c,v 1.131 2005/01/30 17:27:38 thorpej Exp $ */ +/* $NetBSD: tulip.c,v 1.132 2005/02/04 02:10:37 perry Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.131 2005/01/30 17:27:38 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.132 2005/02/04 02:10:37 perry Exp $"); #include "bpfilter.h" @@ -95,59 +95,59 @@ const struct tulip_txthresh_tab tlp_winb_txthresh_tab[] = const struct tulip_txthresh_tab tlp_dm9102_txthresh_tab[] = TLP_TXTHRESH_TAB_DM9102; -void tlp_start __P((struct ifnet *)); -void tlp_watchdog __P((struct ifnet *)); -int tlp_ioctl __P((struct ifnet *, u_long, caddr_t)); -int tlp_init __P((struct ifnet *)); -void tlp_stop __P((struct ifnet *, int)); +void tlp_start(struct ifnet *); +void tlp_watchdog(struct ifnet *); +int tlp_ioctl(struct ifnet *, u_long, caddr_t); +int tlp_init(struct ifnet *); +void tlp_stop(struct ifnet *, int); -void tlp_shutdown __P((void *)); +void tlp_shutdown(void *); -void tlp_rxdrain __P((struct tulip_softc *)); -int tlp_add_rxbuf __P((struct tulip_softc *, int)); -void tlp_idle __P((struct tulip_softc *, u_int32_t)); -void tlp_srom_idle __P((struct tulip_softc *)); -int tlp_srom_size __P((struct tulip_softc *)); +void tlp_rxdrain(struct tulip_softc *); +int tlp_add_rxbuf(struct tulip_softc *, int); +void tlp_idle(struct tulip_softc *, u_int32_t); +void tlp_srom_idle(struct tulip_softc *); +int tlp_srom_size(struct tulip_softc *); -int tlp_enable __P((struct tulip_softc *)); -void tlp_disable __P((struct tulip_softc *)); -void tlp_power __P((int, void *)); +int tlp_enable(struct tulip_softc *); +void tlp_disable(struct tulip_softc *); +void tlp_power(int, void *); -void tlp_filter_setup __P((struct tulip_softc *)); -void tlp_winb_filter_setup __P((struct tulip_softc *)); -void tlp_al981_filter_setup __P((struct tulip_softc *)); +void tlp_filter_setup(struct tulip_softc *); +void tlp_winb_filter_setup(struct tulip_softc *); +void tlp_al981_filter_setup(struct tulip_softc *); -void tlp_rxintr __P((struct tulip_softc *)); -void tlp_txintr __P((struct tulip_softc *)); +void tlp_rxintr(struct tulip_softc *); +void tlp_txintr(struct tulip_softc *); -void tlp_mii_tick __P((void *)); -void tlp_mii_statchg __P((struct device *)); -void tlp_winb_mii_statchg __P((struct device *)); -void tlp_dm9102_mii_statchg __P((struct device *)); +void tlp_mii_tick(void *); +void tlp_mii_statchg(struct device *); +void tlp_winb_mii_statchg(struct device *); +void tlp_dm9102_mii_statchg(struct device *); -void tlp_mii_getmedia __P((struct tulip_softc *, struct ifmediareq *)); -int tlp_mii_setmedia __P((struct tulip_softc *)); +void tlp_mii_getmedia(struct tulip_softc *, struct ifmediareq *); +int tlp_mii_setmedia(struct tulip_softc *); -int tlp_bitbang_mii_readreg __P((struct device *, int, int)); -void tlp_bitbang_mii_writereg __P((struct device *, int, int, int)); +int tlp_bitbang_mii_readreg(struct device *, int, int); +void tlp_bitbang_mii_writereg(struct device *, int, int, int); -int tlp_pnic_mii_readreg __P((struct device *, int, int)); -void tlp_pnic_mii_writereg __P((struct device *, int, int, int)); +int tlp_pnic_mii_readreg(struct device *, int, int); +void tlp_pnic_mii_writereg(struct device *, int, int, int); -int tlp_al981_mii_readreg __P((struct device *, int, int)); -void tlp_al981_mii_writereg __P((struct device *, int, int, int)); +int tlp_al981_mii_readreg(struct device *, int, int); +void tlp_al981_mii_writereg(struct device *, int, int, int); -void tlp_2114x_preinit __P((struct tulip_softc *)); -void tlp_2114x_mii_preinit __P((struct tulip_softc *)); -void tlp_pnic_preinit __P((struct tulip_softc *)); -void tlp_dm9102_preinit __P((struct tulip_softc *)); +void tlp_2114x_preinit(struct tulip_softc *); +void tlp_2114x_mii_preinit(struct tulip_softc *); +void tlp_pnic_preinit(struct tulip_softc *); +void tlp_dm9102_preinit(struct tulip_softc *); -void tlp_21140_reset __P((struct tulip_softc *)); -void tlp_21142_reset __P((struct tulip_softc *)); -void tlp_pmac_reset __P((struct tulip_softc *)); -void tlp_dm9102_reset __P((struct tulip_softc *)); +void tlp_21140_reset(struct tulip_softc *); +void tlp_21142_reset(struct tulip_softc *); +void tlp_pmac_reset(struct tulip_softc *); +void tlp_dm9102_reset(struct tulip_softc *); -void tlp_2114x_nway_tick __P((void *)); +void tlp_2114x_nway_tick(void *); #define tlp_mchash(addr, sz) \ (ether_crc32_le((addr), ETHER_ADDR_LEN) & ((sz) - 1)) @@ -155,8 +155,8 @@ void tlp_2114x_nway_tick __P((void *)); /* * MII bit-bang glue. */ -u_int32_t tlp_sio_mii_bitbang_read __P((struct device *)); -void tlp_sio_mii_bitbang_write __P((struct device *, u_int32_t)); +u_int32_t tlp_sio_mii_bitbang_read(struct device *); +void tlp_sio_mii_bitbang_write(struct device *, u_int32_t); const struct mii_bitbang_ops tlp_sio_mii_bitbang_ops = { tlp_sio_mii_bitbang_read, @@ -178,7 +178,7 @@ const struct mii_bitbang_ops tlp_sio_mii_bitbang_ops = { #endif #ifdef TLP_STATS -void tlp_print_stats __P((struct tulip_softc *)); +void tlp_print_stats(struct tulip_softc *); #endif /* @@ -3850,15 +3850,15 @@ const struct tulip_srom_to_ifmedia tulip_srom_to_ifmedia_table[] = { 0 } }, }; -const struct tulip_srom_to_ifmedia *tlp_srom_to_ifmedia __P((u_int8_t)); -void tlp_srom_media_info __P((struct tulip_softc *, - const struct tulip_srom_to_ifmedia *, struct tulip_21x4x_media *)); -void tlp_add_srom_media __P((struct tulip_softc *, int, +const struct tulip_srom_to_ifmedia *tlp_srom_to_ifmedia(u_int8_t); +void tlp_srom_media_info(struct tulip_softc *, + const struct tulip_srom_to_ifmedia *, struct tulip_21x4x_media *); +void tlp_add_srom_media(struct tulip_softc *, int, void (*)(struct tulip_softc *, struct ifmediareq *), - int (*)(struct tulip_softc *), const u_int8_t *, int)); -void tlp_print_media __P((struct tulip_softc *)); -void tlp_nway_activate __P((struct tulip_softc *, int)); -void tlp_get_minst __P((struct tulip_softc *)); + int (*)(struct tulip_softc *), const u_int8_t *, int); +void tlp_print_media(struct tulip_softc *); +void tlp_nway_activate(struct tulip_softc *, int); +void tlp_get_minst(struct tulip_softc *); const struct tulip_srom_to_ifmedia * tlp_srom_to_ifmedia(sm) @@ -3917,8 +3917,8 @@ void tlp_add_srom_media(sc, type, get, set, list, cnt) struct tulip_softc *sc; int type; - void (*get) __P((struct tulip_softc *, struct ifmediareq *)); - int (*set) __P((struct tulip_softc *)); + void (*get)(struct tulip_softc *, struct ifmediareq *); + int (*set)(struct tulip_softc *); const u_int8_t *list; int cnt; { @@ -4007,11 +4007,11 @@ tlp_get_minst(sc) /* * SIA Utility functions. */ -void tlp_sia_update_link __P((struct tulip_softc *)); -void tlp_sia_get __P((struct tulip_softc *, struct ifmediareq *)); -int tlp_sia_set __P((struct tulip_softc *)); -int tlp_sia_media __P((struct tulip_softc *, struct ifmedia_entry *)); -void tlp_sia_fixup __P((struct tulip_softc *)); +void tlp_sia_update_link(struct tulip_softc *); +void tlp_sia_get(struct tulip_softc *, struct ifmediareq *); +int tlp_sia_set(struct tulip_softc *); +int tlp_sia_media(struct tulip_softc *, struct ifmedia_entry *); +void tlp_sia_fixup(struct tulip_softc *); void tlp_sia_update_link(sc) @@ -4209,7 +4209,7 @@ tlp_sia_media(sc, ife) /* * 21140 GPIO utility functions. */ -void tlp_21140_gpio_update_link __P((struct tulip_softc *)); +void tlp_21140_gpio_update_link(struct tulip_softc *); void tlp_21140_gpio_update_link(sc) @@ -4287,10 +4287,10 @@ tlp_21140_gpio_set(sc) /* * 21040 and 21041 media switches. */ -void tlp_21040_tmsw_init __P((struct tulip_softc *)); -void tlp_21040_tp_tmsw_init __P((struct tulip_softc *)); -void tlp_21040_auibnc_tmsw_init __P((struct tulip_softc *)); -void tlp_21041_tmsw_init __P((struct tulip_softc *)); +void tlp_21040_tmsw_init(struct tulip_softc *); +void tlp_21040_tp_tmsw_init(struct tulip_softc *); +void tlp_21040_auibnc_tmsw_init(struct tulip_softc *); +void tlp_21041_tmsw_init(struct tulip_softc *); const struct tulip_mediasw tlp_21040_mediasw = { tlp_21040_tmsw_init, tlp_sia_get, tlp_sia_set @@ -4529,21 +4529,21 @@ tlp_21041_tmsw_init(sc) /* * DECchip 2114x ISV media switch. */ -void tlp_2114x_isv_tmsw_init __P((struct tulip_softc *)); -void tlp_2114x_isv_tmsw_get __P((struct tulip_softc *, struct ifmediareq *)); -int tlp_2114x_isv_tmsw_set __P((struct tulip_softc *)); +void tlp_2114x_isv_tmsw_init(struct tulip_softc *); +void tlp_2114x_isv_tmsw_get(struct tulip_softc *, struct ifmediareq *); +int tlp_2114x_isv_tmsw_set(struct tulip_softc *); const struct tulip_mediasw tlp_2114x_isv_mediasw = { tlp_2114x_isv_tmsw_init, tlp_2114x_isv_tmsw_get, tlp_2114x_isv_tmsw_set }; -void tlp_2114x_nway_get __P((struct tulip_softc *, struct ifmediareq *)); -int tlp_2114x_nway_set __P((struct tulip_softc *)); +void tlp_2114x_nway_get(struct tulip_softc *, struct ifmediareq *); +int tlp_2114x_nway_set(struct tulip_softc *); -void tlp_2114x_nway_statchg __P((struct device *)); -int tlp_2114x_nway_service __P((struct tulip_softc *, int)); -void tlp_2114x_nway_auto __P((struct tulip_softc *)); -void tlp_2114x_nway_status __P((struct tulip_softc *)); +void tlp_2114x_nway_statchg(struct device *); +int tlp_2114x_nway_service(struct tulip_softc *, int); +void tlp_2114x_nway_auto(struct tulip_softc *); +void tlp_2114x_nway_status(struct tulip_softc *); void tlp_2114x_isv_tmsw_init(sc) @@ -5383,7 +5383,7 @@ tlp_2114x_isv_tmsw_set(sc) /* * MII-on-SIO media switch. Handles only MII attached to the SIO. */ -void tlp_sio_mii_tmsw_init __P((struct tulip_softc *)); +void tlp_sio_mii_tmsw_init(struct tulip_softc *); const struct tulip_mediasw tlp_sio_mii_mediasw = { tlp_sio_mii_tmsw_init, tlp_mii_getmedia, tlp_mii_setmedia @@ -5424,22 +5424,22 @@ tlp_sio_mii_tmsw_init(sc) /* * Lite-On PNIC media switch. Must handle MII or internal NWAY. */ -void tlp_pnic_tmsw_init __P((struct tulip_softc *)); -void tlp_pnic_tmsw_get __P((struct tulip_softc *, struct ifmediareq *)); -int tlp_pnic_tmsw_set __P((struct tulip_softc *)); +void tlp_pnic_tmsw_init(struct tulip_softc *); +void tlp_pnic_tmsw_get(struct tulip_softc *, struct ifmediareq *); +int tlp_pnic_tmsw_set(struct tulip_softc *); const struct tulip_mediasw tlp_pnic_mediasw = { tlp_pnic_tmsw_init, tlp_pnic_tmsw_get, tlp_pnic_tmsw_set }; -void tlp_pnic_nway_statchg __P((struct device *)); -void tlp_pnic_nway_tick __P((void *)); -int tlp_pnic_nway_service __P((struct tulip_softc *, int)); -void tlp_pnic_nway_reset __P((struct tulip_softc *)); -int tlp_pnic_nway_auto __P((struct tulip_softc *, int)); -void tlp_pnic_nway_auto_timeout __P((void *)); -void tlp_pnic_nway_status __P((struct tulip_softc *)); -void tlp_pnic_nway_acomp __P((struct tulip_softc *)); +void tlp_pnic_nway_statchg(struct device *); +void tlp_pnic_nway_tick(void *); +int tlp_pnic_nway_service(struct tulip_softc *, int); +void tlp_pnic_nway_reset(struct tulip_softc *); +int tlp_pnic_nway_auto(struct tulip_softc *, int); +void tlp_pnic_nway_auto_timeout(void *); +void tlp_pnic_nway_status(struct tulip_softc *); +void tlp_pnic_nway_acomp(struct tulip_softc *); void tlp_pnic_tmsw_init(sc) @@ -5838,7 +5838,7 @@ tlp_pnic_nway_acomp(sc) * use the ISV media switch get/set functions to handle the rest. */ -void tlp_pmac_tmsw_init __P((struct tulip_softc *)); +void tlp_pmac_tmsw_init(struct tulip_softc *); const struct tulip_mediasw tlp_pmac_mediasw = { tlp_pmac_tmsw_init, tlp_2114x_isv_tmsw_get, tlp_2114x_isv_tmsw_set @@ -5925,7 +5925,7 @@ tlp_pmac_tmsw_init(sc) /* * ADMtek AL981 media switch. Only has internal PHY. */ -void tlp_al981_tmsw_init __P((struct tulip_softc *)); +void tlp_al981_tmsw_init(struct tulip_softc *); const struct tulip_mediasw tlp_al981_mediasw = { tlp_al981_tmsw_init, tlp_mii_getmedia, tlp_mii_setmedia @@ -5961,7 +5961,7 @@ tlp_al981_tmsw_init(sc) * standard SIO media switch, because the AN985 "ghosts" the * singly PHY at every address. */ -void tlp_an985_tmsw_init __P((struct tulip_softc *)); +void tlp_an985_tmsw_init(struct tulip_softc *); const struct tulip_mediasw tlp_an985_mediasw = { tlp_an985_tmsw_init, tlp_mii_getmedia, tlp_mii_setmedia @@ -5994,10 +5994,9 @@ tlp_an985_tmsw_init(sc) /* * Davicom DM9102 media switch. Internal PHY and possibly HomePNA. */ -void tlp_dm9102_tmsw_init __P((struct tulip_softc *)); -void tlp_dm9102_tmsw_getmedia __P((struct tulip_softc *, - struct ifmediareq *)); -int tlp_dm9102_tmsw_setmedia __P((struct tulip_softc *)); +void tlp_dm9102_tmsw_init(struct tulip_softc *); +void tlp_dm9102_tmsw_getmedia(struct tulip_softc *, struct ifmediareq *); +int tlp_dm9102_tmsw_setmedia(struct tulip_softc *); const struct tulip_mediasw tlp_dm9102_mediasw = { tlp_dm9102_tmsw_init, tlp_dm9102_tmsw_getmedia, diff --git a/sys/dev/ic/tulipvar.h b/sys/dev/ic/tulipvar.h index aab48bfb62d..4fbfa615ccf 100644 --- a/sys/dev/ic/tulipvar.h +++ b/sys/dev/ic/tulipvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: tulipvar.h,v 1.51 2004/10/24 00:35:08 christos Exp $ */ +/* $NetBSD: tulipvar.h,v 1.52 2005/02/04 02:10:37 perry Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -192,9 +192,9 @@ struct tulip_softc; * Media init, change, status function pointers. */ struct tulip_mediasw { - void (*tmsw_init) __P((struct tulip_softc *)); - void (*tmsw_get) __P((struct tulip_softc *, struct ifmediareq *)); - int (*tmsw_set) __P((struct tulip_softc *)); + void (*tmsw_init)(struct tulip_softc *); + void (*tmsw_get)(struct tulip_softc *, struct ifmediareq *); + int (*tmsw_set)(struct tulip_softc *); }; /* @@ -276,9 +276,8 @@ struct tulip_21x4x_media { int tm_type; /* type of media; see tulipreg.h */ const char *tm_name; /* name of media */ - void (*tm_get) __P((struct tulip_softc *, - struct ifmediareq *)); - int (*tm_set) __P((struct tulip_softc *)); + void (*tm_get)(struct tulip_softc *, struct ifmediareq *); + int (*tm_set)(struct tulip_softc *); int tm_phyno; /* PHY # on MII */ @@ -385,25 +384,25 @@ struct tulip_softc { u_int32_t sc_sia_cap; /* SIA media capabilities (21143) */ /* Reset function. */ - void (*sc_reset) __P((struct tulip_softc *)); + void (*sc_reset)(struct tulip_softc *); /* Pre-init function. */ - void (*sc_preinit) __P((struct tulip_softc *)); + void (*sc_preinit)(struct tulip_softc *); /* Filter setup function. */ - void (*sc_filter_setup) __P((struct tulip_softc *)); + void (*sc_filter_setup)(struct tulip_softc *); /* Media status update function. */ - void (*sc_statchg) __P((struct device *)); + void (*sc_statchg)(struct device *); /* Media tick function. */ - void (*sc_tick) __P((void *)); + void (*sc_tick)(void *); struct callout sc_tick_callout; /* Power management hooks. */ - int (*sc_enable) __P((struct tulip_softc *)); - void (*sc_disable) __P((struct tulip_softc *)); - void (*sc_power) __P((struct tulip_softc *, int)); + int (*sc_enable)(struct tulip_softc *); + void (*sc_disable)(struct tulip_softc *); + void (*sc_power)(struct tulip_softc *, int); /* * The Winbond 89C840F places registers 4 bytes apart, instead @@ -595,23 +594,22 @@ extern const struct tulip_mediasw tlp_al981_mediasw; extern const struct tulip_mediasw tlp_an985_mediasw; extern const struct tulip_mediasw tlp_dm9102_mediasw; -void tlp_attach __P((struct tulip_softc *, const u_int8_t *)); -int tlp_activate __P((struct device *, enum devact)); -int tlp_detach __P((struct tulip_softc *)); -int tlp_intr __P((void *)); -int tlp_read_srom __P((struct tulip_softc *)); -int tlp_srom_crcok __P((const u_int8_t *)); -int tlp_isv_srom __P((const u_int8_t *)); -int tlp_isv_srom_enaddr __P((struct tulip_softc *, u_int8_t *)); -int tlp_parse_old_srom __P((struct tulip_softc *, u_int8_t *)); -void tlp_reset __P((struct tulip_softc *)); - -int tlp_mediachange __P((struct ifnet *)); -void tlp_mediastatus __P((struct ifnet *, struct ifmediareq *)); - -void tlp_21140_gpio_get __P((struct tulip_softc *sc, - struct ifmediareq *ifmr)); -int tlp_21140_gpio_set __P((struct tulip_softc *sc)); +void tlp_attach(struct tulip_softc *, const u_int8_t *); +int tlp_activate(struct device *, enum devact); +int tlp_detach(struct tulip_softc *); +int tlp_intr(void *); +int tlp_read_srom(struct tulip_softc *); +int tlp_srom_crcok(const u_int8_t *); +int tlp_isv_srom(const u_int8_t *); +int tlp_isv_srom_enaddr(struct tulip_softc *, u_int8_t *); +int tlp_parse_old_srom(struct tulip_softc *, u_int8_t *); +void tlp_reset(struct tulip_softc *); + +int tlp_mediachange(struct ifnet *); +void tlp_mediastatus(struct ifnet *, struct ifmediareq *); + +void tlp_21140_gpio_get(struct tulip_softc *sc, struct ifmediareq *ifmr); +int tlp_21140_gpio_set(struct tulip_softc *sc); #endif /* _KERNEL */ diff --git a/sys/dev/ic/uha.c b/sys/dev/ic/uha.c index 5ad8bbcd044..df5370cf33b 100644 --- a/sys/dev/ic/uha.c +++ b/sys/dev/ic/uha.c @@ -1,4 +1,4 @@ -/* $NetBSD: uha.c,v 1.33 2004/12/07 14:50:56 thorpej Exp $ */ +/* $NetBSD: uha.c,v 1.34 2005/02/04 02:10:37 perry Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uha.c,v 1.33 2004/12/07 14:50:56 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uha.c,v 1.34 2005/02/04 02:10:37 perry Exp $"); #undef UHADEBUG #ifdef DDB @@ -98,14 +98,13 @@ __KERNEL_RCSID(0, "$NetBSD: uha.c,v 1.33 2004/12/07 14:50:56 thorpej Exp $"); #define UHA_MAXXFER ((UHA_NSEG - 1) << PGSHIFT) -integrate void uha_reset_mscp __P((struct uha_softc *, struct uha_mscp *)); -void uha_free_mscp __P((struct uha_softc *, struct uha_mscp *)); -integrate int uha_init_mscp __P((struct uha_softc *, struct uha_mscp *)); -struct uha_mscp *uha_get_mscp __P((struct uha_softc *)); -void uhaminphys __P((struct buf *)); -void uha_scsipi_request __P((struct scsipi_channel *, - scsipi_adapter_req_t, void *)); -int uha_create_mscps __P((struct uha_softc *, struct uha_mscp *, int)); +integrate void uha_reset_mscp(struct uha_softc *, struct uha_mscp *); +void uha_free_mscp(struct uha_softc *, struct uha_mscp *); +integrate int uha_init_mscp(struct uha_softc *, struct uha_mscp *); +struct uha_mscp *uha_get_mscp(struct uha_softc *); +void uhaminphys(struct buf *); +void uha_scsipi_request(struct scsipi_channel *, scsipi_adapter_req_t, void *); +int uha_create_mscps(struct uha_softc *, struct uha_mscp *, int); #define UHA_ABORT_TIMEOUT 2000 /* time to wait for abort (mSec) */ diff --git a/sys/dev/ic/uhavar.h b/sys/dev/ic/uhavar.h index 6b0eaea3ff3..8f7e8ece480 100644 --- a/sys/dev/ic/uhavar.h +++ b/sys/dev/ic/uhavar.h @@ -1,4 +1,4 @@ -/* $NetBSD: uhavar.h,v 1.12 2001/04/25 17:53:35 bouyer Exp $ */ +/* $NetBSD: uhavar.h,v 1.13 2005/02/04 02:10:37 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -54,9 +54,9 @@ struct uha_softc { int sc_dmaflags; /* bus-specific DMA map creation flags */ - void (*start_mbox) __P((struct uha_softc *, struct uha_mscp *)); - int (*poll) __P((struct uha_softc *, struct scsipi_xfer *, int)); - void (*init) __P((struct uha_softc *)); + void (*start_mbox)(struct uha_softc *, struct uha_mscp *); + int (*poll)(struct uha_softc *, struct scsipi_xfer *, int); + void (*init)(struct uha_softc *); bus_dmamap_t sc_dmamap_mscp; /* maps the mscps */ struct uha_mscp *sc_mscps; /* all our mscps */ @@ -79,7 +79,7 @@ struct uha_probe_data { int sc_scsi_dev; }; -void uha_attach __P((struct uha_softc *, struct uha_probe_data *)); -void uha_timeout __P((void *arg)); -struct uha_mscp *uha_mscp_phys_kv __P((struct uha_softc *, u_long)); -void uha_done __P((struct uha_softc *, struct uha_mscp *)); +void uha_attach(struct uha_softc *, struct uha_probe_data *); +void uha_timeout(void *arg); +struct uha_mscp *uha_mscp_phys_kv(struct uha_softc *, u_long); +void uha_done(struct uha_softc *, struct uha_mscp *); diff --git a/sys/dev/ic/we.c b/sys/dev/ic/we.c index d1911dc574e..bb62b8c319d 100644 --- a/sys/dev/ic/we.c +++ b/sys/dev/ic/we.c @@ -1,4 +1,4 @@ -/* $NetBSD: we.c,v 1.5 2003/01/15 22:20:07 bouyer Exp $ */ +/* $NetBSD: we.c,v 1.6 2005/02/04 02:10:37 perry Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -56,7 +56,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: we.c,v 1.5 2003/01/15 22:20:07 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: we.c,v 1.6 2005/02/04 02:10:37 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -90,21 +90,21 @@ __KERNEL_RCSID(0, "$NetBSD: we.c,v 1.5 2003/01/15 22:20:07 bouyer Exp $"); #define bus_space_write_region_stream_2 bus_space_write_region_2 #endif -static void we_set_media __P((struct we_softc *, int)); +static void we_set_media(struct we_softc *, int); -static void we_media_init __P((struct dp8390_softc *)); +static void we_media_init(struct dp8390_softc *); -static int we_mediachange __P((struct dp8390_softc *)); -static void we_mediastatus __P((struct dp8390_softc *, struct ifmediareq *)); +static int we_mediachange(struct dp8390_softc *); +static void we_mediastatus(struct dp8390_softc *, struct ifmediareq *); -static void we_recv_int __P((struct dp8390_softc *)); -static void we_init_card __P((struct dp8390_softc *)); -static int we_write_mbuf __P((struct dp8390_softc *, struct mbuf *, int)); -static int we_ring_copy __P((struct dp8390_softc *, int, caddr_t, u_short)); -static void we_read_hdr __P((struct dp8390_softc *, int, struct dp8390_ring *)); -static int we_test_mem __P((struct dp8390_softc *)); +static void we_recv_int(struct dp8390_softc *); +static void we_init_card(struct dp8390_softc *); +static int we_write_mbuf(struct dp8390_softc *, struct mbuf *, int); +static int we_ring_copy(struct dp8390_softc *, int, caddr_t, u_short); +static void we_read_hdr(struct dp8390_softc *, int, struct dp8390_ring *); +static int we_test_mem(struct dp8390_softc *); -static __inline void we_readmem __P((struct we_softc *, int, u_int8_t *, int)); +static __inline void we_readmem(struct we_softc *, int, u_int8_t *, int); /* * Delay needed when switching 16-bit access to shared memory. diff --git a/sys/dev/ic/wevar.h b/sys/dev/ic/wevar.h index c0027640629..ab4aeb394f6 100644 --- a/sys/dev/ic/wevar.h +++ b/sys/dev/ic/wevar.h @@ -1,4 +1,4 @@ -/* $NetBSD: wevar.h,v 1.1 2001/03/23 17:34:41 jdolecek Exp $ */ +/* $NetBSD: wevar.h,v 1.2 2005/02/04 02:10:37 perry Exp $ */ /* * National Semiconductor DS8390 NIC register definitions. @@ -26,9 +26,9 @@ struct we_softc { int sc_iobase; /* i/o address */ int sc_maddr; /* physical i/o mem addr */ - void (*sc_init_hook) __P((struct we_softc *)); + void (*sc_init_hook)(struct we_softc *); void *sc_ih; /* interrupt handle */ }; -int we_config __P((struct device *self, struct we_softc *, const char *)); +int we_config(struct device *self, struct we_softc *, const char *); diff --git a/sys/dev/ic/z8530sc.c b/sys/dev/ic/z8530sc.c index 0f0f8b9583a..9e122a708f9 100644 --- a/sys/dev/ic/z8530sc.c +++ b/sys/dev/ic/z8530sc.c @@ -1,4 +1,4 @@ -/* $NetBSD: z8530sc.c,v 1.19 2003/08/07 16:31:03 agc Exp $ */ +/* $NetBSD: z8530sc.c,v 1.20 2005/02/04 02:10:37 perry Exp $ */ /* * Copyright (c) 1992, 1993 @@ -91,7 +91,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: z8530sc.c,v 1.19 2003/08/07 16:31:03 agc Exp $"); +__KERNEL_RCSID(0, "$NetBSD: z8530sc.c,v 1.20 2005/02/04 02:10:37 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -373,10 +373,10 @@ zsc_intr_soft(arg) * Provide a null zs "ops" vector. */ -static void zsnull_rxint __P((struct zs_chanstate *)); -static void zsnull_stint __P((struct zs_chanstate *, int)); -static void zsnull_txint __P((struct zs_chanstate *)); -static void zsnull_softint __P((struct zs_chanstate *)); +static void zsnull_rxint (struct zs_chanstate *); +static void zsnull_stint (struct zs_chanstate *, int); +static void zsnull_txint (struct zs_chanstate *); +static void zsnull_softint(struct zs_chanstate *); static void zsnull_rxint(cs) diff --git a/sys/dev/ic/z8530sc.h b/sys/dev/ic/z8530sc.h index 81818af1c0d..4a2be442503 100644 --- a/sys/dev/ic/z8530sc.h +++ b/sys/dev/ic/z8530sc.h @@ -1,4 +1,4 @@ -/* $NetBSD: z8530sc.h,v 1.20 2004/06/20 18:07:35 thorpej Exp $ */ +/* $NetBSD: z8530sc.h,v 1.21 2005/02/04 02:10:37 perry Exp $ */ /* * Copyright (c) 1992, 1993 @@ -92,13 +92,13 @@ */ struct zs_chanstate; struct zsops { - void (*zsop_rxint) __P((struct zs_chanstate *)); + void (*zsop_rxint)(struct zs_chanstate *); /* receive char available */ - void (*zsop_stint) __P((struct zs_chanstate *, int)); + void (*zsop_stint)(struct zs_chanstate *, int); /* external/status */ - void (*zsop_txint) __P((struct zs_chanstate *)); + void (*zsop_txint)(struct zs_chanstate *); /* xmit buffer empty */ - void (*zsop_softint) __P((struct zs_chanstate *)); + void (*zsop_softint)(struct zs_chanstate *); /* process software interrupt */ }; @@ -165,8 +165,8 @@ struct zs_chanstate { struct zs_chanstate *cs_ctl_chan; /* power management hooks */ - int (*enable) __P((struct zs_chanstate *)); - void (*disable) __P((struct zs_chanstate *)); + int (*enable)(struct zs_chanstate *); + void (*disable)(struct zs_chanstate *); int enabled; /* MD code might define a larger variant of this. */ @@ -193,15 +193,15 @@ struct zsc_attach_args { #define ZS_HWFLAG_USE_CONSDEV 32 /* Use console ops from `consdev' */ #define ZS_HWFLAG_NORESET 64 /* Don't reset at attach time */ -int zsc_intr_soft __P((void *)); -int zsc_intr_hard __P((void *)); +int zsc_intr_soft(void *); +int zsc_intr_hard(void *); -void zs_abort __P((struct zs_chanstate *)); -void zs_break __P((struct zs_chanstate *, int)); -void zs_iflush __P((struct zs_chanstate *)); -void zs_loadchannelregs __P((struct zs_chanstate *)); -int zs_set_speed __P((struct zs_chanstate *, int)); -int zs_set_modes __P((struct zs_chanstate *, int)); +void zs_abort(struct zs_chanstate *); +void zs_break(struct zs_chanstate *, int); +void zs_iflush(struct zs_chanstate *); +void zs_loadchannelregs(struct zs_chanstate *); +int zs_set_speed(struct zs_chanstate *, int); +int zs_set_modes(struct zs_chanstate *, int); -int zs_check_kgdb __P((struct zs_chanstate *, int)); +int zs_check_kgdb(struct zs_chanstate *, int); diff --git a/sys/dev/ic/z8530tty.c b/sys/dev/ic/z8530tty.c index b52e43afbca..e3a03c49e00 100644 --- a/sys/dev/ic/z8530tty.c +++ b/sys/dev/ic/z8530tty.c @@ -1,4 +1,4 @@ -/* $NetBSD: z8530tty.c,v 1.95 2004/06/20 18:07:35 thorpej Exp $ */ +/* $NetBSD: z8530tty.c,v 1.96 2005/02/04 02:10:37 perry Exp $ */ /*- * Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998, 1999 @@ -137,7 +137,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: z8530tty.c,v 1.95 2004/06/20 18:07:35 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: z8530tty.c,v 1.96 2005/02/04 02:10:37 perry Exp $"); #include "opt_kgdb.h" #include "opt_ntp.h" @@ -272,21 +272,21 @@ const struct cdevsw zstty_cdevsw = { struct zsops zsops_tty; -static void zs_shutdown __P((struct zstty_softc *)); -static void zsstart __P((struct tty *)); -static int zsparam __P((struct tty *, struct termios *)); -static void zs_modem __P((struct zstty_softc *, int)); -static void tiocm_to_zs __P((struct zstty_softc *, u_long, int)); -static int zs_to_tiocm __P((struct zstty_softc *)); -static int zshwiflow __P((struct tty *, int)); -static void zs_hwiflow __P((struct zstty_softc *)); -static void zs_maskintr __P((struct zstty_softc *)); +static void zs_shutdown(struct zstty_softc *); +static void zsstart(struct tty *); +static int zsparam(struct tty *, struct termios *); +static void zs_modem(struct zstty_softc *, int); +static void tiocm_to_zs(struct zstty_softc *, u_long, int); +static int zs_to_tiocm(struct zstty_softc *); +static int zshwiflow(struct tty *, int); +static void zs_hwiflow(struct zstty_softc *); +static void zs_maskintr(struct zstty_softc *); /* Low-level routines. */ -static void zstty_rxint __P((struct zs_chanstate *)); -static void zstty_stint __P((struct zs_chanstate *, int)); -static void zstty_txint __P((struct zs_chanstate *)); -static void zstty_softint __P((struct zs_chanstate *)); +static void zstty_rxint (struct zs_chanstate *); +static void zstty_stint (struct zs_chanstate *, int); +static void zstty_txint (struct zs_chanstate *); +static void zstty_softint(struct zs_chanstate *); #define ZSUNIT(x) (minor(x) & 0x7ffff) #define ZSDIALOUT(x) (minor(x) & 0x80000) @@ -1473,10 +1473,10 @@ zs_hwiflow(zst) ****************************************************************/ #define integrate static inline -integrate void zstty_rxsoft __P((struct zstty_softc *, struct tty *)); -integrate void zstty_txsoft __P((struct zstty_softc *, struct tty *)); -integrate void zstty_stsoft __P((struct zstty_softc *, struct tty *)); -static void zstty_diag __P((void *)); +integrate void zstty_rxsoft(struct zstty_softc *, struct tty *); +integrate void zstty_txsoft(struct zstty_softc *, struct tty *); +integrate void zstty_stsoft(struct zstty_softc *, struct tty *); +static void zstty_diag(void *); /* * Receiver Ready interrupt. @@ -1721,7 +1721,7 @@ zstty_rxsoft(zst, tp) struct tty *tp; { struct zs_chanstate *cs = zst->zst_cs; - int (*rint) __P((int c, struct tty *tp)) = tp->t_linesw->l_rint; + int (*rint)(int c, struct tty *tp) = tp->t_linesw->l_rint; u_char *get, *end; u_int cc, scc; u_char rr1; diff --git a/sys/dev/ieee1394/ieee1394var.h b/sys/dev/ieee1394/ieee1394var.h index 1822c5d58ad..ed5ed355c96 100644 --- a/sys/dev/ieee1394/ieee1394var.h +++ b/sys/dev/ieee1394/ieee1394var.h @@ -1,4 +1,4 @@ -/* $NetBSD: ieee1394var.h,v 1.20 2003/06/29 22:30:17 fvdl Exp $ */ +/* $NetBSD: ieee1394var.h,v 1.21 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -137,7 +137,7 @@ struct ieee1394_node { size_t node_configrom_len; }; -int ieee1394_init __P((struct ieee1394_softc *)); +int ieee1394_init(struct ieee1394_softc *); struct ieee1394_it_func_t { diff --git a/sys/dev/isa/addcom_isa.c b/sys/dev/isa/addcom_isa.c index 038c0928049..c7165b6a9ab 100644 --- a/sys/dev/isa/addcom_isa.c +++ b/sys/dev/isa/addcom_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: addcom_isa.c,v 1.11 2004/09/14 20:20:46 drochner Exp $ */ +/* $NetBSD: addcom_isa.c,v 1.12 2005/02/04 02:10:40 perry Exp $ */ /* * Copyright (c) 2000 Michael Graff. All rights reserved. @@ -55,7 +55,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: addcom_isa.c,v 1.11 2004/09/14 20:20:46 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: addcom_isa.c,v 1.12 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -105,9 +105,9 @@ static int slave_iobases[8] = { 0x208 }; -int addcomprobe __P((struct device *, struct cfdata *, void *)); -void addcomattach __P((struct device *, struct device *, void *)); -int addcomintr __P((void *)); +int addcomprobe(struct device *, struct cfdata *, void *); +void addcomattach(struct device *, struct device *, void *); +int addcomintr(void *); CFATTACH_DECL(addcom_isa, sizeof(struct addcom_softc), addcomprobe, addcomattach, NULL, NULL); diff --git a/sys/dev/isa/adv_isa.c b/sys/dev/isa/adv_isa.c index 3dca1560877..9f8c33168d8 100644 --- a/sys/dev/isa/adv_isa.c +++ b/sys/dev/isa/adv_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: adv_isa.c,v 1.8 2004/09/14 20:20:46 drochner Exp $ */ +/* $NetBSD: adv_isa.c,v 1.9 2005/02/04 02:10:40 perry Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: adv_isa.c,v 1.8 2004/09/14 20:20:46 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: adv_isa.c,v 1.9 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -101,8 +101,8 @@ static int asc_ioport[ASC_IOADR_TABLE_MAX_IX] = /******************************************************************************/ -int adv_isa_probe __P((struct device *, struct cfdata *, void *)); -void adv_isa_attach __P((struct device *, struct device *, void *)); +int adv_isa_probe(struct device *, struct cfdata *, void *); +void adv_isa_attach(struct device *, struct device *, void *); CFATTACH_DECL(adv_isa, sizeof(ASC_SOFTC), adv_isa_probe, adv_isa_attach, NULL, NULL); diff --git a/sys/dev/isa/aha_isa.c b/sys/dev/isa/aha_isa.c index 8f640d071d8..b3293e31254 100644 --- a/sys/dev/isa/aha_isa.c +++ b/sys/dev/isa/aha_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: aha_isa.c,v 1.18 2004/09/14 20:20:46 drochner Exp $ */ +/* $NetBSD: aha_isa.c,v 1.19 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aha_isa.c,v 1.18 2004/09/14 20:20:46 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aha_isa.c,v 1.19 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -58,8 +58,8 @@ __KERNEL_RCSID(0, "$NetBSD: aha_isa.c,v 1.18 2004/09/14 20:20:46 drochner Exp $" #define AHA_ISA_IOSIZE 4 -int aha_isa_probe __P((struct device *, struct cfdata *, void *)); -void aha_isa_attach __P((struct device *, struct device *, void *)); +int aha_isa_probe(struct device *, struct cfdata *, void *); +void aha_isa_attach(struct device *, struct device *, void *); CFATTACH_DECL(aha_isa, sizeof(struct aha_softc), aha_isa_probe, aha_isa_attach, NULL, NULL); diff --git a/sys/dev/isa/aic_isa.c b/sys/dev/isa/aic_isa.c index 01d2f7ed4ec..67a78a189d1 100644 --- a/sys/dev/isa/aic_isa.c +++ b/sys/dev/isa/aic_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: aic_isa.c,v 1.14 2004/09/14 20:20:46 drochner Exp $ */ +/* $NetBSD: aic_isa.c,v 1.15 2005/02/04 02:10:40 perry Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Charles M. Hannum. All rights reserved. @@ -51,7 +51,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aic_isa.c,v 1.14 2004/09/14 20:20:46 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aic_isa.c,v 1.15 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -76,7 +76,7 @@ __KERNEL_RCSID(0, "$NetBSD: aic_isa.c,v 1.14 2004/09/14 20:20:46 drochner Exp $" #include <dev/ic/aic6360reg.h> #include <dev/ic/aic6360var.h> -int aic_isa_probe __P((struct device *, struct cfdata *, void *)); +int aic_isa_probe(struct device *, struct cfdata *, void *); struct aic_isa_softc { struct aic_softc sc_aic; /* real "aic" softc */ diff --git a/sys/dev/isa/ast.c b/sys/dev/isa/ast.c index 095c7ebeadc..a0a68bc60ec 100644 --- a/sys/dev/isa/ast.c +++ b/sys/dev/isa/ast.c @@ -1,4 +1,4 @@ -/* $NetBSD: ast.c,v 1.54 2004/09/14 20:20:46 drochner Exp $ */ +/* $NetBSD: ast.c,v 1.55 2005/02/04 02:10:40 perry Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.54 2004/09/14 20:20:46 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.55 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -64,9 +64,9 @@ struct ast_softc { bus_space_handle_t sc_slaveioh[NSLAVES]; }; -int astprobe __P((struct device *, struct cfdata *, void *)); -void astattach __P((struct device *, struct device *, void *)); -int astintr __P((void *)); +int astprobe(struct device *, struct cfdata *, void *); +void astattach(struct device *, struct device *, void *); +int astintr(void *); CFATTACH_DECL(ast, sizeof(struct ast_softc), astprobe, astattach, NULL, NULL); diff --git a/sys/dev/isa/atppc_isa.c b/sys/dev/isa/atppc_isa.c index cb45cf2db5d..cede480158e 100644 --- a/sys/dev/isa/atppc_isa.c +++ b/sys/dev/isa/atppc_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: atppc_isa.c,v 1.6 2004/09/14 20:20:46 drochner Exp $ */ +/* $NetBSD: atppc_isa.c,v 1.7 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c) 2001 Alcove - Nicolas Souchu @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: atppc_isa.c,v 1.6 2004/09/14 20:20:46 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: atppc_isa.c,v 1.7 2005/02/04 02:10:40 perry Exp $"); #include "opt_atppc.h" @@ -76,8 +76,8 @@ struct atppc_isa_softc { }; /* Probe and attach functions for a atppc device on the ISA bus. */ -static int atppc_isa_probe __P((struct device *, struct cfdata *, void *)); -static void atppc_isa_attach __P((struct device *, struct device *, void *)); +static int atppc_isa_probe(struct device *, struct cfdata *, void *); +static void atppc_isa_attach(struct device *, struct device *, void *); static int atppc_isa_dma_start(struct atppc_softc *, void *, u_int, u_int8_t); diff --git a/sys/dev/isa/bha_isa.c b/sys/dev/isa/bha_isa.c index 8078e10e256..f929e4d2dc1 100644 --- a/sys/dev/isa/bha_isa.c +++ b/sys/dev/isa/bha_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: bha_isa.c,v 1.25 2004/09/14 20:20:46 drochner Exp $ */ +/* $NetBSD: bha_isa.c,v 1.26 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bha_isa.c,v 1.25 2004/09/14 20:20:46 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bha_isa.c,v 1.26 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -57,8 +57,8 @@ __KERNEL_RCSID(0, "$NetBSD: bha_isa.c,v 1.25 2004/09/14 20:20:46 drochner Exp $" #define BHA_ISA_IOSIZE 4 -int bha_isa_probe __P((struct device *, struct cfdata *, void *)); -void bha_isa_attach __P((struct device *, struct device *, void *)); +int bha_isa_probe(struct device *, struct cfdata *, void *); +void bha_isa_attach(struct device *, struct device *, void *); CFATTACH_DECL(bha_isa, sizeof(struct bha_softc), bha_isa_probe, bha_isa_attach, NULL, NULL); diff --git a/sys/dev/isa/boca.c b/sys/dev/isa/boca.c index 9df298eca70..8a7376071ad 100644 --- a/sys/dev/isa/boca.c +++ b/sys/dev/isa/boca.c @@ -1,4 +1,4 @@ -/* $NetBSD: boca.c,v 1.43 2004/09/14 20:20:46 drochner Exp $ */ +/* $NetBSD: boca.c,v 1.44 2005/02/04 02:10:40 perry Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: boca.c,v 1.43 2004/09/14 20:20:46 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: boca.c,v 1.44 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -67,10 +67,10 @@ struct boca_softc { struct callout fixup; }; -int bocaprobe __P((struct device *, struct cfdata *, void *)); -void bocaattach __P((struct device *, struct device *, void *)); -int bocaintr __P((void *)); -void boca_fixup __P((void *)); +int bocaprobe(struct device *, struct cfdata *, void *); +void bocaattach(struct device *, struct device *, void *); +int bocaintr(void *); +void boca_fixup(void *); CFATTACH_DECL(boca, sizeof(struct boca_softc), bocaprobe, bocaattach, NULL, NULL); diff --git a/sys/dev/isa/cms.c b/sys/dev/isa/cms.c index 0b1602dad06..81bb3f4bd9b 100644 --- a/sys/dev/isa/cms.c +++ b/sys/dev/isa/cms.c @@ -1,4 +1,4 @@ -/* $NetBSD: cms.c,v 1.8 2004/09/14 20:20:46 drochner Exp $ */ +/* $NetBSD: cms.c,v 1.9 2005/02/04 02:10:40 perry Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cms.c,v 1.8 2004/09/14 20:20:46 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cms.c,v 1.9 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -75,16 +75,16 @@ struct cms_softc { midisyn sc_midisyn; }; -int cms_probe __P((struct device *, struct cfdata *, void *)); -void cms_attach __P((struct device *, struct device *, void *)); +int cms_probe(struct device *, struct cfdata *, void *); +void cms_attach(struct device *, struct device *, void *); CFATTACH_DECL(cms, sizeof(struct cms_softc), cms_probe, cms_attach, NULL, NULL); -int cms_open __P((midisyn *, int)); -void cms_close __P((midisyn *)); -void cms_on __P((midisyn *, u_int32_t, u_int32_t, u_int32_t)); -void cms_off __P((midisyn *, u_int32_t, u_int32_t, u_int32_t)); +int cms_open(midisyn *, int); +void cms_close(midisyn *); +void cms_on(midisyn *, u_int32_t, u_int32_t, u_int32_t); +void cms_off(midisyn *, u_int32_t, u_int32_t, u_int32_t); struct midisyn_methods midi_cms_hw = { cms_open, /* open */ @@ -101,7 +101,7 @@ struct midisyn_methods midi_cms_hw = { 0, /* sysex */ }; -static void cms_reset __P((struct cms_softc *)); +static void cms_reset(struct cms_softc *); static char cms_note_table[] = { /* A */ 3, diff --git a/sys/dev/isa/com_isa.c b/sys/dev/isa/com_isa.c index 2e6325e7082..9f3c8c94300 100644 --- a/sys/dev/isa/com_isa.c +++ b/sys/dev/isa/com_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: com_isa.c,v 1.22 2004/09/14 20:20:46 drochner Exp $ */ +/* $NetBSD: com_isa.c,v 1.23 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -68,7 +68,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: com_isa.c,v 1.22 2004/09/14 20:20:46 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: com_isa.c,v 1.23 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -98,9 +98,9 @@ struct com_isa_softc { void *sc_ih; /* interrupt handler */ }; -int com_isa_probe __P((struct device *, struct cfdata *, void *)); -void com_isa_attach __P((struct device *, struct device *, void *)); -void com_isa_cleanup __P((void *)); +int com_isa_probe(struct device *, struct cfdata *, void *); +void com_isa_attach(struct device *, struct device *, void *); +void com_isa_cleanup(void *); CFATTACH_DECL(com_isa, sizeof(struct com_isa_softc), com_isa_probe, com_isa_attach, NULL, NULL); diff --git a/sys/dev/isa/com_multi.c b/sys/dev/isa/com_multi.c index c1c9217fecb..0cd895ab3e5 100644 --- a/sys/dev/isa/com_multi.c +++ b/sys/dev/isa/com_multi.c @@ -1,4 +1,4 @@ -/* $NetBSD: com_multi.c,v 1.18 2004/09/14 17:38:30 drochner Exp $ */ +/* $NetBSD: com_multi.c,v 1.19 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -72,7 +72,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: com_multi.c,v 1.18 2004/09/14 17:38:30 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: com_multi.c,v 1.19 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -99,8 +99,8 @@ __KERNEL_RCSID(0, "$NetBSD: com_multi.c,v 1.18 2004/09/14 17:38:30 drochner Exp #include "locators.h" -int com_multi_probe __P((struct device *, struct cfdata *, void *)); -void com_multi_attach __P((struct device *, struct device *, void *)); +int com_multi_probe(struct device *, struct cfdata *, void *); +void com_multi_attach(struct device *, struct device *, void *); CFATTACH_DECL(com_multi, sizeof(struct com_softc), com_multi_probe, com_multi_attach, NULL, NULL); diff --git a/sys/dev/isa/cs4231var.h b/sys/dev/isa/cs4231var.h index 4301549e3c3..6e11cf9883f 100644 --- a/sys/dev/isa/cs4231var.h +++ b/sys/dev/isa/cs4231var.h @@ -1,4 +1,4 @@ -/* $NetBSD: cs4231var.h,v 1.3 1997/10/09 07:57:17 jtc Exp $ */ +/* $NetBSD: cs4231var.h,v 1.4 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -48,10 +48,10 @@ struct cs4231_softc { #define CS4231_MUX_LINE_IN 3 }; -int cs4231_set_linein_gain __P((struct ad1848_softc *, struct ad1848_volume *)); -int cs4231_get_linein_gain __P((struct ad1848_softc *, struct ad1848_volume *)); -int cs4231_set_mono_gain __P((struct ad1848_softc *, struct ad1848_volume *)); -int cs4231_get_mono_gain __P((struct ad1848_softc *, struct ad1848_volume *)); -void cs4231_mute_mono __P((struct ad1848_softc *, int /* onoff */)); -void cs4231_mute_line __P((struct ad1848_softc *, int /* onoff */)); -void cs4231_mute_monitor __P((struct ad1848_softc *, int /* onoff */)); +int cs4231_set_linein_gain(struct ad1848_softc *, struct ad1848_volume *); +int cs4231_get_linein_gain(struct ad1848_softc *, struct ad1848_volume *); +int cs4231_set_mono_gain(struct ad1848_softc *, struct ad1848_volume *); +int cs4231_get_mono_gain(struct ad1848_softc *, struct ad1848_volume *); +void cs4231_mute_mono(struct ad1848_softc *, int /* onoff */); +void cs4231_mute_line(struct ad1848_softc *, int /* onoff */); +void cs4231_mute_monitor(struct ad1848_softc *, int /* onoff */); diff --git a/sys/dev/isa/cs89x0isavar.h b/sys/dev/isa/cs89x0isavar.h index 5648c5b17d7..33f3423ce3f 100644 --- a/sys/dev/isa/cs89x0isavar.h +++ b/sys/dev/isa/cs89x0isavar.h @@ -1,4 +1,4 @@ -/* $NetBSD: cs89x0isavar.h,v 1.2 2001/11/26 19:55:38 yamt Exp $ */ +/* $NetBSD: cs89x0isavar.h,v 1.3 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c)2001 YAMAMOTO Takashi, @@ -26,9 +26,9 @@ * SUCH DAMAGE. */ -void cs_process_rx_dma __P((struct cs_softc *)); -void cs_isa_dma_chipinit __P((struct cs_softc *)); -void cs_isa_dma_attach __P((struct cs_softc *)); +void cs_process_rx_dma(struct cs_softc *); +void cs_isa_dma_chipinit(struct cs_softc *); +void cs_isa_dma_attach(struct cs_softc *); struct cs_softc_isa { struct cs_softc sc_cs; diff --git a/sys/dev/isa/daic_isa.c b/sys/dev/isa/daic_isa.c index 13731324086..559d47f89bd 100644 --- a/sys/dev/isa/daic_isa.c +++ b/sys/dev/isa/daic_isa.c @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: daic_isa.c,v 1.11 2003/12/04 13:57:30 keihan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: daic_isa.c,v 1.12 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/errno.h> @@ -65,12 +65,12 @@ struct daic_isa_softc { /* local functions */ #ifdef __BROKEN_INDIRECT_CONFIG -static int daic_isa_probe __P((struct device *, void *, void *)); +static int daic_isa_probe(struct device *, void *, void *); #else -static int daic_isa_probe __P((struct device *, struct cfdata *, void *)); +static int daic_isa_probe(struct device *, struct cfdata *, void *); #endif -static void daic_isa_attach __P((struct device *, struct device *, void *)); -static int daic_isa_intr __P((void *)); +static void daic_isa_attach(struct device *, struct device *, void *); +static int daic_isa_intr(void *); CFATTACH_DECL(daic_isa, sizeof(struct daic_isa_softc), daic_isa_probe, daic_isa_attach, NULL, NULL); diff --git a/sys/dev/isa/elink.h b/sys/dev/isa/elink.h index 9659a1d4e50..a1cfb14e2a8 100644 --- a/sys/dev/isa/elink.h +++ b/sys/dev/isa/elink.h @@ -1,4 +1,4 @@ -/* $NetBSD: elink.h,v 1.8 1999/03/22 22:26:27 bad Exp $ */ +/* $NetBSD: elink.h,v 1.9 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -43,5 +43,5 @@ #define ELINK_509_POLY 0xcf #define TLINK_619_POLY 0x63 -void elink_reset __P((bus_space_tag_t, bus_space_handle_t, int)); -void elink_idseq __P((bus_space_tag_t, bus_space_handle_t, u_char p)); +void elink_reset(bus_space_tag_t, bus_space_handle_t, int); +void elink_idseq(bus_space_tag_t, bus_space_handle_t, u_char p); diff --git a/sys/dev/isa/esp_isa.c b/sys/dev/isa/esp_isa.c index d043b14e391..67cffe506c4 100644 --- a/sys/dev/isa/esp_isa.c +++ b/sys/dev/isa/esp_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: esp_isa.c,v 1.28 2004/09/14 20:20:46 drochner Exp $ */ +/* $NetBSD: esp_isa.c,v 1.29 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -113,7 +113,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: esp_isa.c,v 1.28 2004/09/14 20:20:46 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: esp_isa.c,v 1.29 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -135,8 +135,8 @@ __KERNEL_RCSID(0, "$NetBSD: esp_isa.c,v 1.28 2004/09/14 20:20:46 drochner Exp $" #include <dev/isa/esp_isavar.h> -int esp_isa_match __P((struct device *, struct cfdata *, void *)); -void esp_isa_attach __P((struct device *, struct device *, void *)); +int esp_isa_match(struct device *, struct cfdata *, void *); +void esp_isa_attach(struct device *, struct device *, void *); CFATTACH_DECL(esp_isa, sizeof(struct esp_isa_softc), esp_isa_match, esp_isa_attach, NULL, NULL); @@ -146,16 +146,16 @@ int esp_isa_debug = 0; /* ESP_SHOWTRAC | ESP_SHOWREGS | ESP_SHOWMISC */ /* * Functions and the switch for the MI code. */ -u_char esp_isa_read_reg __P((struct ncr53c9x_softc *, int)); -void esp_isa_write_reg __P((struct ncr53c9x_softc *, int, u_char)); -int esp_isa_dma_isintr __P((struct ncr53c9x_softc *)); -void esp_isa_dma_reset __P((struct ncr53c9x_softc *)); -int esp_isa_dma_intr __P((struct ncr53c9x_softc *)); -int esp_isa_dma_setup __P((struct ncr53c9x_softc *, caddr_t *, - size_t *, int, size_t *)); -void esp_isa_dma_go __P((struct ncr53c9x_softc *)); -void esp_isa_dma_stop __P((struct ncr53c9x_softc *)); -int esp_isa_dma_isactive __P((struct ncr53c9x_softc *)); +u_char esp_isa_read_reg(struct ncr53c9x_softc *, int); +void esp_isa_write_reg(struct ncr53c9x_softc *, int, u_char); +int esp_isa_dma_isintr(struct ncr53c9x_softc *); +void esp_isa_dma_reset(struct ncr53c9x_softc *); +int esp_isa_dma_intr(struct ncr53c9x_softc *); +int esp_isa_dma_setup(struct ncr53c9x_softc *, caddr_t *, + size_t *, int, size_t *); +void esp_isa_dma_go(struct ncr53c9x_softc *); +void esp_isa_dma_stop(struct ncr53c9x_softc *); +int esp_isa_dma_isactive(struct ncr53c9x_softc *); struct ncr53c9x_glue esp_isa_glue = { esp_isa_read_reg, diff --git a/sys/dev/isa/esp_isavar.h b/sys/dev/isa/esp_isavar.h index 10c88bd4435..227f3f90850 100644 --- a/sys/dev/isa/esp_isavar.h +++ b/sys/dev/isa/esp_isavar.h @@ -1,4 +1,4 @@ -/* $NetBSD: esp_isavar.h,v 1.2 2000/03/19 21:27:01 mycroft Exp $ */ +/* $NetBSD: esp_isavar.h,v 1.3 2005/02/04 02:10:40 perry Exp $ */ /* * Copyright (c) 1997 Allen Briggs. @@ -96,9 +96,9 @@ struct esp_isa_probe_data { #define ESP_ISA_IOSIZE 16 -int esp_isa_find __P((bus_space_tag_t, bus_space_handle_t, - struct esp_isa_probe_data *)); -void esp_isa_init __P((struct esp_isa_softc *, struct esp_isa_probe_data *)); +int esp_isa_find(bus_space_tag_t, bus_space_handle_t, + struct esp_isa_probe_data *); +void esp_isa_init(struct esp_isa_softc *, struct esp_isa_probe_data *); #ifdef ESP_DEBUG extern int esp_isa_debug; diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c index 3053f9389a9..01bcafe9b7b 100644 --- a/sys/dev/isa/fd.c +++ b/sys/dev/isa/fd.c @@ -1,4 +1,4 @@ -/* $NetBSD: fd.c,v 1.56 2005/02/01 20:33:58 drochner Exp $ */ +/* $NetBSD: fd.c,v 1.57 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc. @@ -88,7 +88,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.56 2005/02/01 20:33:58 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.57 2005/02/04 02:10:40 perry Exp $"); #include "rnd.h" #include "opt_ddb.h" @@ -173,7 +173,7 @@ __KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.56 2005/02/01 20:33:58 drochner Exp $"); #define B_FORMAT B_XXX /* controller driver configuration */ -int fdprint __P((void *, const char *)); +int fdprint(void *, const char *); #if NMCA > 0 /* MCA - specific entries */ @@ -203,9 +203,9 @@ const struct fd_type fd_types[] = { }; #endif /* defined(atari) */ -void fdcfinishattach __P((struct device *)); -int fdprobe __P((struct device *, struct cfdata *, void *)); -void fdattach __P((struct device *, struct device *, void *)); +void fdcfinishattach(struct device *); +int fdprobe(struct device *, struct cfdata *, void *); +void fdattach(struct device *, struct device *, void *); extern struct cfdriver fd_cd; @@ -233,29 +233,29 @@ const struct cdevsw fd_cdevsw = { nostop, notty, nopoll, nommap, nokqfilter, D_DISK }; -void fdgetdisklabel __P((struct fd_softc *)); -int fd_get_parms __P((struct fd_softc *)); -void fdstart __P((struct fd_softc *)); +void fdgetdisklabel(struct fd_softc *); +int fd_get_parms(struct fd_softc *); +void fdstart(struct fd_softc *); struct dkdriver fddkdriver = { fdstrategy }; #if defined(i386) -const struct fd_type *fd_nvtotype __P((char *, int, int)); +const struct fd_type *fd_nvtotype(char *, int, int); #endif /* i386 */ -void fd_set_motor __P((struct fdc_softc *fdc, int reset)); -void fd_motor_off __P((void *arg)); -void fd_motor_on __P((void *arg)); -int fdcresult __P((struct fdc_softc *fdc)); -void fdcstart __P((struct fdc_softc *fdc)); -void fdcstatus __P((struct device *dv, int n, char *s)); -void fdctimeout __P((void *arg)); -void fdcpseudointr __P((void *arg)); -void fdcretry __P((struct fdc_softc *fdc)); -void fdfinish __P((struct fd_softc *fd, struct buf *bp)); -__inline const struct fd_type *fd_dev_to_type __P((struct fd_softc *, dev_t)); -int fdformat __P((dev_t, struct ne7_fd_formb *, struct proc *)); - -void fd_mountroot_hook __P((struct device *)); +void fd_set_motor(struct fdc_softc *fdc, int reset); +void fd_motor_off(void *arg); +void fd_motor_on(void *arg); +int fdcresult(struct fdc_softc *fdc); +void fdcstart(struct fdc_softc *fdc); +void fdcstatus(struct device *dv, int n, char *s); +void fdctimeout(void *arg); +void fdcpseudointr(void *arg); +void fdcretry(struct fdc_softc *fdc); +void fdfinish(struct fd_softc *fd, struct buf *bp); +__inline const struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t); +int fdformat(dev_t, struct ne7_fd_formb *, struct proc *); + +void fd_mountroot_hook(struct device *); /* * Arguments passed between fdcattach and fdprobe. diff --git a/sys/dev/isa/fdcvar.h b/sys/dev/isa/fdcvar.h index 0843fc25e92..51009447724 100644 --- a/sys/dev/isa/fdcvar.h +++ b/sys/dev/isa/fdcvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: fdcvar.h,v 1.5 2003/09/25 19:06:19 mycroft Exp $ */ +/* $NetBSD: fdcvar.h,v 1.6 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -142,7 +142,7 @@ struct fdc_softc { const struct fd_type *sc_knownfds[4]; /* drive info known fds */ }; -int out_fdc __P((bus_space_tag_t iot, bus_space_handle_t ioh, u_char x)); +int out_fdc(bus_space_tag_t iot, bus_space_handle_t ioh, u_char x); -void fdcattach __P((struct fdc_softc *)); -int fdcintr __P((void *)); +void fdcattach(struct fdc_softc *); +int fdcintr(void *); diff --git a/sys/dev/isa/i82365_isa.c b/sys/dev/isa/i82365_isa.c index 4fa81efb22d..2f21a69037d 100644 --- a/sys/dev/isa/i82365_isa.c +++ b/sys/dev/isa/i82365_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: i82365_isa.c,v 1.22 2004/09/14 20:20:47 drochner Exp $ */ +/* $NetBSD: i82365_isa.c,v 1.23 2005/02/04 02:10:40 perry Exp $ */ /* * Copyright (c) 1997 Marc Horowitz. All rights reserved. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i82365_isa.c,v 1.22 2004/09/14 20:20:47 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i82365_isa.c,v 1.23 2005/02/04 02:10:40 perry Exp $"); #define PCICISADEBUG @@ -61,8 +61,8 @@ int pcicisa_debug = 0; #define DPRINTF(arg) #endif -int pcic_isa_probe __P((struct device *, struct cfdata *, void *)); -void pcic_isa_attach __P((struct device *, struct device *, void *)); +int pcic_isa_probe(struct device *, struct cfdata *, void *); +void pcic_isa_attach(struct device *, struct device *, void *); CFATTACH_DECL(pcic_isa, sizeof(struct pcic_isa_softc), pcic_isa_probe, pcic_isa_attach, NULL, NULL); diff --git a/sys/dev/isa/i82365_isasubr.c b/sys/dev/isa/i82365_isasubr.c index e7748ac9ea9..eb6d454ae0c 100644 --- a/sys/dev/isa/i82365_isasubr.c +++ b/sys/dev/isa/i82365_isasubr.c @@ -1,4 +1,4 @@ -/* $NetBSD: i82365_isasubr.c,v 1.34 2004/09/14 20:20:47 drochner Exp $ */ +/* $NetBSD: i82365_isasubr.c,v 1.35 2005/02/04 02:10:40 perry Exp $ */ /* * Copyright (c) 2000 Christian E. Hopps. All rights reserved. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i82365_isasubr.c,v 1.34 2004/09/14 20:20:47 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i82365_isasubr.c,v 1.35 2005/02/04 02:10:40 perry Exp $"); #define PCICISADEBUG @@ -126,8 +126,8 @@ int pcicsubr_debug = 0; * just use socket 0 */ -void pcic_isa_probe_interrupts __P((struct pcic_softc *, struct pcic_handle *)); -static int pcic_isa_count_intr __P((void *)); +void pcic_isa_probe_interrupts(struct pcic_softc *, struct pcic_handle *); +static int pcic_isa_count_intr(void *); static int pcic_isa_count_intr(arg) @@ -461,7 +461,7 @@ pcic_isa_chip_intr_establish(pch, pf, ipl, fct, arg) pcmcia_chipset_handle_t pch; struct pcmcia_function *pf; int ipl; - int (*fct) __P((void *)); + int (*fct)(void *); void *arg; { struct pcic_handle *h = (struct pcic_handle *) pch; diff --git a/sys/dev/isa/i82365_isavar.h b/sys/dev/isa/i82365_isavar.h index ccb804e09b0..91a94111677 100644 --- a/sys/dev/isa/i82365_isavar.h +++ b/sys/dev/isa/i82365_isavar.h @@ -1,4 +1,4 @@ -/* $NetBSD: i82365_isavar.h,v 1.3 2000/02/22 16:04:45 thorpej Exp $ */ +/* $NetBSD: i82365_isavar.h,v 1.4 2005/02/04 02:10:40 perry Exp $ */ /* * Copyright (c) 1998 Bill Sommerfeld. All rights reserved. @@ -41,17 +41,17 @@ extern int pcic_isa_intr_alloc_mask; * Establish/disestablish interrupts for PCMCIA functions. */ -void *pcic_isa_chip_intr_establish __P((pcmcia_chipset_handle_t, - struct pcmcia_function *, int, int (*) (void *), void *)); -void pcic_isa_chip_intr_disestablish __P((pcmcia_chipset_handle_t, void *)); +void *pcic_isa_chip_intr_establish(pcmcia_chipset_handle_t, + struct pcmcia_function *, int, int (*) (void *), void *); +void pcic_isa_chip_intr_disestablish(pcmcia_chipset_handle_t, void *); /* * Figure out how wide the ISA bus is... */ -void pcic_isa_bus_width_probe __P((struct pcic_softc *, bus_space_tag_t, - bus_space_handle_t, bus_addr_t, u_int32_t)); -void pcic_isa_chip_intr_disestablish __P((pcmcia_chipset_handle_t, void *)); -void pcic_isa_config_interrupts __P((struct device *)); -void *pcic_isa_chip_intr_establish __P((pcmcia_chipset_handle_t, - struct pcmcia_function *, int, int (*) (void *), void *)); +void pcic_isa_bus_width_probe(struct pcic_softc *, bus_space_tag_t, + bus_space_handle_t, bus_addr_t, u_int32_t); +void pcic_isa_chip_intr_disestablish(pcmcia_chipset_handle_t, void *); +void pcic_isa_config_interrupts(struct device *); +void *pcic_isa_chip_intr_establish(pcmcia_chipset_handle_t, + struct pcmcia_function *, int, int (*) (void *), void *); diff --git a/sys/dev/isa/ics2101.c b/sys/dev/isa/ics2101.c index 6ec5464c40e..829b66f6764 100644 --- a/sys/dev/isa/ics2101.c +++ b/sys/dev/isa/ics2101.c @@ -1,4 +1,4 @@ -/* $NetBSD: ics2101.c,v 1.9 2001/11/13 08:01:15 lukem Exp $ */ +/* $NetBSD: ics2101.c,v 1.10 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ics2101.c,v 1.9 2001/11/13 08:01:15 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ics2101.c,v 1.10 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -69,8 +69,8 @@ __KERNEL_RCSID(0, "$NetBSD: ics2101.c,v 1.9 2001/11/13 08:01:15 lukem Exp $"); #define cvt_value(val) ((val) >> 1) -static void ics2101_mix_doit __P((struct ics2101_softc *, u_int, u_int, u_int, - u_int)); +static void ics2101_mix_doit(struct ics2101_softc *, u_int, u_int, u_int, + u_int); /* * Program one channel of the ICS mixer */ diff --git a/sys/dev/isa/ics2101var.h b/sys/dev/isa/ics2101var.h index 981aaa2e64b..8572727cb66 100644 --- a/sys/dev/isa/ics2101var.h +++ b/sys/dev/isa/ics2101var.h @@ -1,4 +1,4 @@ -/* $NetBSD: ics2101var.h,v 1.5 1997/10/09 07:57:24 jtc Exp $ */ +/* $NetBSD: ics2101var.h,v 1.6 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -51,5 +51,5 @@ struct ics2101_softc { u_char sc_mute[ICSMIX_CHAN_5+1][2];/* muted? */ }; -void ics2101_mix_attenuate __P((struct ics2101_softc *, u_int, u_int, u_int)); -void ics2101_mix_mute __P((struct ics2101_softc *, u_int, u_int, u_int)); +void ics2101_mix_attenuate(struct ics2101_softc *, u_int, u_int, u_int); +void ics2101_mix_mute(struct ics2101_softc *, u_int, u_int, u_int); diff --git a/sys/dev/isa/if_ai.c b/sys/dev/isa/if_ai.c index 3da79453e00..484b151b4f5 100644 --- a/sys/dev/isa/if_ai.c +++ b/sys/dev/isa/if_ai.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ai.c,v 1.19 2004/09/14 20:20:47 drochner Exp $ */ +/* $NetBSD: if_ai.c,v 1.20 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ai.c,v 1.19 2004/09/14 20:20:47 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ai.c,v 1.20 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -89,24 +89,24 @@ const char *ai_names[] = { }; /* Functions required by the i82586 MI driver */ -static void ai_reset __P((struct ie_softc *, int)); -static void ai_atten __P((struct ie_softc *, int)); +static void ai_reset(struct ie_softc *, int); +static void ai_atten(struct ie_softc *, int); -static void ai_copyin __P((struct ie_softc *, void *, int, size_t)); -static void ai_copyout __P((struct ie_softc *, const void *, int, size_t)); +static void ai_copyin(struct ie_softc *, void *, int, size_t); +static void ai_copyout(struct ie_softc *, const void *, int, size_t); -static u_int16_t ai_read_16 __P((struct ie_softc *, int)); -static void ai_write_16 __P((struct ie_softc *, int, u_int16_t)); -static void ai_write_24 __P((struct ie_softc *, int, int)); +static u_int16_t ai_read_16(struct ie_softc *, int); +static void ai_write_16(struct ie_softc *, int, u_int16_t); +static void ai_write_24(struct ie_softc *, int, int); /* Local support functions */ -static int check_ie_present __P((struct ie_softc*, bus_space_tag_t, - bus_space_handle_t, bus_size_t)); -static int ai_find_mem_size __P((struct ai_softc*, bus_space_tag_t, - bus_size_t)); +static int check_ie_present(struct ie_softc*, bus_space_tag_t, + bus_space_handle_t, bus_size_t); +static int ai_find_mem_size(struct ai_softc*, bus_space_tag_t, + bus_size_t); -int ai_match __P((struct device *, struct cfdata *, void *)); -void ai_attach __P((struct device *, struct device *, void *)); +int ai_match(struct device *, struct cfdata *, void *); +void ai_attach(struct device *, struct device *, void *); /* * AT&T StarLan support routines diff --git a/sys/dev/isa/if_cs_isa.c b/sys/dev/isa/if_cs_isa.c index 52f5087b924..7ef491df305 100644 --- a/sys/dev/isa/if_cs_isa.c +++ b/sys/dev/isa/if_cs_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_cs_isa.c,v 1.13 2004/09/14 20:20:47 drochner Exp $ */ +/* $NetBSD: if_cs_isa.c,v 1.14 2005/02/04 02:10:40 perry Exp $ */ /* * Copyright 1997 @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cs_isa.c,v 1.13 2004/09/14 20:20:47 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cs_isa.c,v 1.14 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -61,8 +61,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_cs_isa.c,v 1.13 2004/09/14 20:20:47 drochner Exp #include <dev/ic/cs89x0var.h> #include <dev/isa/cs89x0isavar.h> -int cs_isa_probe __P((struct device *, struct cfdata *, void *)); -void cs_isa_attach __P((struct device *, struct device *, void *)); +int cs_isa_probe(struct device *, struct cfdata *, void *); +void cs_isa_attach(struct device *, struct device *, void *); CFATTACH_DECL(cs_isa, sizeof(struct cs_softc), cs_isa_probe, cs_isa_attach, NULL, NULL); diff --git a/sys/dev/isa/if_ec.c b/sys/dev/isa/if_ec.c index 76260702996..2f9dc9a23d0 100644 --- a/sys/dev/isa/if_ec.c +++ b/sys/dev/isa/if_ec.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ec.c,v 1.22 2004/09/14 20:20:47 drochner Exp $ */ +/* $NetBSD: if_ec.c,v 1.23 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -55,7 +55,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.22 2004/09/14 20:20:47 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.23 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -93,27 +93,27 @@ struct ec_softc { void *sc_ih; /* interrupt handle */ }; -int ec_probe __P((struct device *, struct cfdata *, void *)); -void ec_attach __P((struct device *, struct device *, void *)); +int ec_probe(struct device *, struct cfdata *, void *); +void ec_attach(struct device *, struct device *, void *); CFATTACH_DECL(ec, sizeof(struct ec_softc), ec_probe, ec_attach, NULL, NULL); -int ec_set_media __P((struct ec_softc *, int)); +int ec_set_media(struct ec_softc *, int); -void ec_media_init __P((struct dp8390_softc *)); +void ec_media_init(struct dp8390_softc *); -int ec_mediachange __P((struct dp8390_softc *)); -void ec_mediastatus __P((struct dp8390_softc *, struct ifmediareq *)); +int ec_mediachange(struct dp8390_softc *); +void ec_mediastatus(struct dp8390_softc *, struct ifmediareq *); -void ec_init_card __P((struct dp8390_softc *)); -int ec_write_mbuf __P((struct dp8390_softc *, struct mbuf *, int)); -int ec_ring_copy __P((struct dp8390_softc *, int, caddr_t, u_short)); -void ec_read_hdr __P((struct dp8390_softc *, int, struct dp8390_ring *)); -int ec_fake_test_mem __P((struct dp8390_softc *)); -int ec_test_mem __P((struct dp8390_softc *)); +void ec_init_card(struct dp8390_softc *); +int ec_write_mbuf(struct dp8390_softc *, struct mbuf *, int); +int ec_ring_copy(struct dp8390_softc *, int, caddr_t, u_short); +void ec_read_hdr(struct dp8390_softc *, int, struct dp8390_ring *); +int ec_fake_test_mem(struct dp8390_softc *); +int ec_test_mem(struct dp8390_softc *); -__inline void ec_readmem __P((struct ec_softc *, int, u_int8_t *, int)); +__inline void ec_readmem(struct ec_softc *, int, u_int8_t *, int); static const int ec_iobase[] = { 0x2e0, 0x2a0, 0x280, 0x250, 0x350, 0x330, 0x310, 0x300, diff --git a/sys/dev/isa/if_ef.c b/sys/dev/isa/if_ef.c index 3639c23af1a..8064e0d6fce 100644 --- a/sys/dev/isa/if_ef.c +++ b/sys/dev/isa/if_ef.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ef.c,v 1.17 2004/09/14 20:20:47 drochner Exp $ */ +/* $NetBSD: if_ef.c,v 1.18 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ef.c,v 1.17 2004/09/14 20:20:47 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ef.c,v 1.18 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -95,25 +95,25 @@ int eftp_media[] = { #define NEFTP_MEDIA (sizeof(eftp_media) / sizeof(eftp_media[0])) /* Routines required by the MI i82586 driver API */ -static void ef_reset __P((struct ie_softc *, int)); -static void ef_hwinit __P((struct ie_softc *)); -static void ef_atten __P((struct ie_softc *, int)); -static int ef_intrhook __P((struct ie_softc *, int)); +static void ef_reset(struct ie_softc *, int); +static void ef_hwinit(struct ie_softc *); +static void ef_atten(struct ie_softc *, int); +static int ef_intrhook(struct ie_softc *, int); -static void ef_copyin __P((struct ie_softc *, void *, int, size_t)); -static void ef_copyout __P((struct ie_softc *, const void *, int, size_t)); +static void ef_copyin(struct ie_softc *, void *, int, size_t); +static void ef_copyout(struct ie_softc *, const void *, int, size_t); -static u_int16_t ef_read_16 __P((struct ie_softc *, int)); -static void ef_write_16 __P((struct ie_softc *, int, u_int16_t)); -static void ef_write_24 __P((struct ie_softc *, int, int)); +static u_int16_t ef_read_16(struct ie_softc *, int); +static void ef_write_16(struct ie_softc *, int, u_int16_t); +static void ef_write_24(struct ie_softc *, int, int); -static void ef_mediastatus __P((struct ie_softc *, struct ifmediareq *)); +static void ef_mediastatus(struct ie_softc *, struct ifmediareq *); /* Local routines */ -static int ef_port_check __P((bus_space_tag_t, bus_space_handle_t)); +static int ef_port_check(bus_space_tag_t, bus_space_handle_t); -int ef_match __P((struct device *, struct cfdata *, void *)); -void ef_attach __P((struct device *, struct device *, void *)); +int ef_match(struct device *, struct cfdata *, void *); +void ef_attach(struct device *, struct device *, void *); /* * This keeps track of which ISAs have been through an ie probe sequence. diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c index 814dd968824..a6ff9411d14 100644 --- a/sys/dev/isa/if_eg.c +++ b/sys/dev/isa/if_eg.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_eg.c,v 1.63 2004/09/14 20:20:47 drochner Exp $ */ +/* $NetBSD: if_eg.c,v 1.64 2005/02/04 02:10:40 perry Exp $ */ /* * Copyright (c) 1993 Dean Huxley <dean@fsa.ca> @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_eg.c,v 1.63 2004/09/14 20:20:47 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_eg.c,v 1.64 2005/02/04 02:10:40 perry Exp $"); #include "opt_inet.h" #include "opt_ns.h" @@ -126,30 +126,30 @@ struct eg_softc { #endif }; -int egprobe __P((struct device *, struct cfdata *, void *)); -void egattach __P((struct device *, struct device *, void *)); +int egprobe(struct device *, struct cfdata *, void *); +void egattach(struct device *, struct device *, void *); CFATTACH_DECL(eg, sizeof(struct eg_softc), egprobe, egattach, NULL, NULL); -int egintr __P((void *)); -void eginit __P((struct eg_softc *)); -int egioctl __P((struct ifnet *, u_long, caddr_t)); -void egrecv __P((struct eg_softc *)); -void egstart __P((struct ifnet *)); -void egwatchdog __P((struct ifnet *)); -void egreset __P((struct eg_softc *)); -void egread __P((struct eg_softc *, caddr_t, int)); -struct mbuf *egget __P((struct eg_softc *, caddr_t, int)); -void egstop __P((struct eg_softc *)); - -static inline void egprintpcb __P((u_int8_t *)); -static inline void egprintstat __P((u_char)); -static int egoutPCB __P((bus_space_tag_t, bus_space_handle_t, u_int8_t)); -static int egreadPCBstat __P((bus_space_tag_t, bus_space_handle_t, u_int8_t)); -static int egreadPCBready __P((bus_space_tag_t, bus_space_handle_t)); -static int egwritePCB __P((bus_space_tag_t, bus_space_handle_t, u_int8_t *)); -static int egreadPCB __P((bus_space_tag_t, bus_space_handle_t, u_int8_t *)); +int egintr(void *); +void eginit(struct eg_softc *); +int egioctl(struct ifnet *, u_long, caddr_t); +void egrecv(struct eg_softc *); +void egstart(struct ifnet *); +void egwatchdog(struct ifnet *); +void egreset(struct eg_softc *); +void egread(struct eg_softc *, caddr_t, int); +struct mbuf *egget(struct eg_softc *, caddr_t, int); +void egstop(struct eg_softc *); + +static inline void egprintpcb(u_int8_t *); +static inline void egprintstat(u_char); +static int egoutPCB(bus_space_tag_t, bus_space_handle_t, u_int8_t); +static int egreadPCBstat(bus_space_tag_t, bus_space_handle_t, u_int8_t); +static int egreadPCBready(bus_space_tag_t, bus_space_handle_t); +static int egwritePCB(bus_space_tag_t, bus_space_handle_t, u_int8_t *); +static int egreadPCB(bus_space_tag_t, bus_space_handle_t, u_int8_t *); /* * Support stuff diff --git a/sys/dev/isa/if_el.c b/sys/dev/isa/if_el.c index 6f9c747c139..4ac9084a5df 100644 --- a/sys/dev/isa/if_el.c +++ b/sys/dev/isa/if_el.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_el.c,v 1.71 2004/09/14 20:20:47 drochner Exp $ */ +/* $NetBSD: if_el.c,v 1.72 2005/02/04 02:10:40 perry Exp $ */ /* * Copyright (c) 1994, Matthew E. Kimmel. Permission is hereby granted @@ -19,7 +19,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_el.c,v 1.71 2004/09/14 20:20:47 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_el.c,v 1.72 2005/02/04 02:10:40 perry Exp $"); #include "opt_inet.h" #include "opt_ns.h" @@ -95,20 +95,20 @@ struct el_softc { /* * prototypes */ -int elintr __P((void *)); -void elinit __P((struct el_softc *)); -int elioctl __P((struct ifnet *, u_long, caddr_t)); -void elstart __P((struct ifnet *)); -void elwatchdog __P((struct ifnet *)); -void elreset __P((struct el_softc *)); -void elstop __P((struct el_softc *)); -static int el_xmit __P((struct el_softc *)); -void elread __P((struct el_softc *, int)); -struct mbuf *elget __P((struct el_softc *sc, int)); -static inline void el_hardreset __P((struct el_softc *)); - -int elprobe __P((struct device *, struct cfdata *, void *)); -void elattach __P((struct device *, struct device *, void *)); +int elintr(void *); +void elinit(struct el_softc *); +int elioctl(struct ifnet *, u_long, caddr_t); +void elstart(struct ifnet *); +void elwatchdog(struct ifnet *); +void elreset(struct el_softc *); +void elstop(struct el_softc *); +static int el_xmit(struct el_softc *); +void elread(struct el_softc *, int); +struct mbuf *elget(struct el_softc *sc, int); +static inline void el_hardreset(struct el_softc *); + +int elprobe(struct device *, struct cfdata *, void *); +void elattach(struct device *, struct device *, void *); CFATTACH_DECL(el, sizeof(struct el_softc), elprobe, elattach, NULL, NULL); diff --git a/sys/dev/isa/if_ep_isa.c b/sys/dev/isa/if_ep_isa.c index ef50b299da6..689a162a979 100644 --- a/sys/dev/isa/if_ep_isa.c +++ b/sys/dev/isa/if_ep_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ep_isa.c,v 1.34 2004/09/14 20:20:47 drochner Exp $ */ +/* $NetBSD: if_ep_isa.c,v 1.35 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -69,7 +69,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ep_isa.c,v 1.34 2004/09/14 20:20:47 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ep_isa.c,v 1.35 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -99,13 +99,13 @@ __KERNEL_RCSID(0, "$NetBSD: if_ep_isa.c,v 1.34 2004/09/14 20:20:47 drochner Exp #include <dev/isa/isavar.h> #include <dev/isa/elink.h> -int ep_isa_probe __P((struct device *, struct cfdata *, void *)); -void ep_isa_attach __P((struct device *, struct device *, void *)); +int ep_isa_probe(struct device *, struct cfdata *, void *); +void ep_isa_attach(struct device *, struct device *, void *); CFATTACH_DECL(ep_isa, sizeof(struct ep_softc), ep_isa_probe, ep_isa_attach, NULL, NULL); -static void epaddcard __P((int, int, int, int)); +static void epaddcard(int, int, int, int); /* * This keeps track of which ISAs have been through an ep probe sequence. diff --git a/sys/dev/isa/if_ix.c b/sys/dev/isa/if_ix.c index eba09d628fb..a706d943721 100644 --- a/sys/dev/isa/if_ix.c +++ b/sys/dev/isa/if_ix.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ix.c,v 1.19 2004/09/14 20:20:47 drochner Exp $ */ +/* $NetBSD: if_ix.c,v 1.20 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ix.c,v 1.19 2004/09/14 20:20:47 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ix.c,v 1.20 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -88,29 +88,29 @@ struct ix_softc { void *sc_ih; /* interrupt handle */ }; -static void ix_reset __P((struct ie_softc *, int)); -static void ix_atten __P((struct ie_softc *, int)); -static int ix_intrhook __P((struct ie_softc *, int)); +static void ix_reset(struct ie_softc *, int); +static void ix_atten(struct ie_softc *, int); +static int ix_intrhook(struct ie_softc *, int); -static void ix_copyin __P((struct ie_softc *, void *, int, size_t)); -static void ix_copyout __P((struct ie_softc *, const void *, int, size_t)); +static void ix_copyin(struct ie_softc *, void *, int, size_t); +static void ix_copyout(struct ie_softc *, const void *, int, size_t); -static void ix_bus_barrier __P((struct ie_softc *, int, int, int)); +static void ix_bus_barrier(struct ie_softc *, int, int, int); -static u_int16_t ix_read_16 __P((struct ie_softc *, int)); -static void ix_write_16 __P((struct ie_softc *, int, u_int16_t)); -static void ix_write_24 __P((struct ie_softc *, int, int)); -static void ix_zeromem __P((struct ie_softc *, int, int)); +static u_int16_t ix_read_16(struct ie_softc *, int); +static void ix_write_16(struct ie_softc *, int, u_int16_t); +static void ix_write_24(struct ie_softc *, int, int); +static void ix_zeromem (struct ie_softc *, int, int); -static void ix_mediastatus __P((struct ie_softc *, struct ifmediareq *)); +static void ix_mediastatus(struct ie_softc *, struct ifmediareq *); -static u_int16_t ix_read_eeprom __P((bus_space_tag_t, bus_space_handle_t, int)); -static void ix_eeprom_outbits __P((bus_space_tag_t, bus_space_handle_t, int, int)); -static int ix_eeprom_inbits __P((bus_space_tag_t, bus_space_handle_t)); -static void ix_eeprom_clock __P((bus_space_tag_t, bus_space_handle_t, int)); +static u_int16_t ix_read_eeprom(bus_space_tag_t, bus_space_handle_t, int); +static void ix_eeprom_outbits(bus_space_tag_t, bus_space_handle_t, int, int); +static int ix_eeprom_inbits (bus_space_tag_t, bus_space_handle_t); +static void ix_eeprom_clock (bus_space_tag_t, bus_space_handle_t, int); -int ix_match __P((struct device *, struct cfdata *, void *)); -void ix_attach __P((struct device *, struct device *, void *)); +int ix_match(struct device *, struct cfdata *, void *); +void ix_attach(struct device *, struct device *, void *); /* * EtherExpress/16 support routines diff --git a/sys/dev/isa/if_iy.c b/sys/dev/isa/if_iy.c index fa513492eb7..43f507d07b3 100644 --- a/sys/dev/isa/if_iy.c +++ b/sys/dev/isa/if_iy.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_iy.c,v 1.65 2004/10/30 23:34:23 thorpej Exp $ */ +/* $NetBSD: if_iy.c,v 1.66 2005/02/04 02:10:40 perry Exp $ */ /* #define IYDEBUG */ /* #define IYMEMDEBUG */ @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.65 2004/10/30 23:34:23 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.66 2005/02/04 02:10:40 perry Exp $"); #include "opt_inet.h" #include "opt_ns.h" @@ -148,48 +148,47 @@ struct iy_softc { #endif }; -void iywatchdog __P((struct ifnet *)); -int iyioctl __P((struct ifnet *, u_long, caddr_t)); -int iyintr __P((void *)); -void iyinit __P((struct iy_softc *)); -void iystop __P((struct iy_softc *)); -void iystart __P((struct ifnet *)); - -void iy_intr_rx __P((struct iy_softc *)); -void iy_intr_tx __P((struct iy_softc *)); - -void iyreset __P((struct iy_softc *)); -void iy_readframe __P((struct iy_softc *, int)); -void iy_drop_packet_buffer __P((struct iy_softc *)); -void iy_find_mem_size __P((struct iy_softc *)); -void iyrint __P((struct iy_softc *)); -void iytint __P((struct iy_softc *)); -void iyxmit __P((struct iy_softc *)); -static void iy_mc_setup __P((struct iy_softc *)); -static void iy_mc_reset __P((struct iy_softc *)); -void iyget __P((struct iy_softc *, bus_space_tag_t, bus_space_handle_t, int)); -void iyprobemem __P((struct iy_softc *)); -static __inline void eepromwritebit __P((bus_space_tag_t, bus_space_handle_t, - int)); -static __inline int eepromreadbit __P((bus_space_tag_t, bus_space_handle_t)); +void iywatchdog(struct ifnet *); +int iyioctl(struct ifnet *, u_long, caddr_t); +int iyintr(void *); +void iyinit(struct iy_softc *); +void iystop(struct iy_softc *); +void iystart(struct ifnet *); + +void iy_intr_rx(struct iy_softc *); +void iy_intr_tx(struct iy_softc *); + +void iyreset(struct iy_softc *); +void iy_readframe(struct iy_softc *, int); +void iy_drop_packet_buffer(struct iy_softc *); +void iy_find_mem_size(struct iy_softc *); +void iyrint(struct iy_softc *); +void iytint(struct iy_softc *); +void iyxmit(struct iy_softc *); +static void iy_mc_setup(struct iy_softc *); +static void iy_mc_reset(struct iy_softc *); +void iyget(struct iy_softc *, bus_space_tag_t, bus_space_handle_t, int); +void iyprobemem(struct iy_softc *); +static __inline void eepromwritebit(bus_space_tag_t, bus_space_handle_t, int); +static __inline int eepromreadbit(bus_space_tag_t, bus_space_handle_t); #ifdef IYDEBUGX -void print_rbd __P((volatile struct iy_recv_buf_desc *)); +void print_rbd(volatile struct iy_recv_buf_desc *); int in_ifrint = 0; int in_iftint = 0; #endif -int iy_mediachange __P((struct ifnet *)); -void iy_mediastatus __P((struct ifnet *, struct ifmediareq *)); +int iy_mediachange(struct ifnet *); +void iy_mediastatus(struct ifnet *, struct ifmediareq *); -int iyprobe __P((struct device *, struct cfdata *, void *)); -void iyattach __P((struct device *, struct device *, void *)); +int iyprobe(struct device *, struct cfdata *, void *); +void iyattach(struct device *, struct device *, void *); -static u_int16_t eepromread __P((bus_space_tag_t, bus_space_handle_t, int)); +static u_int16_t eepromread(bus_space_tag_t, bus_space_handle_t, int); -static int eepromreadall __P((bus_space_tag_t, bus_space_handle_t, u_int16_t *, - int)); +static int eepromreadall(bus_space_tag_t, bus_space_handle_t, u_int16_t *, + int); CFATTACH_DECL(iy, sizeof(struct iy_softc), iyprobe, iyattach, NULL, NULL); diff --git a/sys/dev/isa/if_lc_isa.c b/sys/dev/isa/if_lc_isa.c index 4ef844a497d..7e714e336f1 100644 --- a/sys/dev/isa/if_lc_isa.c +++ b/sys/dev/isa/if_lc_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_lc_isa.c,v 1.19 2004/09/14 20:20:48 drochner Exp $ */ +/* $NetBSD: if_lc_isa.c,v 1.20 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c) 1994, 1995, 1997 Matt Thomas <matt@3am-software.com> @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_lc_isa.c,v 1.19 2004/09/14 20:20:48 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_lc_isa.c,v 1.20 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -62,10 +62,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_lc_isa.c,v 1.19 2004/09/14 20:20:48 drochner Exp extern struct cfdriver lc_cd; -static int lemac_isa_find __P((lemac_softc_t *, struct isa_attach_args *, - int)); -static int lemac_isa_probe __P((struct device *, struct cfdata *, void *)); -static void lemac_isa_attach __P((struct device *, struct device *, void *)); +static int lemac_isa_find(lemac_softc_t *, struct isa_attach_args *, int); +static int lemac_isa_probe(struct device *, struct cfdata *, void *); +static void lemac_isa_attach(struct device *, struct device *, void *); CFATTACH_DECL(lc_isa, sizeof(lemac_softc_t), lemac_isa_probe, lemac_isa_attach, NULL, NULL); diff --git a/sys/dev/isa/if_le_isa.c b/sys/dev/isa/if_le_isa.c index baf8f11203c..adbd41afb37 100644 --- a/sys/dev/isa/if_le_isa.c +++ b/sys/dev/isa/if_le_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_le_isa.c,v 1.36 2004/09/14 20:20:48 drochner Exp $ */ +/* $NetBSD: if_le_isa.c,v 1.37 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -72,7 +72,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_le_isa.c,v 1.36 2004/09/14 20:20:48 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_le_isa.c,v 1.37 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -102,12 +102,12 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_isa.c,v 1.36 2004/09/14 20:20:48 drochner Exp #include <dev/isa/if_levar.h> -int ne2100_isa_probe __P((struct device *, struct cfdata *, void *)); -int bicc_isa_probe __P((struct device *, struct cfdata *, void *)); -void le_dummyattach __P((struct device *, struct device *, void *)); -int le_dummyprobe __P((struct device *, struct cfdata *, void *)); -void le_ne2100_attach __P((struct device *, struct device *, void *)); -void le_bicc_attach __P((struct device *, struct device *, void *)); +int ne2100_isa_probe(struct device *, struct cfdata *, void *); +int bicc_isa_probe(struct device *, struct cfdata *, void *); +void le_dummyattach(struct device *, struct device *, void *); +int le_dummyprobe(struct device *, struct cfdata *, void *); +void le_ne2100_attach(struct device *, struct device *, void *); +void le_bicc_attach(struct device *, struct device *, void *); CFATTACH_DECL(nele, sizeof(struct device), ne2100_isa_probe, le_dummyattach, NULL, NULL); @@ -135,12 +135,11 @@ struct le_isa_params { 0, 2 }; -int lance_isa_probe __P((struct isa_attach_args *, - struct le_isa_params *, int)); -void le_isa_attach __P((struct device *, struct le_softc *, - struct isa_attach_args *, struct le_isa_params *)); +int lance_isa_probe(struct isa_attach_args *, struct le_isa_params *, int); +void le_isa_attach(struct device *, struct le_softc *, + struct isa_attach_args *, struct le_isa_params *); -int le_isa_intredge __P((void *)); +int le_isa_intredge(void *); #if defined(_KERNEL_OPT) #include "opt_ddb.h" @@ -154,8 +153,8 @@ int le_isa_intredge __P((void *)); #define hide static #endif -hide void le_isa_wrcsr __P((struct lance_softc *, u_int16_t, u_int16_t)); -hide u_int16_t le_isa_rdcsr __P((struct lance_softc *, u_int16_t)); +hide void le_isa_wrcsr(struct lance_softc *, u_int16_t, u_int16_t); +hide u_int16_t le_isa_rdcsr(struct lance_softc *, u_int16_t); #define LE_ISA_MEMSIZE 16384 diff --git a/sys/dev/isa/if_ne_isa.c b/sys/dev/isa/if_ne_isa.c index f4797bf7f1a..cf3ac796dff 100644 --- a/sys/dev/isa/if_ne_isa.c +++ b/sys/dev/isa/if_ne_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ne_isa.c,v 1.18 2004/09/14 20:20:48 drochner Exp $ */ +/* $NetBSD: if_ne_isa.c,v 1.19 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ne_isa.c,v 1.18 2004/09/14 20:20:48 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ne_isa.c,v 1.19 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -69,8 +69,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_ne_isa.c,v 1.18 2004/09/14 20:20:48 drochner Exp #include <dev/isa/isavar.h> -int ne_isa_match __P((struct device *, struct cfdata *, void *)); -void ne_isa_attach __P((struct device *, struct device *, void *)); +int ne_isa_match(struct device *, struct cfdata *, void *); +void ne_isa_attach(struct device *, struct device *, void *); struct ne_isa_softc { struct ne2000_softc sc_ne2000; /* real "ne2000" softc */ diff --git a/sys/dev/isa/if_ntwoc_isa.c b/sys/dev/isa/if_ntwoc_isa.c index 52d5127a503..402dc6026c2 100644 --- a/sys/dev/isa/if_ntwoc_isa.c +++ b/sys/dev/isa/if_ntwoc_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ntwoc_isa.c,v 1.8 2004/09/14 20:20:48 drochner Exp $ */ +/* $NetBSD: if_ntwoc_isa.c,v 1.9 2005/02/04 02:10:40 perry Exp $ */ /* * Copyright (c) 1999 Christian E. Hopps * Copyright (c) 1996 John Hay. @@ -29,11 +29,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ntwoc_isa.c,v 1.8 2004/09/14 20:20:48 drochner Exp $ + * $Id: if_ntwoc_isa.c,v 1.9 2005/02/04 02:10:40 perry Exp $ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_isa.c,v 1.8 2004/09/14 20:20:48 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_isa.c,v 1.9 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -65,7 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ntwoc_isa.c,v 1.8 2004/09/14 20:20:48 drochner Ex #endif #if __NetBSD_Version__ >= 104160000 -static void ntwoc_isa_config_interrupts __P((struct device *)); +static void ntwoc_isa_config_interrupts(struct device *); #else #define SCA_BASECLOCK 9830400 #endif @@ -84,16 +84,16 @@ struct ntwoc_isa_softc { struct sca_softc sc_sca; /* the SCA itself */ }; -static int ntwoc_isa_probe __P((struct device *, struct cfdata *, void *)); -static void ntwoc_isa_attach __P((struct device *, struct device *, void *)); +static int ntwoc_isa_probe(struct device *, struct cfdata *, void *); +static void ntwoc_isa_attach(struct device *, struct device *, void *); -static void ntwoc_isa_clock_callback __P((void *, int, int)); -static void ntwoc_isa_dtr_callback __P((void *, int, int)); -static int ntwoc_isa_intr __P((void *)); -static void ntwoc_isa_get_clock __P((struct sca_port *, u_int8_t, u_int8_t, - u_int8_t, u_int8_t)); +static void ntwoc_isa_clock_callback(void *, int, int); +static void ntwoc_isa_dtr_callback(void *, int, int); +static int ntwoc_isa_intr(void *); +static void ntwoc_isa_get_clock(struct sca_port *, u_int8_t, u_int8_t, + u_int8_t, u_int8_t); static void ntwoc_isa_setup_memory(struct sca_softc *sc); -static void ntwoc_isa_shutdown __P((void *sc)); +static void ntwoc_isa_shutdown(void *sc); CFATTACH_DECL(ntwoc_isa, sizeof(struct ntwoc_isa_softc), ntwoc_isa_probe, ntwoc_isa_attach, NULL, NULL); diff --git a/sys/dev/isa/if_sm_isa.c b/sys/dev/isa/if_sm_isa.c index d47435c2f6a..239d216d422 100644 --- a/sys/dev/isa/if_sm_isa.c +++ b/sys/dev/isa/if_sm_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_sm_isa.c,v 1.13 2004/09/14 20:20:48 drochner Exp $ */ +/* $NetBSD: if_sm_isa.c,v 1.14 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_sm_isa.c,v 1.13 2004/09/14 20:20:48 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_sm_isa.c,v 1.14 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -66,8 +66,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_sm_isa.c,v 1.13 2004/09/14 20:20:48 drochner Exp #include <dev/isa/isavar.h> -int sm_isa_match __P((struct device *, struct cfdata *, void *)); -void sm_isa_attach __P((struct device *, struct device *, void *)); +int sm_isa_match(struct device *, struct cfdata *, void *); +void sm_isa_attach(struct device *, struct device *, void *); struct sm_isa_softc { struct smc91cxx_softc sc_smc; /* real "smc" softc */ diff --git a/sys/dev/isa/if_tr_isa.c b/sys/dev/isa/if_tr_isa.c index 6abc8a6b926..886fef39b60 100644 --- a/sys/dev/isa/if_tr_isa.c +++ b/sys/dev/isa/if_tr_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_tr_isa.c,v 1.11 2002/10/02 03:10:48 thorpej Exp $ */ +/* $NetBSD: if_tr_isa.c,v 1.12 2005/02/04 02:10:40 perry Exp $ */ /* XXXJRT changes isa_attach_args too early!! */ @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_tr_isa.c,v 1.11 2002/10/02 03:10:48 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_tr_isa.c,v 1.12 2005/02/04 02:10:40 perry Exp $"); #undef TRISADEBUG @@ -62,18 +62,18 @@ __KERNEL_RCSID(0, "$NetBSD: if_tr_isa.c,v 1.11 2002/10/02 03:10:48 thorpej Exp $ #include <dev/ic/tropicvar.h> -int tr_isa_probe __P((struct device *, struct cfdata *, void *)); -int trtcm_isa_probe __P((struct device *, struct cfdata *, void *)); -int tribm_isa_probe __P((struct device *, struct cfdata *, void *)); -void tr_isa_attach __P((struct device *, struct device *, void *)); -int tr_isa_map_io __P((struct isa_attach_args *, bus_space_handle_t *, - bus_space_handle_t *)); -void tr_isa_unmap_io __P((struct isa_attach_args *, bus_space_handle_t, - bus_space_handle_t)); -int trtcm_isa_mediachange __P((struct tr_softc *)); -void trtcm_isa_mediastatus __P((struct tr_softc *, struct ifmediareq *)); +int tr_isa_probe(struct device *, struct cfdata *, void *); +int trtcm_isa_probe(struct device *, struct cfdata *, void *); +int tribm_isa_probe(struct device *, struct cfdata *, void *); +void tr_isa_attach(struct device *, struct device *, void *); +int tr_isa_map_io(struct isa_attach_args *, bus_space_handle_t *, + bus_space_handle_t *); +void tr_isa_unmap_io(struct isa_attach_args *, bus_space_handle_t, + bus_space_handle_t); +int trtcm_isa_mediachange(struct tr_softc *); +void trtcm_isa_mediastatus(struct tr_softc *, struct ifmediareq *); #ifdef TRISADEBUG -void tr_isa_dumpaip __P((bus_space_tag_t, bus_space_handle_t)); +void tr_isa_dumpaip(bus_space_tag_t, bus_space_handle_t); #endif /* diff --git a/sys/dev/isa/if_tribm_isa.c b/sys/dev/isa/if_tribm_isa.c index 337a1fce338..e439fb0711b 100644 --- a/sys/dev/isa/if_tribm_isa.c +++ b/sys/dev/isa/if_tribm_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_tribm_isa.c,v 1.5 2004/09/14 20:20:48 drochner Exp $ */ +/* $NetBSD: if_tribm_isa.c,v 1.6 2005/02/04 02:10:40 perry Exp $ */ /* XXXJRT changes isa_attach_args too early */ @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_tribm_isa.c,v 1.5 2004/09/14 20:20:48 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_tribm_isa.c,v 1.6 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -57,11 +57,11 @@ __KERNEL_RCSID(0, "$NetBSD: if_tribm_isa.c,v 1.5 2004/09/14 20:20:48 drochner Ex #include <dev/ic/tropicreg.h> #include <dev/ic/tropicvar.h> -int tribm_isa_probe __P((struct device *, struct cfdata *, void *)); -int tr_isa_map_io __P((struct isa_attach_args *, bus_space_handle_t *, - bus_space_handle_t *)); -void tr_isa_unmap_io __P((struct isa_attach_args *, bus_space_handle_t, - bus_space_handle_t)); +int tribm_isa_probe(struct device *, struct cfdata *, void *); +int tr_isa_map_io(struct isa_attach_args *, bus_space_handle_t *, + bus_space_handle_t *); +void tr_isa_unmap_io(struct isa_attach_args *, bus_space_handle_t, + bus_space_handle_t); int tribm_isa_probe(parent, match, aux) diff --git a/sys/dev/isa/if_trtcm_isa.c b/sys/dev/isa/if_trtcm_isa.c index d65c00595d0..b04ecbac4d0 100644 --- a/sys/dev/isa/if_trtcm_isa.c +++ b/sys/dev/isa/if_trtcm_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_trtcm_isa.c,v 1.6 2004/09/14 20:20:48 drochner Exp $ */ +/* $NetBSD: if_trtcm_isa.c,v 1.7 2005/02/04 02:10:40 perry Exp $ */ /* XXXJRT verify doens't change isa_attach_args too early */ @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_trtcm_isa.c,v 1.6 2004/09/14 20:20:48 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_trtcm_isa.c,v 1.7 2005/02/04 02:10:40 perry Exp $"); #undef TRTCMISADEBUG @@ -63,15 +63,15 @@ __KERNEL_RCSID(0, "$NetBSD: if_trtcm_isa.c,v 1.6 2004/09/14 20:20:48 drochner Ex #include <dev/ic/elink3reg.h> -u_int16_t tcmreadeeprom __P((bus_space_tag_t, bus_space_handle_t, int)); +u_int16_t tcmreadeeprom(bus_space_tag_t, bus_space_handle_t, int); #ifdef TRTCMISADEBUG -void tcmdumpeeprom __P((bus_space_tag_t, bus_space_handle_t)); +void tcmdumpeeprom(bus_space_tag_t, bus_space_handle_t); #endif -int trtcm_isa_probe __P((struct device *, struct cfdata *, void *)); +int trtcm_isa_probe(struct device *, struct cfdata *, void *); -int trtcm_isa_mediachange __P((struct tr_softc *)); -void trtcm_isa_mediastatus __P((struct tr_softc *, struct ifmediareq *)); +int trtcm_isa_mediachange(struct tr_softc *); +void trtcm_isa_mediastatus(struct tr_softc *, struct ifmediareq *); /* * TODO: @@ -82,7 +82,7 @@ void trtcm_isa_mediastatus __P((struct tr_softc *, struct ifmediareq *)); * DIR_SET_DEFAULT_RING_SPEED or set the speed in the eeprom ?? */ -static void tcmaddcard __P((int, int, int, int, u_int, int, int)); +static void tcmaddcard(int, int, int, int, u_int, int, int); /* * This keeps track of which ISAs have been through a 3com probe sequence. diff --git a/sys/dev/isa/if_tscs_isa.c b/sys/dev/isa/if_tscs_isa.c index 1be8124d5f8..770df0cccef 100644 --- a/sys/dev/isa/if_tscs_isa.c +++ b/sys/dev/isa/if_tscs_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_tscs_isa.c,v 1.1 2005/01/08 02:55:52 joff Exp $ */ +/* $NetBSD: if_tscs_isa.c,v 1.2 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_tscs_isa.c,v 1.1 2005/01/08 02:55:52 joff Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_tscs_isa.c,v 1.2 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -64,8 +64,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_tscs_isa.c,v 1.1 2005/01/08 02:55:52 joff Exp $") #include <dev/ic/cs89x0var.h> #include <dev/isa/cs89x0isavar.h> -int tscs_isa_probe __P((struct device *, struct cfdata *, void *)); -void tscs_isa_attach __P((struct device *, struct device *, void *)); +int tscs_isa_probe(struct device *, struct cfdata *, void *); +void tscs_isa_attach(struct device *, struct device *, void *); CFATTACH_DECL(tscs_isa, sizeof(struct cs_softc), tscs_isa_probe, tscs_isa_attach, NULL, NULL); diff --git a/sys/dev/isa/if_we_isa.c b/sys/dev/isa/if_we_isa.c index d59ff7510dd..468800a44b2 100644 --- a/sys/dev/isa/if_we_isa.c +++ b/sys/dev/isa/if_we_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_we_isa.c,v 1.9 2004/09/14 20:20:48 drochner Exp $ */ +/* $NetBSD: if_we_isa.c,v 1.10 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -56,7 +56,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_we_isa.c,v 1.9 2004/09/14 20:20:48 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_we_isa.c,v 1.10 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -90,16 +90,16 @@ __KERNEL_RCSID(0, "$NetBSD: if_we_isa.c,v 1.9 2004/09/14 20:20:48 drochner Exp $ #define bus_space_write_region_stream_2 bus_space_write_region_2 #endif -int we_isa_probe __P((struct device *, struct cfdata *, void *)); -void we_isa_attach __P((struct device *, struct device *, void *)); +int we_isa_probe(struct device *, struct cfdata *, void *); +void we_isa_attach(struct device *, struct device *, void *); CFATTACH_DECL(we_isa, sizeof(struct we_softc), we_isa_probe, we_isa_attach, NULL, NULL); extern struct cfdriver we_cd; -static const char *we_params __P((bus_space_tag_t, bus_space_handle_t, - u_int8_t *, bus_size_t *, int *, int *)); +static const char *we_params(bus_space_tag_t, bus_space_handle_t, + u_int8_t *, bus_size_t *, int *, int *); static const int we_584_irq[] = { 9, 3, 5, 7, 10, 11, 15, 4, diff --git a/sys/dev/isa/ioat66.c b/sys/dev/isa/ioat66.c index 72049eacadb..d3a2892bc37 100644 --- a/sys/dev/isa/ioat66.c +++ b/sys/dev/isa/ioat66.c @@ -1,4 +1,4 @@ -/* $NetBSD: ioat66.c,v 1.9 2004/09/14 20:20:48 drochner Exp $ */ +/* $NetBSD: ioat66.c,v 1.10 2005/02/04 02:10:40 perry Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ioat66.c,v 1.9 2004/09/14 20:20:48 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ioat66.c,v 1.10 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -68,9 +68,9 @@ struct ioat66_softc { int ioatbases[NSLAVES]={0x220,0x228,0x240,0x248,0x260,0x268}; #define IOAT66SHARED 0x208 -int ioat66probe __P((struct device *, struct cfdata *, void *)); -void ioat66attach __P((struct device *, struct device *, void *)); -int ioat66intr __P((void *)); +int ioat66probe(struct device *, struct cfdata *, void *); +void ioat66attach(struct device *, struct device *, void *); +int ioat66intr(void *); CFATTACH_DECL(ioat, sizeof(struct ioat_softc), ioat66probe, ioat66attach, NULL, NULL); diff --git a/sys/dev/isa/isadma.c b/sys/dev/isa/isadma.c index 0d49b0f2098..637e16fe0c7 100644 --- a/sys/dev/isa/isadma.c +++ b/sys/dev/isa/isadma.c @@ -1,4 +1,4 @@ -/* $NetBSD: isadma.c,v 1.52 2003/05/09 23:51:29 fvdl Exp $ */ +/* $NetBSD: isadma.c,v 1.53 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isadma.c,v 1.52 2003/05/09 23:51:29 fvdl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isadma.c,v 1.53 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -88,8 +88,8 @@ static u_int8_t dmamode[] = { DMA37MD_WRITE | DMA37MD_DEMAND | DMA37MD_LOOP, }; -static inline void _isa_dmaunmask __P((struct isa_dma_state *, int)); -static inline void _isa_dmamask __P((struct isa_dma_state *, int)); +static inline void _isa_dmaunmask(struct isa_dma_state *, int); +static inline void _isa_dmamask(struct isa_dma_state *, int); static inline void _isa_dmaunmask(ids, chan) diff --git a/sys/dev/isa/isadmavar.h b/sys/dev/isa/isadmavar.h index eb7d3922ac5..93c489e3f27 100644 --- a/sys/dev/isa/isadmavar.h +++ b/sys/dev/isa/isadmavar.h @@ -1,4 +1,4 @@ -/* $NetBSD: isadmavar.h,v 1.19 2003/05/09 23:51:29 fvdl Exp $ */ +/* $NetBSD: isadmavar.h,v 1.20 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc. @@ -101,46 +101,45 @@ struct isa_mem { struct proc; struct malloc_type; -void _isa_dmainit __P((struct isa_dma_state *, bus_space_tag_t, - bus_dma_tag_t, struct device *)); - -int _isa_dmacascade __P((struct isa_dma_state *, int)); - -bus_size_t _isa_dmamaxsize __P((struct isa_dma_state *, int)); - -int _isa_dmamap_create __P((struct isa_dma_state *, int, - bus_size_t, int)); -void _isa_dmamap_destroy __P((struct isa_dma_state *, int)); - -int _isa_dmastart __P((struct isa_dma_state *, int, void *, bus_size_t, - struct proc *, int, int)); -void _isa_dmaabort __P((struct isa_dma_state *, int)); -bus_size_t _isa_dmacount __P((struct isa_dma_state *, int)); -int _isa_dmafinished __P((struct isa_dma_state *, int)); -void _isa_dmadone __P((struct isa_dma_state *, int)); - -void _isa_dmafreeze __P((struct isa_dma_state *)); -void _isa_dmathaw __P((struct isa_dma_state *)); - -int _isa_dmamem_alloc __P((struct isa_dma_state *, int, bus_size_t, - bus_addr_t *, int)); -void _isa_dmamem_free __P((struct isa_dma_state *, int, bus_addr_t, - bus_size_t)); -int _isa_dmamem_map __P((struct isa_dma_state *, int, bus_addr_t, - bus_size_t, caddr_t *, int)); -void _isa_dmamem_unmap __P((struct isa_dma_state *, int, caddr_t, - size_t)); -paddr_t _isa_dmamem_mmap __P((struct isa_dma_state *, int, bus_addr_t, - bus_size_t, off_t, int, int)); - -int _isa_drq_alloc __P((struct isa_dma_state *, int)); -int _isa_drq_free __P((struct isa_dma_state *, int)); -int _isa_drq_isfree __P((struct isa_dma_state *, int)); - -void *_isa_malloc __P((struct isa_dma_state *, int, size_t, - struct malloc_type *, int)); -void _isa_free __P((void *, struct malloc_type *)); -paddr_t _isa_mappage __P((void *, off_t, int)); +void _isa_dmainit(struct isa_dma_state *, bus_space_tag_t, + bus_dma_tag_t, struct device *); + +int _isa_dmacascade(struct isa_dma_state *, int); + +bus_size_t _isa_dmamaxsize(struct isa_dma_state *, int); + +int _isa_dmamap_create(struct isa_dma_state *, int, bus_size_t, int); +void _isa_dmamap_destroy(struct isa_dma_state *, int); + +int _isa_dmastart(struct isa_dma_state *, int, void *, bus_size_t, + struct proc *, int, int); +void _isa_dmaabort(struct isa_dma_state *, int); +bus_size_t _isa_dmacount(struct isa_dma_state *, int); +int _isa_dmafinished(struct isa_dma_state *, int); +void _isa_dmadone(struct isa_dma_state *, int); + +void _isa_dmafreeze(struct isa_dma_state *); +void _isa_dmathaw(struct isa_dma_state *); + +int _isa_dmamem_alloc(struct isa_dma_state *, int, bus_size_t, + bus_addr_t *, int); +void _isa_dmamem_free(struct isa_dma_state *, int, bus_addr_t, + bus_size_t); +int _isa_dmamem_map(struct isa_dma_state *, int, bus_addr_t, + bus_size_t, caddr_t *, int); +void _isa_dmamem_unmap(struct isa_dma_state *, int, caddr_t, + size_t); +paddr_t _isa_dmamem_mmap(struct isa_dma_state *, int, bus_addr_t, + bus_size_t, off_t, int, int); + +int _isa_drq_alloc(struct isa_dma_state *, int); +int _isa_drq_free(struct isa_dma_state *, int); +int _isa_drq_isfree(struct isa_dma_state *, int); + +void *_isa_malloc(struct isa_dma_state *, int, size_t, + struct malloc_type *, int); +void _isa_free(void *, struct malloc_type *); +paddr_t _isa_mappage(void *, off_t, int); #endif /* _KERNEL */ #endif /* _DEV_ISA_ISADMAVAR_H_ */ diff --git a/sys/dev/isa/isavar.h b/sys/dev/isa/isavar.h index fa01f32e86d..42650ae4362 100644 --- a/sys/dev/isa/isavar.h +++ b/sys/dev/isa/isavar.h @@ -1,4 +1,4 @@ -/* $NetBSD: isavar.h,v 1.44 2004/09/14 20:20:48 drochner Exp $ */ +/* $NetBSD: isavar.h,v 1.45 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c) 1997, 2001 The NetBSD Foundation, Inc. @@ -264,7 +264,7 @@ int isabusprint(void *, const char *); */ /* ISA interrupt sharing types */ -char *isa_intr_typename __P((int)); +char *isa_intr_typename(int); /* * Some ISA devices (e.g. on a VLB) can perform 32-bit DMA. This diff --git a/sys/dev/isa/isic_isa.c b/sys/dev/isa/isic_isa.c index 85b09b092b6..41941352e67 100644 --- a/sys/dev/isa/isic_isa.c +++ b/sys/dev/isa/isic_isa.c @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isic_isa.c,v 1.20 2004/09/14 20:20:48 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isic_isa.c,v 1.21 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/errno.h> @@ -86,17 +86,17 @@ extern const struct isdn_layer1_isdnif_driver isic_std_driver; /* local functions */ #ifdef __BROKEN_INDIRECT_CONFIG -static int isic_isa_probe __P((struct device *, void *, void *)); +static int isic_isa_probe(struct device *, void *, void *); #else -static int isic_isa_probe __P((struct device *, struct cfdata *, void *)); +static int isic_isa_probe(struct device *, struct cfdata *, void *); #endif -static void isic_isa_attach __P((struct device *, struct device *, void *)); -static int setup_io_map __P((int flags, bus_space_tag_t iot, +static void isic_isa_attach(struct device *, struct device *, void *); +static int setup_io_map(int flags, bus_space_tag_t iot, bus_space_tag_t memt, bus_size_t iobase, bus_size_t maddr, int *num_mappings, struct isic_io_map *maps, int *iosize, - int *msize)); -static void args_unmap __P((int *num_mappings, struct isic_io_map *maps)); + int *msize); +static void args_unmap(int *num_mappings, struct isic_io_map *maps); CFATTACH_DECL(isic_isa, sizeof(struct isic_softc), isic_isa_probe, isic_isa_attach, NULL, NULL); diff --git a/sys/dev/isa/isic_isa_avm_a1.c b/sys/dev/isa/isic_isa_avm_a1.c index 83cb1d46a71..7480fa13cd5 100644 --- a/sys/dev/isa/isic_isa_avm_a1.c +++ b/sys/dev/isa/isic_isa_avm_a1.c @@ -35,14 +35,14 @@ * i4b_avm_a1.c - AVM A1/Fritz passive card driver for isdn4bsd * ------------------------------------------------------------ * - * $Id: isic_isa_avm_a1.c,v 1.4 2002/03/24 20:35:48 martin Exp $ + * $Id: isic_isa_avm_a1.c,v 1.5 2005/02/04 02:10:40 perry Exp $ * * last edit-date: [Fri Jan 5 11:37:22 2001] * *---------------------------------------------------------------------------*/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isic_isa_avm_a1.c,v 1.4 2002/03/24 20:35:48 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isic_isa_avm_a1.c,v 1.5 2005/02/04 02:10:40 perry Exp $"); #include "opt_isicisa.h" #ifdef ISICISA_AVM_A1 @@ -89,10 +89,10 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isa_avm_a1.c,v 1.4 2002/03/24 20:35:48 martin E #include <dev/ic/hscx.h> #ifndef __FreeBSD__ -static u_int8_t avma1_read_reg __P((struct isic_softc *sc, int what, bus_size_t offs)); -static void avma1_write_reg __P((struct isic_softc *sc, int what, bus_size_t offs, u_int8_t data)); -static void avma1_read_fifo __P((struct isic_softc *sc, int what, void *buf, size_t size)); -static void avma1_write_fifo __P((struct isic_softc *sc, int what, const void *data, size_t size)); +static u_int8_t avma1_read_reg(struct isic_softc *sc, int what, bus_size_t offs); +static void avma1_write_reg(struct isic_softc *sc, int what, bus_size_t offs, u_int8_t data); +static void avma1_read_fifo(struct isic_softc *sc, int what, void *buf, size_t size); +static void avma1_write_fifo(struct isic_softc *sc, int what, const void *data, size_t size); #endif /*---------------------------------------------------------------------------* diff --git a/sys/dev/isa/isic_isa_tel_s016.c b/sys/dev/isa/isic_isa_tel_s016.c index c878e4efb19..b55dee9b05e 100644 --- a/sys/dev/isa/isic_isa_tel_s016.c +++ b/sys/dev/isa/isic_isa_tel_s016.c @@ -37,7 +37,7 @@ * isic - I4B Siemens ISDN Chipset Driver for Teles S0/16 and clones * ================================================================= * - * $Id: isic_isa_tel_s016.c,v 1.4 2002/03/24 20:35:49 martin Exp $ + * $Id: isic_isa_tel_s016.c,v 1.5 2005/02/04 02:10:40 perry Exp $ * * last edit-date: [Fri Jan 5 11:37:22 2001] * @@ -50,7 +50,7 @@ *---------------------------------------------------------------------------*/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s016.c,v 1.4 2002/03/24 20:35:49 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s016.c,v 1.5 2005/02/04 02:10:40 perry Exp $"); #include "opt_isicisa.h" #ifdef ISICISA_TEL_S0_16 @@ -102,10 +102,10 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s016.c,v 1.4 2002/03/24 20:35:49 martin static u_char intr_no[] = { 1, 1, 0, 2, 4, 6, 1, 1, 1, 0, 8, 10, 12, 1, 1, 14 }; #ifndef __FreeBSD__ -static u_int8_t tels016_read_reg __P((struct isic_softc *sc, int what, bus_size_t offs)); -static void tels016_write_reg __P((struct isic_softc *sc, int what, bus_size_t offs, u_int8_t data)); -static void tels016_read_fifo __P((struct isic_softc *sc, int what, void *buf, size_t size)); -static void tels016_write_fifo __P((struct isic_softc *sc, int what, const void *data, size_t size)); +static u_int8_t tels016_read_reg(struct isic_softc *sc, int what, bus_size_t offs); +static void tels016_write_reg(struct isic_softc *sc, int what, bus_size_t offs, u_int8_t data); +static void tels016_read_fifo(struct isic_softc *sc, int what, void *buf, size_t size); +static void tels016_write_fifo(struct isic_softc *sc, int what, const void *data, size_t size); #endif /*---------------------------------------------------------------------------* diff --git a/sys/dev/isa/isic_isa_tel_s0163.c b/sys/dev/isa/isic_isa_tel_s0163.c index 3024d2a2e27..a32c0c78430 100644 --- a/sys/dev/isa/isic_isa_tel_s0163.c +++ b/sys/dev/isa/isic_isa_tel_s0163.c @@ -37,7 +37,7 @@ * isic - I4B Siemens ISDN Chipset Driver for Teles S0/16.3 * ======================================================== * - * $Id: isic_isa_tel_s0163.c,v 1.4 2002/03/24 20:35:49 martin Exp $ + * $Id: isic_isa_tel_s0163.c,v 1.5 2005/02/04 02:10:40 perry Exp $ * * last edit-date: [Fri Jan 5 11:37:22 2001] * @@ -49,7 +49,7 @@ *---------------------------------------------------------------------------*/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s0163.c,v 1.4 2002/03/24 20:35:49 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s0163.c,v 1.5 2005/02/04 02:10:40 perry Exp $"); #include "opt_isicisa.h" #ifdef ISICISA_TEL_S0_16_3 @@ -102,10 +102,10 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s0163.c,v 1.4 2002/03/24 20:35:49 marti static u_char intr_no[] = { 1, 1, 0, 2, 4, 6, 1, 1, 1, 0, 8, 10, 12, 1, 1, 14 }; #if !defined(__FreeBSD__) && !defined(__bsdi__) -static u_int8_t tels0163_read_reg __P((struct isic_softc *sc, int what, bus_size_t offs)); -static void tels0163_write_reg __P((struct isic_softc *sc, int what, bus_size_t offs, u_int8_t data)); -static void tels0163_read_fifo __P((struct isic_softc *sc, int what, void *buf, size_t size)); -static void tels0163_write_fifo __P((struct isic_softc *sc, int what, const void *data, size_t size)); +static u_int8_t tels0163_read_reg(struct isic_softc *sc, int what, bus_size_t offs); +static void tels0163_write_reg(struct isic_softc *sc, int what, bus_size_t offs, u_int8_t data); +static void tels0163_read_fifo(struct isic_softc *sc, int what, void *buf, size_t size); +static void tels0163_write_fifo(struct isic_softc *sc, int what, const void *data, size_t size); #endif /*---------------------------------------------------------------------------* diff --git a/sys/dev/isa/isic_isa_tel_s08.c b/sys/dev/isa/isic_isa_tel_s08.c index 247d846f5ca..97defd76756 100644 --- a/sys/dev/isa/isic_isa_tel_s08.c +++ b/sys/dev/isa/isic_isa_tel_s08.c @@ -37,7 +37,7 @@ * isic - I4B Siemens ISDN Chipset Driver for Teles S0/8 and clones * ================================================================ * - * $Id: isic_isa_tel_s08.c,v 1.4 2002/03/24 20:35:49 martin Exp $ + * $Id: isic_isa_tel_s08.c,v 1.5 2005/02/04 02:10:40 perry Exp $ * * last edit-date: [Fri Jan 5 11:37:22 2001] * @@ -50,7 +50,7 @@ *---------------------------------------------------------------------------*/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s08.c,v 1.4 2002/03/24 20:35:49 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s08.c,v 1.5 2005/02/04 02:10:40 perry Exp $"); #include "opt_isicisa.h" #ifdef ISICISA_TEL_S0_8 @@ -100,10 +100,10 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s08.c,v 1.4 2002/03/24 20:35:49 martin #include <dev/ic/hscx.h> #ifndef __FreeBSD__ -static u_int8_t tels08_read_reg __P((struct isic_softc *sc, int what, bus_size_t offs)); -static void tels08_write_reg __P((struct isic_softc *sc, int what, bus_size_t offs, u_int8_t data)); -static void tels08_write_fifo __P((struct isic_softc *sc, int what, const void *data, size_t size)); -static void tels08_read_fifo __P((struct isic_softc *sc, int what, void *buf, size_t size)); +static u_int8_t tels08_read_reg(struct isic_softc *sc, int what, bus_size_t offs); +static void tels08_write_reg(struct isic_softc *sc, int what, bus_size_t offs, u_int8_t data); +static void tels08_write_fifo(struct isic_softc *sc, int what, const void *data, size_t size); +static void tels08_read_fifo(struct isic_softc *sc, int what, void *buf, size_t size); #endif /*---------------------------------------------------------------------------* diff --git a/sys/dev/isa/joy_isa.c b/sys/dev/isa/joy_isa.c index f2fd903499d..eb53e379006 100644 --- a/sys/dev/isa/joy_isa.c +++ b/sys/dev/isa/joy_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: joy_isa.c,v 1.6 2004/09/14 20:20:48 drochner Exp $ */ +/* $NetBSD: joy_isa.c,v 1.7 2005/02/04 02:10:40 perry Exp $ */ /*- * Copyright (c) 1995 Jean-Marc Zucconi @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: joy_isa.c,v 1.6 2004/09/14 20:20:48 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: joy_isa.c,v 1.7 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -48,8 +48,8 @@ __KERNEL_RCSID(0, "$NetBSD: joy_isa.c,v 1.6 2004/09/14 20:20:48 drochner Exp $") #define JOY_NPORTS 1 -int joy_isa_probe __P((struct device *, struct cfdata *, void *)); -void joy_isa_attach __P((struct device *, struct device *, void *)); +int joy_isa_probe(struct device *, struct cfdata *, void *); +void joy_isa_attach(struct device *, struct device *, void *); CFATTACH_DECL(joy_isa, sizeof(struct joy_softc), joy_isa_probe, joy_isa_attach, NULL, NULL); diff --git a/sys/dev/isa/lpt_isa.c b/sys/dev/isa/lpt_isa.c index 392b5bd2a14..bfd5b5a4054 100644 --- a/sys/dev/isa/lpt_isa.c +++ b/sys/dev/isa/lpt_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: lpt_isa.c,v 1.58 2004/09/14 20:20:48 drochner Exp $ */ +/* $NetBSD: lpt_isa.c,v 1.59 2005/02/04 02:10:40 perry Exp $ */ /* * Copyright (c) 1993, 1994 Charles M. Hannum. @@ -54,7 +54,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lpt_isa.c,v 1.58 2004/09/14 20:20:48 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lpt_isa.c,v 1.59 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -90,14 +90,14 @@ struct lpt_isa_softc { }; -int lpt_isa_probe __P((struct device *, struct cfdata *, void *)); -void lpt_isa_attach __P((struct device *, struct device *, void *)); +int lpt_isa_probe(struct device *, struct cfdata *, void *); +void lpt_isa_attach(struct device *, struct device *, void *); CFATTACH_DECL(lpt_isa, sizeof(struct lpt_isa_softc), lpt_isa_probe, lpt_isa_attach, NULL, NULL); -int lpt_port_test __P((bus_space_tag_t, bus_space_handle_t, bus_addr_t, - bus_size_t, u_char, u_char)); +int lpt_port_test(bus_space_tag_t, bus_space_handle_t, bus_addr_t, + bus_size_t, u_char, u_char); /* * Internal routine to lptprobe to do port tests of one byte value. diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c index 5b96ad30d70..fee6ceb9a5c 100644 --- a/sys/dev/isa/mcd.c +++ b/sys/dev/isa/mcd.c @@ -1,4 +1,4 @@ -/* $NetBSD: mcd.c,v 1.87 2004/10/28 07:07:40 yamt Exp $ */ +/* $NetBSD: mcd.c,v 1.88 2005/02/04 02:10:40 perry Exp $ */ /* * Copyright (c) 1993, 1994, 1995 Charles M. Hannum. All rights reserved. @@ -56,7 +56,7 @@ /*static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";*/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.87 2004/10/28 07:07:40 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.88 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -156,40 +156,40 @@ struct mcd_softc { u_char probe; }; -static int bcd2bin __P((bcd_t)); -static bcd_t bin2bcd __P((int)); -static void hsg2msf __P((int, bcd_t *)); -static daddr_t msf2hsg __P((bcd_t *, int)); - -int mcd_playtracks __P((struct mcd_softc *, struct ioc_play_track *)); -int mcd_playmsf __P((struct mcd_softc *, struct ioc_play_msf *)); -int mcd_playblocks __P((struct mcd_softc *, struct ioc_play_blocks *)); -int mcd_stop __P((struct mcd_softc *)); -int mcd_eject __P((struct mcd_softc *)); -int mcd_read_subchannel __P((struct mcd_softc *, struct ioc_read_subchannel *)); -int mcd_pause __P((struct mcd_softc *)); -int mcd_resume __P((struct mcd_softc *)); -int mcd_toc_header __P((struct mcd_softc *, struct ioc_toc_header *)); -int mcd_toc_entries __P((struct mcd_softc *, struct ioc_read_toc_entry *)); - -int mcd_getreply __P((struct mcd_softc *)); -int mcd_getstat __P((struct mcd_softc *)); -int mcd_getresult __P((struct mcd_softc *, struct mcd_result *)); -void mcd_setflags __P((struct mcd_softc *)); -int mcd_get __P((struct mcd_softc *, char *, int)); -int mcd_send __P((struct mcd_softc *, struct mcd_mbox *, int)); -int mcdintr __P((void *)); -void mcd_soft_reset __P((struct mcd_softc *)); -int mcd_hard_reset __P((struct mcd_softc *)); -int mcd_setmode __P((struct mcd_softc *, int)); -int mcd_setupc __P((struct mcd_softc *, int)); -int mcd_read_toc __P((struct mcd_softc *)); -int mcd_getqchan __P((struct mcd_softc *, union mcd_qchninfo *, int)); -int mcd_setlock __P((struct mcd_softc *, int)); - -int mcd_find __P((bus_space_tag_t, bus_space_handle_t, struct mcd_softc *)); -int mcdprobe __P((struct device *, struct cfdata *, void *)); -void mcdattach __P((struct device *, struct device *, void *)); +static int bcd2bin(bcd_t); +static bcd_t bin2bcd(int); +static void hsg2msf(int, bcd_t *); +static daddr_t msf2hsg(bcd_t *, int); + +int mcd_playtracks(struct mcd_softc *, struct ioc_play_track *); +int mcd_playmsf(struct mcd_softc *, struct ioc_play_msf *); +int mcd_playblocks(struct mcd_softc *, struct ioc_play_blocks *); +int mcd_stop(struct mcd_softc *); +int mcd_eject(struct mcd_softc *); +int mcd_read_subchannel(struct mcd_softc *, struct ioc_read_subchannel *); +int mcd_pause(struct mcd_softc *); +int mcd_resume(struct mcd_softc *); +int mcd_toc_header(struct mcd_softc *, struct ioc_toc_header *); +int mcd_toc_entries(struct mcd_softc *, struct ioc_read_toc_entry *); + +int mcd_getreply(struct mcd_softc *); +int mcd_getstat(struct mcd_softc *); +int mcd_getresult(struct mcd_softc *, struct mcd_result *); +void mcd_setflags(struct mcd_softc *); +int mcd_get(struct mcd_softc *, char *, int); +int mcd_send(struct mcd_softc *, struct mcd_mbox *, int); +int mcdintr(void *); +void mcd_soft_reset(struct mcd_softc *); +int mcd_hard_reset(struct mcd_softc *); +int mcd_setmode(struct mcd_softc *, int); +int mcd_setupc(struct mcd_softc *, int); +int mcd_read_toc(struct mcd_softc *); +int mcd_getqchan(struct mcd_softc *, union mcd_qchninfo *, int); +int mcd_setlock(struct mcd_softc *, int); + +int mcd_find(bus_space_tag_t, bus_space_handle_t, struct mcd_softc *); +int mcdprobe(struct device *, struct cfdata *, void *); +void mcdattach(struct device *, struct device *, void *); CFATTACH_DECL(mcd, sizeof(struct mcd_softc), mcdprobe, mcdattach, NULL, NULL); @@ -214,11 +214,11 @@ const struct cdevsw mcd_cdevsw = { nostop, notty, nopoll, nommap, nokqfilter, D_DISK }; -void mcdgetdefaultlabel __P((struct mcd_softc *, struct disklabel *)); -void mcdgetdisklabel __P((struct mcd_softc *)); -int mcd_get_parms __P((struct mcd_softc *)); -void mcdstart __P((struct mcd_softc *)); -void mcd_pseudointr __P((void *)); +void mcdgetdefaultlabel(struct mcd_softc *, struct disklabel *); +void mcdgetdisklabel(struct mcd_softc *); +int mcd_get_parms(struct mcd_softc *); +void mcdstart(struct mcd_softc *); +void mcd_pseudointr(void *); struct dkdriver mcddkdriver = { mcdstrategy }; diff --git a/sys/dev/isa/midi_pcppi.c b/sys/dev/isa/midi_pcppi.c index 1a5b35d39a9..419d52f187a 100644 --- a/sys/dev/isa/midi_pcppi.c +++ b/sys/dev/isa/midi_pcppi.c @@ -1,4 +1,4 @@ -/* $NetBSD: midi_pcppi.c,v 1.9 2003/12/04 13:57:30 keihan Exp $ */ +/* $NetBSD: midi_pcppi.c,v 1.10 2005/02/04 02:10:40 perry Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: midi_pcppi.c,v 1.9 2003/12/04 13:57:30 keihan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: midi_pcppi.c,v 1.10 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -65,12 +65,12 @@ struct midi_pcppi_softc { midisyn sc_midisyn; }; -int midi_pcppi_match __P((struct device *, struct cfdata *, void *)); -void midi_pcppi_attach __P((struct device *, struct device *, void *)); +int midi_pcppi_match(struct device *, struct cfdata *, void *); +void midi_pcppi_attach(struct device *, struct device *, void *); -void midi_pcppi_on __P((midisyn *, u_int32_t, u_int32_t, u_int32_t)); -void midi_pcppi_off __P((midisyn *, u_int32_t, u_int32_t, u_int32_t)); -void midi_pcppi_close __P((midisyn *)); +void midi_pcppi_on (midisyn *, u_int32_t, u_int32_t, u_int32_t); +void midi_pcppi_off (midisyn *, u_int32_t, u_int32_t, u_int32_t); +void midi_pcppi_close(midisyn *); CFATTACH_DECL(midi_pcppi, sizeof(struct midi_pcppi_softc), midi_pcppi_match, midi_pcppi_attach, NULL, NULL); diff --git a/sys/dev/isa/moxa_isa.c b/sys/dev/isa/moxa_isa.c index eb957ff0f35..1171c010b45 100644 --- a/sys/dev/isa/moxa_isa.c +++ b/sys/dev/isa/moxa_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: moxa_isa.c,v 1.10 2004/09/14 20:20:48 drochner Exp $ */ +/* $NetBSD: moxa_isa.c,v 1.11 2005/02/04 02:10:40 perry Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: moxa_isa.c,v 1.10 2004/09/14 20:20:48 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: moxa_isa.c,v 1.11 2005/02/04 02:10:40 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -64,9 +64,9 @@ struct moxa_isa_softc { bus_space_handle_t sc_slaveioh[NSLAVES]; }; -int moxa_isaprobe __P((struct device *, struct cfdata *, void *)); -void moxa_isaattach __P((struct device *, struct device *, void *)); -int moxa_isaintr __P((void *)); +int moxa_isaprobe(struct device *, struct cfdata *, void *); +void moxa_isaattach(struct device *, struct device *, void *); +int moxa_isaintr(void *); CFATTACH_DECL(moxa_isa, sizeof(struct moxa_isa_softc), moxa_isaprobe, moxa_isaattach, NULL, NULL); diff --git a/sys/dev/isa/mpu_isa.c b/sys/dev/isa/mpu_isa.c index 4f380325982..e1684d650bd 100644 --- a/sys/dev/isa/mpu_isa.c +++ b/sys/dev/isa/mpu_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: mpu_isa.c,v 1.11 2004/12/02 09:50:42 xtraeme Exp $ */ +/* $NetBSD: mpu_isa.c,v 1.12 2005/02/04 02:10:41 perry Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mpu_isa.c,v 1.11 2004/12/02 09:50:42 xtraeme Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpu_isa.c,v 1.12 2005/02/04 02:10:41 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -60,8 +60,8 @@ struct mpu_isa_softc { void *sc_ih; /* ISA interrupt handler */ }; -int mpu_isa_match __P((struct device *, struct cfdata *, void *)); -void mpu_isa_attach __P((struct device *, struct device *, void *)); +int mpu_isa_match(struct device *, struct cfdata *, void *); +void mpu_isa_attach(struct device *, struct device *, void *); CFATTACH_DECL(mpu_isa, sizeof(struct mpu_isa_softc), mpu_isa_match, mpu_isa_attach, NULL, NULL); diff --git a/sys/dev/isa/mpu_sb.c b/sys/dev/isa/mpu_sb.c index bcf4aeb471a..00d3845410e 100644 --- a/sys/dev/isa/mpu_sb.c +++ b/sys/dev/isa/mpu_sb.c @@ -1,4 +1,4 @@ -/* $NetBSD: mpu_sb.c,v 1.7 2004/12/02 09:50:42 xtraeme Exp $ */ +/* $NetBSD: mpu_sb.c,v 1.8 2005/02/04 02:10:41 perry Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mpu_sb.c,v 1.7 2004/12/02 09:50:42 xtraeme Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpu_sb.c,v 1.8 2005/02/04 02:10:41 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -57,8 +57,8 @@ __KERNEL_RCSID(0, "$NetBSD: mpu_sb.c,v 1.7 2004/12/02 09:50:42 xtraeme Exp $"); #include <dev/isa/isavar.h> #include <dev/isa/sbdspvar.h> -int mpu_sb_match __P((struct device *, struct cfdata *, void *)); -void mpu_sb_attach __P((struct device *, struct device *, void *)); +int mpu_sb_match(struct device *, struct cfdata *, void *); +void mpu_sb_attach(struct device *, struct device *, void *); CFATTACH_DECL(mpu_sb, sizeof(struct mpu_softc), mpu_sb_match, mpu_sb_attach, NULL, NULL); diff --git a/sys/dev/isa/mpu_ym.c b/sys/dev/isa/mpu_ym.c index 2b9079da200..36c37f83a92 100644 --- a/sys/dev/isa/mpu_ym.c +++ b/sys/dev/isa/mpu_ym.c @@ -1,4 +1,4 @@ -/* $NetBSD: mpu_ym.c,v 1.8 2004/12/02 09:50:42 xtraeme Exp $ */ +/* $NetBSD: mpu_ym.c,v 1.9 2005/02/04 02:10:41 perry Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mpu_ym.c,v 1.8 2004/12/02 09:50:42 xtraeme Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpu_ym.c,v 1.9 2005/02/04 02:10:41 perry Exp $"); #define NMPU_YM 1 @@ -62,10 +62,10 @@ __KERNEL_RCSID(0, "$NetBSD: mpu_ym.c,v 1.8 2004/12/02 09:50:42 xtraeme Exp $"); #include <dev/isa/ymvar.h> #include <dev/ic/mpuvar.h> -int mpu_ym_match __P((struct device *, struct cfdata *, void *)); -void mpu_ym_attach __P((struct device *, struct device *, void *)); +int mpu_ym_match(struct device *, struct cfdata *, void *); +void mpu_ym_attach(struct device *, struct device *, void *); #ifndef AUDIO_NO_POWER_CTL -int mpu_ym_power_ctl __P((void *, int)); +int mpu_ym_power_ctl(void *, int); #endif CFATTACH_DECL(mpu_ym, sizeof(struct mpu_softc), diff --git a/sys/dev/isa/nca_isa.c b/sys/dev/isa/nca_isa.c index 07f45b4df15..661ac2ec3a5 100644 --- a/sys/dev/isa/nca_isa.c +++ b/sys/dev/isa/nca_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: nca_isa.c,v 1.13 2004/09/14 20:20:48 drochner Exp $ */ +/* $NetBSD: nca_isa.c,v 1.14 2005/02/04 02:10:41 perry Exp $ */ /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -64,7 +64,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nca_isa.c,v 1.13 2004/09/14 20:20:48 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nca_isa.c,v 1.14 2005/02/04 02:10:41 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -99,11 +99,11 @@ struct nca_isa_probe_data { int sc_host_type; }; -int nca_isa_find __P((bus_space_tag_t, bus_space_handle_t, bus_size_t, - struct nca_isa_probe_data *)); -int nca_isa_match __P((struct device *, struct cfdata *, void *)); -void nca_isa_attach __P((struct device *, struct device *, void *)); -int nca_isa_test __P((bus_space_tag_t, bus_space_handle_t, bus_size_t)); +int nca_isa_find(bus_space_tag_t, bus_space_handle_t, bus_size_t, + struct nca_isa_probe_data *); +int nca_isa_match(struct device *, struct cfdata *, void *); +void nca_isa_attach(struct device *, struct device *, void *); +int nca_isa_test(bus_space_tag_t, bus_space_handle_t, bus_size_t); CFATTACH_DECL(nca_isa, sizeof(struct nca_isa_softc), nca_isa_match, nca_isa_attach, NULL, NULL); diff --git a/sys/dev/isa/nsclpcsio_isa.c b/sys/dev/isa/nsclpcsio_isa.c index d5b312062f2..c9b4013d91f 100644 --- a/sys/dev/isa/nsclpcsio_isa.c +++ b/sys/dev/isa/nsclpcsio_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: nsclpcsio_isa.c,v 1.6 2004/09/14 20:20:49 drochner Exp $ */ +/* $NetBSD: nsclpcsio_isa.c,v 1.7 2005/02/04 02:10:41 perry Exp $ */ /* * Copyright (c) 2002 @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nsclpcsio_isa.c,v 1.6 2004/09/14 20:20:49 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nsclpcsio_isa.c,v 1.7 2005/02/04 02:10:41 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -38,9 +38,8 @@ __KERNEL_RCSID(0, "$NetBSD: nsclpcsio_isa.c,v 1.6 2004/09/14 20:20:49 drochner E #include <dev/isa/isavar.h> #include <dev/sysmon/sysmonvar.h> -static int nsclpcsio_isa_match __P((struct device *, struct cfdata *, void *)); -static void nsclpcsio_isa_attach __P((struct device *, struct device *, - void *)); +static int nsclpcsio_isa_match(struct device *, struct cfdata *, void *); +static void nsclpcsio_isa_attach(struct device *, struct device *, void *); struct nsclpcsio_softc { struct device sc_dev; diff --git a/sys/dev/isa/opl_ess.c b/sys/dev/isa/opl_ess.c index a800cea4894..abb47e481c4 100644 --- a/sys/dev/isa/opl_ess.c +++ b/sys/dev/isa/opl_ess.c @@ -1,4 +1,4 @@ -/* $NetBSD: opl_ess.c,v 1.8 2002/10/02 03:10:49 thorpej Exp $ */ +/* $NetBSD: opl_ess.c,v 1.9 2005/02/04 02:10:41 perry Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: opl_ess.c,v 1.8 2002/10/02 03:10:49 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: opl_ess.c,v 1.9 2005/02/04 02:10:41 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -61,10 +61,10 @@ __KERNEL_RCSID(0, "$NetBSD: opl_ess.c,v 1.8 2002/10/02 03:10:49 thorpej Exp $"); #include <dev/isa/isavar.h> #include <dev/isa/essvar.h> -extern int ess_speaker_ctl __P((void *, int)); +extern int ess_speaker_ctl(void *, int); -int opl_ess_match __P((struct device *, struct cfdata *, void *)); -void opl_ess_attach __P((struct device *, struct device *, void *)); +int opl_ess_match(struct device *, struct cfdata *, void *); +void opl_ess_attach(struct device *, struct device *, void *); CFATTACH_DECL(opl_ess, sizeof(struct opl_softc), opl_ess_match, opl_ess_attach, NULL, NULL); diff --git a/sys/dev/isa/opl_isa.c b/sys/dev/isa/opl_isa.c index 6a2e2ddf3e6..97c9447fbaa 100644 --- a/sys/dev/isa/opl_isa.c +++ b/sys/dev/isa/opl_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: opl_isa.c,v 1.10 2004/09/14 20:20:49 drochner Exp $ */ +/* $NetBSD: opl_isa.c,v 1.11 2005/02/04 02:10:41 perry Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: opl_isa.c,v 1.10 2004/09/14 20:20:49 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: opl_isa.c,v 1.11 2005/02/04 02:10:41 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -63,8 +63,8 @@ __KERNEL_RCSID(0, "$NetBSD: opl_isa.c,v 1.10 2004/09/14 20:20:49 drochner Exp $" #define OPL_SIZE 4 -int opl_isa_match __P((struct device *, struct cfdata *, void *)); -void opl_isa_attach __P((struct device *, struct device *, void *)); +int opl_isa_match(struct device *, struct cfdata *, void *); +void opl_isa_attach(struct device *, struct device *, void *); CFATTACH_DECL(opl_isa, sizeof(struct opl_softc), opl_isa_match, opl_isa_attach, NULL, NULL); diff --git a/sys/dev/isa/opl_sb.c b/sys/dev/isa/opl_sb.c index eedaaf35fc9..a3152afec32 100644 --- a/sys/dev/isa/opl_sb.c +++ b/sys/dev/isa/opl_sb.c @@ -1,4 +1,4 @@ -/* $NetBSD: opl_sb.c,v 1.9 2003/12/04 13:57:30 keihan Exp $ */ +/* $NetBSD: opl_sb.c,v 1.10 2005/02/04 02:10:41 perry Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: opl_sb.c,v 1.9 2003/12/04 13:57:30 keihan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: opl_sb.c,v 1.10 2005/02/04 02:10:41 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -61,8 +61,8 @@ __KERNEL_RCSID(0, "$NetBSD: opl_sb.c,v 1.9 2003/12/04 13:57:30 keihan Exp $"); #include <dev/isa/isavar.h> #include <dev/isa/sbdspvar.h> -int opl_sb_match __P((struct device *, struct cfdata *, void *)); -void opl_sb_attach __P((struct device *, struct device *, void *)); +int opl_sb_match(struct device *, struct cfdata *, void *); +void opl_sb_attach(struct device *, struct device *, void *); CFATTACH_DECL(opl_sb, sizeof(struct opl_softc), opl_sb_match, opl_sb_attach, NULL, NULL); diff --git a/sys/dev/isa/opl_wss.c b/sys/dev/isa/opl_wss.c index f0adfabb4a9..9ae1795b6a6 100644 --- a/sys/dev/isa/opl_wss.c +++ b/sys/dev/isa/opl_wss.c @@ -1,4 +1,4 @@ -/* $NetBSD: opl_wss.c,v 1.5 2002/10/02 03:10:49 thorpej Exp $ */ +/* $NetBSD: opl_wss.c,v 1.6 2005/02/04 02:10:41 perry Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: opl_wss.c,v 1.5 2002/10/02 03:10:49 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: opl_wss.c,v 1.6 2005/02/04 02:10:41 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -61,8 +61,8 @@ __KERNEL_RCSID(0, "$NetBSD: opl_wss.c,v 1.5 2002/10/02 03:10:49 thorpej Exp $"); #include <dev/isa/ad1848var.h> #include <dev/isa/wssvar.h> -int opl_wss_match __P((struct device *, struct cfdata *, void *)); -void opl_wss_attach __P((struct device *, struct device *, void *)); +int opl_wss_match(struct device *, struct cfdata *, void *); +void opl_wss_attach(struct device *, struct device *, void *); CFATTACH_DECL(opl_wss, sizeof(struct opl_softc), opl_wss_match, opl_wss_attach, NULL, NULL); diff --git a/sys/dev/isa/opl_ym.c b/sys/dev/isa/opl_ym.c index f90409f4237..f47bc08c0f2 100644 --- a/sys/dev/isa/opl_ym.c +++ b/sys/dev/isa/opl_ym.c @@ -1,4 +1,4 @@ -/* $NetBSD: opl_ym.c,v 1.7 2004/04/22 00:17:12 itojun Exp $ */ +/* $NetBSD: opl_ym.c,v 1.8 2005/02/04 02:10:41 perry Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: opl_ym.c,v 1.7 2004/04/22 00:17:12 itojun Exp $"); +__KERNEL_RCSID(0, "$NetBSD: opl_ym.c,v 1.8 2005/02/04 02:10:41 perry Exp $"); #include "mpu_ym.h" @@ -64,10 +64,10 @@ __KERNEL_RCSID(0, "$NetBSD: opl_ym.c,v 1.7 2004/04/22 00:17:12 itojun Exp $"); #include <dev/ic/opl3sa3reg.h> #include <dev/isa/ymvar.h> -int opl_ym_match __P((struct device *, struct cfdata *, void *)); -void opl_ym_attach __P((struct device *, struct device *, void *)); +int opl_ym_match(struct device *, struct cfdata *, void *); +void opl_ym_attach(struct device *, struct device *, void *); #ifndef AUDIO_NO_POWER_CTL -int opl_ym_power_ctl __P((void *, int)); +int opl_ym_power_ctl(void *, int); #endif CFATTACH_DECL(opl_ym, sizeof(struct opl_softc), diff --git a/sys/dev/isa/pcdisplay.c b/sys/dev/isa/pcdisplay.c index c0eac959711..1b04f057e24 100644 --- a/sys/dev/isa/pcdisplay.c +++ b/sys/dev/isa/pcdisplay.c @@ -1,4 +1,4 @@ -/* $NetBSD: pcdisplay.c,v 1.26 2004/09/14 20:20:49 drochner Exp $ */ +/* $NetBSD: pcdisplay.c,v 1.27 2005/02/04 02:10:41 perry Exp $ */ /* * Copyright (c) 1998 @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pcdisplay.c,v 1.26 2004/09/14 20:20:49 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pcdisplay.c,v 1.27 2005/02/04 02:10:41 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -71,16 +71,16 @@ struct pcdisplay_softc { static int pcdisplayconsole, pcdisplay_console_attached; static struct pcdisplay_config pcdisplay_console_dc; -int pcdisplay_match __P((struct device *, struct cfdata *, void *)); -void pcdisplay_attach __P((struct device *, struct device *, void *)); +int pcdisplay_match(struct device *, struct cfdata *, void *); +void pcdisplay_attach(struct device *, struct device *, void *); -static int pcdisplay_is_console __P((bus_space_tag_t)); -static int pcdisplay_probe_col __P((bus_space_tag_t, bus_space_tag_t)); -static int pcdisplay_probe_mono __P((bus_space_tag_t, bus_space_tag_t)); -static void pcdisplay_init __P((struct pcdisplay_config *, +static int pcdisplay_is_console(bus_space_tag_t); +static int pcdisplay_probe_col(bus_space_tag_t, bus_space_tag_t); +static int pcdisplay_probe_mono(bus_space_tag_t, bus_space_tag_t); +static void pcdisplay_init(struct pcdisplay_config *, bus_space_tag_t, bus_space_tag_t, - int)); -static int pcdisplay_allocattr __P((void *, int, int, int, long *)); + int); +static int pcdisplay_allocattr(void *, int, int, int, long *); CFATTACH_DECL(pcdisplay, sizeof(struct pcdisplay_softc), pcdisplay_match, pcdisplay_attach, NULL, NULL); @@ -112,13 +112,13 @@ const struct wsscreen_list pcdisplay_screenlist = { _pcdisplay_scrlist }; -static int pcdisplay_ioctl __P((void *, u_long, caddr_t, int, struct proc *)); -static paddr_t pcdisplay_mmap __P((void *, off_t, int)); -static int pcdisplay_alloc_screen __P((void *, const struct wsscreen_descr *, - void **, int *, int *, long *)); -static void pcdisplay_free_screen __P((void *, void *)); -static int pcdisplay_show_screen __P((void *, void *, int, - void (*) (void *, int, int), void *)); +static int pcdisplay_ioctl(void *, u_long, caddr_t, int, struct proc *); +static paddr_t pcdisplay_mmap(void *, off_t, int); +static int pcdisplay_alloc_screen(void *, const struct wsscreen_descr *, + void **, int *, int *, long *); +static void pcdisplay_free_screen(void *, void *); +static int pcdisplay_show_screen(void *, void *, int, + void (*) (void *, int, int), void *); const struct wsdisplay_accessops pcdisplay_accessops = { pcdisplay_ioctl, @@ -436,7 +436,7 @@ pcdisplay_show_screen(v, cookie, waitok, cb, cbarg) void *v; void *cookie; int waitok; - void (*cb) __P((void *, int, int)); + void (*cb)(void *, int, int); void *cbarg; { #ifdef DIAGNOSTIC diff --git a/sys/dev/isa/pcdisplayvar.h b/sys/dev/isa/pcdisplayvar.h index 8f39ae65f01..514ebcac981 100644 --- a/sys/dev/isa/pcdisplayvar.h +++ b/sys/dev/isa/pcdisplayvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: pcdisplayvar.h,v 1.2 2004/03/24 17:26:53 drochner Exp $ */ +/* $NetBSD: pcdisplayvar.h,v 1.3 2005/02/04 02:10:41 perry Exp $ */ /* * Copyright (c) 1998 @@ -26,4 +26,4 @@ * */ -int pcdisplay_cnattach __P((bus_space_tag_t, bus_space_tag_t)); +int pcdisplay_cnattach(bus_space_tag_t, bus_space_tag_t); diff --git a/sys/dev/isa/pckbc_isa.c b/sys/dev/isa/pckbc_isa.c index 0a6962e4d77..e545148b069 100644 --- a/sys/dev/isa/pckbc_isa.c +++ b/sys/dev/isa/pckbc_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: pckbc_isa.c,v 1.14 2004/09/14 20:20:49 drochner Exp $ */ +/* $NetBSD: pckbc_isa.c,v 1.15 2005/02/04 02:10:41 perry Exp $ */ /* * Copyright (c) 1998 @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pckbc_isa.c,v 1.14 2004/09/14 20:20:49 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pckbc_isa.c,v 1.15 2005/02/04 02:10:41 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -46,8 +46,8 @@ __KERNEL_RCSID(0, "$NetBSD: pckbc_isa.c,v 1.14 2004/09/14 20:20:49 drochner Exp #include <dev/ic/i8042reg.h> #include <dev/ic/pckbcvar.h> -int pckbc_isa_match __P((struct device *, struct cfdata *, void *)); -void pckbc_isa_attach __P((struct device *, struct device *, void *)); +int pckbc_isa_match(struct device *, struct cfdata *, void *); +void pckbc_isa_attach(struct device *, struct device *, void *); struct pckbc_isa_softc { struct pckbc_softc sc_pckbc; @@ -59,7 +59,7 @@ struct pckbc_isa_softc { CFATTACH_DECL(pckbc_isa, sizeof(struct pckbc_isa_softc), pckbc_isa_match, pckbc_isa_attach, NULL, NULL); -void pckbc_isa_intr_establish __P((struct pckbc_softc *, pckbc_slot_t)); +void pckbc_isa_intr_establish(struct pckbc_softc *, pckbc_slot_t); int pckbc_isa_match(parent, match, aux) diff --git a/sys/dev/isa/pcppi.c b/sys/dev/isa/pcppi.c index 78ddd59954c..86013ed5e61 100644 --- a/sys/dev/isa/pcppi.c +++ b/sys/dev/isa/pcppi.c @@ -1,4 +1,4 @@ -/* $NetBSD: pcppi.c,v 1.11 2004/09/14 20:20:49 drochner Exp $ */ +/* $NetBSD: pcppi.c,v 1.12 2005/02/04 02:10:41 perry Exp $ */ /* * Copyright (c) 1996 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pcppi.c,v 1.11 2004/09/14 20:20:49 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pcppi.c,v 1.12 2005/02/04 02:10:41 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: pcppi.c,v 1.11 2004/09/14 20:20:49 drochner Exp $"); #if NPCKBD > 0 #include <dev/pckbport/pckbdvar.h> -void pcppi_pckbd_bell __P((void *, u_int, u_int, u_int, int)); +void pcppi_pckbd_bell(void *, u_int, u_int, u_int, int); #endif struct pcppi_softc { @@ -67,13 +67,13 @@ struct pcppi_softc { int sc_timeout; }; -int pcppi_match __P((struct device *, struct cfdata *, void *)); -void pcppi_attach __P((struct device *, struct device *, void *)); +int pcppi_match(struct device *, struct cfdata *, void *); +void pcppi_attach(struct device *, struct device *, void *); CFATTACH_DECL(pcppi, sizeof(struct pcppi_softc), pcppi_match, pcppi_attach, NULL, NULL); -static void pcppi_bell_stop __P((void*)); +static void pcppi_bell_stop(void*); #define PCPPIPRI (PZERO - 1) diff --git a/sys/dev/isa/pcppivar.h b/sys/dev/isa/pcppivar.h index 31cb4928d08..5eb4c89da7e 100644 --- a/sys/dev/isa/pcppivar.h +++ b/sys/dev/isa/pcppivar.h @@ -1,4 +1,4 @@ -/* $NetBSD: pcppivar.h,v 1.2 2000/03/06 21:40:08 thorpej Exp $ */ +/* $NetBSD: pcppivar.h,v 1.3 2005/02/04 02:10:41 perry Exp $ */ /* * Copyright (c) 1996 Carnegie-Mellon University. @@ -36,4 +36,4 @@ struct pcppi_attach_args { #define PCPPI_BELL_SLEEP 0x01 /* synchronous; sleep for complete */ #define PCPPI_BELL_POLL 0x02 /* synchronous; poll for complete */ -void pcppi_bell __P((pcppi_tag_t, int, int, int)); +void pcppi_bell(pcppi_tag_t, int, int, int); diff --git a/sys/dev/isa/pss.c b/sys/dev/isa/pss.c index 5fc7d2d0076..bdfeaa1c7e1 100644 --- a/sys/dev/isa/pss.c +++ b/sys/dev/isa/pss.c @@ -1,4 +1,4 @@ -/* $NetBSD: pss.c,v 1.66 2004/10/29 12:57:17 yamt Exp $ */ +/* $NetBSD: pss.c,v 1.67 2005/02/04 02:10:41 perry Exp $ */ /* XXX THIS DRIVER IS BROKEN. IT WILL NOT EVEN COMPILE. */ @@ -53,7 +53,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pss.c,v 1.66 2004/10/29 12:57:17 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pss.c,v 1.67 2005/02/04 02:10:41 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -154,63 +154,63 @@ int pssdebug = 0; #define DPRINTF(x) #endif -int pssprobe __P((struct device *, struct cfdata *, void *)); -void pssattach __P((struct device *, struct device *, void *)); -static int pssfind __P((struct device *, struct pss_softc *, - struct isa_attach_args *)); +int pssprobe(struct device *, struct cfdata *, void *); +void pssattach(struct device *, struct device *, void *); +static int pssfind(struct device *, struct pss_softc *, + struct isa_attach_args *); -int spprobe __P((struct device *, struct cfdata *, void *)); -void spattach __P((struct device *, struct device *, void *)); -static int spfind __P((struct device *, struct ad1848_isa_softc *, - struct isa_attach_args *)); +int spprobe(struct device *, struct cfdata *, void *); +void spattach(struct device *, struct device *, void *); +static int spfind(struct device *, struct ad1848_isa_softc *, + struct isa_attach_args *); #ifdef notyet -int mpuprobe __P((struct device *, struct cfdata *, void *)); -void mpuattach __P((struct device *, struct device *, void *)); +int mpuprobe(struct device *, struct cfdata *, void *); +void mpuattach(struct device *, struct device *, void *); -int pcdprobe __P((struct device *, struct cfdata *, void *)); -void pcdattach __P((struct device *, struct device *, void *)); +int pcdprobe(struct device *, struct cfdata *, void *); +void pcdattach(struct device *, struct device *, void *); #endif -int pssintr __P((void *)); +int pssintr(void *); #ifdef notyet -int mpuintr __P((void *)); +int mpuintr(void *); #endif -int pss_speaker_ctl __P((void *, int)); +int pss_speaker_ctl(void *, int); -int pss_getdev __P((void *, struct audio_device *)); +int pss_getdev(void *, struct audio_device *); -int pss_mixer_set_port __P((void *, mixer_ctrl_t *)); -int pss_mixer_get_port __P((void *, mixer_ctrl_t *)); -int pss_query_devinfo __P((void *, mixer_devinfo_t *)); +int pss_mixer_set_port(void *, mixer_ctrl_t *); +int pss_mixer_get_port(void *, mixer_ctrl_t *); +int pss_query_devinfo(void *, mixer_devinfo_t *); #ifdef PSS_DSP -void pss_dspwrite __P((struct pss_softc *, int)); +void pss_dspwrite(struct pss_softc *, int); #endif -void pss_setaddr __P((int, int)); -int pss_setint __P((int, int)); -int pss_setdma __P((int, int)); -int pss_testirq __P((struct pss_softc *, int)); -int pss_testdma __P((struct pss_softc *, int)); +void pss_setaddr(int, int); +int pss_setint(int, int); +int pss_setdma(int, int); +int pss_testirq(struct pss_softc *, int); +int pss_testdma(struct pss_softc *, int); #ifdef notyet -int pss_reset_dsp __P((struct pss_softc *)); -int pss_download_dsp __P((struct pss_softc *, u_char *, int)); +int pss_reset_dsp(struct pss_softc *); +int pss_download_dsp(struct pss_softc *, u_char *, int); #endif #ifdef AUDIO_DEBUG -void pss_dump_regs __P((struct pss_softc *)); +void pss_dump_regs(struct pss_softc *); #endif -int pss_set_master_gain __P((struct pss_softc *, struct ad1848_volume *)); -int pss_set_master_mode __P((struct pss_softc *, int)); -int pss_set_treble __P((struct pss_softc *, u_int)); -int pss_set_bass __P((struct pss_softc *, u_int)); -int pss_get_master_gain __P((struct pss_softc *, struct ad1848_volume *)); -int pss_get_master_mode __P((struct pss_softc *, u_int *)); -int pss_get_treble __P((struct pss_softc *, u_char *)); -int pss_get_bass __P((struct pss_softc *, u_char *)); +int pss_set_master_gain(struct pss_softc *, struct ad1848_volume *); +int pss_set_master_mode(struct pss_softc *, int); +int pss_set_treble(struct pss_softc *, u_int); +int pss_set_bass(struct pss_softc *, u_int); +int pss_get_master_gain(struct pss_softc *, struct ad1848_volume *); +int pss_get_master_mode(struct pss_softc *, u_int *); +int pss_get_treble(struct pss_softc *, u_char *); +int pss_get_bass(struct pss_softc *, u_char *); #ifdef AUDIO_DEBUG -void wss_dump_regs __P((struct ad1848_isa_softc *)); +void wss_dump_regs(struct ad1848_isa_softc *); #endif /* diff --git a/sys/dev/isa/rtfps.c b/sys/dev/isa/rtfps.c index 624cb094e46..34cffac94a0 100644 --- a/sys/dev/isa/rtfps.c +++ b/sys/dev/isa/rtfps.c @@ -1,4 +1,4 @@ -/* $NetBSD: rtfps.c,v 1.48 2004/09/14 20:20:49 drochner Exp $ */ +/* $NetBSD: rtfps.c,v 1.49 2005/02/04 02:10:41 perry Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rtfps.c,v 1.48 2004/09/14 20:20:49 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtfps.c,v 1.49 2005/02/04 02:10:41 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -66,9 +66,9 @@ struct rtfps_softc { bus_space_handle_t sc_slaveioh[NSLAVES]; }; -int rtfpsprobe __P((struct device *, struct cfdata *, void *)); -void rtfpsattach __P((struct device *, struct device *, void *)); -int rtfpsintr __P((void *)); +int rtfpsprobe(struct device *, struct cfdata *, void *); +void rtfpsattach(struct device *, struct device *, void *); +int rtfpsintr(void *); CFATTACH_DECL(rtfps, sizeof(struct rtfps_softc), rtfpsprobe, rtfpsattach, NULL, NULL); diff --git a/sys/dev/isa/satlink.c b/sys/dev/isa/satlink.c index f8ec3f7fcc3..2c249c45eae 100644 --- a/sys/dev/isa/satlink.c +++ b/sys/dev/isa/satlink.c @@ -1,4 +1,4 @@ -/* $NetBSD: satlink.c,v 1.23 2004/09/14 20:20:49 drochner Exp $ */ +/* $NetBSD: satlink.c,v 1.24 2005/02/04 02:10:41 perry Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: satlink.c,v 1.23 2004/09/14 20:20:49 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: satlink.c,v 1.24 2005/02/04 02:10:41 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -100,9 +100,9 @@ struct satlink_softc { */ #define SATLINK_TIMEOUT (hz/10) -int satlinkprobe __P((struct device *, struct cfdata *, void *)); -void satlinkattach __P((struct device *, struct device *, void *)); -void satlinktimeout __P((void *)); +int satlinkprobe(struct device *, struct cfdata *, void *); +void satlinkattach(struct device *, struct device *, void *); +void satlinktimeout(void *); CFATTACH_DECL(satlink, sizeof(struct satlink_softc), satlinkprobe, satlinkattach, NULL, NULL); diff --git a/sys/dev/isa/sb_isa.c b/sys/dev/isa/sb_isa.c index 45265a910d3..43a75e99e9e 100644 --- a/sys/dev/isa/sb_isa.c +++ b/sys/dev/isa/sb_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: sb_isa.c,v 1.29 2002/10/02 03:10:50 thorpej Exp $ */ +/* $NetBSD: sb_isa.c,v 1.30 2005/02/04 02:10:41 perry Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sb_isa.c,v 1.29 2002/10/02 03:10:50 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sb_isa.c,v 1.30 2005/02/04 02:10:41 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -60,11 +60,11 @@ __KERNEL_RCSID(0, "$NetBSD: sb_isa.c,v 1.29 2002/10/02 03:10:50 thorpej Exp $"); #include <dev/isa/sbdspvar.h> -static int sbfind __P((struct device *, struct sbdsp_softc *, int, - struct isa_attach_args *)); +static int sbfind(struct device *, struct sbdsp_softc *, int, + struct isa_attach_args *); -int sb_isa_match __P((struct device *, struct cfdata *, void *)); -void sb_isa_attach __P((struct device *, struct device *, void *)); +int sb_isa_match(struct device *, struct cfdata *, void *); +void sb_isa_attach(struct device *, struct device *, void *); CFATTACH_DECL(sb_isa, sizeof(struct sbdsp_softc), sb_isa_match, sb_isa_attach, NULL, NULL); diff --git a/sys/dev/isa/seagate.c b/sys/dev/isa/seagate.c index 5224a4bbd9c..0ec99908e31 100644 --- a/sys/dev/isa/seagate.c +++ b/sys/dev/isa/seagate.c @@ -1,4 +1,4 @@ -/* $NetBSD: seagate.c,v 1.55 2004/09/14 20:20:49 drochner Exp $ */ +/* $NetBSD: seagate.c,v 1.56 2005/02/04 02:10:41 perry Exp $ */ /* * ST01/02, Future Domain TMC-885, TMC-950 SCSI driver @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: seagate.c,v 1.55 2004/09/14 20:20:49 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: seagate.c,v 1.56 2005/02/04 02:10:41 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -275,28 +275,27 @@ static const char *bases[] = { #define nbases (sizeof(bases) / sizeof(bases[0])) #endif -int seaintr __P((void *)); -void sea_scsipi_request __P((struct scsipi_channel *, - scsipi_adapter_req_t, void *)); -void sea_timeout __P((void *)); -void sea_done __P((struct sea_softc *, struct sea_scb *)); -struct sea_scb *sea_get_scb __P((struct sea_softc *, int)); -void sea_free_scb __P((struct sea_softc *, struct sea_scb *, int)); -static void sea_main __P((void)); -static void sea_information_transfer __P((struct sea_softc *)); -int sea_poll __P((struct sea_softc *, struct scsipi_xfer *, int)); -void sea_init __P((struct sea_softc *)); -void sea_send_scb __P((struct sea_softc *sea, struct sea_scb *scb)); -void sea_reselect __P((struct sea_softc *sea)); -int sea_select __P((struct sea_softc *sea, struct sea_scb *scb)); -int sea_transfer_pio __P((struct sea_softc *sea, u_char *phase, - int *count, u_char **data)); -int sea_abort __P((struct sea_softc *, struct sea_scb *scb)); - -void sea_grow_scb __P((struct sea_softc *)); - -int seaprobe __P((struct device *, struct cfdata *, void *)); -void seaattach __P((struct device *, struct device *, void *)); +int seaintr(void *); +void sea_scsipi_request(struct scsipi_channel *, scsipi_adapter_req_t, void *); +void sea_timeout(void *); +void sea_done(struct sea_softc *, struct sea_scb *); +struct sea_scb *sea_get_scb(struct sea_softc *, int); +void sea_free_scb(struct sea_softc *, struct sea_scb *, int); +static void sea_main(void); +static void sea_information_transfer(struct sea_softc *); +int sea_poll(struct sea_softc *, struct scsipi_xfer *, int); +void sea_init(struct sea_softc *); +void sea_send_scb(struct sea_softc *sea, struct sea_scb *scb); +void sea_reselect(struct sea_softc *sea); +int sea_select(struct sea_softc *sea, struct sea_scb *scb); +int sea_transfer_pio(struct sea_softc *sea, u_char *phase, + int *count, u_char **data); +int sea_abort(struct sea_softc *, struct sea_scb *scb); + +void sea_grow_scb(struct sea_softc *); + +int seaprobe(struct device *, struct cfdata *, void *); +void seaattach(struct device *, struct device *, void *); CFATTACH_DECL(sea, sizeof(struct sea_softc), seaprobe, seaattach, NULL, NULL); diff --git a/sys/dev/isa/spkr.c b/sys/dev/isa/spkr.c index ea71d2a96f6..ab6da9b0100 100644 --- a/sys/dev/isa/spkr.c +++ b/sys/dev/isa/spkr.c @@ -1,4 +1,4 @@ -/* $NetBSD: spkr.c,v 1.15 2003/06/29 22:30:22 fvdl Exp $ */ +/* $NetBSD: spkr.c,v 1.16 2005/02/04 02:10:41 perry Exp $ */ /* * Copyright (c) 1990 Eric S. Raymond (esr@snark.thyrsus.com) @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.15 2003/06/29 22:30:22 fvdl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.16 2005/02/04 02:10:41 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -60,8 +60,8 @@ __KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.15 2003/06/29 22:30:22 fvdl Exp $"); #include <dev/isa/spkrio.h> -int spkrprobe __P((struct device *, struct cfdata *, void *)); -void spkrattach __P((struct device *, struct device *, void *)); +int spkrprobe(struct device *, struct cfdata *, void *); +void spkrattach(struct device *, struct device *, void *); struct spkr_softc { struct device sc_dev; @@ -84,11 +84,11 @@ static pcppi_tag_t ppicookie; #define SPKRPRI (PZERO - 1) -static void tone __P((u_int, u_int)); -static void rest __P((int)); -static void playinit __P((void)); -static void playtone __P((int, int, int)); -static void playstring __P((char *, int)); +static void tone(u_int, u_int); +static void rest(int); +static void playinit(void); +static void playtone(int, int, int); +static void playstring(char *, int); static void tone(hz, ticks) diff --git a/sys/dev/isa/tcic2_isa.c b/sys/dev/isa/tcic2_isa.c index 7f1386d0db6..0da12adbfd0 100644 --- a/sys/dev/isa/tcic2_isa.c +++ b/sys/dev/isa/tcic2_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: tcic2_isa.c,v 1.11 2004/09/14 20:20:49 drochner Exp $ */ +/* $NetBSD: tcic2_isa.c,v 1.12 2005/02/04 02:10:41 perry Exp $ */ /* * @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tcic2_isa.c,v 1.11 2004/09/14 20:20:49 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tcic2_isa.c,v 1.12 2005/02/04 02:10:41 perry Exp $"); #undef TCICISADEBUG @@ -110,12 +110,12 @@ int tcic_isa_debug = 1; #define DPRINTF(arg) #endif -int tcic_isa_probe __P((struct device *, struct cfdata *, void *)); -void tcic_isa_attach __P((struct device *, struct device *, void *)); +int tcic_isa_probe(struct device *, struct cfdata *, void *); +void tcic_isa_attach(struct device *, struct device *, void *); -void *tcic_isa_chip_intr_establish __P((pcmcia_chipset_handle_t, - struct pcmcia_function *, int, int (*) (void *), void *)); -void tcic_isa_chip_intr_disestablish __P((pcmcia_chipset_handle_t, void *)); +void *tcic_isa_chip_intr_establish(pcmcia_chipset_handle_t, + struct pcmcia_function *, int, int (*) (void *), void *); +void tcic_isa_chip_intr_disestablish(pcmcia_chipset_handle_t, void *); CFATTACH_DECL(tcic_isa, sizeof(struct tcic_softc), tcic_isa_probe, tcic_isa_attach, NULL, NULL); @@ -343,7 +343,7 @@ tcic_isa_chip_intr_establish(pch, pf, ipl, fct, arg) pcmcia_chipset_handle_t pch; struct pcmcia_function *pf; int ipl; - int (*fct) __P((void *)); + int (*fct)(void *); void *arg; { struct tcic_handle *h = (struct tcic_handle *) pch; diff --git a/sys/dev/isa/tcom.c b/sys/dev/isa/tcom.c index b3160334f9c..9c6cc0f27ca 100644 --- a/sys/dev/isa/tcom.c +++ b/sys/dev/isa/tcom.c @@ -1,4 +1,4 @@ -/* $NetBSD: tcom.c,v 1.9 2004/09/14 20:20:49 drochner Exp $ */ +/* $NetBSD: tcom.c,v 1.10 2005/02/04 02:10:41 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tcom.c,v 1.9 2004/09/14 20:20:49 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tcom.c,v 1.10 2005/02/04 02:10:41 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -110,9 +110,9 @@ struct tcom_softc { bus_space_handle_t sc_statusioh; }; -int tcomprobe __P((struct device *, struct cfdata *, void *)); -void tcomattach __P((struct device *, struct device *, void *)); -int tcomintr __P((void *)); +int tcomprobe(struct device *, struct cfdata *, void *); +void tcomattach(struct device *, struct device *, void *); +int tcomintr(void *); CFATTACH_DECL(tcom, sizeof(struct tcom_softc), tcomprobe, tcomattach, NULL, NULL); diff --git a/sys/dev/isa/uha_isa.c b/sys/dev/isa/uha_isa.c index 3c3e90cd491..0c1e11ab46c 100644 --- a/sys/dev/isa/uha_isa.c +++ b/sys/dev/isa/uha_isa.c @@ -1,4 +1,4 @@ -/* $NetBSD: uha_isa.c,v 1.27 2004/09/14 20:20:49 drochner Exp $ */ +/* $NetBSD: uha_isa.c,v 1.28 2005/02/04 02:10:41 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uha_isa.c,v 1.27 2004/09/14 20:20:49 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uha_isa.c,v 1.28 2005/02/04 02:10:41 perry Exp $"); #include "opt_ddb.h" @@ -63,8 +63,8 @@ __KERNEL_RCSID(0, "$NetBSD: uha_isa.c,v 1.27 2004/09/14 20:20:49 drochner Exp $" #define UHA_ISA_IOSIZE 16 -int uha_isa_probe __P((struct device *, struct cfdata *, void *)); -void uha_isa_attach __P((struct device *, struct device *, void *)); +int uha_isa_probe(struct device *, struct cfdata *, void *); +void uha_isa_attach(struct device *, struct device *, void *); CFATTACH_DECL(uha_isa, sizeof(struct uha_softc), uha_isa_probe, uha_isa_attach, NULL, NULL); @@ -73,12 +73,11 @@ CFATTACH_DECL(uha_isa, sizeof(struct uha_softc), #define Debugger() panic("should call debugger here (uha_isa.c)") #endif /* ! DDB */ -int u14_find __P((bus_space_tag_t, bus_space_handle_t, - struct uha_probe_data *)); -void u14_start_mbox __P((struct uha_softc *, struct uha_mscp *)); -int u14_poll __P((struct uha_softc *, struct scsipi_xfer *, int)); -int u14_intr __P((void *)); -void u14_init __P((struct uha_softc *)); +int u14_find(bus_space_tag_t, bus_space_handle_t, struct uha_probe_data *); +void u14_start_mbox(struct uha_softc *, struct uha_mscp *); +int u14_poll(struct uha_softc *, struct scsipi_xfer *, int); +int u14_intr(void *); +void u14_init(struct uha_softc *); /* * Check the slots looking for a board we recognise diff --git a/sys/dev/isa/vga_isavar.h b/sys/dev/isa/vga_isavar.h index c76ec81f79c..fec7f17b7cf 100644 --- a/sys/dev/isa/vga_isavar.h +++ b/sys/dev/isa/vga_isavar.h @@ -1,4 +1,4 @@ -/* $NetBSD: vga_isavar.h,v 1.1 1998/03/22 15:14:36 drochner Exp $ */ +/* $NetBSD: vga_isavar.h,v 1.2 2005/02/04 02:10:41 perry Exp $ */ /* * Copyright (c) 1996 Carnegie-Mellon University. @@ -27,4 +27,4 @@ * rights to redistribute these changes. */ -int vga_isa_cnattach __P((bus_space_tag_t, bus_space_tag_t)); +int vga_isa_cnattach(bus_space_tag_t, bus_space_tag_t); diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c index f85e499a71d..e9c9c8183c6 100644 --- a/sys/dev/isa/wds.c +++ b/sys/dev/isa/wds.c @@ -1,4 +1,4 @@ -/* $NetBSD: wds.c,v 1.59 2004/12/07 14:50:56 thorpej Exp $ */ +/* $NetBSD: wds.c,v 1.60 2005/02/04 02:10:41 perry Exp $ */ /* * XXX @@ -86,7 +86,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wds.c,v 1.59 2004/12/07 14:50:56 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wds.c,v 1.60 2005/02/04 02:10:41 perry Exp $"); #include "opt_ddb.h" @@ -181,33 +181,33 @@ struct wds_probe_data { }; integrate void - wds_wait __P((bus_space_tag_t, bus_space_handle_t, int, int, int)); -int wds_cmd __P((bus_space_tag_t, bus_space_handle_t, u_char *, int)); -integrate void wds_finish_scbs __P((struct wds_softc *)); -int wdsintr __P((void *)); -integrate void wds_reset_scb __P((struct wds_softc *, struct wds_scb *)); -void wds_free_scb __P((struct wds_softc *, struct wds_scb *)); -integrate int wds_init_scb __P((struct wds_softc *, struct wds_scb *)); -struct wds_scb *wds_get_scb __P((struct wds_softc *)); -struct wds_scb *wds_scb_phys_kv __P((struct wds_softc *, u_long)); -void wds_queue_scb __P((struct wds_softc *, struct wds_scb *)); -void wds_collect_mbo __P((struct wds_softc *)); -void wds_start_scbs __P((struct wds_softc *)); -void wds_done __P((struct wds_softc *, struct wds_scb *, u_char)); -int wds_find __P((bus_space_tag_t, bus_space_handle_t, struct wds_probe_data *)); -void wds_attach __P((struct wds_softc *, struct wds_probe_data *)); -void wds_init __P((struct wds_softc *, int)); -void wds_inquire_setup_information __P((struct wds_softc *)); -void wdsminphys __P((struct buf *)); -void wds_scsipi_request __P((struct scsipi_channel *, - scsipi_adapter_req_t, void *)); -int wds_poll __P((struct wds_softc *, struct scsipi_xfer *, int)); -int wds_ipoll __P((struct wds_softc *, struct wds_scb *, int)); -void wds_timeout __P((void *)); -int wds_create_scbs __P((struct wds_softc *, void *, size_t)); - -int wdsprobe __P((struct device *, struct cfdata *, void *)); -void wdsattach __P((struct device *, struct device *, void *)); + wds_wait(bus_space_tag_t, bus_space_handle_t, int, int, int); +int wds_cmd(bus_space_tag_t, bus_space_handle_t, u_char *, int); +integrate void wds_finish_scbs(struct wds_softc *); +int wdsintr(void *); +integrate void wds_reset_scb(struct wds_softc *, struct wds_scb *); +void wds_free_scb(struct wds_softc *, struct wds_scb *); +integrate int wds_init_scb(struct wds_softc *, struct wds_scb *); +struct wds_scb *wds_get_scb(struct wds_softc *); +struct wds_scb *wds_scb_phys_kv(struct wds_softc *, u_long); +void wds_queue_scb(struct wds_softc *, struct wds_scb *); +void wds_collect_mbo(struct wds_softc *); +void wds_start_scbs(struct wds_softc *); +void wds_done(struct wds_softc *, struct wds_scb *, u_char); +int wds_find(bus_space_tag_t, bus_space_handle_t, struct wds_probe_data *); +void wds_attach(struct wds_softc *, struct wds_probe_data *); +void wds_init(struct wds_softc *, int); +void wds_inquire_setup_information(struct wds_softc *); +void wdsminphys(struct buf *); +void wds_scsipi_request(struct scsipi_channel *, + scsipi_adapter_req_t, void *); +int wds_poll(struct wds_softc *, struct scsipi_xfer *, int); +int wds_ipoll(struct wds_softc *, struct wds_scb *, int); +void wds_timeout(void *); +int wds_create_scbs(struct wds_softc *, void *, size_t); + +int wdsprobe(struct device *, struct cfdata *, void *); +void wdsattach(struct device *, struct device *, void *); CFATTACH_DECL(wds, sizeof(struct wds_softc), wdsprobe, wdsattach, NULL, NULL); diff --git a/sys/dev/isa/wt.c b/sys/dev/isa/wt.c index b1661d07f9d..e41b3abba8a 100644 --- a/sys/dev/isa/wt.c +++ b/sys/dev/isa/wt.c @@ -1,4 +1,4 @@ -/* $NetBSD: wt.c,v 1.62 2004/09/14 20:20:49 drochner Exp $ */ +/* $NetBSD: wt.c,v 1.63 2005/02/04 02:10:41 perry Exp $ */ /* * Streamer tape driver. @@ -51,7 +51,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wt.c,v 1.62 2004/09/14 20:20:49 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wt.c,v 1.63 2005/02/04 02:10:41 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -165,23 +165,23 @@ const struct cdevsw wt_cdevsw = { nostop, notty, nopoll, nommap, nokqfilter, D_TAPE }; -int wtwait __P((struct wt_softc *sc, int catch, char *msg)); -int wtcmd __P((struct wt_softc *sc, int cmd)); -int wtstart __P((struct wt_softc *sc, int flag, void *vaddr, size_t len)); -void wtdma __P((struct wt_softc *sc)); -void wttimer __P((void *arg)); -void wtclock __P((struct wt_softc *sc)); -int wtreset __P((bus_space_tag_t, bus_space_handle_t, struct wtregs *)); -int wtsense __P((struct wt_softc *sc, int verbose, int ignore)); -int wtstatus __P((struct wt_softc *sc)); -void wtrewind __P((struct wt_softc *sc)); -int wtreadfm __P((struct wt_softc *sc)); -int wtwritefm __P((struct wt_softc *sc)); -u_char wtsoft __P((struct wt_softc *sc, int mask, int bits)); - -int wtprobe __P((struct device *, struct cfdata *, void *)); -void wtattach __P((struct device *, struct device *, void *)); -int wtintr __P((void *sc)); +int wtwait(struct wt_softc *sc, int catch, char *msg); +int wtcmd(struct wt_softc *sc, int cmd); +int wtstart(struct wt_softc *sc, int flag, void *vaddr, size_t len); +void wtdma(struct wt_softc *sc); +void wttimer(void *arg); +void wtclock(struct wt_softc *sc); +int wtreset(bus_space_tag_t, bus_space_handle_t, struct wtregs *); +int wtsense(struct wt_softc *sc, int verbose, int ignore); +int wtstatus(struct wt_softc *sc); +void wtrewind(struct wt_softc *sc); +int wtreadfm(struct wt_softc *sc); +int wtwritefm(struct wt_softc *sc); +u_char wtsoft(struct wt_softc *sc, int mask, int bits); + +int wtprobe(struct device *, struct cfdata *, void *); +void wtattach(struct device *, struct device *, void *); +int wtintr(void *sc); CFATTACH_DECL(wt, sizeof(struct wt_softc), wtprobe, wtattach, NULL, NULL); diff --git a/sys/dev/isapnp/aha_isapnp.c b/sys/dev/isapnp/aha_isapnp.c index 3022723f246..0336fd36cd2 100644 --- a/sys/dev/isapnp/aha_isapnp.c +++ b/sys/dev/isapnp/aha_isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: aha_isapnp.c,v 1.7 2002/10/02 16:33:56 thorpej Exp $ */ +/* $NetBSD: aha_isapnp.c,v 1.8 2005/02/04 02:10:43 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aha_isapnp.c,v 1.7 2002/10/02 16:33:56 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aha_isapnp.c,v 1.8 2005/02/04 02:10:43 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -60,8 +60,8 @@ __KERNEL_RCSID(0, "$NetBSD: aha_isapnp.c,v 1.7 2002/10/02 16:33:56 thorpej Exp $ #include <dev/ic/ahareg.h> #include <dev/ic/ahavar.h> -int aha_isapnp_probe __P((struct device *, struct cfdata *, void *)); -void aha_isapnp_attach __P((struct device *, struct device *, void *)); +int aha_isapnp_probe(struct device *, struct cfdata *, void *); +void aha_isapnp_attach(struct device *, struct device *, void *); CFATTACH_DECL(aha_isapnp, sizeof(struct aha_softc), aha_isapnp_probe, aha_isapnp_attach, NULL, NULL); diff --git a/sys/dev/isapnp/aic_isapnp.c b/sys/dev/isapnp/aic_isapnp.c index 0eb9b4a6616..74295434253 100644 --- a/sys/dev/isapnp/aic_isapnp.c +++ b/sys/dev/isapnp/aic_isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: aic_isapnp.c,v 1.9 2002/10/02 16:33:57 thorpej Exp $ */ +/* $NetBSD: aic_isapnp.c,v 1.10 2005/02/04 02:10:43 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aic_isapnp.c,v 1.9 2002/10/02 16:33:57 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aic_isapnp.c,v 1.10 2005/02/04 02:10:43 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -64,8 +64,8 @@ struct aic_isapnp_softc { void *sc_ih; /* interrupt handler */ }; -int aic_isapnp_match __P((struct device *, struct cfdata *, void *)); -void aic_isapnp_attach __P((struct device *, struct device *, void *)); +int aic_isapnp_match(struct device *, struct cfdata *, void *); +void aic_isapnp_attach(struct device *, struct device *, void *); CFATTACH_DECL(aic_isapnp, sizeof(struct aic_isapnp_softc), aic_isapnp_match, aic_isapnp_attach, NULL, NULL); diff --git a/sys/dev/isapnp/com_isapnp.c b/sys/dev/isapnp/com_isapnp.c index 89a598c2372..0666b7a61fa 100644 --- a/sys/dev/isapnp/com_isapnp.c +++ b/sys/dev/isapnp/com_isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: com_isapnp.c,v 1.20 2002/10/02 16:33:57 thorpej Exp $ */ +/* $NetBSD: com_isapnp.c,v 1.21 2005/02/04 02:10:43 perry Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: com_isapnp.c,v 1.20 2002/10/02 16:33:57 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: com_isapnp.c,v 1.21 2005/02/04 02:10:43 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -66,8 +66,8 @@ struct com_isapnp_softc { void *sc_ih; /* interrupt handler */ }; -int com_isapnp_match __P((struct device *, struct cfdata *, void *)); -void com_isapnp_attach __P((struct device *, struct device *, void *)); +int com_isapnp_match(struct device *, struct cfdata *, void *); +void com_isapnp_attach(struct device *, struct device *, void *); CFATTACH_DECL(com_isapnp, sizeof(struct com_isapnp_softc), com_isapnp_match, com_isapnp_attach, NULL, NULL); diff --git a/sys/dev/isapnp/i82365_isapnp.c b/sys/dev/isapnp/i82365_isapnp.c index d3ac1953e66..e898bdc40e5 100644 --- a/sys/dev/isapnp/i82365_isapnp.c +++ b/sys/dev/isapnp/i82365_isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: i82365_isapnp.c,v 1.17 2004/09/01 21:26:29 drochner Exp $ */ +/* $NetBSD: i82365_isapnp.c,v 1.18 2005/02/04 02:10:43 perry Exp $ */ /* * Copyright (c) 1998 Bill Sommerfeld. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i82365_isapnp.c,v 1.17 2004/09/01 21:26:29 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i82365_isapnp.c,v 1.18 2005/02/04 02:10:43 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -65,8 +65,8 @@ int pcicisapnp_debug = 0 /* XXX */ ; #define DPRINTF(arg) #endif -int pcic_isapnp_match __P((struct device *, struct cfdata *, void *)); -void pcic_isapnp_attach __P((struct device *, struct device *, void *)); +int pcic_isapnp_match(struct device *, struct cfdata *, void *); +void pcic_isapnp_attach(struct device *, struct device *, void *); CFATTACH_DECL(pcic_isapnp, sizeof(struct pcic_isa_softc), pcic_isapnp_match, pcic_isapnp_attach, NULL, NULL); diff --git a/sys/dev/isapnp/if_ep_isapnp.c b/sys/dev/isapnp/if_ep_isapnp.c index 0d0aeebe7cc..aa790c284b7 100644 --- a/sys/dev/isapnp/if_ep_isapnp.c +++ b/sys/dev/isapnp/if_ep_isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ep_isapnp.c,v 1.25 2002/10/02 16:34:01 thorpej Exp $ */ +/* $NetBSD: if_ep_isapnp.c,v 1.26 2005/02/04 02:10:43 perry Exp $ */ /* * Copyright (c) 1997 Jonathan Stone <jonathan@NetBSD.org> @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ep_isapnp.c,v 1.25 2002/10/02 16:34:01 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ep_isapnp.c,v 1.26 2005/02/04 02:10:43 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -63,8 +63,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_ep_isapnp.c,v 1.25 2002/10/02 16:34:01 thorpej Ex #include <dev/ic/elink3var.h> #include <dev/ic/elink3reg.h> -int ep_isapnp_match __P((struct device *, struct cfdata *, void *)); -void ep_isapnp_attach __P((struct device *, struct device *, void *)); +int ep_isapnp_match(struct device *, struct cfdata *, void *); +void ep_isapnp_attach(struct device *, struct device *, void *); CFATTACH_DECL(ep_isapnp, sizeof(struct ep_softc), ep_isapnp_match, ep_isapnp_attach, NULL, NULL); diff --git a/sys/dev/isapnp/if_le_isapnp.c b/sys/dev/isapnp/if_le_isapnp.c index 33e32f1424f..f6eaf2bad75 100644 --- a/sys/dev/isapnp/if_le_isapnp.c +++ b/sys/dev/isapnp/if_le_isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_le_isapnp.c,v 1.24 2002/10/04 16:16:32 tsutsui Exp $ */ +/* $NetBSD: if_le_isapnp.c,v 1.25 2005/02/04 02:10:43 perry Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -68,7 +68,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_le_isapnp.c,v 1.24 2002/10/04 16:16:32 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_le_isapnp.c,v 1.25 2005/02/04 02:10:43 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -127,15 +127,15 @@ struct le_isapnp_softc { int sc_rap, sc_rdp; /* offsets to LANCE registers */ }; -int le_isapnp_match __P((struct device *, struct cfdata *, void *)); -void le_isapnp_attach __P((struct device *, struct device *, void *)); +int le_isapnp_match(struct device *, struct cfdata *, void *); +void le_isapnp_attach(struct device *, struct device *, void *); CFATTACH_DECL(le_isapnp, sizeof(struct le_isapnp_softc), le_isapnp_match, le_isapnp_attach, NULL, NULL); -int le_isapnp_intredge __P((void *)); -static void le_isapnp_wrcsr __P((struct lance_softc *, u_int16_t, u_int16_t)); -static u_int16_t le_isapnp_rdcsr __P((struct lance_softc *, u_int16_t)); +int le_isapnp_intredge(void *); +static void le_isapnp_wrcsr(struct lance_softc *, u_int16_t, u_int16_t); +static u_int16_t le_isapnp_rdcsr(struct lance_softc *, u_int16_t); static void le_isapnp_wrcsr(sc, port, val) diff --git a/sys/dev/isapnp/if_ne_isapnp.c b/sys/dev/isapnp/if_ne_isapnp.c index 97f2edcbc69..6a0a1595464 100644 --- a/sys/dev/isapnp/if_ne_isapnp.c +++ b/sys/dev/isapnp/if_ne_isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ne_isapnp.c,v 1.18 2004/02/13 10:05:50 wiz Exp $ */ +/* $NetBSD: if_ne_isapnp.c,v 1.19 2005/02/04 02:10:43 perry Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ne_isapnp.c,v 1.18 2004/02/13 10:05:50 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ne_isapnp.c,v 1.19 2005/02/04 02:10:43 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -73,8 +73,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_ne_isapnp.c,v 1.18 2004/02/13 10:05:50 wiz Exp $" #include <dev/isapnp/isapnpvar.h> #include <dev/isapnp/isapnpdevs.h> -static int ne_isapnp_match __P((struct device *, struct cfdata *, void *)); -static void ne_isapnp_attach __P((struct device *, struct device *, void *)); +static int ne_isapnp_match(struct device *, struct cfdata *, void *); +static void ne_isapnp_attach(struct device *, struct device *, void *); struct ne_isapnp_softc { struct ne2000_softc sc_ne2000; /* real "ne2000" softc */ diff --git a/sys/dev/isapnp/if_tr_isapnp.c b/sys/dev/isapnp/if_tr_isapnp.c index a12c41932c7..bdeba61d667 100644 --- a/sys/dev/isapnp/if_tr_isapnp.c +++ b/sys/dev/isapnp/if_tr_isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_tr_isapnp.c,v 1.9 2002/10/02 16:34:02 thorpej Exp $ */ +/* $NetBSD: if_tr_isapnp.c,v 1.10 2005/02/04 02:10:43 perry Exp $ */ /* * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_tr_isapnp.c,v 1.9 2002/10/02 16:34:02 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_tr_isapnp.c,v 1.10 2005/02/04 02:10:43 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -68,8 +68,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_tr_isapnp.c,v 1.9 2002/10/02 16:34:02 thorpej Exp #include <dev/isapnp/isapnpvar.h> #include <dev/isapnp/isapnpdevs.h> -int tr_isapnp_match __P((struct device *, struct cfdata *, void *)); -void tr_isapnp_attach __P((struct device *, struct device *, void *)); +int tr_isapnp_match(struct device *, struct cfdata *, void *); +void tr_isapnp_attach(struct device *, struct device *, void *); CFATTACH_DECL(tr_isapnp, sizeof(struct tr_softc), tr_isapnp_match, tr_isapnp_attach, NULL, NULL); diff --git a/sys/dev/isapnp/isapnp.c b/sys/dev/isapnp/isapnp.c index 04b484ef397..a3d363d0538 100644 --- a/sys/dev/isapnp/isapnp.c +++ b/sys/dev/isapnp/isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: isapnp.c,v 1.43 2004/09/13 12:55:48 drochner Exp $ */ +/* $NetBSD: isapnp.c,v 1.44 2005/02/04 02:10:43 perry Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isapnp.c,v 1.43 2004/09/13 12:55:48 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isapnp.c,v 1.44 2005/02/04 02:10:43 perry Exp $"); #include "isadma.h" @@ -64,31 +64,30 @@ __KERNEL_RCSID(0, "$NetBSD: isapnp.c,v 1.43 2004/09/13 12:55:48 drochner Exp $") #define ISAPNP_ALLOC_INTR_MASK (~0) #endif -static void isapnp_init __P((struct isapnp_softc *)); -static __inline u_char isapnp_shift_bit __P((struct isapnp_softc *)); -static int isapnp_findcard __P((struct isapnp_softc *)); -static void isapnp_free_region __P((bus_space_tag_t, struct isapnp_region *)); -static int isapnp_alloc_region __P((bus_space_tag_t, struct isapnp_region *)); -static int isapnp_alloc_irq __P((isa_chipset_tag_t, struct isapnp_pin *)); -static int isapnp_alloc_drq __P((isa_chipset_tag_t, struct isapnp_pin *)); -static int isapnp_testconfig __P((bus_space_tag_t, bus_space_tag_t, - struct isapnp_attach_args *, int)); -static struct isapnp_attach_args *isapnp_bestconfig __P((struct isapnp_softc *, - struct isapnp_attach_args **)); -static void isapnp_print_region __P((const char *, struct isapnp_region *, - size_t)); -static void isapnp_configure __P((struct isapnp_softc *, - const struct isapnp_attach_args *)); -static void isapnp_print_pin __P((const char *, struct isapnp_pin *, size_t)); -static int isapnp_print __P((void *, const char *)); +static void isapnp_init(struct isapnp_softc *); +static __inline u_char isapnp_shift_bit(struct isapnp_softc *); +static int isapnp_findcard(struct isapnp_softc *); +static void isapnp_free_region(bus_space_tag_t, struct isapnp_region *); +static int isapnp_alloc_region(bus_space_tag_t, struct isapnp_region *); +static int isapnp_alloc_irq(isa_chipset_tag_t, struct isapnp_pin *); +static int isapnp_alloc_drq(isa_chipset_tag_t, struct isapnp_pin *); +static int isapnp_testconfig(bus_space_tag_t, bus_space_tag_t, + struct isapnp_attach_args *, int); +static struct isapnp_attach_args *isapnp_bestconfig(struct isapnp_softc *, + struct isapnp_attach_args **); +static void isapnp_print_region(const char *, struct isapnp_region *, size_t); +static void isapnp_configure(struct isapnp_softc *, + const struct isapnp_attach_args *); +static void isapnp_print_pin(const char *, struct isapnp_pin *, size_t); +static int isapnp_print(void *, const char *); #ifdef _KERNEL -static int isapnp_submatch __P((struct device *, struct cfdata *, - const locdesc_t *, void *)); +static int isapnp_submatch(struct device *, struct cfdata *, + const locdesc_t *, void *); #endif -static int isapnp_find __P((struct isapnp_softc *, int)); -static int isapnp_match __P((struct device *, struct cfdata *, void *)); -static void isapnp_attach __P((struct device *, struct device *, void *)); -static void isapnp_callback __P((struct device *)); +static int isapnp_find(struct isapnp_softc *, int); +static int isapnp_match(struct device *, struct cfdata *, void *); +static void isapnp_attach(struct device *, struct device *, void *); +static void isapnp_callback(struct device *); CFATTACH_DECL(isapnp, sizeof(struct isapnp_softc), isapnp_match, isapnp_attach, NULL, NULL); diff --git a/sys/dev/isapnp/isapnpres.c b/sys/dev/isapnp/isapnpres.c index bc2816dc031..cf65f31be12 100644 --- a/sys/dev/isapnp/isapnpres.c +++ b/sys/dev/isapnp/isapnpres.c @@ -1,4 +1,4 @@ -/* $NetBSD: isapnpres.c,v 1.12 2004/12/13 13:46:29 christos Exp $ */ +/* $NetBSD: isapnpres.c,v 1.13 2005/02/04 02:10:43 perry Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isapnpres.c,v 1.12 2004/12/13 13:46:29 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isapnpres.c,v 1.13 2005/02/04 02:10:43 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -56,18 +56,18 @@ __KERNEL_RCSID(0, "$NetBSD: isapnpres.c,v 1.12 2004/12/13 13:46:29 christos Exp #include <dev/isapnp/isapnpvar.h> -static int isapnp_wait_status __P((struct isapnp_softc *)); +static int isapnp_wait_status(struct isapnp_softc *); static struct isapnp_attach_args * - isapnp_newdev __P((struct isapnp_attach_args *)); + isapnp_newdev(struct isapnp_attach_args *); static struct isapnp_attach_args * - isapnp_newconf __P((struct isapnp_attach_args *)); -static void isapnp_merge __P((struct isapnp_attach_args *, - const struct isapnp_attach_args *)); + isapnp_newconf(struct isapnp_attach_args *); +static void isapnp_merge(struct isapnp_attach_args *, + const struct isapnp_attach_args *); static struct isapnp_attach_args * - isapnp_flatten __P((struct isapnp_attach_args *)); -static int isapnp_process_tag __P((u_char, u_char, u_char *, + isapnp_flatten(struct isapnp_attach_args *); +static int isapnp_process_tag(u_char, u_char, u_char *, struct isapnp_attach_args **, struct isapnp_attach_args **, - struct isapnp_attach_args **)); + struct isapnp_attach_args **); /* isapnp_wait_status(): diff --git a/sys/dev/isapnp/isapnpvar.h b/sys/dev/isapnp/isapnpvar.h index e82a154e71e..838f179c761 100644 --- a/sys/dev/isapnp/isapnpvar.h +++ b/sys/dev/isapnp/isapnpvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: isapnpvar.h,v 1.20 2001/12/25 14:03:15 christos Exp $ */ +/* $NetBSD: isapnpvar.h,v 1.21 2005/02/04 02:10:43 perry Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -151,8 +151,8 @@ struct isapnp_attach_args { struct isapnp_pin ipa_drq[ISAPNP_NUM_DRQ]; }; -static __inline void isapnp_write_reg __P((struct isapnp_softc *, int, u_char)); -static __inline u_char isapnp_read_reg __P((struct isapnp_softc *, int)); +static __inline void isapnp_write_reg(struct isapnp_softc *, int, u_char); +static __inline u_char isapnp_read_reg(struct isapnp_softc *, int); static __inline void isapnp_write_reg(sc, r, v) @@ -173,30 +173,29 @@ isapnp_read_reg(sc, r) } struct isapnp_attach_args * - isapnp_get_resource __P((struct isapnp_softc *, int)); -char *isapnp_id_to_vendor __P((char *, const u_char *)); + isapnp_get_resource(struct isapnp_softc *, int); +char *isapnp_id_to_vendor(char *, const u_char *); -int isapnp_config __P((bus_space_tag_t, bus_space_tag_t, - struct isapnp_attach_args *)); -void isapnp_unconfig __P((bus_space_tag_t, bus_space_tag_t, - struct isapnp_attach_args *)); +int isapnp_config(bus_space_tag_t, bus_space_tag_t, + struct isapnp_attach_args *); +void isapnp_unconfig(bus_space_tag_t, bus_space_tag_t, + struct isapnp_attach_args *); #ifdef _KERNEL struct isapnp_devinfo; -int isapnp_devmatch __P((const struct isapnp_attach_args *, - const struct isapnp_devinfo *, int *)); -void isapnp_isa_attach_hook __P((struct isa_softc *)); +int isapnp_devmatch(const struct isapnp_attach_args *, + const struct isapnp_devinfo *, int *); +void isapnp_isa_attach_hook(struct isa_softc *); #endif #ifdef DEBUG_ISAPNP -void isapnp_print_mem __P((const char *, const struct isapnp_region *)); -void isapnp_print_io __P((const char *, const struct isapnp_region *)); -void isapnp_print_irq __P((const char *, const struct isapnp_pin *)); -void isapnp_print_drq __P((const char *, const struct isapnp_pin *)); -void isapnp_print_dep_start __P((const char *, const u_char)); -void isapnp_print_attach __P((const struct isapnp_attach_args *)); -void isapnp_get_config __P((struct isapnp_softc *, - struct isapnp_attach_args *)); -void isapnp_print_config __P((const struct isapnp_attach_args *)); +void isapnp_print_mem(const char *, const struct isapnp_region *); +void isapnp_print_io(const char *, const struct isapnp_region *); +void isapnp_print_irq(const char *, const struct isapnp_pin *); +void isapnp_print_drq(const char *, const struct isapnp_pin *); +void isapnp_print_dep_start(const char *, const u_char); +void isapnp_print_attach(const struct isapnp_attach_args *); +void isapnp_get_config(struct isapnp_softc *, struct isapnp_attach_args *); +void isapnp_print_config(const struct isapnp_attach_args *); #endif #endif /* ! _DEV_ISAPNP_ISAPNPVAR_H_ */ diff --git a/sys/dev/isapnp/isic_isapnp.c b/sys/dev/isapnp/isic_isapnp.c index 4a7464565b2..53b8c0c11ce 100644 --- a/sys/dev/isapnp/isic_isapnp.c +++ b/sys/dev/isapnp/isic_isapnp.c @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isic_isapnp.c,v 1.17 2003/12/04 13:57:30 keihan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isic_isapnp.c,v 1.18 2005/02/04 02:10:43 perry Exp $"); #include <sys/param.h> #include <sys/errno.h> @@ -83,11 +83,11 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isapnp.c,v 1.17 2003/12/04 13:57:30 keihan Exp extern const struct isdn_layer1_isdnif_driver isic_std_driver; #ifdef __BROKEN_INDIRECT_CONFIG -static int isic_isapnp_probe __P((struct device *, void *, void *)); +static int isic_isapnp_probe(struct device *, void *, void *); #else -static int isic_isapnp_probe __P((struct device *, struct cfdata *, void *)); +static int isic_isapnp_probe(struct device *, struct cfdata *, void *); #endif -static void isic_isapnp_attach __P((struct device *, struct device *, void *)); +static void isic_isapnp_attach(struct device *, struct device *, void *); CFATTACH_DECL(isic_isapnp, sizeof(struct isic_softc), isic_isapnp_probe, isic_isapnp_attach, NULL, NULL); @@ -109,14 +109,14 @@ static void tls_pnp_mapalloc(struct isapnp_attach_args *ipa, struct isic_softc * #endif /* card attach functions */ -extern void isic_attach_Cs0P __P((struct isic_softc *sc)); -extern void isic_attach_Dyn __P((struct isic_softc *sc)); -extern void isic_attach_s0163P __P((struct isic_softc *sc)); -extern void isic_attach_drnngo __P((struct isic_softc *sc)); -extern void isic_attach_sws __P((struct isic_softc *sc)); -extern void isic_attach_Eqs1pi __P((struct isic_softc *sc)); -extern void isic_attach_siemens_isurf __P((struct isic_softc *sc)); -extern void isic_attach_isapnp_itkix1 __P((struct isic_softc *sc)); +extern void isic_attach_Cs0P(struct isic_softc *sc); +extern void isic_attach_Dyn(struct isic_softc *sc); +extern void isic_attach_s0163P(struct isic_softc *sc); +extern void isic_attach_drnngo(struct isic_softc *sc); +extern void isic_attach_sws(struct isic_softc *sc); +extern void isic_attach_Eqs1pi(struct isic_softc *sc); +extern void isic_attach_siemens_isurf(struct isic_softc *sc); +extern void isic_attach_isapnp_itkix1(struct isic_softc *sc); struct isic_isapnp_card_desc { char *devlogic; /* ISAPNP logical device ID */ diff --git a/sys/dev/isapnp/isic_isapnp_ctx_s0P.c b/sys/dev/isapnp/isic_isapnp_ctx_s0P.c index e32b5ee45f5..dd37d3dbf98 100644 --- a/sys/dev/isapnp/isic_isapnp_ctx_s0P.c +++ b/sys/dev/isapnp/isic_isapnp_ctx_s0P.c @@ -27,14 +27,14 @@ * isic - I4B Siemens ISDN Chipset Driver for Creatix PnP cards * ============================================================ * - * $Id: isic_isapnp_ctx_s0P.c,v 1.4 2002/03/24 20:35:50 martin Exp $ + * $Id: isic_isapnp_ctx_s0P.c,v 1.5 2005/02/04 02:10:43 perry Exp $ * * last edit-date: [Fri Jan 5 11:38:29 2001] * *---------------------------------------------------------------------------*/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_ctx_s0P.c,v 1.4 2002/03/24 20:35:50 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_ctx_s0P.c,v 1.5 2005/02/04 02:10:43 perry Exp $"); #include "opt_isicpnp.h" #if ISICPNP_CRTX_S0_P @@ -86,10 +86,10 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isapnp_ctx_s0P.c,v 1.4 2002/03/24 20:35:50 mart #include <netisdn/i4b_mbuf.h> #ifndef __FreeBSD__ -static u_int8_t ctxs0P_read_reg __P((struct isic_softc *sc, int what, bus_size_t offs)); -static void ctxs0P_write_reg __P((struct isic_softc *sc, int what, bus_size_t offs, u_int8_t data)); -static void ctxs0P_read_fifo __P((struct isic_softc *sc, int what, void *buf, size_t size)); -static void ctxs0P_write_fifo __P((struct isic_softc *sc, int what, const void *data, size_t size)); +static u_int8_t ctxs0P_read_reg(struct isic_softc *sc, int what, bus_size_t offs); +static void ctxs0P_write_reg(struct isic_softc *sc, int what, bus_size_t offs, u_int8_t data); +static void ctxs0P_read_fifo(struct isic_softc *sc, int what, void *buf, size_t size); +static void ctxs0P_write_fifo(struct isic_softc *sc, int what, const void *data, size_t size); void isic_attach_Cs0P(struct isic_softc *sc); #endif diff --git a/sys/dev/isapnp/isic_isapnp_drn_ngo.c b/sys/dev/isapnp/isic_isapnp_drn_ngo.c index b4cf47954fd..588e0963483 100644 --- a/sys/dev/isapnp/isic_isapnp_drn_ngo.c +++ b/sys/dev/isapnp/isic_isapnp_drn_ngo.c @@ -27,14 +27,14 @@ * i4b_drn_ngo.c - Dr. Neuhaus Niccy GO@ and SAGEM Cybermod * -------------------------------------------------------- * - * $Id: isic_isapnp_drn_ngo.c,v 1.4 2002/03/24 20:35:50 martin Exp $ + * $Id: isic_isapnp_drn_ngo.c,v 1.5 2005/02/04 02:10:43 perry Exp $ * * last edit-date: [Fri Jan 5 11:38:29 2001] * *---------------------------------------------------------------------------*/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_drn_ngo.c,v 1.4 2002/03/24 20:35:50 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_drn_ngo.c,v 1.5 2005/02/04 02:10:43 perry Exp $"); #include "opt_isicpnp.h" #ifdef ISICPNP_DRN_NGO @@ -454,11 +454,11 @@ isic_attach_drnngo(struct isa_device *dev, unsigned int iobase2) #else -static u_int8_t drnngo_read_reg __P((struct isic_softc *sc, int what, bus_size_t offs)); -static void drnngo_write_reg __P((struct isic_softc *sc, int what, bus_size_t offs, u_int8_t data)); -static void drnngo_read_fifo __P((struct isic_softc *sc, int what, void *buf, size_t size)); -static void drnngo_write_fifo __P((struct isic_softc *sc, int what, const void *data, size_t size)); -void isic_attach_drnngo __P((struct isic_softc *sc)); +static u_int8_t drnngo_read_reg(struct isic_softc *sc, int what, bus_size_t offs); +static void drnngo_write_reg(struct isic_softc *sc, int what, bus_size_t offs, u_int8_t data); +static void drnngo_read_fifo(struct isic_softc *sc, int what, void *buf, size_t size); +static void drnngo_write_fifo(struct isic_softc *sc, int what, const void *data, size_t size); +void isic_attach_drnngo(struct isic_softc *sc); /* * Mapping from "what" parameter to offsets into the io map diff --git a/sys/dev/isapnp/isic_isapnp_elsa_qs1i.c b/sys/dev/isapnp/isic_isapnp_elsa_qs1i.c index ee111c1b77d..299ebbc0090 100644 --- a/sys/dev/isapnp/isic_isapnp_elsa_qs1i.c +++ b/sys/dev/isapnp/isic_isapnp_elsa_qs1i.c @@ -27,14 +27,14 @@ * isic - I4B Siemens ISDN Chipset Driver for ELSA Quickstep 1000pro ISA * ===================================================================== * - * $Id: isic_isapnp_elsa_qs1i.c,v 1.9 2002/04/15 08:11:00 martin Exp $ + * $Id: isic_isapnp_elsa_qs1i.c,v 1.10 2005/02/04 02:10:43 perry Exp $ * * last edit-date: [Fri Jan 5 11:38:29 2001] * *---------------------------------------------------------------------------*/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_elsa_qs1i.c,v 1.9 2002/04/15 08:11:00 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_elsa_qs1i.c,v 1.10 2005/02/04 02:10:43 perry Exp $"); #include "opt_isicpnp.h" #if defined(ISICPNP_ELSA_QS1ISA) || defined(ISICPNP_ELSA_PCC16) @@ -85,7 +85,7 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isapnp_elsa_qs1i.c,v 1.9 2002/04/15 08:11:00 ma static void i4b_eq1i_clrirq(void* base); #else static void i4b_eq1i_clrirq(struct isic_softc *sc); -void isic_attach_Eqs1pi __P((struct isic_softc *sc)); +void isic_attach_Eqs1pi(struct isic_softc *sc); static void elsa_command_req(struct isic_softc *sc, int command, void *data); static void elsa_led_handler(void *); #endif diff --git a/sys/dev/isapnp/isic_isapnp_siemens_isurf.c b/sys/dev/isapnp/isic_isapnp_siemens_isurf.c index 32488820a1d..94b2dae7619 100644 --- a/sys/dev/isapnp/isic_isapnp_siemens_isurf.c +++ b/sys/dev/isapnp/isic_isapnp_siemens_isurf.c @@ -37,14 +37,14 @@ * Siemens I-Surf 2.0 PnP specific routines for isic driver * -------------------------------------------------------- * - * $Id: isic_isapnp_siemens_isurf.c,v 1.4 2002/03/24 20:35:52 martin Exp $ + * $Id: isic_isapnp_siemens_isurf.c,v 1.5 2005/02/04 02:10:43 perry Exp $ * * last edit-date: [Fri Jan 5 11:38:29 2001] * *---------------------------------------------------------------------------*/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_siemens_isurf.c,v 1.4 2002/03/24 20:35:52 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_siemens_isurf.c,v 1.5 2005/02/04 02:10:43 perry Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -93,7 +93,7 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isapnp_siemens_isurf.c,v 1.4 2002/03/24 20:35:5 #include <dev/ic/hscx.h> #if !defined(__FreeBSD__) -void isic_attach_siemens_isurf __P((struct isic_softc *sc)); +void isic_attach_siemens_isurf(struct isic_softc *sc); #endif /* masks for register encoded in base addr */ diff --git a/sys/dev/isapnp/isic_isapnp_sws.c b/sys/dev/isapnp/isic_isapnp_sws.c index d40ee0e7b6a..aafbfdaf2ba 100644 --- a/sys/dev/isapnp/isic_isapnp_sws.c +++ b/sys/dev/isapnp/isic_isapnp_sws.c @@ -47,7 +47,7 @@ * EXPERIMENTAL !!!! * ================= * - * $Id: isic_isapnp_sws.c,v 1.5 2003/11/10 08:51:52 wiz Exp $ + * $Id: isic_isapnp_sws.c,v 1.6 2005/02/04 02:10:43 perry Exp $ * * last edit-date: [Fri Jan 5 11:38:29 2001] * @@ -57,7 +57,7 @@ *---------------------------------------------------------------------------*/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_sws.c,v 1.5 2003/11/10 08:51:52 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_sws.c,v 1.6 2005/02/04 02:10:43 perry Exp $"); #include "opt_isicpnp.h" #ifdef ISICPNP_SEDLBAUER @@ -123,11 +123,11 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isapnp_sws.c,v 1.5 2003/11/10 08:51:52 wiz Exp #include <netisdn/i4b_mbuf.h> #ifndef __FreeBSD__ -static u_int8_t sws_read_reg __P((struct isic_softc *sc, int what, bus_size_t offs)); -static void sws_write_reg __P((struct isic_softc *sc, int what, bus_size_t offs, u_int8_t data)); -static void sws_read_fifo __P((struct isic_softc *sc, int what, void *buf, size_t size)); -static void sws_write_fifo __P((struct isic_softc *sc, int what, const void *data, size_t size)); -void isic_attach_sws __P((struct isic_softc *sc)); +static u_int8_t sws_read_reg (struct isic_softc *sc, int what, bus_size_t offs); +static void sws_write_reg (struct isic_softc *sc, int what, bus_size_t offs, u_int8_t data); +static void sws_read_fifo (struct isic_softc *sc, int what, void *buf, size_t size); +static void sws_write_fifo(struct isic_softc *sc, int what, const void *data, size_t size); +void isic_attach_sws(struct isic_softc *sc); #endif /*---------------------------------------------------------------------------* diff --git a/sys/dev/isapnp/isic_isapnp_tel_s0P.c b/sys/dev/isapnp/isic_isapnp_tel_s0P.c index 8bd90262cb0..f99642bd0a0 100644 --- a/sys/dev/isapnp/isic_isapnp_tel_s0P.c +++ b/sys/dev/isapnp/isic_isapnp_tel_s0P.c @@ -38,14 +38,14 @@ * EXPERIMENTAL !!! * ================ * - * $Id: isic_isapnp_tel_s0P.c,v 1.4 2002/03/24 20:35:53 martin Exp $ + * $Id: isic_isapnp_tel_s0P.c,v 1.5 2005/02/04 02:10:43 perry Exp $ * * last edit-date: [Fri Jan 5 11:38:29 2001] * *---------------------------------------------------------------------------*/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_tel_s0P.c,v 1.4 2002/03/24 20:35:53 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_tel_s0P.c,v 1.5 2005/02/04 02:10:43 perry Exp $"); #include "opt_isicpnp.h" #ifdef ISICPNP_TEL_S0_16_3_P @@ -95,11 +95,11 @@ __KERNEL_RCSID(0, "$NetBSD: isic_isapnp_tel_s0P.c,v 1.4 2002/03/24 20:35:53 mart #include <netisdn/i4b_mbuf.h> #ifndef __FreeBSD__ -static u_int8_t tels0163P_read_reg __P((struct isic_softc *sc, int what, bus_size_t offs)); -static void tels0163P_write_reg __P((struct isic_softc *sc, int what, bus_size_t offs, u_int8_t data)); -static void tels0163P_read_fifo __P((struct isic_softc *sc, int what, void *buf, size_t size)); -static void tels0163P_write_fifo __P((struct isic_softc *sc, int what, const void *data, size_t size)); -void isic_attach_s0163P __P((struct isic_softc *sc)); +static u_int8_t tels0163P_read_reg(struct isic_softc *sc, int what, bus_size_t offs); +static void tels0163P_write_reg(struct isic_softc *sc, int what, bus_size_t offs, u_int8_t data); +static void tels0163P_read_fifo(struct isic_softc *sc, int what, void *buf, size_t size); +static void tels0163P_write_fifo(struct isic_softc *sc, int what, const void *data, size_t size); +void isic_attach_s0163P(struct isic_softc *sc); #endif diff --git a/sys/dev/isapnp/joy_isapnp.c b/sys/dev/isapnp/joy_isapnp.c index 200722a3389..9aa6547918c 100644 --- a/sys/dev/isapnp/joy_isapnp.c +++ b/sys/dev/isapnp/joy_isapnp.c @@ -1,4 +1,4 @@ -/* $NetBSD: joy_isapnp.c,v 1.4 2002/10/02 16:34:04 thorpej Exp $ */ +/* $NetBSD: joy_isapnp.c,v 1.5 2005/02/04 02:10:43 perry Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: joy_isapnp.c,v 1.4 2002/10/02 16:34:04 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: joy_isapnp.c,v 1.5 2005/02/04 02:10:43 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -53,8 +53,8 @@ __KERNEL_RCSID(0, "$NetBSD: joy_isapnp.c,v 1.4 2002/10/02 16:34:04 thorpej Exp $ #include <dev/ic/joyvar.h> -int joy_isapnp_match __P((struct device *, struct cfdata *, void *)); -void joy_isapnp_attach __P((struct device *, struct device *, void *)); +int joy_isapnp_match(struct device *, struct cfdata *, void *); +void joy_isapnp_attach(struct device *, struct device *, void *); CFATTACH_DECL(joy_isapnp, sizeof(struct joy_softc), joy_isapnp_match, joy_isapnp_attach, NULL, NULL); diff --git a/sys/dev/isapnp/mpu_isapnp.c b/sys/dev/isapnp/mpu_isapnp.c index 67e81176502..4e77c5121e0 100644 --- a/sys/dev/isapnp/mpu_isapnp.c +++ b/sys/dev/isapnp/mpu_isapnp.c @@ -1,7 +1,7 @@ -/* $NetBSD: mpu_isapnp.c,v 1.8 2002/10/02 16:34:04 thorpej Exp $ */ +/* $NetBSD: mpu_isapnp.c,v 1.9 2005/02/04 02:10:43 perry Exp $ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mpu_isapnp.c,v 1.8 2002/10/02 16:34:04 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpu_isapnp.c,v 1.9 2005/02/04 02:10:43 perry Exp $"); #include "midi.h" @@ -29,8 +29,8 @@ __KERNEL_RCSID(0, "$NetBSD: mpu_isapnp.c,v 1.8 2002/10/02 16:34:04 thorpej Exp $ #include <dev/ic/mpuvar.h> -int mpu_isapnp_match __P((struct device *, struct cfdata *, void *)); -void mpu_isapnp_attach __P((struct device *, struct device *, void *)); +int mpu_isapnp_match(struct device *, struct cfdata *, void *); +void mpu_isapnp_attach(struct device *, struct device *, void *); struct mpu_isapnp_softc { struct device sc_dev; diff --git a/sys/dev/marvell/gtidma.c b/sys/dev/marvell/gtidma.c index 4731a0dbeba..e917c64d076 100644 --- a/sys/dev/marvell/gtidma.c +++ b/sys/dev/marvell/gtidma.c @@ -1,4 +1,4 @@ -/* $NetBSD: gtidma.c,v 1.3 2003/07/14 15:47:17 lukem Exp $ */ +/* $NetBSD: gtidma.c,v 1.4 2005/02/04 02:10:43 perry Exp $ */ /* * Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc. @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gtidma.c,v 1.3 2003/07/14 15:47:17 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gtidma.c,v 1.4 2005/02/04 02:10:43 perry Exp $"); #include "opt_idma.h" #include "opt_ddb.h" @@ -228,31 +228,31 @@ idma_list_sync_post(idma_chan_t * const idcp, idma_desch_t *iddhp) #endif /* IDMA_COHERENT */ -STATIC void idma_attach __P((struct device *, struct device *, void *)); -STATIC int idma_match __P((struct device *, struct cfdata *, void *)); +STATIC void idma_attach (struct device *, struct device *, void *); +STATIC int idma_match (struct device *, struct cfdata *, void *); STATIC void idma_chan_init - __P((idma_softc_t *, idma_chan_t *, unsigned int)); -STATIC void idma_arb_init __P((idma_softc_t *)); -STATIC void idma_dmamem_free __P((idma_softc_t *, idma_dmamem_t *)); + (idma_softc_t *, idma_chan_t *, unsigned int); +STATIC void idma_arb_init(idma_softc_t *); +STATIC void idma_dmamem_free(idma_softc_t *, idma_dmamem_t *); STATIC int idma_dmamem_alloc - __P((idma_softc_t *, idma_dmamem_t *, int, size_t sz)); + (idma_softc_t *, idma_dmamem_t *, int, size_t sz); STATIC void idma_qstart - __P((idma_softc_t *, idma_chan_t *, unsigned int)); + (idma_softc_t *, idma_chan_t *, unsigned int); STATIC void idma_start_subr - __P((idma_softc_t *, idma_chan_t *, unsigned int, idma_desch_t *)); + (idma_softc_t *, idma_chan_t *, unsigned int, idma_desch_t *); STATIC void idma_retry - __P((idma_softc_t *, idma_chan_t *, const u_int, idma_desch_t *)); + (idma_softc_t *, idma_chan_t *, const u_int, idma_desch_t *); STATIC void idma_done - __P((idma_softc_t *, idma_chan_t *, const u_int, idma_desch_t *, u_int32_t)); -STATIC int idma_intr0_1 __P((void *)); -STATIC int idma_intr2_3 __P((void *)); -STATIC int idma_intr4_5 __P((void *)); -STATIC int idma_intr6_7 __P((void *)); + (idma_softc_t *, idma_chan_t *, const u_int, idma_desch_t *, u_int32_t); +STATIC int idma_intr0_1 (void *); +STATIC int idma_intr2_3 (void *); +STATIC int idma_intr4_5 (void *); +STATIC int idma_intr6_7 (void *); STATIC int idma_intr_comm - __P((idma_softc_t *, unsigned int, unsigned int, unsigned int, u_int32_t, char *)); + (idma_softc_t *, unsigned int, unsigned int, unsigned int, u_int32_t, char *); STATIC void idma_print_active - __P((idma_softc_t *, unsigned int, idma_desch_t *)); + (idma_softc_t *, unsigned int, idma_desch_t *); struct cfattach idma_ca = { @@ -432,7 +432,7 @@ idma_chan_free(idma_chan_t * const idcp) idma_chan_t * idma_chan_alloc( const unsigned int ndesc, - int (* const callback) __P((void *, idma_desch_t *, u_int32_t)), + int (* const callback)(void *, idma_desch_t *, u_int32_t), void * const arg) { idma_softc_t * const sc = idma_sc; /* XXX */ @@ -446,7 +446,7 @@ idma_chan_alloc( int err; int i; unsigned int s; - STATIC void idma_time __P((void *));; + STATIC void idma_time(void *);; DPRINTF(("idma_chan_alloc %d %p %p\n", ndesc, callback, arg)); KASSERT(ndesc >= 0); @@ -1198,7 +1198,7 @@ idma_done( idma_desch_t * const iddhp, u_int32_t ccause) { - int (*callback) __P((void *, idma_desch_t *, u_int32_t)); + int (*callback)(void *, idma_desch_t *, u_int32_t); idcp->idc_active = NULL; idcp->idc_done_count++; diff --git a/sys/dev/marvell/gtidmavar.h b/sys/dev/marvell/gtidmavar.h index 5714b63fe18..75250aff199 100644 --- a/sys/dev/marvell/gtidmavar.h +++ b/sys/dev/marvell/gtidmavar.h @@ -1,4 +1,4 @@ -/* $NetBSD: gtidmavar.h,v 1.1 2003/03/05 22:08:21 matt Exp $ */ +/* $NetBSD: gtidmavar.h,v 1.2 2005/02/04 02:10:43 perry Exp $ */ /* * Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc. @@ -145,7 +145,7 @@ typedef struct idma_chan { idma_chan_state_t idc_state; struct idma_softc *idc_sc; unsigned int idc_chan; /* channel number */ - int (*idc_callback) __P((void *, struct idma_desch *, u_int32_t)); + int (*idc_callback)(void *, struct idma_desch *, u_int32_t); /* completion callback */ void *idc_arg; /* completion callback arg */ idma_q_t idc_q; /* pending transactions */ @@ -185,24 +185,24 @@ typedef struct idma_softc { /* * IDMA external function prototypes */ -extern void idma_chan_free __P((idma_chan_t *)); -extern idma_chan_t *idma_chan_alloc - __P((unsigned int, int (*) __P((void *, struct idma_desch *, u_int32_t)), void *)); +extern void idma_chan_free(idma_chan_t *); +extern idma_chan_t *idma_chan_alloc(unsigned int, + int (*)(void *, struct idma_desch *, u_int32_t), void *); -extern void idma_desch_free __P((idma_desch_t *)); -extern idma_desch_t *idma_desch_alloc __P((idma_chan_t *)); -extern void idma_desch_list_free __P((idma_desch_t *)); +extern void idma_desch_free(idma_desch_t *); +extern idma_desch_t *idma_desch_alloc(idma_chan_t *); +extern void idma_desch_list_free(idma_desch_t *); -extern void idma_desc_list_free __P((idma_desch_t *)); -extern idma_desch_t *idma_desch_list_alloc __P((idma_chan_t *, unsigned int)); +extern void idma_desc_list_free(idma_desch_t *); +extern idma_desch_t *idma_desch_list_alloc(idma_chan_t *, unsigned int); -extern void idma_intr_enb __P((idma_chan_t *)); -extern void idma_intr_dis __P((idma_chan_t *)); +extern void idma_intr_enb(idma_chan_t *); +extern void idma_intr_dis(idma_chan_t *); -extern int idma_start __P((idma_desch_t *)); -extern void idma_qflush __P((idma_chan_t *)); +extern int idma_start(idma_desch_t *); +extern void idma_qflush(idma_chan_t *); -extern void idma_abort __P((idma_desch_t *, unsigned int, const char *)); +extern void idma_abort(idma_desch_t *, unsigned int, const char *); /* * flags for idma_abort() diff --git a/sys/dev/mca/aha_mca.c b/sys/dev/mca/aha_mca.c index fc44b842ae7..07eaaa8f322 100644 --- a/sys/dev/mca/aha_mca.c +++ b/sys/dev/mca/aha_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: aha_mca.c,v 1.10 2002/10/02 16:34:06 thorpej Exp $ */ +/* $NetBSD: aha_mca.c,v 1.11 2005/02/04 02:10:43 perry Exp $ */ /* * Copyright (c) 2000-2002 The NetBSD Foundation, Inc. @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aha_mca.c,v 1.10 2002/10/02 16:34:06 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aha_mca.c,v 1.11 2005/02/04 02:10:43 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -77,8 +77,8 @@ __KERNEL_RCSID(0, "$NetBSD: aha_mca.c,v 1.10 2002/10/02 16:34:06 thorpej Exp $") #define AHA_ISA_IOSIZE 4 -int aha_mca_probe __P((struct device *, struct cfdata *, void *)); -void aha_mca_attach __P((struct device *, struct device *, void *)); +int aha_mca_probe(struct device *, struct cfdata *, void *); +void aha_mca_attach(struct device *, struct device *, void *); CFATTACH_DECL(aha_mca, sizeof(struct aha_softc), aha_mca_probe, aha_mca_attach, NULL, NULL); diff --git a/sys/dev/mca/com_mca.c b/sys/dev/mca/com_mca.c index 4a917ab8586..683a332e1e2 100644 --- a/sys/dev/mca/com_mca.c +++ b/sys/dev/mca/com_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: com_mca.c,v 1.10 2003/08/07 16:31:08 agc Exp $ */ +/* $NetBSD: com_mca.c,v 1.11 2005/02/04 02:10:43 perry Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -72,7 +72,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: com_mca.c,v 1.10 2003/08/07 16:31:08 agc Exp $"); +__KERNEL_RCSID(0, "$NetBSD: com_mca.c,v 1.11 2005/02/04 02:10:43 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -103,13 +103,13 @@ struct com_mca_softc { void *sc_ih; /* interrupt handler */ }; -int com_mca_probe __P((struct device *, struct cfdata *, void *)); -void com_mca_attach __P((struct device *, struct device *, void *)); -void com_mca_cleanup __P((void *)); +int com_mca_probe(struct device *, struct cfdata *, void *); +void com_mca_attach(struct device *, struct device *, void *); +void com_mca_cleanup(void *); -static int ibm_modem_getcfg __P((struct mca_attach_args *, int *, int *)); -static int neocom1_getcfg __P((struct mca_attach_args *, int *, int *)); -static int ibm_mpcom_getcfg __P((struct mca_attach_args *, int *, int *)); +static int ibm_modem_getcfg(struct mca_attach_args *, int *, int *); +static int neocom1_getcfg(struct mca_attach_args *, int *, int *); +static int ibm_mpcom_getcfg(struct mca_attach_args *, int *, int *); CFATTACH_DECL(com_mca, sizeof(struct com_mca_softc), com_mca_probe, com_mca_attach, NULL, NULL); @@ -117,7 +117,7 @@ CFATTACH_DECL(com_mca, sizeof(struct com_mca_softc), static const struct com_mca_product { u_int32_t cp_prodid; /* MCA product ID */ const char *cp_name; /* device name */ - int (*cp_getcfg) __P((struct mca_attach_args *, int *iobase, int *irq)); + int (*cp_getcfg)(struct mca_attach_args *, int *iobase, int *irq); /* get device i/o base and irq */ } com_mca_products[] = { { MCA_PRODUCT_IBM_MOD, "IBM Internal Modem", ibm_modem_getcfg }, @@ -128,7 +128,7 @@ static const struct com_mca_product { { 0, NULL, NULL }, }; -static const struct com_mca_product *com_mca_lookup __P((int)); +static const struct com_mca_product *com_mca_lookup(int); static const struct com_mca_product * com_mca_lookup(ma_id) diff --git a/sys/dev/mca/ed_mca.c b/sys/dev/mca/ed_mca.c index 0ea68dd211a..956a691ab65 100644 --- a/sys/dev/mca/ed_mca.c +++ b/sys/dev/mca/ed_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: ed_mca.c,v 1.27 2004/10/28 07:07:40 yamt Exp $ */ +/* $NetBSD: ed_mca.c,v 1.28 2005/02/04 02:10:43 perry Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.27 2004/10/28 07:07:40 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.28 2005/02/04 02:10:43 perry Exp $"); #include "rnd.h" @@ -82,17 +82,17 @@ __KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.27 2004/10/28 07:07:40 yamt Exp $"); #define EDLABELDEV(dev) (MAKEDISKDEV(major(dev), DISKUNIT(dev), RAW_PART)) -static int ed_mca_probe __P((struct device *, struct cfdata *, void *)); -static void ed_mca_attach __P((struct device *, struct device *, void *)); +static int ed_mca_probe (struct device *, struct cfdata *, void *); +static void ed_mca_attach (struct device *, struct device *, void *); CFATTACH_DECL(ed_mca, sizeof(struct ed_softc), ed_mca_probe, ed_mca_attach, NULL, NULL); extern struct cfdriver ed_cd; -static int ed_get_params __P((struct ed_softc *, int *)); -static void edgetdisklabel __P((dev_t, struct ed_softc *)); -static void edgetdefaultlabel __P((struct ed_softc *, struct disklabel *)); +static int ed_get_params(struct ed_softc *, int *); +static void edgetdisklabel(dev_t, struct ed_softc *); +static void edgetdefaultlabel(struct ed_softc *, struct disklabel *); dev_type_open(edmcaopen); dev_type_close(edmcaclose); diff --git a/sys/dev/mca/edc_mca.c b/sys/dev/mca/edc_mca.c index 00795869b12..5b260c2899d 100644 --- a/sys/dev/mca/edc_mca.c +++ b/sys/dev/mca/edc_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: edc_mca.c,v 1.26 2004/10/28 07:07:40 yamt Exp $ */ +/* $NetBSD: edc_mca.c,v 1.27 2005/02/04 02:10:43 perry Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.26 2004/10/28 07:07:40 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.27 2005/02/04 02:10:43 perry Exp $"); #include "rnd.h" @@ -120,19 +120,19 @@ struct edc_mca_softc { u_int16_t status_block[EDC_MAX_CMD_RES_LEN]; }; -int edc_mca_probe __P((struct device *, struct cfdata *, void *)); -void edc_mca_attach __P((struct device *, struct device *, void *)); +int edc_mca_probe(struct device *, struct cfdata *, void *); +void edc_mca_attach(struct device *, struct device *, void *); CFATTACH_DECL(edc_mca, sizeof(struct edc_mca_softc), edc_mca_probe, edc_mca_attach, NULL, NULL); -static int edc_intr __P((void *)); -static void edc_dump_status_block __P((struct edc_mca_softc *, - u_int16_t *, int)); -static int edc_do_attn __P((struct edc_mca_softc *, int, int, int)); -static void edc_cmd_wait __P((struct edc_mca_softc *, int, int)); -static void edcworker __P((void *)); -static void edc_spawn_worker __P((void *)); +static int edc_intr(void *); +static void edc_dump_status_block(struct edc_mca_softc *, + u_int16_t *, int); +static int edc_do_attn(struct edc_mca_softc *, int, int, int); +static void edc_cmd_wait(struct edc_mca_softc *, int, int); +static void edcworker(void *); +static void edc_spawn_worker(void *); int edc_mca_probe(parent, match, aux) diff --git a/sys/dev/mca/edcvar.h b/sys/dev/mca/edcvar.h index 5a25e00b00c..67f14ad15b0 100644 --- a/sys/dev/mca/edcvar.h +++ b/sys/dev/mca/edcvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: edcvar.h,v 1.5 2004/09/01 20:57:58 drochner Exp $ */ +/* $NetBSD: edcvar.h,v 1.6 2005/02/04 02:10:43 perry Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -37,8 +37,7 @@ struct ed_attach_args { int edc_drive; }; -int edc_run_cmd __P((struct edc_mca_softc *, int, - int, u_int16_t [], int, int)); -void edc_add_disk __P((struct edc_mca_softc *, struct ed_softc *)); -int edc_bio __P((struct edc_mca_softc *, struct ed_softc *, - void *, size_t, daddr_t, int, int)); +int edc_run_cmd(struct edc_mca_softc *, int, int, u_int16_t [], int, int); +void edc_add_disk(struct edc_mca_softc *, struct ed_softc *); +int edc_bio(struct edc_mca_softc *, struct ed_softc *, + void *, size_t, daddr_t, int, int); diff --git a/sys/dev/mca/esp_mca.c b/sys/dev/mca/esp_mca.c index 97f658aa2b0..d0bbb6c1f3d 100644 --- a/sys/dev/mca/esp_mca.c +++ b/sys/dev/mca/esp_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: esp_mca.c,v 1.7 2003/07/14 15:47:18 lukem Exp $ */ +/* $NetBSD: esp_mca.c,v 1.8 2005/02/04 02:10:43 perry Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: esp_mca.c,v 1.7 2003/07/14 15:47:18 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: esp_mca.c,v 1.8 2005/02/04 02:10:43 perry Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -93,8 +93,8 @@ static int esp_mca_debug = 0; #define ESP_MCA_IOSIZE 0x20 #define ESP_REG_OFFSET 0x10 -static void esp_mca_attach __P((struct device *, struct device *, void *)); -static int esp_mca_match __P((struct device *, struct cfdata *, void *)); +static void esp_mca_attach(struct device *, struct device *, void *); +static int esp_mca_match(struct device *, struct cfdata *, void *); CFATTACH_DECL(esp_mca, sizeof(struct esp_softc), esp_mca_match, esp_mca_attach, NULL, NULL); @@ -102,16 +102,16 @@ CFATTACH_DECL(esp_mca, sizeof(struct esp_softc), /* * Functions and the switch for the MI code. */ -static u_char esp_read_reg __P((struct ncr53c9x_softc *, int)); -static void esp_write_reg __P((struct ncr53c9x_softc *, int, u_char)); -static int esp_dma_isintr __P((struct ncr53c9x_softc *)); -static void esp_dma_reset __P((struct ncr53c9x_softc *)); -static int esp_dma_intr __P((struct ncr53c9x_softc *)); -static int esp_dma_setup __P((struct ncr53c9x_softc *, caddr_t *, - size_t *, int, size_t *)); -static void esp_dma_go __P((struct ncr53c9x_softc *)); -static void esp_dma_stop __P((struct ncr53c9x_softc *)); -static int esp_dma_isactive __P((struct ncr53c9x_softc *)); +static u_char esp_read_reg(struct ncr53c9x_softc *, int); +static void esp_write_reg(struct ncr53c9x_softc *, int, u_char); +static int esp_dma_isintr(struct ncr53c9x_softc *); +static void esp_dma_reset(struct ncr53c9x_softc *); +static int esp_dma_intr(struct ncr53c9x_softc *); +static int esp_dma_setup(struct ncr53c9x_softc *, caddr_t *, + size_t *, int, size_t *); +static void esp_dma_go(struct ncr53c9x_softc *); +static void esp_dma_stop(struct ncr53c9x_softc *); +static int esp_dma_isactive(struct ncr53c9x_softc *); static struct ncr53c9x_glue esp_glue = { esp_read_reg, diff --git a/sys/dev/mca/if_ate_mca.c b/sys/dev/mca/if_ate_mca.c index 62e8bd5c120..7765730299f 100644 --- a/sys/dev/mca/if_ate_mca.c +++ b/sys/dev/mca/if_ate_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ate_mca.c,v 1.10 2003/02/23 04:11:51 simonb Exp $ */ +/* $NetBSD: if_ate_mca.c,v 1.11 2005/02/04 02:10:43 perry Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ate_mca.c,v 1.10 2003/02/23 04:11:51 simonb Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ate_mca.c,v 1.11 2005/02/04 02:10:43 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -62,10 +62,10 @@ __KERNEL_RCSID(0, "$NetBSD: if_ate_mca.c,v 1.10 2003/02/23 04:11:51 simonb Exp $ #include <dev/mca/mcavar.h> #include <dev/mca/mcadevs.h> -int ate_mca_match __P((struct device *, struct cfdata *, void *)); -void ate_mca_attach __P((struct device *, struct device *, void *)); -static void ate_mca_detect __P((bus_space_tag_t, bus_space_handle_t, - u_int8_t enaddr[ETHER_ADDR_LEN])); +int ate_mca_match(struct device *, struct cfdata *, void *); +void ate_mca_attach(struct device *, struct device *, void *); +static void ate_mca_detect(bus_space_tag_t, bus_space_handle_t, + u_int8_t enaddr[ETHER_ADDR_LEN]); #define ATE_NPORTS 0x20 @@ -91,7 +91,7 @@ static const struct ate_mca_product { { 0, }, }; -static const struct ate_mca_product *ate_mca_lookup __P((u_int32_t)); +static const struct ate_mca_product *ate_mca_lookup(u_int32_t); static const struct ate_mca_product * ate_mca_lookup(id) diff --git a/sys/dev/mca/if_elmc_mca.c b/sys/dev/mca/if_elmc_mca.c index e6d4a8b911d..537dd3c7124 100644 --- a/sys/dev/mca/if_elmc_mca.c +++ b/sys/dev/mca/if_elmc_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_elmc_mca.c,v 1.15 2004/12/29 18:14:12 jdolecek Exp $ */ +/* $NetBSD: if_elmc_mca.c,v 1.16 2005/02/04 02:10:43 perry Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_elmc_mca.c,v 1.15 2004/12/29 18:14:12 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_elmc_mca.c,v 1.16 2005/02/04 02:10:43 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -79,17 +79,17 @@ struct elmc_mca_softc { void *sc_ih; /* interrupt handle */ }; -int elmc_mca_match __P((struct device *, struct cfdata *, void *)); -void elmc_mca_attach __P((struct device *, struct device *, void *)); - -static void elmc_mca_copyin __P((struct ie_softc *, void *, int, size_t)); -static void elmc_mca_copyout __P((struct ie_softc *, const void *, int, size_t)); -static u_int16_t elmc_mca_read_16 __P((struct ie_softc *, int)); -static void elmc_mca_write_16 __P((struct ie_softc *, int, u_int16_t)); -static void elmc_mca_write_24 __P((struct ie_softc *, int, int)); -static void elmc_mca_attn __P((struct ie_softc *, int)); -static void elmc_mca_hwreset __P((struct ie_softc *, int)); -static int elmc_mca_intrhook __P((struct ie_softc *, int)); +int elmc_mca_match(struct device *, struct cfdata *, void *); +void elmc_mca_attach(struct device *, struct device *, void *); + +static void elmc_mca_copyin(struct ie_softc *, void *, int, size_t); +static void elmc_mca_copyout(struct ie_softc *, const void *, int, size_t); +static u_int16_t elmc_mca_read_16(struct ie_softc *, int); +static void elmc_mca_write_16(struct ie_softc *, int, u_int16_t); +static void elmc_mca_write_24(struct ie_softc *, int, int); +static void elmc_mca_attn(struct ie_softc *, int); +static void elmc_mca_hwreset(struct ie_softc *, int); +static int elmc_mca_intrhook(struct ie_softc *, int); int elmc_mca_match(struct device *parent, struct cfdata *cf, void *aux) diff --git a/sys/dev/mca/if_ep_mca.c b/sys/dev/mca/if_ep_mca.c index e8ad0dd04c0..187d56e8179 100644 --- a/sys/dev/mca/if_ep_mca.c +++ b/sys/dev/mca/if_ep_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ep_mca.c,v 1.11 2003/10/25 18:37:03 christos Exp $ */ +/* $NetBSD: if_ep_mca.c,v 1.12 2005/02/04 02:10:43 perry Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -76,7 +76,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ep_mca.c,v 1.11 2003/10/25 18:37:03 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ep_mca.c,v 1.12 2005/02/04 02:10:43 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -106,8 +106,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_ep_mca.c,v 1.11 2003/10/25 18:37:03 christos Exp #define MCA_CBIO 0x200 /* Configuration Base IO Address */ #define MCA_IOSZ 0x10 /* I/O space size */ -int ep_mca_match __P((struct device *, struct cfdata *, void *)); -void ep_mca_attach __P((struct device *, struct device *, void *)); +int ep_mca_match(struct device *, struct cfdata *, void *); +void ep_mca_attach(struct device *, struct device *, void *); CFATTACH_DECL(ep_mca, sizeof(struct ep_softc), ep_mca_match, ep_mca_attach, NULL, NULL); @@ -126,7 +126,7 @@ const struct ep_mca_product { }; static const struct ep_mca_product *ep_mca_lookup - __P((const struct mca_attach_args *)); + (const struct mca_attach_args *); static const struct ep_mca_product * ep_mca_lookup(ma) diff --git a/sys/dev/mca/if_le_mca.c b/sys/dev/mca/if_le_mca.c index 96a2f677584..28aba6a0c9e 100644 --- a/sys/dev/mca/if_le_mca.c +++ b/sys/dev/mca/if_le_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_le_mca.c,v 1.7 2003/10/25 18:37:03 christos Exp $ */ +/* $NetBSD: if_le_mca.c,v 1.8 2005/02/04 02:10:43 perry Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_le_mca.c,v 1.7 2003/10/25 18:37:03 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_le_mca.c,v 1.8 2005/02/04 02:10:43 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -82,8 +82,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_mca.c,v 1.7 2003/10/25 18:37:03 christos Exp $ #include <dev/mca/if_lereg.h> -int le_mca_match __P((struct device *, struct cfdata *, void *)); -void le_mca_attach __P((struct device *, struct device *, void *)); +int le_mca_match(struct device *, struct cfdata *, void *); +void le_mca_attach(struct device *, struct device *, void *); struct le_mca_softc { struct am7990_softc sc_am7990; /* glue to MI code */ @@ -93,16 +93,16 @@ struct le_mca_softc { bus_space_handle_t sc_memh; }; -static void le_mca_wrcsr __P((struct lance_softc *, u_int16_t, u_int16_t)); -static u_int16_t le_mca_rdcsr __P((struct lance_softc *, u_int16_t)); -static void le_mca_hwreset __P((struct lance_softc *)); -static int le_mca_intredge __P((void *)); +static void le_mca_wrcsr(struct lance_softc *, u_int16_t, u_int16_t); +static u_int16_t le_mca_rdcsr(struct lance_softc *, u_int16_t); +static void le_mca_hwreset(struct lance_softc *); +static int le_mca_intredge(void *); static void le_mca_copytobuf(struct lance_softc *, void *, int, int); static void le_mca_copyfrombuf(struct lance_softc *, void *, int, int); static void le_mca_zerobuf(struct lance_softc *, int, int); -static __inline void le_mca_wrreg __P((struct le_mca_softc *, int, int)); +static __inline void le_mca_wrreg(struct le_mca_softc *, int, int); #define le_mca_set_RAP(sc, reg_number) \ le_mca_wrreg(sc, reg_number, RAP | REGWRITE) diff --git a/sys/dev/mca/if_ne_mca.c b/sys/dev/mca/if_ne_mca.c index 901bdcba945..93a1de16118 100644 --- a/sys/dev/mca/if_ne_mca.c +++ b/sys/dev/mca/if_ne_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ne_mca.c,v 1.6 2002/10/02 16:34:12 thorpej Exp $ */ +/* $NetBSD: if_ne_mca.c,v 1.7 2005/02/04 02:10:43 perry Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ne_mca.c,v 1.6 2002/10/02 16:34:12 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ne_mca.c,v 1.7 2005/02/04 02:10:43 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -83,8 +83,8 @@ struct ne_mca_softc { void *sc_ih; /* interrupt handle */ }; -int ne_mca_match __P((struct device *, struct cfdata *, void *)); -void ne_mca_attach __P((struct device *, struct device *, void *)); +int ne_mca_match(struct device *, struct cfdata *, void *); +void ne_mca_attach(struct device *, struct device *, void *); CFATTACH_DECL(ne_mca, sizeof(struct ne_mca_softc), ne_mca_match, ne_mca_attach, NULL, NULL); @@ -99,7 +99,7 @@ static const struct ne_mca_products { { 0, NULL } }; -static const struct ne_mca_products *ne_mca_lookup __P((int id)); +static const struct ne_mca_products *ne_mca_lookup(int id); static const struct ne_mca_products * ne_mca_lookup(int id) diff --git a/sys/dev/mca/if_tr_mca.c b/sys/dev/mca/if_tr_mca.c index 0d90b236aa7..3d22b1794da 100644 --- a/sys/dev/mca/if_tr_mca.c +++ b/sys/dev/mca/if_tr_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_tr_mca.c,v 1.10 2002/10/02 16:34:12 thorpej Exp $ */ +/* $NetBSD: if_tr_mca.c,v 1.11 2005/02/04 02:10:43 perry Exp $ */ /*_ * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_tr_mca.c,v 1.10 2002/10/02 16:34:12 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_tr_mca.c,v 1.11 2005/02/04 02:10:43 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -67,8 +67,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_tr_mca.c,v 1.10 2002/10/02 16:34:12 thorpej Exp $ #define TR_MBPS_4 0 #define TR_MBPS_16 1 -int tr_mca_probe __P((struct device *, struct cfdata *, void *)); -void tr_mca_attach __P((struct device *, struct device *, void *)); +int tr_mca_probe(struct device *, struct cfdata *, void *); +void tr_mca_attach(struct device *, struct device *, void *); CFATTACH_DECL(tr_mca, sizeof(struct tr_softc), tr_mca_probe, tr_mca_attach, NULL, NULL); @@ -82,7 +82,7 @@ static const struct tr_mca_product { { 0, NULL }, }; -static const struct tr_mca_product *tr_mca_lookup __P((int)); +static const struct tr_mca_product *tr_mca_lookup(int); static const struct tr_mca_product * tr_mca_lookup(id) diff --git a/sys/dev/mca/if_we_mca.c b/sys/dev/mca/if_we_mca.c index 06f81a73981..ab46dede1d0 100644 --- a/sys/dev/mca/if_we_mca.c +++ b/sys/dev/mca/if_we_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_we_mca.c,v 1.11 2004/09/08 19:09:43 jdolecek Exp $ */ +/* $NetBSD: if_we_mca.c,v 1.12 2005/02/04 02:10:43 perry Exp $ */ /*- * Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_we_mca.c,v 1.11 2004/09/08 19:09:43 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_we_mca.c,v 1.12 2005/02/04 02:10:43 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -87,9 +87,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_we_mca.c,v 1.11 2004/09/08 19:09:43 jdolecek Exp #define WD_8003 0x01 #define WD_ELITE 0x02 -int we_mca_probe __P((struct device *, struct cfdata *, void *)); -void we_mca_attach __P((struct device *, struct device *, void *)); -void we_mca_init_hook __P((struct we_softc *)); +int we_mca_probe(struct device *, struct cfdata *, void *); +void we_mca_attach(struct device *, struct device *, void *); +void we_mca_init_hook(struct we_softc *); CFATTACH_DECL(we_mca, sizeof(struct we_softc), we_mca_probe, we_mca_attach, NULL, NULL); @@ -129,7 +129,7 @@ static const int we_mca_irq[] = { 3, 4, 10, 15, }; -static const struct we_mca_product *we_mca_lookup __P((int)); +static const struct we_mca_product *we_mca_lookup(int); static const struct we_mca_product * we_mca_lookup(id) diff --git a/sys/dev/mca/mca.c b/sys/dev/mca/mca.c index 140aee0bcce..caec15560d8 100644 --- a/sys/dev/mca/mca.c +++ b/sys/dev/mca/mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: mca.c,v 1.16 2004/08/30 18:27:21 drochner Exp $ */ +/* $NetBSD: mca.c,v 1.17 2005/02/04 02:10:43 perry Exp $ */ /*- * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mca.c,v 1.16 2004/08/30 18:27:21 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mca.c,v 1.17 2005/02/04 02:10:43 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -56,15 +56,15 @@ __KERNEL_RCSID(0, "$NetBSD: mca.c,v 1.16 2004/08/30 18:27:21 drochner Exp $"); #include "locators.h" -int mca_match __P((struct device *, struct cfdata *, void *)); -void mca_attach __P((struct device *, struct device *, void *)); +int mca_match(struct device *, struct cfdata *, void *); +void mca_attach(struct device *, struct device *, void *); CFATTACH_DECL(mca, sizeof(struct device), mca_match, mca_attach, NULL, NULL); -int mca_submatch __P((struct device *, struct cfdata *, - const locdesc_t *, void *)); -int mca_print __P((void *, const char *)); +int mca_submatch(struct device *, struct cfdata *, + const locdesc_t *, void *); +int mca_print(void *, const char *); int mca_match(parent, cf, aux) diff --git a/sys/dev/mca/mcavar.h b/sys/dev/mca/mcavar.h index 6ab5f153b6e..04fc8b95e70 100644 --- a/sys/dev/mca/mcavar.h +++ b/sys/dev/mca/mcavar.h @@ -1,4 +1,4 @@ -/* $NetBSD: mcavar.h,v 1.7 2004/08/30 18:27:21 drochner Exp $ */ +/* $NetBSD: mcavar.h,v 1.8 2005/02/04 02:10:43 perry Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -75,7 +75,7 @@ struct mca_attach_args { int mcabusprint(void *, const char *); -void mca_devinfo __P((int, char *, size_t)); -int mca_match_disabled __P((int)); +void mca_devinfo(int, char *, size_t); +int mca_match_disabled(int); #endif /* _DEV_MCA_MCAVAR_H_ */ diff --git a/sys/dev/mscp/mscp_disk.c b/sys/dev/mscp/mscp_disk.c index f866ef9a9eb..b875f1150a8 100644 --- a/sys/dev/mscp/mscp_disk.c +++ b/sys/dev/mscp/mscp_disk.c @@ -1,4 +1,4 @@ -/* $NetBSD: mscp_disk.c,v 1.45 2005/01/04 19:36:48 matt Exp $ */ +/* $NetBSD: mscp_disk.c,v 1.46 2005/02/04 02:10:43 perry Exp $ */ /* * Copyright (c) 1988 Regents of the University of California. * All rights reserved. @@ -81,7 +81,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.45 2005/01/04 19:36:48 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.46 2005/02/04 02:10:43 perry Exp $"); #include <sys/param.h> #include <sys/buf.h> @@ -126,15 +126,15 @@ struct ra_softc { #define rx_softc ra_softc -void rxattach __P((struct device *, struct device *, void *)); -int rx_putonline __P((struct rx_softc *)); -void rrmakelabel __P((struct disklabel *, long)); +void rxattach(struct device *, struct device *, void *); +int rx_putonline(struct rx_softc *); +void rrmakelabel(struct disklabel *, long); #if NRA -int ramatch __P((struct device *, struct cfdata *, void *)); -void raattach __P((struct device *, struct device *, void *)); -int ra_putonline __P((struct ra_softc *)); +int ramatch(struct device *, struct cfdata *, void *); +void raattach(struct device *, struct device *, void *); +int ra_putonline(struct ra_softc *); CFATTACH_DECL(ra, sizeof(struct ra_softc), ramatch, rxattach, NULL, NULL); @@ -619,7 +619,7 @@ rasize(dev) #if NRX -int rxmatch __P((struct device *, struct cfdata *, void *)); +int rxmatch(struct device *, struct cfdata *, void *); CFATTACH_DECL(rx, sizeof(struct rx_softc), rxmatch, rxattach, NULL, NULL); @@ -933,14 +933,14 @@ rxsize(dev) #endif /* NRX */ -void rrdgram __P((struct device *, struct mscp *, struct mscp_softc *)); -void rriodone __P((struct device *, struct buf *)); -int rronline __P((struct device *, struct mscp *)); -int rrgotstatus __P((struct device *, struct mscp *)); -void rrreplace __P((struct device *, struct mscp *)); -int rrioerror __P((struct device *, struct mscp *, struct buf *)); -void rrfillin __P((struct buf *, struct mscp *)); -void rrbb __P((struct device *, struct mscp *, struct buf *)); +void rrdgram(struct device *, struct mscp *, struct mscp_softc *); +void rriodone(struct device *, struct buf *); +int rronline(struct device *, struct mscp *); +int rrgotstatus(struct device *, struct mscp *); +void rrreplace(struct device *, struct mscp *); +int rrioerror(struct device *, struct mscp *, struct buf *); +void rrfillin(struct buf *, struct mscp *); +void rrbb(struct device *, struct mscp *, struct buf *); struct mscp_device ra_device = { diff --git a/sys/dev/mscp/mscp_subr.c b/sys/dev/mscp/mscp_subr.c index 6ff3586b9ec..083d875ed67 100644 --- a/sys/dev/mscp/mscp_subr.c +++ b/sys/dev/mscp/mscp_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: mscp_subr.c,v 1.25 2004/10/28 07:07:40 yamt Exp $ */ +/* $NetBSD: mscp_subr.c,v 1.26 2005/02/04 02:10:43 perry Exp $ */ /* * Copyright (c) 1988 Regents of the University of California. * All rights reserved. @@ -75,7 +75,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mscp_subr.c,v 1.25 2004/10/28 07:07:40 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mscp_subr.c,v 1.26 2005/02/04 02:10:43 perry Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -96,12 +96,12 @@ __KERNEL_RCSID(0, "$NetBSD: mscp_subr.c,v 1.25 2004/10/28 07:07:40 yamt Exp $"); #define b_forw b_hash.le_next -int mscp_match __P((struct device *, struct cfdata *, void *)); -void mscp_attach __P((struct device *, struct device *, void *)); -void mscp_start __P((struct mscp_softc *)); -int mscp_init __P((struct mscp_softc *)); -void mscp_initds __P((struct mscp_softc *)); -int mscp_waitstep __P((struct mscp_softc *, int, int)); +int mscp_match(struct device *, struct cfdata *, void *); +void mscp_attach(struct device *, struct device *, void *); +void mscp_start(struct mscp_softc *); +int mscp_init(struct mscp_softc *); +void mscp_initds(struct mscp_softc *); +int mscp_waitstep(struct mscp_softc *, int, int); CFATTACH_DECL(mscpbus, sizeof(struct mscp_softc), mscp_match, mscp_attach, NULL, NULL); diff --git a/sys/dev/mscp/mscp_tape.c b/sys/dev/mscp/mscp_tape.c index 640be8a9378..c40bb5c3e75 100644 --- a/sys/dev/mscp/mscp_tape.c +++ b/sys/dev/mscp/mscp_tape.c @@ -1,4 +1,4 @@ -/* $NetBSD: mscp_tape.c,v 1.22 2004/10/31 12:52:55 he Exp $ */ +/* $NetBSD: mscp_tape.c,v 1.23 2005/02/04 02:10:43 perry Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mscp_tape.c,v 1.22 2004/10/31 12:52:55 he Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mscp_tape.c,v 1.23 2005/02/04 02:10:43 perry Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -81,17 +81,17 @@ struct mt_softc { #define MT_OFFLINE 0 #define MT_ONLINE 1 -int mtmatch __P((struct device *, struct cfdata *, void *)); -void mtattach __P((struct device *, struct device *, void *)); -void mtdgram __P((struct device *, struct mscp *, struct mscp_softc *)); -void mtiodone __P((struct device *, struct buf *)); -int mtonline __P((struct device *, struct mscp *)); -int mtgotstatus __P((struct device *, struct mscp *)); -int mtioerror __P((struct device *, struct mscp *, struct buf *)); -void mtfillin __P((struct buf *, struct mscp *)); -int mtcmd __P((struct mt_softc *, int, int, int)); -void mtcmddone __P((struct device *, struct mscp *)); -int mt_putonline __P((struct mt_softc *)); +int mtmatch(struct device *, struct cfdata *, void *); +void mtattach(struct device *, struct device *, void *); +void mtdgram(struct device *, struct mscp *, struct mscp_softc *); +void mtiodone(struct device *, struct buf *); +int mtonline(struct device *, struct mscp *); +int mtgotstatus(struct device *, struct mscp *); +int mtioerror(struct device *, struct mscp *, struct buf *); +void mtfillin(struct buf *, struct mscp *); +int mtcmd(struct mt_softc *, int, int, int); +void mtcmddone(struct device *, struct mscp *); +int mt_putonline(struct mt_softc *); struct mscp_device mt_device = { mtdgram, diff --git a/sys/dev/mscp/mscpvar.h b/sys/dev/mscp/mscpvar.h index 024ce50bb23..93681d7f4b8 100644 --- a/sys/dev/mscp/mscpvar.h +++ b/sys/dev/mscp/mscpvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: mscpvar.h,v 1.10 2003/08/07 16:31:10 agc Exp $ */ +/* $NetBSD: mscpvar.h,v 1.11 2005/02/04 02:10:43 perry Exp $ */ /* * Copyright (c) 1988 Regents of the University of California. * All rights reserved. @@ -113,34 +113,34 @@ struct mscp_xi { struct mscp_ctlr { void (*mc_ctlrdone) /* controller operation complete */ - __P((struct device *)); + (struct device *); void (*mc_go) /* device-specific start routine */ - __P((struct device *, struct mscp_xi *)); + (struct device *, struct mscp_xi *); void (*mc_saerror) /* ctlr error handling */ - __P((struct device *, int)); + (struct device *, int); }; struct mscp_softc; struct mscp_device { void (*me_dgram) /* error datagram */ - __P((struct device *, struct mscp *, struct mscp_softc *)); + (struct device *, struct mscp *, struct mscp_softc *); void (*me_iodone) /* normal I/O is done */ - __P((struct device *, struct buf *)); + (struct device *, struct buf *); int (*me_online) /* drive on line */ - __P((struct device *, struct mscp *)); + (struct device *, struct mscp *); int (*me_gotstatus) /* got unit status */ - __P((struct device *, struct mscp *)); + (struct device *, struct mscp *); void (*me_replace) /* replace done */ - __P((struct device *, struct mscp *)); + (struct device *, struct mscp *); int (*me_ioerr) /* read or write failed */ - __P((struct device *, struct mscp *, struct buf *)); + (struct device *, struct mscp *, struct buf *); void (*me_bb) /* B_BAD io done */ - __P((struct device *, struct mscp *, struct buf *)); + (struct device *, struct mscp *, struct buf *); void (*me_fillin) /* Fill in mscp info for this drive */ - __P((struct buf *,struct mscp *)); + (struct buf *,struct mscp *); void (*me_cmddone) /* Non-data transfer operation is done */ - __P((struct device *, struct mscp *)); + (struct device *, struct mscp *); }; /* @@ -267,16 +267,16 @@ struct mscp_softc { } /* Prototypes */ -struct mscp *mscp_getcp __P((struct mscp_softc *, int)); -void mscp_printevent __P((struct mscp *)); -void mscp_go __P((struct mscp_softc *, struct mscp *, int)); -void mscp_requeue __P((struct mscp_softc *)); -void mscp_dorsp __P((struct mscp_softc *)); -int mscp_decodeerror __P((char *, struct mscp *, struct mscp_softc *)); -int mscp_print __P((void *, const char *)); -void mscp_hexdump __P((struct mscp *)); -void mscp_strategy __P((struct buf *, struct device *)); -void mscp_printtype __P((int, int)); -int mscp_waitstep __P((struct mscp_softc *, int, int)); -void mscp_dgo __P((struct mscp_softc *, struct mscp_xi *)); -void mscp_intr __P((struct mscp_softc *)); +struct mscp *mscp_getcp(struct mscp_softc *, int); +void mscp_printevent(struct mscp *); +void mscp_go(struct mscp_softc *, struct mscp *, int); +void mscp_requeue(struct mscp_softc *); +void mscp_dorsp(struct mscp_softc *); +int mscp_decodeerror(char *, struct mscp *, struct mscp_softc *); +int mscp_print(void *, const char *); +void mscp_hexdump(struct mscp *); +void mscp_strategy(struct buf *, struct device *); +void mscp_printtype(int, int); +int mscp_waitstep(struct mscp_softc *, int, int); +void mscp_dgo(struct mscp_softc *, struct mscp_xi *); +void mscp_intr(struct mscp_softc *); diff --git a/sys/dev/mvme/clmpcc_pcctwo.c b/sys/dev/mvme/clmpcc_pcctwo.c index fc08c3349f4..910846bd955 100644 --- a/sys/dev/mvme/clmpcc_pcctwo.c +++ b/sys/dev/mvme/clmpcc_pcctwo.c @@ -1,4 +1,4 @@ -/* $NetBSD: clmpcc_pcctwo.c,v 1.8 2003/11/09 14:26:15 he Exp $ */ +/* $NetBSD: clmpcc_pcctwo.c,v 1.9 2005/02/04 02:10:43 perry Exp $ */ /*- * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clmpcc_pcctwo.c,v 1.8 2003/11/09 14:26:15 he Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clmpcc_pcctwo.c,v 1.9 2005/02/04 02:10:43 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -75,10 +75,10 @@ __KERNEL_RCSID(0, "$NetBSD: clmpcc_pcctwo.c,v 1.8 2003/11/09 14:26:15 he Exp $") /* Definition of the driver for autoconfig. */ -int clmpcc_pcctwo_match __P((struct device *, struct cfdata *, void *)); -void clmpcc_pcctwo_attach __P((struct device *, struct device *, void *)); -void clmpcc_pcctwo_iackhook __P((struct clmpcc_softc *, int)); -void clmpcc_pcctwo_consiackhook __P((struct clmpcc_softc *, int)); +int clmpcc_pcctwo_match(struct device *, struct cfdata *, void *); +void clmpcc_pcctwo_attach(struct device *, struct device *, void *); +void clmpcc_pcctwo_iackhook(struct clmpcc_softc *, int); +void clmpcc_pcctwo_consiackhook(struct clmpcc_softc *, int); CFATTACH_DECL(clmpcc_pcctwo, sizeof(struct clmpcc_softc), clmpcc_pcctwo_match, clmpcc_pcctwo_attach, NULL, NULL); diff --git a/sys/dev/mvme/clock_pcctwo.c b/sys/dev/mvme/clock_pcctwo.c index 6ffb1e6a1e8..e3d456b323c 100644 --- a/sys/dev/mvme/clock_pcctwo.c +++ b/sys/dev/mvme/clock_pcctwo.c @@ -1,4 +1,4 @@ -/* $NetBSD: clock_pcctwo.c,v 1.5 2003/07/14 15:47:19 lukem Exp $ */ +/* $NetBSD: clock_pcctwo.c,v 1.6 2005/02/04 02:10:43 perry Exp $ */ /*- * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clock_pcctwo.c,v 1.5 2003/07/14 15:47:19 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clock_pcctwo.c,v 1.6 2005/02/04 02:10:43 perry Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -58,8 +58,8 @@ __KERNEL_RCSID(0, "$NetBSD: clock_pcctwo.c,v 1.5 2003/07/14 15:47:19 lukem Exp $ #include <dev/mvme/pcctworeg.h> -int clock_pcctwo_match __P((struct device *, struct cfdata *, void *)); -void clock_pcctwo_attach __P((struct device *, struct device *, void *)); +int clock_pcctwo_match(struct device *, struct cfdata *, void *); +void clock_pcctwo_attach(struct device *, struct device *, void *); struct clock_pcctwo_softc { struct device sc_dev; @@ -72,11 +72,11 @@ CFATTACH_DECL(clock_pcctwo, sizeof(struct device), extern struct cfdriver clock_cd; -static int clock_pcctwo_profintr __P((void *)); -static int clock_pcctwo_statintr __P((void *)); -static void clock_pcctwo_initclocks __P((void *, int, int)); -static long clock_pcctwo_microtime __P((void *)); -static void clock_pcctwo_shutdown __P((void *)); +static int clock_pcctwo_profintr(void *); +static int clock_pcctwo_statintr(void *); +static void clock_pcctwo_initclocks(void *, int, int); +static long clock_pcctwo_microtime(void *); +static void clock_pcctwo_shutdown(void *); static struct clock_pcctwo_softc *clock_pcctwo_sc; diff --git a/sys/dev/mvme/clockvar.h b/sys/dev/mvme/clockvar.h index f08b51baf84..b29205d2eb1 100644 --- a/sys/dev/mvme/clockvar.h +++ b/sys/dev/mvme/clockvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: clockvar.h,v 1.4 2003/11/01 22:42:23 tsutsui Exp $ */ +/* $NetBSD: clockvar.h,v 1.5 2005/02/04 02:10:43 perry Exp $ */ /*- * Copyright (c) 1996, 2002 The NetBSD Foundation, Inc. @@ -52,13 +52,13 @@ extern int clock_statvar; extern int clock_statmin; struct clock_attach_args { - void (*ca_initfunc) __P((void *, int, int)); - long (*ca_microtime) __P((void *)); + void (*ca_initfunc)(void *, int, int); + long (*ca_microtime)(void *); void *ca_arg; }; -void clock_config __P((struct device *, struct clock_attach_args *, - struct evcnt *)); +void clock_config(struct device *, struct clock_attach_args *, + struct evcnt *); /* * Macro to compute a new randomized interval. The intervals are diff --git a/sys/dev/mvme/if_ie_mvme.c b/sys/dev/mvme/if_ie_mvme.c index 3e996c27bf6..f0a589e6c51 100644 --- a/sys/dev/mvme/if_ie_mvme.c +++ b/sys/dev/mvme/if_ie_mvme.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ie_mvme.c,v 1.6 2003/07/14 15:47:19 lukem Exp $ */ +/* $NetBSD: if_ie_mvme.c,v 1.7 2005/02/04 02:10:43 perry Exp $ */ /*- * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ie_mvme.c,v 1.6 2003/07/14 15:47:19 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ie_mvme.c,v 1.7 2005/02/04 02:10:43 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -67,8 +67,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_ie_mvme.c,v 1.6 2003/07/14 15:47:19 lukem Exp $") #include <dev/mvme/pcctworeg.h> -int ie_pcctwo_match __P((struct device *, struct cfdata *, void *)); -void ie_pcctwo_attach __P((struct device *, struct device *, void *)); +int ie_pcctwo_match(struct device *, struct cfdata *, void *); +void ie_pcctwo_attach(struct device *, struct device *, void *); struct ie_pcctwo_softc { struct ie_softc ps_ie; @@ -84,17 +84,17 @@ extern struct cfdriver ie_cd; /* Functions required by the i82586 MI driver */ -static void ie_reset __P((struct ie_softc *, int)); -static int ie_intrhook __P((struct ie_softc *, int)); -static void ie_hwinit __P((struct ie_softc *)); -static void ie_atten __P((struct ie_softc *, int)); +static void ie_reset(struct ie_softc *, int); +static int ie_intrhook(struct ie_softc *, int); +static void ie_hwinit(struct ie_softc *); +static void ie_atten(struct ie_softc *, int); -static void ie_copyin __P((struct ie_softc *, void *, int, size_t)); -static void ie_copyout __P((struct ie_softc *, const void *, int, size_t)); +static void ie_copyin(struct ie_softc *, void *, int, size_t); +static void ie_copyout(struct ie_softc *, const void *, int, size_t); -static u_int16_t ie_read_16 __P((struct ie_softc *, int)); -static void ie_write_16 __P((struct ie_softc *, int, u_int16_t)); -static void ie_write_24 __P((struct ie_softc *, int, int)); +static u_int16_t ie_read_16(struct ie_softc *, int); +static void ie_write_16(struct ie_softc *, int, u_int16_t); +static void ie_write_24(struct ie_softc *, int, int); /* * i82596 Support Routines for MVME1[67][27] and MVME187 Boards diff --git a/sys/dev/mvme/lpt_mvme.c b/sys/dev/mvme/lpt_mvme.c index f113ee76017..80899a64af1 100644 --- a/sys/dev/mvme/lpt_mvme.c +++ b/sys/dev/mvme/lpt_mvme.c @@ -1,4 +1,4 @@ -/* $NetBSD: lpt_mvme.c,v 1.4 2003/07/14 15:47:19 lukem Exp $ */ +/* $NetBSD: lpt_mvme.c,v 1.5 2005/02/04 02:10:44 perry Exp $ */ /*- * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc. @@ -91,7 +91,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lpt_mvme.c,v 1.4 2003/07/14 15:47:19 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lpt_mvme.c,v 1.5 2005/02/04 02:10:44 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -127,8 +127,8 @@ int lptdebug = 1; #define LPTUNIT(s) (minor(s) & 0x0f) #define LPTFLAGS(s) (minor(s) & 0xf0) -static void lpt_wakeup __P((void *arg)); -static int pushbytes __P((struct lpt_softc *)); +static void lpt_wakeup(void *arg); +static int pushbytes(struct lpt_softc *); extern struct cfdriver lpt_cd; diff --git a/sys/dev/mvme/lpt_pcctwo.c b/sys/dev/mvme/lpt_pcctwo.c index 99535306cde..70d2917086e 100644 --- a/sys/dev/mvme/lpt_pcctwo.c +++ b/sys/dev/mvme/lpt_pcctwo.c @@ -1,4 +1,4 @@ -/* $NetBSD: lpt_pcctwo.c,v 1.5 2003/07/14 15:47:19 lukem Exp $ */ +/* $NetBSD: lpt_pcctwo.c,v 1.6 2005/02/04 02:10:44 perry Exp $ */ /*- * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lpt_pcctwo.c,v 1.5 2003/07/14 15:47:19 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lpt_pcctwo.c,v 1.6 2005/02/04 02:10:44 perry Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -59,8 +59,8 @@ __KERNEL_RCSID(0, "$NetBSD: lpt_pcctwo.c,v 1.5 2003/07/14 15:47:19 lukem Exp $") /* * Autoconfig stuff */ -int lpt_pcctwo_match __P((struct device *, struct cfdata *, void *)); -void lpt_pcctwo_attach __P((struct device *, struct device *, void *)); +int lpt_pcctwo_match(struct device *, struct cfdata *, void *); +void lpt_pcctwo_attach(struct device *, struct device *, void *); CFATTACH_DECL(lpt_pcctwo, sizeof(struct lpt_softc), lpt_pcctwo_match, lpt_pcctwo_attach, NULL, NULL); @@ -68,13 +68,13 @@ CFATTACH_DECL(lpt_pcctwo, sizeof(struct lpt_softc), extern struct cfdriver lpt_cd; -int lpt_pcctwo_intr __P((void *)); -void lpt_pcctwo_open __P((struct lpt_softc *, int)); -void lpt_pcctwo_close __P((struct lpt_softc *)); -void lpt_pcctwo_iprime __P((struct lpt_softc *)); -void lpt_pcctwo_speed __P((struct lpt_softc *, int)); -int lpt_pcctwo_notrdy __P((struct lpt_softc *, int)); -void lpt_pcctwo_wr_data __P((struct lpt_softc *, u_char)); +int lpt_pcctwo_intr(void *); +void lpt_pcctwo_open(struct lpt_softc *, int); +void lpt_pcctwo_close(struct lpt_softc *); +void lpt_pcctwo_iprime(struct lpt_softc *); +void lpt_pcctwo_speed(struct lpt_softc *, int); +int lpt_pcctwo_notrdy(struct lpt_softc *, int); +void lpt_pcctwo_wr_data(struct lpt_softc *, u_char); struct lpt_funcs lpt_pcctwo_funcs = { lpt_pcctwo_open, diff --git a/sys/dev/mvme/lptvar.h b/sys/dev/mvme/lptvar.h index 5b461396545..cd70e3aaca9 100644 --- a/sys/dev/mvme/lptvar.h +++ b/sys/dev/mvme/lptvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: lptvar.h,v 1.1 2002/02/12 20:38:45 scw Exp $ */ +/* $NetBSD: lptvar.h,v 1.2 2005/02/04 02:10:44 perry Exp $ */ /*- * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc. @@ -78,18 +78,18 @@ struct lpt_softc { struct lpt_funcs { - void (*lf_open) __P((struct lpt_softc *, int)); - void (*lf_close) __P((struct lpt_softc *)); - void (*lf_iprime) __P((struct lpt_softc *)); - void (*lf_speed) __P((struct lpt_softc *, int)); - int (*lf_notrdy) __P((struct lpt_softc *, int)); - void (*lf_wrdata) __P((struct lpt_softc *, u_char)); + void (*lf_open)(struct lpt_softc *, int); + void (*lf_close)(struct lpt_softc *); + void (*lf_iprime)(struct lpt_softc *); + void (*lf_speed)(struct lpt_softc *, int); + int (*lf_notrdy)(struct lpt_softc *, int); + void (*lf_wrdata)(struct lpt_softc *, u_char); }; #define LPT_STROBE_FAST 0 #define LPT_STROBE_SLOW 1 -extern void lpt_attach_subr __P((struct lpt_softc *)); -extern int lpt_intr __P((struct lpt_softc *)); +extern void lpt_attach_subr(struct lpt_softc *); +extern int lpt_intr(struct lpt_softc *); #endif /* __mvme_lptvar_h */ diff --git a/sys/dev/mvme/osiop_pcctwo.c b/sys/dev/mvme/osiop_pcctwo.c index e5882660258..0ed919368a9 100644 --- a/sys/dev/mvme/osiop_pcctwo.c +++ b/sys/dev/mvme/osiop_pcctwo.c @@ -1,4 +1,4 @@ -/* $NetBSD: osiop_pcctwo.c,v 1.7 2004/02/13 11:36:22 wiz Exp $ */ +/* $NetBSD: osiop_pcctwo.c,v 1.8 2005/02/04 02:10:44 perry Exp $ */ /*- * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: osiop_pcctwo.c,v 1.7 2004/02/13 11:36:22 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: osiop_pcctwo.c,v 1.8 2005/02/04 02:10:44 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -64,8 +64,8 @@ __KERNEL_RCSID(0, "$NetBSD: osiop_pcctwo.c,v 1.7 2004/02/13 11:36:22 wiz Exp $") #include <dev/mvme/pcctwovar.h> -int osiop_pcctwo_match __P((struct device *, struct cfdata *, void *)); -void osiop_pcctwo_attach __P((struct device *, struct device *, void *)); +int osiop_pcctwo_match(struct device *, struct cfdata *, void *); +void osiop_pcctwo_attach(struct device *, struct device *, void *); struct osiop_pcctwo_softc { struct osiop_softc sc_osiop; @@ -75,7 +75,7 @@ struct osiop_pcctwo_softc { CFATTACH_DECL(osiop_pcctwo, sizeof(struct osiop_pcctwo_softc), osiop_pcctwo_match, osiop_pcctwo_attach, NULL, NULL); -static int osiop_pcctwo_intr __P((void *)); +static int osiop_pcctwo_intr(void *); extern struct cfdriver osiop_cd; diff --git a/sys/dev/mvme/pcctwo.c b/sys/dev/mvme/pcctwo.c index f431da25a6b..cd18cfdd4ae 100644 --- a/sys/dev/mvme/pcctwo.c +++ b/sys/dev/mvme/pcctwo.c @@ -1,4 +1,4 @@ -/* $NetBSD: pcctwo.c,v 1.3 2003/07/14 15:47:20 lukem Exp $ */ +/* $NetBSD: pcctwo.c,v 1.4 2005/02/04 02:10:44 perry Exp $ */ /*- * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pcctwo.c,v 1.3 2003/07/14 15:47:20 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pcctwo.c,v 1.4 2005/02/04 02:10:44 perry Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -142,7 +142,7 @@ pcctwoprint(aux, cp) void pcctwointr_establish(vec, hand, lvl, arg, evcnt) int vec; - int (*hand) __P((void *)), lvl; + int (*hand)(void *), lvl; void *arg; struct evcnt *evcnt; { diff --git a/sys/dev/mvme/vme_two_isr.c b/sys/dev/mvme/vme_two_isr.c index f06311d6217..27ada557159 100644 --- a/sys/dev/mvme/vme_two_isr.c +++ b/sys/dev/mvme/vme_two_isr.c @@ -1,4 +1,4 @@ -/* $NetBSD: vme_two_isr.c,v 1.4 2003/07/14 15:47:21 lukem Exp $ */ +/* $NetBSD: vme_two_isr.c,v 1.5 2005/02/04 02:10:44 perry Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vme_two_isr.c,v 1.4 2003/07/14 15:47:21 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vme_two_isr.c,v 1.5 2005/02/04 02:10:44 perry Exp $"); #include "vmetwo.h" @@ -78,7 +78,7 @@ int vmetwo_not_present; * which does the clearing automatically. */ static struct vme_two_handler { - int (*isr_hand) __P((void *)); + int (*isr_hand)(void *); void *isr_arg; } vme_two_handlers[(VME2_VECTOR_LOCAL_MAX - VME2_VECTOR_LOCAL_MIN) + 1]; diff --git a/sys/dev/nullcons_subr.c b/sys/dev/nullcons_subr.c index 5118703a62f..eab51791cff 100644 --- a/sys/dev/nullcons_subr.c +++ b/sys/dev/nullcons_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: nullcons_subr.c,v 1.1 2003/10/17 20:27:38 cdi Exp $ */ +/* $NetBSD: nullcons_subr.c,v 1.2 2005/02/04 02:10:35 perry Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nullcons_subr.c,v 1.1 2003/10/17 20:27:38 cdi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nullcons_subr.c,v 1.2 2005/02/04 02:10:35 perry Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -60,7 +60,7 @@ dev_type_read(nullcndev_read); dev_type_ioctl(nullcndev_ioctl); dev_type_tty(nullcndev_tty); -static int nullcons_newdev __P((struct consdev *)); +static int nullcons_newdev(struct consdev *); const struct cdevsw nullcn_devsw = { nullopen, nullclose, nullcndev_read, nullwrite, nullcndev_ioctl, diff --git a/sys/dev/ofisa/com_ofisa.c b/sys/dev/ofisa/com_ofisa.c index 86a333265f4..6b48aa0b115 100644 --- a/sys/dev/ofisa/com_ofisa.c +++ b/sys/dev/ofisa/com_ofisa.c @@ -1,4 +1,4 @@ -/* $NetBSD: com_ofisa.c,v 1.7 2002/10/02 16:34:27 thorpej Exp $ */ +/* $NetBSD: com_ofisa.c,v 1.8 2005/02/04 02:10:44 perry Exp $ */ /* * Copyright 1997, 1998 @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: com_ofisa.c,v 1.7 2002/10/02 16:34:27 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: com_ofisa.c,v 1.8 2005/02/04 02:10:44 perry Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -62,8 +62,8 @@ struct com_ofisa_softc { void *sc_ih; /* interrupt handler */ }; -int com_ofisa_probe __P((struct device *, struct cfdata *, void *)); -void com_ofisa_attach __P((struct device *, struct device *, void *)); +int com_ofisa_probe(struct device *, struct cfdata *, void *); +void com_ofisa_attach(struct device *, struct device *, void *); CFATTACH_DECL(com_ofisa, sizeof(struct com_ofisa_softc), com_ofisa_probe, com_ofisa_attach, NULL, NULL); diff --git a/sys/dev/ofisa/ess_ofisa.c b/sys/dev/ofisa/ess_ofisa.c index fc62bee9dc1..2a814e3171a 100644 --- a/sys/dev/ofisa/ess_ofisa.c +++ b/sys/dev/ofisa/ess_ofisa.c @@ -1,4 +1,4 @@ -/* $NetBSD: ess_ofisa.c,v 1.13 2004/08/04 18:55:06 drochner Exp $ */ +/* $NetBSD: ess_ofisa.c,v 1.14 2005/02/04 02:10:44 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ess_ofisa.c,v 1.13 2004/08/04 18:55:06 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ess_ofisa.c,v 1.14 2005/02/04 02:10:44 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -58,8 +58,8 @@ __KERNEL_RCSID(0, "$NetBSD: ess_ofisa.c,v 1.13 2004/08/04 18:55:06 drochner Exp #include <dev/isa/essreg.h> #include <dev/isa/essvar.h> -int ess_ofisa_match __P((struct device *, struct cfdata *, void *)); -void ess_ofisa_attach __P((struct device *, struct device *, void *)); +int ess_ofisa_match(struct device *, struct cfdata *, void *); +void ess_ofisa_attach(struct device *, struct device *, void *); CFATTACH_DECL(ess_ofisa, sizeof(struct ess_softc), ess_ofisa_match, ess_ofisa_attach, NULL, NULL); diff --git a/sys/dev/ofisa/if_cs_ofisa.c b/sys/dev/ofisa/if_cs_ofisa.c index f8cf49335df..f21d4907b24 100644 --- a/sys/dev/ofisa/if_cs_ofisa.c +++ b/sys/dev/ofisa/if_cs_ofisa.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_cs_ofisa.c,v 1.12 2004/09/01 21:30:25 drochner Exp $ */ +/* $NetBSD: if_cs_ofisa.c,v 1.13 2005/02/04 02:10:44 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa.c,v 1.12 2004/09/01 21:30:25 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa.c,v 1.13 2005/02/04 02:10:44 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -70,8 +70,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa.c,v 1.12 2004/09/01 21:30:25 drochner Ex #include <dev/ic/cs89x0var.h> #include <dev/isa/cs89x0isavar.h> -int cs_ofisa_match __P((struct device *, struct cfdata *, void *)); -void cs_ofisa_attach __P((struct device *, struct device *, void *)); +int cs_ofisa_match(struct device *, struct cfdata *, void *); +void cs_ofisa_attach(struct device *, struct device *, void *); CFATTACH_DECL(cs_ofisa, sizeof(struct cs_softc_isa), cs_ofisa_match, cs_ofisa_attach, NULL, NULL); diff --git a/sys/dev/ofisa/joy_ofisa.c b/sys/dev/ofisa/joy_ofisa.c index a16df37441e..962f87c510e 100644 --- a/sys/dev/ofisa/joy_ofisa.c +++ b/sys/dev/ofisa/joy_ofisa.c @@ -1,4 +1,4 @@ -/* $NetBSD: joy_ofisa.c,v 1.7 2002/10/02 16:34:29 thorpej Exp $ */ +/* $NetBSD: joy_ofisa.c,v 1.8 2005/02/04 02:10:44 perry Exp $ */ /*- * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: joy_ofisa.c,v 1.7 2002/10/02 16:34:29 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: joy_ofisa.c,v 1.8 2005/02/04 02:10:44 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -54,8 +54,8 @@ __KERNEL_RCSID(0, "$NetBSD: joy_ofisa.c,v 1.7 2002/10/02 16:34:29 thorpej Exp $" #define JOY_NPORTS 1 /* XXX should be in a header file */ -int joy_ofisa_match __P((struct device *, struct cfdata *, void *)); -void joy_ofisa_attach __P((struct device *, struct device *, void *)); +int joy_ofisa_match(struct device *, struct cfdata *, void *); +void joy_ofisa_attach(struct device *, struct device *, void *); CFATTACH_DECL(joy_ofisa, sizeof(struct joy_softc), joy_ofisa_match, joy_ofisa_attach, NULL, NULL); diff --git a/sys/dev/ofisa/lpt_ofisa.c b/sys/dev/ofisa/lpt_ofisa.c index 3c76741b2f4..110e51ccdf5 100644 --- a/sys/dev/ofisa/lpt_ofisa.c +++ b/sys/dev/ofisa/lpt_ofisa.c @@ -1,4 +1,4 @@ -/* $NetBSD: lpt_ofisa.c,v 1.7 2002/10/02 16:34:29 thorpej Exp $ */ +/* $NetBSD: lpt_ofisa.c,v 1.8 2005/02/04 02:10:44 perry Exp $ */ /* * Copyright 1997, 1998 @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lpt_ofisa.c,v 1.7 2002/10/02 16:34:29 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lpt_ofisa.c,v 1.8 2005/02/04 02:10:44 perry Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -62,8 +62,8 @@ struct lpt_ofisa_softc { void *sc_ih; /* interrupt handler */ }; -int lpt_ofisa_probe __P((struct device *, struct cfdata *, void *)); -void lpt_ofisa_attach __P((struct device *, struct device *, void *)); +int lpt_ofisa_probe(struct device *, struct cfdata *, void *); +void lpt_ofisa_attach(struct device *, struct device *, void *); CFATTACH_DECL(lpt_ofisa, sizeof(struct lpt_ofisa_softc), lpt_ofisa_probe, lpt_ofisa_attach, NULL, NULL); diff --git a/sys/dev/ofisa/ofisa.c b/sys/dev/ofisa/ofisa.c index f53d7452f25..12bbaf57055 100644 --- a/sys/dev/ofisa/ofisa.c +++ b/sys/dev/ofisa/ofisa.c @@ -1,4 +1,4 @@ -/* $NetBSD: ofisa.c,v 1.14 2004/04/22 00:17:12 itojun Exp $ */ +/* $NetBSD: ofisa.c,v 1.15 2005/02/04 02:10:44 perry Exp $ */ /* * Copyright 1997, 1998 @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ofisa.c,v 1.14 2004/04/22 00:17:12 itojun Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofisa.c,v 1.15 2005/02/04 02:10:44 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -51,15 +51,15 @@ __KERNEL_RCSID(0, "$NetBSD: ofisa.c,v 1.14 2004/04/22 00:17:12 itojun Exp $"); #define OFW_MAX_STACK_BUF_SIZE 256 -static int ofisamatch __P((struct device *, struct cfdata *, void *)); -static void ofisaattach __P((struct device *, struct device *, void *)); +static int ofisamatch(struct device *, struct cfdata *, void *); +static void ofisaattach(struct device *, struct device *, void *); CFATTACH_DECL(ofisa, sizeof(struct device), ofisamatch, ofisaattach, NULL, NULL); extern struct cfdriver ofisa_cd; -static int ofisaprint __P((void *, const char *)); +static int ofisaprint(void *, const char *); static int ofisaprint(aux, pnp) diff --git a/sys/dev/ofisa/ofisavar.h b/sys/dev/ofisa/ofisavar.h index 6e4554ff2c3..868c703d6a3 100644 --- a/sys/dev/ofisa/ofisavar.h +++ b/sys/dev/ofisa/ofisavar.h @@ -1,4 +1,4 @@ -/* $NetBSD: ofisavar.h,v 1.4 1999/03/19 03:30:35 cgd Exp $ */ +/* $NetBSD: ofisavar.h,v 1.5 2005/02/04 02:10:44 perry Exp $ */ /* * Copyright 1998 @@ -89,14 +89,14 @@ struct ofisa_dma_desc { */ #include <machine/ofisa_machdep.h> -int ofisa_reg_count __P((int)); -int ofisa_reg_get __P((int, struct ofisa_reg_desc *, int)); -void ofisa_reg_print __P((struct ofisa_reg_desc *, int)); -int ofisa_intr_count __P((int)); -int ofisa_intr_get __P((int, struct ofisa_intr_desc *, int)); -void ofisa_intr_print __P((struct ofisa_intr_desc *, int)); -int ofisa_dma_count __P((int)); -int ofisa_dma_get __P((int, struct ofisa_dma_desc *, int)); -void ofisa_dma_print __P((struct ofisa_dma_desc *, int)); +int ofisa_reg_count(int); +int ofisa_reg_get(int, struct ofisa_reg_desc *, int); +void ofisa_reg_print(struct ofisa_reg_desc *, int); +int ofisa_intr_count(int); +int ofisa_intr_get(int, struct ofisa_intr_desc *, int); +void ofisa_intr_print(struct ofisa_intr_desc *, int); +int ofisa_dma_count(int); +int ofisa_dma_get(int, struct ofisa_dma_desc *, int); +void ofisa_dma_print(struct ofisa_dma_desc *, int); #endif /* _DEV_OFISA_OFISAVAR_H_ */ diff --git a/sys/dev/ofisa/sb_ofisa.c b/sys/dev/ofisa/sb_ofisa.c index 44a5ee97dc1..08364cac461 100644 --- a/sys/dev/ofisa/sb_ofisa.c +++ b/sys/dev/ofisa/sb_ofisa.c @@ -1,4 +1,4 @@ -/* $NetBSD: sb_ofisa.c,v 1.11 2003/05/03 18:11:32 wiz Exp $ */ +/* $NetBSD: sb_ofisa.c,v 1.12 2005/02/04 02:10:44 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sb_ofisa.c,v 1.11 2003/05/03 18:11:32 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sb_ofisa.c,v 1.12 2005/02/04 02:10:44 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -60,8 +60,8 @@ __KERNEL_RCSID(0, "$NetBSD: sb_ofisa.c,v 1.11 2003/05/03 18:11:32 wiz Exp $"); #include <dev/isa/sbvar.h> #include <dev/isa/sbdspvar.h> -int sb_ofisa_match __P((struct device *, struct cfdata *, void *)); -void sb_ofisa_attach __P((struct device *, struct device *, void *)); +int sb_ofisa_match(struct device *, struct cfdata *, void *); +void sb_ofisa_attach(struct device *, struct device *, void *); CFATTACH_DECL(sb_ofisa, sizeof(struct sbdsp_softc), sb_ofisa_match, sb_ofisa_attach, NULL, NULL); diff --git a/sys/dev/ofw/ofbus.c b/sys/dev/ofw/ofbus.c index ca9f41c99a0..68d22dd374d 100644 --- a/sys/dev/ofw/ofbus.c +++ b/sys/dev/ofw/ofbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: ofbus.c,v 1.18 2004/04/22 00:17:12 itojun Exp $ */ +/* $NetBSD: ofbus.c,v 1.19 2005/02/04 02:10:44 perry Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ofbus.c,v 1.18 2004/04/22 00:17:12 itojun Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofbus.c,v 1.19 2005/02/04 02:10:44 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -40,9 +40,9 @@ __KERNEL_RCSID(0, "$NetBSD: ofbus.c,v 1.18 2004/04/22 00:17:12 itojun Exp $"); #include <dev/ofw/openfirm.h> -int ofbus_match __P((struct device *, struct cfdata *, void *)); -void ofbus_attach __P((struct device *, struct device *, void *)); -static int ofbus_print __P((void *, const char *)); +int ofbus_match(struct device *, struct cfdata *, void *); +void ofbus_attach(struct device *, struct device *, void *); +static int ofbus_print(void *, const char *); CFATTACH_DECL(ofbus, sizeof(struct device), ofbus_match, ofbus_attach, NULL, NULL); diff --git a/sys/dev/ofw/ofcons.c b/sys/dev/ofw/ofcons.c index 847e49db3d5..590025f183f 100644 --- a/sys/dev/ofw/ofcons.c +++ b/sys/dev/ofw/ofcons.c @@ -1,4 +1,4 @@ -/* $NetBSD: ofcons.c,v 1.21 2002/10/23 09:13:29 jdolecek Exp $ */ +/* $NetBSD: ofcons.c,v 1.22 2005/02/04 02:10:44 perry Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ofcons.c,v 1.21 2002/10/23 09:13:29 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofcons.c,v 1.22 2005/02/04 02:10:44 perry Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -61,8 +61,8 @@ cons_decl(ofcons_); static int stdin, stdout; -static int ofcons_match __P((struct device *, struct cfdata *, void *)); -static void ofcons_attach __P((struct device *, struct device *, void *)); +static int ofcons_match(struct device *, struct cfdata *, void *); +static void ofcons_attach(struct device *, struct device *, void *); CFATTACH_DECL(ofcons, sizeof(struct ofcons_softc), ofcons_match, ofcons_attach, NULL, NULL); @@ -82,7 +82,7 @@ const struct cdevsw ofcons_cdevsw = { nostop, ofcons_tty, ofcons_poll, nommap, ttykqfilter, D_TTY }; -static int ofcons_probe __P((void)); +static int ofcons_probe(void); static int ofcons_match(parent, match, aux) @@ -112,9 +112,9 @@ ofcons_attach(parent, self, aux) callout_init(&sc->sc_poll_ch); } -static void ofcons_start __P((struct tty *)); -static int ofcons_param __P((struct tty *, struct termios *)); -static void ofcons_pollin __P((void *)); +static void ofcons_start(struct tty *); +static int ofcons_param(struct tty *, struct termios *); +static void ofcons_pollin(void *); int ofcons_open(dev, flag, mode, p) diff --git a/sys/dev/ofw/ofrtc.c b/sys/dev/ofw/ofrtc.c index 1161a8cab10..c8c0a7fa834 100644 --- a/sys/dev/ofw/ofrtc.c +++ b/sys/dev/ofw/ofrtc.c @@ -1,4 +1,4 @@ -/* $NetBSD: ofrtc.c,v 1.15 2002/10/23 09:13:30 jdolecek Exp $ */ +/* $NetBSD: ofrtc.c,v 1.16 2005/02/04 02:10:44 perry Exp $ */ /* * Copyright (C) 1996 Wolfgang Solfrank. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ofrtc.c,v 1.15 2002/10/23 09:13:30 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofrtc.c,v 1.16 2005/02/04 02:10:44 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -48,8 +48,8 @@ struct ofrtc_softc { int sc_ihandle; }; -static int ofrtc_match __P((struct device *, struct cfdata *, void *)); -static void ofrtc_attach __P((struct device *, struct device *, void *)); +static int ofrtc_match(struct device *, struct cfdata *, void *); +static void ofrtc_attach(struct device *, struct device *, void *); CFATTACH_DECL(ofrtc, sizeof(struct ofrtc_softc), ofrtc_match, ofrtc_attach, NULL, NULL); diff --git a/sys/dev/ofw/ofw_network_subr.c b/sys/dev/ofw/ofw_network_subr.c index 48635525e14..1fb9b3252ec 100644 --- a/sys/dev/ofw/ofw_network_subr.c +++ b/sys/dev/ofw/ofw_network_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: ofw_network_subr.c,v 1.2 2001/11/13 07:26:28 lukem Exp $ */ +/* $NetBSD: ofw_network_subr.c,v 1.3 2005/02/04 02:10:44 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ofw_network_subr.c,v 1.2 2001/11/13 07:26:28 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofw_network_subr.c,v 1.3 2005/02/04 02:10:44 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -58,7 +58,7 @@ struct table_entry { int t_value; }; -int of_network_parse_network_type __P((const char *)); +int of_network_parse_network_type(const char *); /* * int of_network_decode_media(phandle, nmediap, defmediap) diff --git a/sys/dev/pci/adv_pci.c b/sys/dev/pci/adv_pci.c index 55aacf8186a..f197aa61096 100644 --- a/sys/dev/pci/adv_pci.c +++ b/sys/dev/pci/adv_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: adv_pci.c,v 1.14 2003/01/31 00:07:39 thorpej Exp $ */ +/* $NetBSD: adv_pci.c,v 1.15 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. @@ -63,7 +63,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: adv_pci.c,v 1.14 2003/01/31 00:07:39 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: adv_pci.c,v 1.15 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -92,8 +92,8 @@ __KERNEL_RCSID(0, "$NetBSD: adv_pci.c,v 1.14 2003/01/31 00:07:39 thorpej Exp $") /******************************************************************************/ -int adv_pci_match __P((struct device *, struct cfdata *, void *)); -void adv_pci_attach __P((struct device *, struct device *, void *)); +int adv_pci_match(struct device *, struct cfdata *, void *); +void adv_pci_attach(struct device *, struct device *, void *); CFATTACH_DECL(adv_pci, sizeof(ASC_SOFTC), adv_pci_match, adv_pci_attach, NULL, NULL); diff --git a/sys/dev/pci/adw_pci.c b/sys/dev/pci/adw_pci.c index 9ba89c26187..3d0acd9fa2b 100644 --- a/sys/dev/pci/adw_pci.c +++ b/sys/dev/pci/adw_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: adw_pci.c,v 1.14 2003/01/31 00:07:39 thorpej Exp $ */ +/* $NetBSD: adw_pci.c,v 1.15 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: adw_pci.c,v 1.14 2003/01/31 00:07:39 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: adw_pci.c,v 1.15 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -78,8 +78,8 @@ __KERNEL_RCSID(0, "$NetBSD: adw_pci.c,v 1.14 2003/01/31 00:07:39 thorpej Exp $") /******************************************************************************/ -static int adw_pci_match __P((struct device *, struct cfdata *, void *)); -static void adw_pci_attach __P((struct device *, struct device *, void *)); +static int adw_pci_match(struct device *, struct cfdata *, void *); +static void adw_pci_attach(struct device *, struct device *, void *); CFATTACH_DECL(adw_pci, sizeof(ADW_SOFTC), adw_pci_match, adw_pci_attach, NULL, NULL); diff --git a/sys/dev/pci/ahc_pci.c b/sys/dev/pci/ahc_pci.c index 1686ce3e1fe..ff17d0f79c5 100644 --- a/sys/dev/pci/ahc_pci.c +++ b/sys/dev/pci/ahc_pci.c @@ -39,7 +39,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: ahc_pci.c,v 1.47 2004/10/17 01:10:44 christos Exp $ + * $Id: ahc_pci.c,v 1.48 2005/02/04 02:10:45 perry Exp $ * * //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#57 $ * @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ahc_pci.c,v 1.47 2004/10/17 01:10:44 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ahc_pci.c,v 1.48 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -707,8 +707,8 @@ static void ahc_scbram_config(struct ahc_softc *ahc, int enable, int pcheck, int fast, int large); static void ahc_probe_ext_scbram(struct ahc_softc *ahc); -int ahc_pci_probe __P((struct device *, struct cfdata *, void *)); -void ahc_pci_attach __P((struct device *, struct device *, void *)); +int ahc_pci_probe(struct device *, struct cfdata *, void *); +void ahc_pci_attach(struct device *, struct device *, void *); CFATTACH_DECL(ahc_pci, sizeof(struct ahc_softc), diff --git a/sys/dev/pci/ahd_pci.c b/sys/dev/pci/ahd_pci.c index cce2484374a..733332863d8 100644 --- a/sys/dev/pci/ahd_pci.c +++ b/sys/dev/pci/ahd_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: ahd_pci.c,v 1.13 2004/02/24 15:22:01 wiz Exp $ */ +/* $NetBSD: ahd_pci.c,v 1.14 2005/02/04 02:10:45 perry Exp $ */ /* * Product specific probe and attach routines for: @@ -49,7 +49,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ahd_pci.c,v 1.13 2004/02/24 15:22:01 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ahd_pci.c,v 1.14 2005/02/04 02:10:45 perry Exp $"); #define AHD_PCI_IOADDR PCI_MAPREG_START /* I/O Address */ #define AHD_PCI_MEMADDR (PCI_MAPREG_START + 4) /* Mem I/O Address */ @@ -274,8 +274,8 @@ static const char *pci_bus_modes[] = #define LATTIME 0x0000ff00ul -int ahd_pci_probe __P((struct device *, struct cfdata *, void *)); -void ahd_pci_attach __P((struct device *, struct device *, void *)); +int ahd_pci_probe(struct device *, struct cfdata *, void *); +void ahd_pci_attach(struct device *, struct device *, void *); CFATTACH_DECL(ahd_pci, sizeof(struct ahd_softc), ahd_pci_probe, ahd_pci_attach, NULL, NULL); diff --git a/sys/dev/pci/bha_pci.c b/sys/dev/pci/bha_pci.c index d170e2de71e..4cd9d730c45 100644 --- a/sys/dev/pci/bha_pci.c +++ b/sys/dev/pci/bha_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: bha_pci.c,v 1.25 2003/01/31 00:07:40 thorpej Exp $ */ +/* $NetBSD: bha_pci.c,v 1.26 2005/02/04 02:10:45 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bha_pci.c,v 1.25 2003/01/31 00:07:40 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bha_pci.c,v 1.26 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -57,8 +57,8 @@ __KERNEL_RCSID(0, "$NetBSD: bha_pci.c,v 1.25 2003/01/31 00:07:40 thorpej Exp $") #define PCI_CBIO 0x10 -int bha_pci_match __P((struct device *, struct cfdata *, void *)); -void bha_pci_attach __P((struct device *, struct device *, void *)); +int bha_pci_match(struct device *, struct cfdata *, void *); +void bha_pci_attach(struct device *, struct device *, void *); CFATTACH_DECL(bha_pci, sizeof(struct bha_softc), bha_pci_match, bha_pci_attach, NULL, NULL); diff --git a/sys/dev/pci/btvmei.c b/sys/dev/pci/btvmei.c index e1b90adf667..18dfc93b35c 100644 --- a/sys/dev/pci/btvmei.c +++ b/sys/dev/pci/btvmei.c @@ -1,4 +1,4 @@ -/* $NetBSD: btvmei.c,v 1.12 2003/01/31 00:07:40 thorpej Exp $ */ +/* $NetBSD: btvmei.c,v 1.13 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1999 @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: btvmei.c,v 1.12 2003/01/31 00:07:40 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: btvmei.c,v 1.13 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -51,14 +51,14 @@ __KERNEL_RCSID(0, "$NetBSD: btvmei.c,v 1.12 2003/01/31 00:07:40 thorpej Exp $"); #include <dev/pci/btvmeireg.h> #include <dev/pci/btvmeivar.h> -static int b3_617_match __P((struct device *, struct cfdata *, void *)); -static void b3_617_attach __P((struct device *, struct device *, void *)); +static int b3_617_match(struct device *, struct cfdata *, void *); +static void b3_617_attach(struct device *, struct device *, void *); #ifdef notyet -static int b3_617_detach __P((struct device *)); +static int b3_617_detach(struct device *); #endif -void b3_617_slaveconfig __P((struct device *, struct vme_attach_args *)); +void b3_617_slaveconfig(struct device *, struct vme_attach_args *); -static void b3_617_vmeintr __P((struct b3_617_softc *, unsigned char)); +static void b3_617_vmeintr(struct b3_617_softc *, unsigned char); /* * mapping ressources, needed for deallocation @@ -508,7 +508,7 @@ b3_617_vme_probe(vsc, addr, len, am, datasize, callback, cbarg) vme_size_t len; vme_am_t am; vme_datasize_t datasize; - int (*callback) __P((void *, bus_space_tag_t, bus_space_handle_t)); + int (*callback)(void *, bus_space_tag_t, bus_space_handle_t); void *cbarg; { bus_space_tag_t tag; @@ -588,7 +588,7 @@ b3_617_establish_vmeint(vsc, handle, prior, func, arg) void *vsc; vme_intr_handle_t handle; int prior; - int (*func) __P((void *)); + int (*func)(void *); void *arg; { struct b3_617_vmeintrhand *ih; diff --git a/sys/dev/pci/btvmeii.c b/sys/dev/pci/btvmeii.c index db9da424755..c2e762e7a67 100644 --- a/sys/dev/pci/btvmeii.c +++ b/sys/dev/pci/btvmeii.c @@ -1,4 +1,4 @@ -/* $NetBSD: btvmeii.c,v 1.9 2003/01/31 00:07:40 thorpej Exp $ */ +/* $NetBSD: btvmeii.c,v 1.10 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1999 @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: btvmeii.c,v 1.9 2003/01/31 00:07:40 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: btvmeii.c,v 1.10 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -54,36 +54,36 @@ __KERNEL_RCSID(0, "$NetBSD: btvmeii.c,v 1.9 2003/01/31 00:07:40 thorpej Exp $"); #include <dev/pci/universe_pci_var.h> -static int b3_2706_match __P((struct device *, struct cfdata *, void *)); -static void b3_2706_attach __P((struct device *, struct device *, void *)); +static int b3_2706_match(struct device *, struct cfdata *, void *); +static void b3_2706_attach(struct device *, struct device *, void *); /* exported via tag structs */ -int b3_2706_map_vme __P((void *, vme_addr_t, vme_size_t, +int b3_2706_map_vme(void *, vme_addr_t, vme_size_t, vme_am_t, vme_datasize_t, vme_swap_t, - bus_space_tag_t *, bus_space_handle_t *, vme_mapresc_t*)); -void b3_2706_unmap_vme __P((void *, vme_mapresc_t)); + bus_space_tag_t *, bus_space_handle_t *, vme_mapresc_t*); +void b3_2706_unmap_vme(void *, vme_mapresc_t); -int b3_2706_vme_probe __P((void *, vme_addr_t, vme_size_t, vme_am_t, +int b3_2706_vme_probe(void *, vme_addr_t, vme_size_t, vme_am_t, vme_datasize_t, int (*)(void *, bus_space_tag_t, bus_space_handle_t), - void *)); + void *); -int b3_2706_map_vmeint __P((void *, int, int, vme_intr_handle_t *)); -void *b3_2706_establish_vmeint __P((void *, vme_intr_handle_t, int, - int (*)(void *), void *)); -void b3_2706_disestablish_vmeint __P((void *, void *)); -void b3_2706_vmeint __P((void *, int, int)); +int b3_2706_map_vmeint(void *, int, int, vme_intr_handle_t *); +void *b3_2706_establish_vmeint(void *, vme_intr_handle_t, int, + int (*)(void *), void *); +void b3_2706_disestablish_vmeint(void *, void *); +void b3_2706_vmeint(void *, int, int); -int b3_2706_dmamap_create __P((void *, vme_size_t, +int b3_2706_dmamap_create(void *, vme_size_t, vme_am_t, vme_datasize_t, vme_swap_t, int, vme_size_t, vme_addr_t, - int, bus_dmamap_t *)); -void b3_2706_dmamap_destroy __P((void *, bus_dmamap_t)); + int, bus_dmamap_t *); +void b3_2706_dmamap_destroy(void *, bus_dmamap_t); -int b3_2706_dmamem_alloc __P((void *, vme_size_t, +int b3_2706_dmamem_alloc(void *, vme_size_t, vme_am_t, vme_datasize_t, vme_swap_t, - bus_dma_segment_t *, int, int *, int)); -void b3_2706_dmamem_free __P((void *, bus_dma_segment_t *, int)); + bus_dma_segment_t *, int, int *, int); +void b3_2706_dmamem_free(void *, bus_dma_segment_t *, int); struct b3_2706_vmemaprescs { int wnd; @@ -94,7 +94,7 @@ struct b3_2706_vmemaprescs { struct b3_2706_vmeintrhand { TAILQ_ENTRY(b3_2706_vmeintrhand) ih_next; - int (*ih_fun) __P((void*)); + int (*ih_fun)(void*); void *ih_arg; int ih_level; int ih_vector; @@ -391,7 +391,7 @@ b3_2706_vme_probe(vsc, addr, len, am, datasize, callback, cbarg) vme_size_t len; vme_am_t am; vme_datasize_t datasize; - int (*callback) __P((void *, bus_space_tag_t, bus_space_handle_t)); + int (*callback)(void *, bus_space_tag_t, bus_space_handle_t); void *cbarg; { bus_space_tag_t tag; @@ -460,7 +460,7 @@ b3_2706_establish_vmeint(vsc, handle, prior, func, arg) void *vsc; vme_intr_handle_t handle; int prior; - int (*func) __P((void *)); + int (*func)(void *); void *arg; { struct b3_2706_vmeintrhand *ih; diff --git a/sys/dev/pci/btvmeivar.h b/sys/dev/pci/btvmeivar.h index dcc801e6f8c..10fe96ed646 100644 --- a/sys/dev/pci/btvmeivar.h +++ b/sys/dev/pci/btvmeivar.h @@ -1,4 +1,4 @@ -/* $NetBSD: btvmeivar.h,v 1.2 2004/03/24 17:26:53 drochner Exp $ */ +/* $NetBSD: btvmeivar.h,v 1.3 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1999 @@ -28,7 +28,7 @@ struct b3_617_vmeintrhand { TAILQ_ENTRY(b3_617_vmeintrhand) ih_next; - int (*ih_fun) __P((void*)); + int (*ih_fun)(void*); void *ih_arg; int ih_level; int ih_vector; @@ -87,39 +87,40 @@ struct b3_617_softc { #define DMA_PAGESIZE 0x1000 /* shared between driver parts */ -int b3_617_reset __P((struct b3_617_softc*)); -int b3_617_init __P((struct b3_617_softc*)); +int b3_617_reset(struct b3_617_softc*); +int b3_617_init(struct b3_617_softc*); #ifdef notyet /* for detach */ -void b3_617_halt __P((struct b3_617_softc*)); +void b3_617_halt(struct b3_617_softc*); #endif -int b3_617_intr __P((void*)); +int b3_617_intr(void*); #if 0 -void b3_617_cntlrdma_done __P((struct b3_617_softc*)); +void b3_617_cntlrdma_done(struct b3_617_softc*); #endif /* exported via tag structs */ -int b3_617_map_vme __P((void *, vme_addr_t, vme_size_t, +int b3_617_map_vme(void *, vme_addr_t, vme_size_t, vme_am_t, vme_datasize_t, vme_swap_t, - bus_space_tag_t *, bus_space_handle_t *, vme_mapresc_t*)); -void b3_617_unmap_vme __P((void *, vme_mapresc_t)); + bus_space_tag_t *, bus_space_handle_t *, + vme_mapresc_t*); +void b3_617_unmap_vme(void *, vme_mapresc_t); -int b3_617_vme_probe __P((void *, vme_addr_t, vme_size_t, vme_am_t, +int b3_617_vme_probe(void *, vme_addr_t, vme_size_t, vme_am_t, vme_datasize_t, int (*)(void *, bus_space_tag_t, bus_space_handle_t), - void *)); + void *); -int b3_617_map_vmeint __P((void *, int, int, vme_intr_handle_t *)); -void *b3_617_establish_vmeint __P((void *, vme_intr_handle_t, int, - int (*)(void *), void *)); -void b3_617_disestablish_vmeint __P((void *, void *)); +int b3_617_map_vmeint(void *, int, int, vme_intr_handle_t *); +void *b3_617_establish_vmeint(void *, vme_intr_handle_t, int, + int (*)(void *), void *); +void b3_617_disestablish_vmeint(void *, void *); -int b3_617_dmamap_create __P((void *, vme_size_t, +int b3_617_dmamap_create(void *, vme_size_t, vme_am_t, vme_datasize_t, vme_swap_t, int, vme_size_t, vme_addr_t, - int, bus_dmamap_t *)); -void b3_617_dmamap_destroy __P((void *, bus_dmamap_t)); + int, bus_dmamap_t *); +void b3_617_dmamap_destroy(void *, bus_dmamap_t); -int b3_617_dmamem_alloc __P((void *, vme_size_t, +int b3_617_dmamem_alloc(void *, vme_size_t, vme_am_t, vme_datasize_t, vme_swap_t, - bus_dma_segment_t *, int, int *, int)); -void b3_617_dmamem_free __P((void *, bus_dma_segment_t *, int)); + bus_dma_segment_t *, int, int *, int); +void b3_617_dmamem_free(void *, bus_dma_segment_t *, int); diff --git a/sys/dev/pci/com_puc.c b/sys/dev/pci/com_puc.c index 053d37bd52a..2cf5bede0d6 100644 --- a/sys/dev/pci/com_puc.c +++ b/sys/dev/pci/com_puc.c @@ -1,4 +1,4 @@ -/* $NetBSD: com_puc.c,v 1.10 2004/02/03 20:35:17 fredb Exp $ */ +/* $NetBSD: com_puc.c,v 1.11 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1998 Christopher G. Demetriou. All rights reserved. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: com_puc.c,v 1.10 2004/02/03 20:35:17 fredb Exp $"); +__KERNEL_RCSID(0, "$NetBSD: com_puc.c,v 1.11 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -60,8 +60,8 @@ struct com_puc_softc { void *sc_ih; /* interrupt handler */ }; -int com_puc_probe __P((struct device *, struct cfdata *, void *)); -void com_puc_attach __P((struct device *, struct device *, void *)); +int com_puc_probe(struct device *, struct cfdata *, void *); +void com_puc_attach(struct device *, struct device *, void *); CFATTACH_DECL(com_puc, sizeof(struct com_puc_softc), com_puc_probe, com_puc_attach, NULL, NULL); diff --git a/sys/dev/pci/esiop_pci.c b/sys/dev/pci/esiop_pci.c index 240c9e7bcaa..6f323a8873b 100644 --- a/sys/dev/pci/esiop_pci.c +++ b/sys/dev/pci/esiop_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: esiop_pci.c,v 1.6 2003/04/09 01:35:12 thorpej Exp $ */ +/* $NetBSD: esiop_pci.c,v 1.7 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 2002 Manuel Bouyer. @@ -32,7 +32,7 @@ /* SYM53c8xx PCI-SCSI I/O Processors driver: PCI front-end */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: esiop_pci.c,v 1.6 2003/04/09 01:35:12 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: esiop_pci.c,v 1.7 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -51,8 +51,8 @@ __KERNEL_RCSID(0, "$NetBSD: esiop_pci.c,v 1.6 2003/04/09 01:35:12 thorpej Exp $" #include <dev/pci/siop_pci_common.h> #include <dev/ic/esiopvar.h> -int esiop_pci_match __P((struct device *, struct cfdata *, void *)); -void esiop_pci_attach __P((struct device *, struct device *, void *)); +int esiop_pci_match(struct device *, struct cfdata *, void *); +void esiop_pci_attach(struct device *, struct device *, void *); struct esiop_pci_softc { struct esiop_softc esiop; diff --git a/sys/dev/pci/fwlynx_pci.c b/sys/dev/pci/fwlynx_pci.c index 9fb97aa1f6a..b67ce8ff674 100644 --- a/sys/dev/pci/fwlynx_pci.c +++ b/sys/dev/pci/fwlynx_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: fwlynx_pci.c,v 1.8 2004/04/23 21:13:06 itojun Exp $ */ +/* $NetBSD: fwlynx_pci.c,v 1.9 2005/02/04 02:10:45 perry Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fwlynx_pci.c,v 1.8 2004/04/23 21:13:06 itojun Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fwlynx_pci.c,v 1.9 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -60,8 +60,8 @@ struct fwlynx_pci_softc { void *psc_ih; }; -static int fwlynx_pci_match __P((struct device *, struct cfdata *, void *)); -static void fwlynx_pci_attach __P((struct device *, struct device *, void *)); +static int fwlynx_pci_match(struct device *, struct cfdata *, void *); +static void fwlynx_pci_attach(struct device *, struct device *, void *); CFATTACH_DECL(fwlynx_pci, sizeof(struct fwlynx_pci_softc), fwlynx_pci_match, fwlynx_pci_attach, NULL, NULL); diff --git a/sys/dev/pci/fwohci_pci.c b/sys/dev/pci/fwohci_pci.c index c10c1a7728f..6b237c8843a 100644 --- a/sys/dev/pci/fwohci_pci.c +++ b/sys/dev/pci/fwohci_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: fwohci_pci.c,v 1.19 2004/04/23 21:13:06 itojun Exp $ */ +/* $NetBSD: fwohci_pci.c,v 1.20 2005/02/04 02:10:45 perry Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fwohci_pci.c,v 1.19 2004/04/23 21:13:06 itojun Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fwohci_pci.c,v 1.20 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -61,8 +61,8 @@ struct fwohci_pci_softc { void *psc_ih; }; -static int fwohci_pci_match __P((struct device *, struct cfdata *, void *)); -static void fwohci_pci_attach __P((struct device *, struct device *, void *)); +static int fwohci_pci_match(struct device *, struct cfdata *, void *); +static void fwohci_pci_attach(struct device *, struct device *, void *); CFATTACH_DECL(fwohci_pci, sizeof(struct fwohci_pci_softc), fwohci_pci_match, fwohci_pci_attach, NULL, NULL); diff --git a/sys/dev/pci/i82365_pci.c b/sys/dev/pci/i82365_pci.c index bae272f1ebe..db00ee836c6 100644 --- a/sys/dev/pci/i82365_pci.c +++ b/sys/dev/pci/i82365_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: i82365_pci.c,v 1.18 2004/08/11 00:18:20 mycroft Exp $ */ +/* $NetBSD: i82365_pci.c,v 1.19 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1997 Marc Horowitz. All rights reserved. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i82365_pci.c,v 1.18 2004/08/11 00:18:20 mycroft Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i82365_pci.c,v 1.19 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -57,8 +57,8 @@ __KERNEL_RCSID(0, "$NetBSD: i82365_pci.c,v 1.18 2004/08/11 00:18:20 mycroft Exp */ #define PCI_CBIO 0x10 /* Configuration Base IO Address */ -int pcic_pci_match __P((struct device *, struct cfdata *, void *)); -void pcic_pci_attach __P((struct device *, struct device *, void *)); +int pcic_pci_match(struct device *, struct cfdata *, void *); +void pcic_pci_attach(struct device *, struct device *, void *); CFATTACH_DECL(pcic_pci, sizeof(struct pcic_pci_softc), pcic_pci_match, pcic_pci_attach, NULL, NULL); @@ -108,7 +108,7 @@ pcic_pci_match(parent, match, aux) return (1); } -void pcic_isa_config_interrupts __P((struct device *)); +void pcic_isa_config_interrupts(struct device *); void pcic_pci_attach(parent, self, aux) diff --git a/sys/dev/pci/i82365_pcivar.h b/sys/dev/pci/i82365_pcivar.h index 59f4237048b..1d80762131e 100644 --- a/sys/dev/pci/i82365_pcivar.h +++ b/sys/dev/pci/i82365_pcivar.h @@ -1,4 +1,4 @@ -/* $NetBSD: i82365_pcivar.h,v 1.2 2000/02/22 16:04:47 thorpej Exp $ */ +/* $NetBSD: i82365_pcivar.h,v 1.3 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -42,14 +42,13 @@ struct pcic_pci_softc { * Establish/disestablish interrupts for PCMCIA functions. */ -void *pcic_pci_machdep_intr_est __P((pci_chipset_tag_t)); +void *pcic_pci_machdep_intr_est(pci_chipset_tag_t); -void *pcic_pci_machdep_pcic_intr_establish __P((struct pcic_softc *, - int (*) __P((void *)))); +void *pcic_pci_machdep_pcic_intr_establish(struct pcic_softc *, + int (*)(void *)); -void *pcic_pci_machdep_chip_intr_establish __P((pcmcia_chipset_handle_t, +void *pcic_pci_machdep_chip_intr_establish(pcmcia_chipset_handle_t, struct pcmcia_function *, - int, int (*) __P((void *)), - void *)); -void pcic_pci_machdep_chip_intr_disestablish __P((pcmcia_chipset_handle_t, - void *)); + int, int (*)(void *), + void *); +void pcic_pci_machdep_chip_intr_disestablish(pcmcia_chipset_handle_t, void *); diff --git a/sys/dev/pci/if_en_pci.c b/sys/dev/pci/if_en_pci.c index 11502ef1c06..52dd93e26c0 100644 --- a/sys/dev/pci/if_en_pci.c +++ b/sys/dev/pci/if_en_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_en_pci.c,v 1.20 2003/10/30 01:58:17 simonb Exp $ */ +/* $NetBSD: if_en_pci.c,v 1.21 2005/02/04 02:10:45 perry Exp $ */ /* * @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_en_pci.c,v 1.20 2003/10/30 01:58:17 simonb Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_en_pci.c,v 1.21 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -81,12 +81,10 @@ struct en_pci_softc { */ #if !defined(MIDWAY_ENIONLY) -static void eni_get_macaddr __P((struct en_pci_softc *, - struct pci_attach_args *)); +static void eni_get_macaddr(struct en_pci_softc *, struct pci_attach_args *); #endif #if !defined(MIDWAY_ADPONLY) -static void adp_get_macaddr __P((struct en_pci_softc *, - struct pci_attach_args *)); +static void adp_get_macaddr(struct en_pci_softc *, struct pci_attach_args *); #endif /* @@ -121,8 +119,8 @@ static void adp_get_macaddr __P((struct en_pci_softc *, * prototypes */ -static int en_pci_match __P((struct device *, struct cfdata *, void *)); -static void en_pci_attach __P((struct device *, struct device *, void *)); +static int en_pci_match(struct device *, struct cfdata *, void *); +static void en_pci_attach(struct device *, struct device *, void *); /* * PCI autoconfig attachments @@ -133,7 +131,7 @@ CFATTACH_DECL(en_pci, sizeof(struct en_pci_softc), #if !defined(MIDWAY_ENIONLY) -static void adp_busreset __P((void *)); +static void adp_busreset(void *); /* * bus specific reset function [ADP only!] diff --git a/sys/dev/pci/if_gem_pci.c b/sys/dev/pci/if_gem_pci.c index ff37639ebb5..4bba6219074 100644 --- a/sys/dev/pci/if_gem_pci.c +++ b/sys/dev/pci/if_gem_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_gem_pci.c,v 1.17 2004/10/17 21:49:08 heas Exp $ */ +/* $NetBSD: if_gem_pci.c,v 1.18 2005/02/04 02:10:45 perry Exp $ */ /* * @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.17 2004/10/17 21:49:08 heas Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.18 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -84,8 +84,8 @@ struct gem_pci_softc { void *gsc_ih; }; -int gem_match_pci __P((struct device *, struct cfdata *, void *)); -void gem_attach_pci __P((struct device *, struct device *, void *)); +int gem_match_pci(struct device *, struct cfdata *, void *); +void gem_attach_pci(struct device *, struct device *, void *); CFATTACH_DECL(gem_pci, sizeof(struct gem_pci_softc), gem_match_pci, gem_attach_pci, NULL, NULL); diff --git a/sys/dev/pci/if_hme_pci.c b/sys/dev/pci/if_hme_pci.c index 162572ff0b5..8e17316d17b 100644 --- a/sys/dev/pci/if_hme_pci.c +++ b/sys/dev/pci/if_hme_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_hme_pci.c,v 1.14 2004/03/17 08:58:23 martin Exp $ */ +/* $NetBSD: if_hme_pci.c,v 1.15 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 2000 Matthew R. Green @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_hme_pci.c,v 1.14 2004/03/17 08:58:23 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_hme_pci.c,v 1.15 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -76,8 +76,8 @@ struct hme_pci_softc { void *hsc_ih; }; -int hmematch_pci __P((struct device *, struct cfdata *, void *)); -void hmeattach_pci __P((struct device *, struct device *, void *)); +int hmematch_pci(struct device *, struct cfdata *, void *); +void hmeattach_pci(struct device *, struct device *, void *); CFATTACH_DECL(hme_pci, sizeof(struct hme_pci_softc), hmematch_pci, hmeattach_pci, NULL, NULL); diff --git a/sys/dev/pci/if_ntwoc_pci.c b/sys/dev/pci/if_ntwoc_pci.c index 34e7f2dad5f..428b6b9d743 100644 --- a/sys/dev/pci/if_ntwoc_pci.c +++ b/sys/dev/pci/if_ntwoc_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ntwoc_pci.c,v 1.13 2003/11/02 10:31:06 wiz Exp $ */ +/* $NetBSD: if_ntwoc_pci.c,v 1.14 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1998 Vixie Enterprises @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_pci.c,v 1.13 2003/11/02 10:31:06 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_pci.c,v 1.14 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -88,7 +88,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ntwoc_pci.c,v 1.13 2003/11/02 10:31:06 wiz Exp $" #endif #if __NetBSD_Version__ >= 104160000 -static void ntwoc_pci_config_interrupts __P((struct device *)); +static void ntwoc_pci_config_interrupts(struct device *); #else #define SCA_BASECLOCK 16000000 #endif @@ -113,17 +113,17 @@ struct ntwoc_pci_softc { struct sca_softc sc_sca; /* the SCA itself */ }; -static int ntwoc_pci_match __P((struct device *, struct cfdata *, void *)); -static void ntwoc_pci_attach __P((struct device *, struct device *, void *)); - -static int ntwoc_pci_alloc_dma __P((struct sca_softc *)); -static void ntwoc_pci_clock_callback __P((void *, int, int)); -static void ntwoc_pci_dtr_callback __P((void *, int, int)); -static void ntwoc_pci_get_clock __P((struct sca_port *, u_int8_t, u_int8_t, - u_int8_t, u_int8_t)); -static int ntwoc_pci_intr __P((void *)); -static void ntwoc_pci_setup_dma __P((struct sca_softc *)); -static void ntwoc_pci_shutdown __P((void *sc)); +static int ntwoc_pci_match(struct device *, struct cfdata *, void *); +static void ntwoc_pci_attach(struct device *, struct device *, void *); + +static int ntwoc_pci_alloc_dma(struct sca_softc *); +static void ntwoc_pci_clock_callback(void *, int, int); +static void ntwoc_pci_dtr_callback(void *, int, int); +static void ntwoc_pci_get_clock(struct sca_port *, u_int8_t, u_int8_t, + u_int8_t, u_int8_t); +static int ntwoc_pci_intr(void *); +static void ntwoc_pci_setup_dma(struct sca_softc *); +static void ntwoc_pci_shutdown(void *sc); CFATTACH_DECL(ntwoc_pci, sizeof(struct ntwoc_pci_softc), ntwoc_pci_match, ntwoc_pci_attach, NULL, NULL); diff --git a/sys/dev/pci/if_ti.c b/sys/dev/pci/if_ti.c index a0c10d632da..d3b49538767 100644 --- a/sys/dev/pci/if_ti.c +++ b/sys/dev/pci/if_ti.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ti.c,v 1.63 2004/09/29 11:22:03 yamt Exp $ */ +/* $NetBSD: if_ti.c,v 1.64 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -81,7 +81,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.63 2004/09/29 11:22:03 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.64 2005/02/04 02:10:45 perry Exp $"); #include "bpfilter.h" #include "opt_inet.h" @@ -153,66 +153,61 @@ static const struct ti_type ti_devs[] = { { 0, 0, NULL } }; -static const struct ti_type *ti_type_match __P((struct pci_attach_args *)); -static int ti_probe __P((struct device *, struct cfdata *, void *)); -static void ti_attach __P((struct device *, struct device *, void *)); -static void ti_shutdown __P((void *)); -static void ti_txeof_tigon1 __P((struct ti_softc *)); -static void ti_txeof_tigon2 __P((struct ti_softc *)); -static void ti_rxeof __P((struct ti_softc *)); - -static void ti_stats_update __P((struct ti_softc *)); -static int ti_encap_tigon1 __P((struct ti_softc *, struct mbuf *, - u_int32_t *)); -static int ti_encap_tigon2 __P((struct ti_softc *, struct mbuf *, - u_int32_t *)); - -static int ti_intr __P((void *)); -static void ti_start __P((struct ifnet *)); -static int ti_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void ti_init __P((void *)); -static void ti_init2 __P((struct ti_softc *)); -static void ti_stop __P((struct ti_softc *)); -static void ti_watchdog __P((struct ifnet *)); -static int ti_ifmedia_upd __P((struct ifnet *)); -static void ti_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); - -static u_int32_t ti_eeprom_putbyte __P((struct ti_softc *, int)); -static u_int8_t ti_eeprom_getbyte __P((struct ti_softc *, - int, u_int8_t *)); -static int ti_read_eeprom __P((struct ti_softc *, caddr_t, int, int)); - -static void ti_add_mcast __P((struct ti_softc *, struct ether_addr *)); -static void ti_del_mcast __P((struct ti_softc *, struct ether_addr *)); -static void ti_setmulti __P((struct ti_softc *)); - -static void ti_mem __P((struct ti_softc *, u_int32_t, - u_int32_t, caddr_t)); -static void ti_loadfw __P((struct ti_softc *)); -static void ti_cmd __P((struct ti_softc *, struct ti_cmd_desc *)); -static void ti_cmd_ext __P((struct ti_softc *, struct ti_cmd_desc *, - caddr_t, int)); -static void ti_handle_events __P((struct ti_softc *)); -static int ti_alloc_jumbo_mem __P((struct ti_softc *)); -static void *ti_jalloc __P((struct ti_softc *)); -static void ti_jfree __P((struct mbuf *, caddr_t, size_t, void *)); -static int ti_newbuf_std __P((struct ti_softc *, int, struct mbuf *, bus_dmamap_t)); -static int ti_newbuf_mini __P((struct ti_softc *, int, struct mbuf *, bus_dmamap_t)); -static int ti_newbuf_jumbo __P((struct ti_softc *, int, struct mbuf *)); -static int ti_init_rx_ring_std __P((struct ti_softc *)); -static void ti_free_rx_ring_std __P((struct ti_softc *)); -static int ti_init_rx_ring_jumbo __P((struct ti_softc *)); -static void ti_free_rx_ring_jumbo __P((struct ti_softc *)); -static int ti_init_rx_ring_mini __P((struct ti_softc *)); -static void ti_free_rx_ring_mini __P((struct ti_softc *)); -static void ti_free_tx_ring __P((struct ti_softc *)); -static int ti_init_tx_ring __P((struct ti_softc *)); - -static int ti_64bitslot_war __P((struct ti_softc *)); -static int ti_chipinit __P((struct ti_softc *)); -static int ti_gibinit __P((struct ti_softc *)); - -static int ti_ether_ioctl __P((struct ifnet *, u_long, caddr_t)); +static const struct ti_type *ti_type_match(struct pci_attach_args *); +static int ti_probe(struct device *, struct cfdata *, void *); +static void ti_attach(struct device *, struct device *, void *); +static void ti_shutdown(void *); +static void ti_txeof_tigon1(struct ti_softc *); +static void ti_txeof_tigon2(struct ti_softc *); +static void ti_rxeof(struct ti_softc *); + +static void ti_stats_update(struct ti_softc *); +static int ti_encap_tigon1(struct ti_softc *, struct mbuf *, u_int32_t *); +static int ti_encap_tigon2(struct ti_softc *, struct mbuf *, u_int32_t *); + +static int ti_intr(void *); +static void ti_start(struct ifnet *); +static int ti_ioctl(struct ifnet *, u_long, caddr_t); +static void ti_init(void *); +static void ti_init2(struct ti_softc *); +static void ti_stop(struct ti_softc *); +static void ti_watchdog(struct ifnet *); +static int ti_ifmedia_upd(struct ifnet *); +static void ti_ifmedia_sts(struct ifnet *, struct ifmediareq *); + +static u_int32_t ti_eeprom_putbyte(struct ti_softc *, int); +static u_int8_t ti_eeprom_getbyte(struct ti_softc *, int, u_int8_t *); +static int ti_read_eeprom(struct ti_softc *, caddr_t, int, int); + +static void ti_add_mcast(struct ti_softc *, struct ether_addr *); +static void ti_del_mcast(struct ti_softc *, struct ether_addr *); +static void ti_setmulti(struct ti_softc *); + +static void ti_mem(struct ti_softc *, u_int32_t, u_int32_t, caddr_t); +static void ti_loadfw(struct ti_softc *); +static void ti_cmd(struct ti_softc *, struct ti_cmd_desc *); +static void ti_cmd_ext(struct ti_softc *, struct ti_cmd_desc *, caddr_t, int); +static void ti_handle_events(struct ti_softc *); +static int ti_alloc_jumbo_mem(struct ti_softc *); +static void *ti_jalloc(struct ti_softc *); +static void ti_jfree(struct mbuf *, caddr_t, size_t, void *); +static int ti_newbuf_std(struct ti_softc *, int, struct mbuf *, bus_dmamap_t); +static int ti_newbuf_mini(struct ti_softc *, int, struct mbuf *, bus_dmamap_t); +static int ti_newbuf_jumbo(struct ti_softc *, int, struct mbuf *); +static int ti_init_rx_ring_std(struct ti_softc *); +static void ti_free_rx_ring_std(struct ti_softc *); +static int ti_init_rx_ring_jumbo(struct ti_softc *); +static void ti_free_rx_ring_jumbo(struct ti_softc *); +static int ti_init_rx_ring_mini(struct ti_softc *); +static void ti_free_rx_ring_mini(struct ti_softc *); +static void ti_free_tx_ring(struct ti_softc *); +static int ti_init_tx_ring(struct ti_softc *); + +static int ti_64bitslot_war(struct ti_softc *); +static int ti_chipinit(struct ti_softc *); +static int ti_gibinit(struct ti_softc *); + +static int ti_ether_ioctl(struct ifnet *, u_long, caddr_t); CFATTACH_DECL(ti, sizeof(struct ti_softc), ti_probe, ti_attach, NULL, NULL); @@ -221,10 +216,10 @@ CFATTACH_DECL(ti, sizeof(struct ti_softc), * Send an instruction or address to the EEPROM, check for ACK. */ static u_int32_t ti_eeprom_putbyte(sc, byte) - struct ti_softc *sc; - int byte; + struct ti_softc *sc; + int byte; { - int i, ack = 0; + int i, ack = 0; /* * Make sure we're in TX mode. diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c index 54851ac5f52..ed7092f3ec5 100644 --- a/sys/dev/pci/if_tl.c +++ b/sys/dev/pci/if_tl.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_tl.c,v 1.67 2005/01/23 10:53:19 dan Exp $ */ +/* $NetBSD: if_tl.c,v 1.68 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1997 Manuel Bouyer. All rights reserved. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.67 2005/01/23 10:53:19 dan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.68 2005/02/04 02:10:45 perry Exp $"); #undef TLDEBUG #define TL_PRIV_STATS @@ -123,44 +123,44 @@ __KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.67 2005/01/23 10:53:19 dan Exp $"); #define TL_NBUF 32 #endif -static int tl_pci_match __P((struct device *, struct cfdata *, void *)); -static void tl_pci_attach __P((struct device *, struct device *, void *)); -static int tl_intr __P((void *)); +static int tl_pci_match(struct device *, struct cfdata *, void *); +static void tl_pci_attach(struct device *, struct device *, void *); +static int tl_intr(void *); -static int tl_ifioctl __P((struct ifnet *, ioctl_cmd_t, caddr_t)); -static int tl_mediachange __P((struct ifnet *)); -static void tl_mediastatus __P((struct ifnet *, struct ifmediareq *)); -static void tl_ifwatchdog __P((struct ifnet *)); -static void tl_shutdown __P((void*)); +static int tl_ifioctl(struct ifnet *, ioctl_cmd_t, caddr_t); +static int tl_mediachange(struct ifnet *); +static void tl_mediastatus(struct ifnet *, struct ifmediareq *); +static void tl_ifwatchdog(struct ifnet *); +static void tl_shutdown(void*); -static void tl_ifstart __P((struct ifnet *)); -static void tl_reset __P((tl_softc_t*)); -static int tl_init __P((struct ifnet *)); -static void tl_stop __P((struct ifnet *, int)); -static void tl_restart __P((void *)); -static int tl_add_RxBuff __P((tl_softc_t*, struct Rx_list*, struct mbuf*)); -static void tl_read_stats __P((tl_softc_t*)); -static void tl_ticks __P((void*)); -static int tl_multicast_hash __P((u_int8_t*)); -static void tl_addr_filter __P((tl_softc_t*)); +static void tl_ifstart(struct ifnet *); +static void tl_reset(tl_softc_t*); +static int tl_init(struct ifnet *); +static void tl_stop(struct ifnet *, int); +static void tl_restart(void *); +static int tl_add_RxBuff(tl_softc_t*, struct Rx_list*, struct mbuf*); +static void tl_read_stats(tl_softc_t*); +static void tl_ticks(void*); +static int tl_multicast_hash(u_int8_t*); +static void tl_addr_filter(tl_softc_t*); -static u_int32_t tl_intreg_read __P((tl_softc_t*, u_int32_t)); -static void tl_intreg_write __P((tl_softc_t*, u_int32_t, u_int32_t)); -static u_int8_t tl_intreg_read_byte __P((tl_softc_t*, u_int32_t)); -static void tl_intreg_write_byte __P((tl_softc_t*, u_int32_t, u_int8_t)); +static u_int32_t tl_intreg_read(tl_softc_t*, u_int32_t); +static void tl_intreg_write(tl_softc_t*, u_int32_t, u_int32_t); +static u_int8_t tl_intreg_read_byte(tl_softc_t*, u_int32_t); +static void tl_intreg_write_byte(tl_softc_t*, u_int32_t, u_int8_t); -void tl_mii_sync __P((struct tl_softc *)); -void tl_mii_sendbits __P((struct tl_softc *, u_int32_t, int)); +void tl_mii_sync(struct tl_softc *); +void tl_mii_sendbits(struct tl_softc *, u_int32_t, int); #if defined(TLDEBUG_RX) -static void ether_printheader __P((struct ether_header*)); +static void ether_printheader(struct ether_header*); #endif -int tl_mii_read __P((struct device *, int, int)); -void tl_mii_write __P((struct device *, int, int, int)); +int tl_mii_read(struct device *, int, int); +void tl_mii_write(struct device *, int, int, int); -void tl_statchg __P((struct device *)); +void tl_statchg(struct device *); /* I2C glue */ static int tl_i2c_acquire_bus(void *, int); @@ -187,9 +187,9 @@ static const struct i2c_bitbang_ops tl_i2cbb_ops = { } }; -static __inline void netsio_clr __P((tl_softc_t*, u_int8_t)); -static __inline void netsio_set __P((tl_softc_t*, u_int8_t)); -static __inline u_int8_t netsio_read __P((tl_softc_t*, u_int8_t)); +static __inline void netsio_clr(tl_softc_t*, u_int8_t); +static __inline void netsio_set(tl_softc_t*, u_int8_t); +static __inline u_int8_t netsio_read(tl_softc_t*, u_int8_t); static __inline void netsio_clr(sc, bits) tl_softc_t* sc; u_int8_t bits; @@ -257,7 +257,7 @@ const struct tl_vendor_desc tl_vendors[] = { { 0, NULL }, }; -const struct tl_product_desc *tl_lookup_product __P((u_int32_t)); +const struct tl_product_desc *tl_lookup_product(u_int32_t); const struct tl_product_desc * tl_lookup_product(id) diff --git a/sys/dev/pci/isic_pci.c b/sys/dev/pci/isic_pci.c index 89c803c0d79..42f2951b1c6 100644 --- a/sys/dev/pci/isic_pci.c +++ b/sys/dev/pci/isic_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: isic_pci.c,v 1.21 2004/07/22 19:14:39 drochner Exp $ */ +/* $NetBSD: isic_pci.c,v 1.22 2005/02/04 02:10:45 perry Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isic_pci.c,v 1.21 2004/07/22 19:14:39 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isic_pci.c,v 1.22 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/errno.h> @@ -75,11 +75,11 @@ __KERNEL_RCSID(0, "$NetBSD: isic_pci.c,v 1.21 2004/07/22 19:14:39 drochner Exp $ extern const struct isdn_layer1_isdnif_driver isic_std_driver; -static int isic_pci_match __P((struct device *, struct cfdata *, void *)); -static void isic_pci_attach __P((struct device *, struct device *, void *)); -static const struct isic_pci_product * find_matching_card __P((struct pci_attach_args *pa)); +static int isic_pci_match(struct device *, struct cfdata *, void *); +static void isic_pci_attach(struct device *, struct device *, void *); +static const struct isic_pci_product * find_matching_card(struct pci_attach_args *pa); -static void isic_pci_isdn_attach __P((struct pci_isic_softc *psc, struct pci_attach_args *pa, const char *cardname)); +static void isic_pci_isdn_attach(struct pci_isic_softc *psc, struct pci_attach_args *pa, const char *cardname); static int isic_pci_detach(struct device *self, int flags); static int isic_pci_activate(struct device *self, enum devact act); diff --git a/sys/dev/pci/isic_pci.h b/sys/dev/pci/isic_pci.h index cb4dfe5ca8d..463bc3fa601 100644 --- a/sys/dev/pci/isic_pci.h +++ b/sys/dev/pci/isic_pci.h @@ -1,4 +1,4 @@ -/* $NetBSD: isic_pci.h,v 1.8 2004/07/22 19:14:39 drochner Exp $ */ +/* $NetBSD: isic_pci.h,v 1.9 2005/02/04 02:10:45 perry Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -53,5 +53,5 @@ struct pci_isic_softc { int ledblinkfreq; }; -extern int isic_attach_Eqs1pp __P((struct pci_isic_softc *psc, struct pci_attach_args *pa)); +extern int isic_attach_Eqs1pp(struct pci_isic_softc *psc, struct pci_attach_args *pa); extern int isic_intr_qs1p(void *); diff --git a/sys/dev/pci/joy_eso.c b/sys/dev/pci/joy_eso.c index 3bd5af9d7fa..3abdea3d75c 100644 --- a/sys/dev/pci/joy_eso.c +++ b/sys/dev/pci/joy_eso.c @@ -1,4 +1,4 @@ -/* $NetBSD: joy_eso.c,v 1.6 2003/12/04 13:57:31 keihan Exp $ */ +/* $NetBSD: joy_eso.c,v 1.7 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: joy_eso.c,v 1.6 2003/12/04 13:57:31 keihan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: joy_eso.c,v 1.7 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -61,8 +61,8 @@ __KERNEL_RCSID(0, "$NetBSD: joy_eso.c,v 1.6 2003/12/04 13:57:31 keihan Exp $"); #include <dev/ic/joyvar.h> -static int joy_eso_match __P((struct device *, struct cfdata *, void *)); -static void joy_eso_attach __P((struct device *, struct device *, void *)); +static int joy_eso_match(struct device *, struct cfdata *, void *); +static void joy_eso_attach(struct device *, struct device *, void *); CFATTACH_DECL(joy_eso, sizeof (struct joy_softc), joy_eso_match, joy_eso_attach, NULL, NULL); diff --git a/sys/dev/pci/joy_pci.c b/sys/dev/pci/joy_pci.c index 2876dd9d070..451e3071ad1 100644 --- a/sys/dev/pci/joy_pci.c +++ b/sys/dev/pci/joy_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: joy_pci.c,v 1.9 2004/04/23 21:13:06 itojun Exp $ */ +/* $NetBSD: joy_pci.c,v 1.10 2005/02/04 02:10:45 perry Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: joy_pci.c,v 1.9 2004/04/23 21:13:06 itojun Exp $"); +__KERNEL_RCSID(0, "$NetBSD: joy_pci.c,v 1.10 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -52,9 +52,9 @@ __KERNEL_RCSID(0, "$NetBSD: joy_pci.c,v 1.9 2004/04/23 21:13:06 itojun Exp $"); #include <dev/ic/joyvar.h> -int joy_pci_match __P((struct device *, struct cfdata *, void *)); -void joy_pci_attach __P((struct device *, struct device *, void *)); -static int bar_is_io __P((pci_chipset_tag_t pc, pcitag_t tag, int reg)); +int joy_pci_match(struct device *, struct cfdata *, void *); +void joy_pci_attach(struct device *, struct device *, void *); +static int bar_is_io(pci_chipset_tag_t pc, pcitag_t tag, int reg); CFATTACH_DECL(joy_pci, sizeof(struct joy_softc), joy_pci_match, joy_pci_attach, NULL, NULL); diff --git a/sys/dev/pci/lpt_puc.c b/sys/dev/pci/lpt_puc.c index 628619d9227..53154e1d32f 100644 --- a/sys/dev/pci/lpt_puc.c +++ b/sys/dev/pci/lpt_puc.c @@ -1,4 +1,4 @@ -/* $NetBSD: lpt_puc.c,v 1.6 2002/10/02 16:51:43 thorpej Exp $ */ +/* $NetBSD: lpt_puc.c,v 1.7 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1998 Christopher G. Demetriou. All rights reserved. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lpt_puc.c,v 1.6 2002/10/02 16:51:43 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lpt_puc.c,v 1.7 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -50,8 +50,8 @@ __KERNEL_RCSID(0, "$NetBSD: lpt_puc.c,v 1.6 2002/10/02 16:51:43 thorpej Exp $"); #include <dev/pci/pucvar.h> #include <dev/ic/lptvar.h> -int lpt_puc_probe __P((struct device *, struct cfdata *, void *)); -void lpt_puc_attach __P((struct device *, struct device *, void *)); +int lpt_puc_probe(struct device *, struct cfdata *, void *); +void lpt_puc_attach(struct device *, struct device *, void *); CFATTACH_DECL(lpt_puc, sizeof(struct lpt_softc), lpt_puc_probe, lpt_puc_attach, NULL, NULL); diff --git a/sys/dev/pci/mpu_cmpci.c b/sys/dev/pci/mpu_cmpci.c index 0653ab81bb9..f011f32ac11 100644 --- a/sys/dev/pci/mpu_cmpci.c +++ b/sys/dev/pci/mpu_cmpci.c @@ -1,4 +1,4 @@ -/* $NetBSD: mpu_cmpci.c,v 1.7 2004/12/02 09:50:42 xtraeme Exp $ */ +/* $NetBSD: mpu_cmpci.c,v 1.8 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mpu_cmpci.c,v 1.7 2004/12/02 09:50:42 xtraeme Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpu_cmpci.c,v 1.8 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -59,8 +59,8 @@ __KERNEL_RCSID(0, "$NetBSD: mpu_cmpci.c,v 1.7 2004/12/02 09:50:42 xtraeme Exp $" #include <dev/ic/mpuvar.h> #include <dev/pci/cmpcivar.h> -static int mpu_cmpci_match __P((struct device *, struct cfdata *, void *)); -static void mpu_cmpci_attach __P((struct device *, struct device *, void *)); +static int mpu_cmpci_match(struct device *, struct cfdata *, void *); +static void mpu_cmpci_attach(struct device *, struct device *, void *); CFATTACH_DECL(mpu_cmpci, sizeof (struct mpu_softc), mpu_cmpci_match, mpu_cmpci_attach, NULL, NULL); diff --git a/sys/dev/pci/mpu_eso.c b/sys/dev/pci/mpu_eso.c index 2c89a116420..f9e259e82e4 100644 --- a/sys/dev/pci/mpu_eso.c +++ b/sys/dev/pci/mpu_eso.c @@ -1,4 +1,4 @@ -/* $NetBSD: mpu_eso.c,v 1.8 2004/12/02 09:50:42 xtraeme Exp $ */ +/* $NetBSD: mpu_eso.c,v 1.9 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mpu_eso.c,v 1.8 2004/12/02 09:50:42 xtraeme Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpu_eso.c,v 1.9 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -60,8 +60,8 @@ __KERNEL_RCSID(0, "$NetBSD: mpu_eso.c,v 1.8 2004/12/02 09:50:42 xtraeme Exp $"); #include <dev/ic/mpuvar.h> #include <dev/pci/esovar.h> -static int mpu_eso_match __P((struct device *, struct cfdata *, void *)); -static void mpu_eso_attach __P((struct device *, struct device *, void *)); +static int mpu_eso_match(struct device *, struct cfdata *, void *); +static void mpu_eso_attach(struct device *, struct device *, void *); CFATTACH_DECL(mpu_eso, sizeof (struct mpu_softc), mpu_eso_match, mpu_eso_attach, NULL, NULL); diff --git a/sys/dev/pci/mpu_fms.c b/sys/dev/pci/mpu_fms.c index 2e64993618c..6a0369e32d0 100644 --- a/sys/dev/pci/mpu_fms.c +++ b/sys/dev/pci/mpu_fms.c @@ -1,4 +1,4 @@ -/* $NetBSD: mpu_fms.c,v 1.8 2004/12/02 09:50:42 xtraeme Exp $ */ +/* $NetBSD: mpu_fms.c,v 1.9 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mpu_fms.c,v 1.8 2004/12/02 09:50:42 xtraeme Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpu_fms.c,v 1.9 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -61,8 +61,8 @@ __KERNEL_RCSID(0, "$NetBSD: mpu_fms.c,v 1.8 2004/12/02 09:50:42 xtraeme Exp $"); #include <dev/ic/mpuvar.h> #include <dev/pci/fmsvar.h> -static int mpu_fms_match __P((struct device *, struct cfdata *, void *)); -static void mpu_fms_attach __P((struct device *, struct device *, void *)); +static int mpu_fms_match(struct device *, struct cfdata *, void *); +static void mpu_fms_attach(struct device *, struct device *, void *); CFATTACH_DECL(mpu_fms, sizeof (struct mpu_softc), mpu_fms_match, mpu_fms_attach, NULL, NULL); diff --git a/sys/dev/pci/opl_cmpci.c b/sys/dev/pci/opl_cmpci.c index 65c21f51a51..855e14bac2f 100644 --- a/sys/dev/pci/opl_cmpci.c +++ b/sys/dev/pci/opl_cmpci.c @@ -1,4 +1,4 @@ -/* $NetBSD: opl_cmpci.c,v 1.6 2003/12/04 13:57:31 keihan Exp $ */ +/* $NetBSD: opl_cmpci.c,v 1.7 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: opl_cmpci.c,v 1.6 2003/12/04 13:57:31 keihan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: opl_cmpci.c,v 1.7 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -63,8 +63,8 @@ __KERNEL_RCSID(0, "$NetBSD: opl_cmpci.c,v 1.6 2003/12/04 13:57:31 keihan Exp $") #include <dev/pci/cmpcireg.h> #include <dev/pci/cmpcivar.h> -int opl_cmpci_match __P((struct device *, struct cfdata *, void *)); -void opl_cmpci_attach __P((struct device *, struct device *, void *)); +int opl_cmpci_match(struct device *, struct cfdata *, void *); +void opl_cmpci_attach(struct device *, struct device *, void *); CFATTACH_DECL(opl_cmpci, sizeof (struct opl_softc), opl_cmpci_match, opl_cmpci_attach, NULL, NULL); diff --git a/sys/dev/pci/opl_eso.c b/sys/dev/pci/opl_eso.c index 5257285ee1a..7aa6f627e40 100644 --- a/sys/dev/pci/opl_eso.c +++ b/sys/dev/pci/opl_eso.c @@ -1,4 +1,4 @@ -/* $NetBSD: opl_eso.c,v 1.8 2003/12/04 13:57:31 keihan Exp $ */ +/* $NetBSD: opl_eso.c,v 1.9 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: opl_eso.c,v 1.8 2003/12/04 13:57:31 keihan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: opl_eso.c,v 1.9 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -63,8 +63,8 @@ __KERNEL_RCSID(0, "$NetBSD: opl_eso.c,v 1.8 2003/12/04 13:57:31 keihan Exp $"); #include <dev/pci/esovar.h> -static int opl_eso_match __P((struct device *, struct cfdata *, void *)); -static void opl_eso_attach __P((struct device *, struct device *, void *)); +static int opl_eso_match(struct device *, struct cfdata *, void *); +static void opl_eso_attach(struct device *, struct device *, void *); CFATTACH_DECL(opl_eso, sizeof (struct opl_softc), opl_eso_match, opl_eso_attach, NULL, NULL); diff --git a/sys/dev/pci/opl_fms.c b/sys/dev/pci/opl_fms.c index 4ed46b8e14a..2a33191cdb6 100644 --- a/sys/dev/pci/opl_fms.c +++ b/sys/dev/pci/opl_fms.c @@ -1,4 +1,4 @@ -/* $NetBSD: opl_fms.c,v 1.7 2003/12/04 13:57:31 keihan Exp $ */ +/* $NetBSD: opl_fms.c,v 1.8 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: opl_fms.c,v 1.7 2003/12/04 13:57:31 keihan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: opl_fms.c,v 1.8 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -64,8 +64,8 @@ __KERNEL_RCSID(0, "$NetBSD: opl_fms.c,v 1.7 2003/12/04 13:57:31 keihan Exp $"); #include <dev/pci/fmsvar.h> -int opl_fms_match __P((struct device *, struct cfdata *, void *)); -void opl_fms_attach __P((struct device *, struct device *, void *)); +int opl_fms_match(struct device *, struct cfdata *, void *); +void opl_fms_attach(struct device *, struct device *, void *); CFATTACH_DECL(opl_fms, sizeof (struct opl_softc), opl_fms_match, opl_fms_attach, NULL, NULL); diff --git a/sys/dev/pci/opl_sv.c b/sys/dev/pci/opl_sv.c index 0c33827df89..4a8b962522a 100644 --- a/sys/dev/pci/opl_sv.c +++ b/sys/dev/pci/opl_sv.c @@ -1,4 +1,4 @@ -/* $NetBSD: opl_sv.c,v 1.6 2003/12/04 13:57:31 keihan Exp $ */ +/* $NetBSD: opl_sv.c,v 1.7 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: opl_sv.c,v 1.6 2003/12/04 13:57:31 keihan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: opl_sv.c,v 1.7 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -63,8 +63,8 @@ __KERNEL_RCSID(0, "$NetBSD: opl_sv.c,v 1.6 2003/12/04 13:57:31 keihan Exp $"); #include <dev/pci/svvar.h> -int opl_sv_match __P((struct device *, struct cfdata *, void *)); -void opl_sv_attach __P((struct device *, struct device *, void *)); +int opl_sv_match(struct device *, struct cfdata *, void *); +void opl_sv_attach(struct device *, struct device *, void *); CFATTACH_DECL(opl_sv, sizeof (struct opl_softc), opl_sv_match, opl_sv_attach, NULL, NULL); diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c index a41fdcb9654..ae2c598bf61 100644 --- a/sys/dev/pci/pccbb.c +++ b/sys/dev/pci/pccbb.c @@ -1,4 +1,4 @@ -/* $NetBSD: pccbb.c,v 1.115 2005/01/27 03:03:33 jmcneill Exp $ */ +/* $NetBSD: pccbb.c,v 1.116 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1998, 1999 and 2000 @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.115 2005/01/27 03:03:33 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.116 2005/02/04 02:10:45 perry Exp $"); /* #define CBB_DEBUG @@ -111,122 +111,118 @@ struct cfdriver cbb_cd = { } \ } while (0) -int pcicbbmatch __P((struct device *, struct cfdata *, void *)); -void pccbbattach __P((struct device *, struct device *, void *)); -int pccbbintr __P((void *)); -static void pci113x_insert __P((void *)); -static int pccbbintr_function __P((struct pccbb_softc *)); +int pcicbbmatch(struct device *, struct cfdata *, void *); +void pccbbattach(struct device *, struct device *, void *); +int pccbbintr(void *); +static void pci113x_insert(void *); +static int pccbbintr_function(struct pccbb_softc *); -static int pccbb_detect_card __P((struct pccbb_softc *)); +static int pccbb_detect_card(struct pccbb_softc *); -static void pccbb_pcmcia_write __P((struct pcic_handle *, int, u_int8_t)); -static u_int8_t pccbb_pcmcia_read __P((struct pcic_handle *, int)); +static void pccbb_pcmcia_write(struct pcic_handle *, int, u_int8_t); +static u_int8_t pccbb_pcmcia_read(struct pcic_handle *, int); #define Pcic_read(ph, reg) ((ph)->ph_read((ph), (reg))) #define Pcic_write(ph, reg, val) ((ph)->ph_write((ph), (reg), (val))) -STATIC int cb_reset __P((struct pccbb_softc *)); -STATIC int cb_detect_voltage __P((struct pccbb_softc *)); -STATIC int cbbprint __P((void *, const char *)); +STATIC int cb_reset(struct pccbb_softc *); +STATIC int cb_detect_voltage(struct pccbb_softc *); +STATIC int cbbprint(void *, const char *); -static int cb_chipset __P((u_int32_t, int *)); -STATIC void pccbb_pcmcia_attach_setup __P((struct pccbb_softc *, - struct pcmciabus_attach_args *)); +static int cb_chipset(u_int32_t, int *); +STATIC void pccbb_pcmcia_attach_setup(struct pccbb_softc *, + struct pcmciabus_attach_args *); #if 0 -STATIC void pccbb_pcmcia_attach_card __P((struct pcic_handle *)); -STATIC void pccbb_pcmcia_detach_card __P((struct pcic_handle *, int)); -STATIC void pccbb_pcmcia_deactivate_card __P((struct pcic_handle *)); +STATIC void pccbb_pcmcia_attach_card(struct pcic_handle *); +STATIC void pccbb_pcmcia_detach_card(struct pcic_handle *, int); +STATIC void pccbb_pcmcia_deactivate_card(struct pcic_handle *); #endif -STATIC int pccbb_ctrl __P((cardbus_chipset_tag_t, int)); -STATIC int pccbb_power __P((cardbus_chipset_tag_t, int)); -STATIC int pccbb_cardenable __P((struct pccbb_softc * sc, int function)); +STATIC int pccbb_ctrl(cardbus_chipset_tag_t, int); +STATIC int pccbb_power(cardbus_chipset_tag_t, int); +STATIC int pccbb_cardenable(struct pccbb_softc * sc, int function); #if !rbus -static int pccbb_io_open __P((cardbus_chipset_tag_t, int, u_int32_t, - u_int32_t)); -static int pccbb_io_close __P((cardbus_chipset_tag_t, int)); -static int pccbb_mem_open __P((cardbus_chipset_tag_t, int, u_int32_t, - u_int32_t)); -static int pccbb_mem_close __P((cardbus_chipset_tag_t, int)); +static int pccbb_io_open(cardbus_chipset_tag_t, int, u_int32_t, u_int32_t); +static int pccbb_io_close(cardbus_chipset_tag_t, int); +static int pccbb_mem_open(cardbus_chipset_tag_t, int, u_int32_t, u_int32_t); +static int pccbb_mem_close(cardbus_chipset_tag_t, int); #endif /* !rbus */ -static void *pccbb_intr_establish __P((struct pccbb_softc *, int irq, - int level, int (*ih) (void *), void *sc)); -static void pccbb_intr_disestablish __P((struct pccbb_softc *, void *ih)); - -static void *pccbb_cb_intr_establish __P((cardbus_chipset_tag_t, int irq, - int level, int (*ih) (void *), void *sc)); -static void pccbb_cb_intr_disestablish __P((cardbus_chipset_tag_t ct, void *ih)); - -static cardbustag_t pccbb_make_tag __P((cardbus_chipset_tag_t, int, int, int)); -static void pccbb_free_tag __P((cardbus_chipset_tag_t, cardbustag_t)); -static cardbusreg_t pccbb_conf_read __P((cardbus_chipset_tag_t, cardbustag_t, - int)); -static void pccbb_conf_write __P((cardbus_chipset_tag_t, cardbustag_t, int, - cardbusreg_t)); -static void pccbb_chipinit __P((struct pccbb_softc *)); - -STATIC int pccbb_pcmcia_mem_alloc __P((pcmcia_chipset_handle_t, bus_size_t, - struct pcmcia_mem_handle *)); -STATIC void pccbb_pcmcia_mem_free __P((pcmcia_chipset_handle_t, - struct pcmcia_mem_handle *)); -STATIC int pccbb_pcmcia_mem_map __P((pcmcia_chipset_handle_t, int, bus_addr_t, - bus_size_t, struct pcmcia_mem_handle *, bus_addr_t *, int *)); -STATIC void pccbb_pcmcia_mem_unmap __P((pcmcia_chipset_handle_t, int)); -STATIC int pccbb_pcmcia_io_alloc __P((pcmcia_chipset_handle_t, bus_addr_t, - bus_size_t, bus_size_t, struct pcmcia_io_handle *)); -STATIC void pccbb_pcmcia_io_free __P((pcmcia_chipset_handle_t, - struct pcmcia_io_handle *)); -STATIC int pccbb_pcmcia_io_map __P((pcmcia_chipset_handle_t, int, bus_addr_t, - bus_size_t, struct pcmcia_io_handle *, int *)); -STATIC void pccbb_pcmcia_io_unmap __P((pcmcia_chipset_handle_t, int)); -STATIC void *pccbb_pcmcia_intr_establish __P((pcmcia_chipset_handle_t, - struct pcmcia_function *, int, int (*)(void *), void *)); -STATIC void pccbb_pcmcia_intr_disestablish __P((pcmcia_chipset_handle_t, - void *)); -STATIC void pccbb_pcmcia_socket_enable __P((pcmcia_chipset_handle_t)); -STATIC void pccbb_pcmcia_socket_disable __P((pcmcia_chipset_handle_t)); -STATIC void pccbb_pcmcia_socket_settype __P((pcmcia_chipset_handle_t, int)); -STATIC int pccbb_pcmcia_card_detect __P((pcmcia_chipset_handle_t pch)); - -static int pccbb_pcmcia_wait_ready __P((struct pcic_handle *)); -static void pccbb_pcmcia_delay __P((struct pcic_handle *, int, const char *)); - -static void pccbb_pcmcia_do_io_map __P((struct pcic_handle *, int)); -static void pccbb_pcmcia_do_mem_map __P((struct pcic_handle *, int)); -static void pccbb_powerhook __P((int, void *)); +static void *pccbb_intr_establish(struct pccbb_softc *, int irq, + int level, int (*ih) (void *), void *sc); +static void pccbb_intr_disestablish(struct pccbb_softc *, void *ih); + +static void *pccbb_cb_intr_establish(cardbus_chipset_tag_t, int irq, + int level, int (*ih) (void *), void *sc); +static void pccbb_cb_intr_disestablish(cardbus_chipset_tag_t ct, void *ih); + +static cardbustag_t pccbb_make_tag(cardbus_chipset_tag_t, int, int, int); +static void pccbb_free_tag(cardbus_chipset_tag_t, cardbustag_t); +static cardbusreg_t pccbb_conf_read(cardbus_chipset_tag_t, cardbustag_t, int); +static void pccbb_conf_write(cardbus_chipset_tag_t, cardbustag_t, int, + cardbusreg_t); +static void pccbb_chipinit(struct pccbb_softc *); + +STATIC int pccbb_pcmcia_mem_alloc(pcmcia_chipset_handle_t, bus_size_t, + struct pcmcia_mem_handle *); +STATIC void pccbb_pcmcia_mem_free(pcmcia_chipset_handle_t, + struct pcmcia_mem_handle *); +STATIC int pccbb_pcmcia_mem_map(pcmcia_chipset_handle_t, int, bus_addr_t, + bus_size_t, struct pcmcia_mem_handle *, bus_addr_t *, int *); +STATIC void pccbb_pcmcia_mem_unmap(pcmcia_chipset_handle_t, int); +STATIC int pccbb_pcmcia_io_alloc(pcmcia_chipset_handle_t, bus_addr_t, + bus_size_t, bus_size_t, struct pcmcia_io_handle *); +STATIC void pccbb_pcmcia_io_free(pcmcia_chipset_handle_t, + struct pcmcia_io_handle *); +STATIC int pccbb_pcmcia_io_map(pcmcia_chipset_handle_t, int, bus_addr_t, + bus_size_t, struct pcmcia_io_handle *, int *); +STATIC void pccbb_pcmcia_io_unmap(pcmcia_chipset_handle_t, int); +STATIC void *pccbb_pcmcia_intr_establish(pcmcia_chipset_handle_t, + struct pcmcia_function *, int, int (*)(void *), void *); +STATIC void pccbb_pcmcia_intr_disestablish(pcmcia_chipset_handle_t, void *); +STATIC void pccbb_pcmcia_socket_enable(pcmcia_chipset_handle_t); +STATIC void pccbb_pcmcia_socket_disable(pcmcia_chipset_handle_t); +STATIC void pccbb_pcmcia_socket_settype(pcmcia_chipset_handle_t, int); +STATIC int pccbb_pcmcia_card_detect(pcmcia_chipset_handle_t pch); + +static int pccbb_pcmcia_wait_ready(struct pcic_handle *); +static void pccbb_pcmcia_delay(struct pcic_handle *, int, const char *); + +static void pccbb_pcmcia_do_io_map(struct pcic_handle *, int); +static void pccbb_pcmcia_do_mem_map(struct pcic_handle *, int); +static void pccbb_powerhook(int, void *); /* bus-space allocation and deallocation functions */ #if rbus -static int pccbb_rbus_cb_space_alloc __P((cardbus_chipset_tag_t, rbus_tag_t, +static int pccbb_rbus_cb_space_alloc(cardbus_chipset_tag_t, rbus_tag_t, bus_addr_t addr, bus_size_t size, bus_addr_t mask, bus_size_t align, - int flags, bus_addr_t * addrp, bus_space_handle_t * bshp)); -static int pccbb_rbus_cb_space_free __P((cardbus_chipset_tag_t, rbus_tag_t, - bus_space_handle_t, bus_size_t)); + int flags, bus_addr_t * addrp, bus_space_handle_t * bshp); +static int pccbb_rbus_cb_space_free(cardbus_chipset_tag_t, rbus_tag_t, + bus_space_handle_t, bus_size_t); #endif /* rbus */ #if rbus -static int pccbb_open_win __P((struct pccbb_softc *, bus_space_tag_t, - bus_addr_t, bus_size_t, bus_space_handle_t, int flags)); -static int pccbb_close_win __P((struct pccbb_softc *, bus_space_tag_t, - bus_space_handle_t, bus_size_t)); -static int pccbb_winlist_insert __P((struct pccbb_win_chain_head *, bus_addr_t, - bus_size_t, bus_space_handle_t, int)); -static int pccbb_winlist_delete __P((struct pccbb_win_chain_head *, - bus_space_handle_t, bus_size_t)); -static void pccbb_winset __P((bus_addr_t align, struct pccbb_softc *, - bus_space_tag_t)); +static int pccbb_open_win(struct pccbb_softc *, bus_space_tag_t, + bus_addr_t, bus_size_t, bus_space_handle_t, int flags); +static int pccbb_close_win(struct pccbb_softc *, bus_space_tag_t, + bus_space_handle_t, bus_size_t); +static int pccbb_winlist_insert(struct pccbb_win_chain_head *, bus_addr_t, + bus_size_t, bus_space_handle_t, int); +static int pccbb_winlist_delete(struct pccbb_win_chain_head *, + bus_space_handle_t, bus_size_t); +static void pccbb_winset(bus_addr_t align, struct pccbb_softc *, + bus_space_tag_t); void pccbb_winlist_show(struct pccbb_win_chain *); #endif /* rbus */ /* for config_defer */ -static void pccbb_pci_callback __P((struct device *)); +static void pccbb_pci_callback(struct device *); #if defined SHOW_REGS -static void cb_show_regs __P((pci_chipset_tag_t pc, pcitag_t tag, - bus_space_tag_t memt, bus_space_handle_t memh)); +static void cb_show_regs(pci_chipset_tag_t pc, pcitag_t tag, + bus_space_tag_t memt, bus_space_handle_t memh); #endif CFATTACH_DECL(cbb_pci, sizeof(struct pccbb_softc), @@ -1415,7 +1411,7 @@ pccbb_power(ct, command) #if defined CB_PCMCIA_POLL struct cb_poll_str { void *arg; - int (*func) __P((void *)); + int (*func)(void *); int level; pccard_chipset_tag_t ct; int count; @@ -1425,7 +1421,7 @@ struct cb_poll_str { static struct cb_poll_str cb_poll[10]; static int cb_poll_n = 0; -static void cb_pcmcia_poll __P((void *arg)); +static void cb_pcmcia_poll(void *arg); static void cb_pcmcia_poll(arg) @@ -1737,7 +1733,7 @@ pccbb_mem_close(ct, win) * static void *pccbb_cb_intr_establish(cardbus_chipset_tag_t ct, * int irq, * int level, - * int (* func) __P((void *)), + * int (* func)(void *), * void *arg) * * This function registers an interrupt handler at the bridge, in @@ -1750,7 +1746,7 @@ static void * pccbb_cb_intr_establish(ct, irq, level, func, arg) cardbus_chipset_tag_t ct; int irq, level; - int (*func) __P((void *)); + int (*func)(void *); void *arg; { struct pccbb_softc *sc = (struct pccbb_softc *)ct; @@ -1803,7 +1799,7 @@ pccbb_intr_route(sc) * static void *pccbb_intr_establish(struct pccbb_softc *sc, * int irq, * int level, - * int (* func) __P((void *)), + * int (* func)(void *), * void *arg) * * This function registers an interrupt handler at the bridge, in @@ -1816,7 +1812,7 @@ static void * pccbb_intr_establish(sc, irq, level, func, arg) struct pccbb_softc *sc; int irq, level; - int (*func) __P((void *)); + int (*func)(void *); void *arg; { struct pccbb_intrhand_list *pil, *newpil; @@ -2908,7 +2904,7 @@ pccbb_pcmcia_mem_unmap(pch, window) #if defined PCCBB_PCMCIA_POLL struct pccbb_poll_str { void *arg; - int (*func) __P((void *)); + int (*func)(void *); int level; struct pcic_handle *ph; int count; @@ -2919,7 +2915,7 @@ struct pccbb_poll_str { static struct pccbb_poll_str pccbb_poll[10]; static int pccbb_poll_n = 0; -static void pccbb_pcmcia_poll __P((void *arg)); +static void pccbb_pcmcia_poll(void *arg); static void pccbb_pcmcia_poll(arg) @@ -2982,7 +2978,7 @@ pccbb_pcmcia_intr_establish(pch, pf, ipl, func, arg) pcmcia_chipset_handle_t pch; struct pcmcia_function *pf; int ipl; - int (*func) __P((void *)); + int (*func)(void *); void *arg; { struct pcic_handle *ph = (struct pcic_handle *)pch; diff --git a/sys/dev/pci/pccbbvar.h b/sys/dev/pci/pccbbvar.h index 38d30a6e3bb..5951319d780 100644 --- a/sys/dev/pci/pccbbvar.h +++ b/sys/dev/pci/pccbbvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: pccbbvar.h,v 1.23 2005/01/27 02:44:59 jmcneill Exp $ */ +/* $NetBSD: pccbbvar.h,v 1.24 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1999 HAYAKAWA Koichi. All rights reserved. * @@ -68,8 +68,8 @@ struct cbb_pcic_handle { struct device *ph_parent; bus_space_tag_t ph_base_t; bus_space_handle_t ph_base_h; - u_int8_t (*ph_read) __P((struct cbb_pcic_handle *, int)); - void (*ph_write) __P((struct cbb_pcic_handle *, int, u_int8_t)); + u_int8_t (*ph_read)(struct cbb_pcic_handle *, int); + void (*ph_write)(struct cbb_pcic_handle *, int, u_int8_t); int sock; int vendor; @@ -173,13 +173,13 @@ struct pccbb_softc { */ struct pccbb_intrhand_list { - int (*pil_func) __P((void *)); + int (*pil_func)(void *); void *pil_arg; int pil_level; LIST_ENTRY(pccbb_intrhand_list) pil_next; }; -void pccbb_intr_route __P((struct pccbb_softc *sc)); +void pccbb_intr_route(struct pccbb_softc *sc); #endif /* _DEV_PCI_PCCBBREG_H_ */ diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 92127b50556..d43185457d6 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: pci.c,v 1.90 2005/01/26 21:49:00 jmcneill Exp $ */ +/* $NetBSD: pci.c,v 1.91 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1995, 1996, 1997, 1998 @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.90 2005/01/26 21:49:00 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.91 2005/02/04 02:10:45 perry Exp $"); #include "opt_pci.h" @@ -58,17 +58,17 @@ int pci_config_dump = 1; int pci_config_dump = 0; #endif -int pcimatch __P((struct device *, struct cfdata *, void *)); -void pciattach __P((struct device *, struct device *, void *)); +int pcimatch(struct device *, struct cfdata *, void *); +void pciattach(struct device *, struct device *, void *); int pcirescan(struct device *, const char *, const int *); void pcidevdetached(struct device *, struct device *); CFATTACH_DECL2(pci, sizeof(struct pci_softc), pcimatch, pciattach, NULL, NULL, pcirescan, pcidevdetached); -int pciprint __P((void *, const char *)); -int pcisubmatch __P((struct device *, struct cfdata *, - const locdesc_t *, void *)); +int pciprint(void *, const char *); +int pcisubmatch(struct device *, struct cfdata *, + const locdesc_t *, void *); #ifdef PCI_MACHDEP_ENUMERATE_BUS #define pci_enumerate_bus PCI_MACHDEP_ENUMERATE_BUS diff --git a/sys/dev/pci/pciconf.h b/sys/dev/pci/pciconf.h index 6f5abf0d661..45c49c40b60 100644 --- a/sys/dev/pci/pciconf.h +++ b/sys/dev/pci/pciconf.h @@ -1,4 +1,4 @@ -/* $NetBSD: pciconf.h,v 1.7 2002/09/28 10:31:02 scw Exp $ */ +/* $NetBSD: pciconf.h,v 1.8 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -40,13 +40,13 @@ * where pmem_extent is "pre-fetchable" memory -- if NULL, mem_extent will * be used for both */ -int pci_configure_bus __P((pci_chipset_tag_t, struct extent *, - struct extent *, struct extent *, int, int)); +int pci_configure_bus(pci_chipset_tag_t, struct extent *, + struct extent *, struct extent *, int, int); /* Defined in machdep code. Returns the interrupt line to set */ /* args: chipset_tag, bus, dev, ipin, ptr to interrupt line */ #ifndef pci_conf_interrupt -void pci_conf_interrupt __P((pci_chipset_tag_t, int, int, int, int, int *)); +void pci_conf_interrupt(pci_chipset_tag_t, int, int, int, int, int *); #endif #define PCI_CONF_MAP_IO 0x01 diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c index e9e9a8b1d75..c7e67cb9b99 100644 --- a/sys/dev/pci/pciide.c +++ b/sys/dev/pci/pciide.c @@ -1,4 +1,4 @@ -/* $NetBSD: pciide.c,v 1.210 2004/09/17 23:04:02 enami Exp $ */ +/* $NetBSD: pciide.c,v 1.211 2005/02/04 02:10:45 perry Exp $ */ /* @@ -75,7 +75,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pciide.c,v 1.210 2004/09/17 23:04:02 enami Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pciide.c,v 1.211 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> @@ -83,8 +83,8 @@ __KERNEL_RCSID(0, "$NetBSD: pciide.c,v 1.210 2004/09/17 23:04:02 enami Exp $"); #include <dev/pci/pciidereg.h> #include <dev/pci/pciidevar.h> -int pciide_match __P((struct device *, struct cfdata *, void *)); -void pciide_attach __P((struct device *, struct device *, void *)); +int pciide_match(struct device *, struct cfdata *, void *); +void pciide_attach(struct device *, struct device *, void *); CFATTACH_DECL(pciide, sizeof(struct pciide_softc), pciide_match, pciide_attach, NULL, NULL); diff --git a/sys/dev/pci/pciide_common.c b/sys/dev/pci/pciide_common.c index 3c14515b2c4..df3417736fc 100644 --- a/sys/dev/pci/pciide_common.c +++ b/sys/dev/pci/pciide_common.c @@ -1,4 +1,4 @@ -/* $NetBSD: pciide_common.c,v 1.22 2004/11/24 19:52:50 bouyer Exp $ */ +/* $NetBSD: pciide_common.c,v 1.23 2005/02/04 02:10:45 perry Exp $ */ /* @@ -76,7 +76,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.22 2004/11/24 19:52:50 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.23 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/malloc.h> @@ -252,7 +252,7 @@ pciide_mapregs_native(pa, cp, cmdsizep, ctlsizep, pci_intr) struct pci_attach_args * pa; struct pciide_channel *cp; bus_size_t *cmdsizep, *ctlsizep; - int (*pci_intr) __P((void *)); + int (*pci_intr)(void *); { struct pciide_softc *sc = CHAN_TO_PCIIDE(&cp->ata_channel); struct ata_channel *wdc_cp = &cp->ata_channel; @@ -804,7 +804,7 @@ pciide_mapchan(pa, cp, interface, cmdsizep, ctlsizep, pci_intr) struct pciide_channel *cp; pcireg_t interface; bus_size_t *cmdsizep, *ctlsizep; - int (*pci_intr) __P((void *)); + int (*pci_intr)(void *); { struct ata_channel *wdc_cp = &cp->ata_channel; diff --git a/sys/dev/pci/pciidevar.h b/sys/dev/pci/pciidevar.h index 2111a902de6..6bc79495b7f 100644 --- a/sys/dev/pci/pciidevar.h +++ b/sys/dev/pci/pciidevar.h @@ -1,4 +1,4 @@ -/* $NetBSD: pciidevar.h,v 1.27 2005/01/26 21:50:31 jmcneill Exp $ */ +/* $NetBSD: pciidevar.h,v 1.28 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1998 Christopher G. Demetriou. All rights reserved. @@ -159,7 +159,7 @@ struct pciide_product_desc { int ide_flags; const char *ide_name; /* map and setup chip, probe drives */ - void (*chip_map) __P((struct pciide_softc*, struct pci_attach_args*)); + void (*chip_map)(struct pciide_softc*, struct pci_attach_args*); }; /* Flags for ide_flags */ @@ -167,10 +167,9 @@ struct pciide_product_desc { /* inlines for reading/writing 8-bit PCI registers */ -static __inline u_int8_t pciide_pci_read __P((pci_chipset_tag_t, pcitag_t, - int)); -static __inline void pciide_pci_write __P((pci_chipset_tag_t, pcitag_t, - int, u_int8_t)); +static __inline u_int8_t pciide_pci_read(pci_chipset_tag_t, pcitag_t, int); +static __inline void pciide_pci_write(pci_chipset_tag_t, pcitag_t, + int, u_int8_t); static __inline u_int8_t pciide_pci_read(pc, pa, reg) @@ -198,17 +197,17 @@ pciide_pci_write(pc, pa, reg, val) pci_conf_write(pc, pa, (reg & ~0x03), pcival); } -void default_chip_map __P((struct pciide_softc*, struct pci_attach_args*)); -void sata_setup_channel __P((struct ata_channel*)); +void default_chip_map(struct pciide_softc*, struct pci_attach_args*); +void sata_setup_channel(struct ata_channel*); -void pciide_channel_dma_setup __P((struct pciide_channel *)); -int pciide_dma_table_setup __P((struct pciide_softc*, int, int)); -int pciide_dma_dmamap_setup __P((struct pciide_softc *, int, int, - void *, size_t, int)); -int pciide_dma_init __P((void*, int, int, void *, size_t, int)); -void pciide_dma_start __P((void*, int, int)); -int pciide_dma_finish __P((void*, int, int, int)); -void pciide_irqack __P((struct ata_channel *)); +void pciide_channel_dma_setup(struct pciide_channel *); +int pciide_dma_table_setup(struct pciide_softc*, int, int); +int pciide_dma_dmamap_setup(struct pciide_softc *, int, int, + void *, size_t, int); +int pciide_dma_init(void*, int, int, void *, size_t, int); +void pciide_dma_start(void*, int, int); +int pciide_dma_finish(void*, int, int, int); +void pciide_irqack(struct ata_channel *); /* * Functions defined by machine-dependent code. @@ -216,31 +215,30 @@ void pciide_irqack __P((struct ata_channel *)); /* Attach compat interrupt handler, returning handle or NULL if failed. */ #ifdef __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_ESTABLISH -void *pciide_machdep_compat_intr_establish __P((struct device *, - struct pci_attach_args *, int, int (*)(void *), void *)); +void *pciide_machdep_compat_intr_establish(struct device *, + struct pci_attach_args *, int, int (*)(void *), void *); #endif const struct pciide_product_desc* pciide_lookup_product - __P((u_int32_t, const struct pciide_product_desc *)); -void pciide_common_attach - __P((struct pciide_softc *, struct pci_attach_args *, - const struct pciide_product_desc *)); - -int pciide_chipen __P((struct pciide_softc *, struct pci_attach_args *)); -void pciide_mapregs_compat __P(( struct pci_attach_args *, - struct pciide_channel *, int, bus_size_t *, bus_size_t*)); -void pciide_mapregs_native __P((struct pci_attach_args *, + (u_int32_t, const struct pciide_product_desc *); +void pciide_common_attach(struct pciide_softc *, struct pci_attach_args *, + const struct pciide_product_desc *); + +int pciide_chipen(struct pciide_softc *, struct pci_attach_args *); +void pciide_mapregs_compat(struct pci_attach_args *, + struct pciide_channel *, int, bus_size_t *, bus_size_t*); +void pciide_mapregs_native(struct pci_attach_args *, struct pciide_channel *, bus_size_t *, bus_size_t *, - int (*pci_intr) __P((void *)))); -void pciide_mapreg_dma __P((struct pciide_softc *, - struct pci_attach_args *)); -int pciide_chansetup __P((struct pciide_softc *, int, pcireg_t)); -void pciide_mapchan __P((struct pci_attach_args *, + int (*pci_intr)(void *)); +void pciide_mapreg_dma(struct pciide_softc *, + struct pci_attach_args *); +int pciide_chansetup(struct pciide_softc *, int, pcireg_t); +void pciide_mapchan(struct pci_attach_args *, struct pciide_channel *, pcireg_t, bus_size_t *, bus_size_t *, - int (*pci_intr) __P((void *)))); -void pciide_map_compat_intr __P(( struct pci_attach_args *, - struct pciide_channel *, int)); -int pciide_compat_intr __P((void *)); -int pciide_pci_intr __P((void *)); + int (*pci_intr)(void *)); +void pciide_map_compat_intr(struct pci_attach_args *, + struct pciide_channel *, int); +int pciide_compat_intr(void *); +int pciide_pci_intr(void *); #endif /* _DEV_PCI_PCIIDEVAR_H_ */ diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h index 925ddea960f..00861baeb0f 100644 --- a/sys/dev/pci/pcivar.h +++ b/sys/dev/pci/pcivar.h @@ -1,4 +1,4 @@ -/* $NetBSD: pcivar.h,v 1.68 2005/01/26 21:49:00 jmcneill Exp $ */ +/* $NetBSD: pcivar.h,v 1.69 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved. @@ -183,34 +183,33 @@ int pcibusprint(void *, const char *); * Configuration space access and utility functions. (Note that most, * e.g. make_tag, conf_read, conf_write are declared by pci_machdep.h.) */ -int pci_mapreg_probe __P((pci_chipset_tag_t, pcitag_t, int, pcireg_t *)); -pcireg_t pci_mapreg_type __P((pci_chipset_tag_t, pcitag_t, int)); -int pci_mapreg_info __P((pci_chipset_tag_t, pcitag_t, int, pcireg_t, - bus_addr_t *, bus_size_t *, int *)); -int pci_mapreg_map __P((struct pci_attach_args *, int, pcireg_t, int, +int pci_mapreg_probe(pci_chipset_tag_t, pcitag_t, int, pcireg_t *); +pcireg_t pci_mapreg_type(pci_chipset_tag_t, pcitag_t, int); +int pci_mapreg_info(pci_chipset_tag_t, pcitag_t, int, pcireg_t, + bus_addr_t *, bus_size_t *, int *); +int pci_mapreg_map(struct pci_attach_args *, int, pcireg_t, int, bus_space_tag_t *, bus_space_handle_t *, bus_addr_t *, - bus_size_t *)); + bus_size_t *); -int pci_get_capability __P((pci_chipset_tag_t, pcitag_t, int, - int *, pcireg_t *)); +int pci_get_capability(pci_chipset_tag_t, pcitag_t, int, int *, pcireg_t *); /* * Helper functions for autoconfiguration. */ int pci_probe_device(struct pci_softc *, pcitag_t tag, int (*)(struct pci_attach_args *), struct pci_attach_args *); -void pci_devinfo __P((pcireg_t, pcireg_t, int, char *, size_t)); -void pci_conf_print __P((pci_chipset_tag_t, pcitag_t, - void (*)(pci_chipset_tag_t, pcitag_t, const pcireg_t *))); +void pci_devinfo(pcireg_t, pcireg_t, int, char *, size_t); +void pci_conf_print(pci_chipset_tag_t, pcitag_t, + void (*)(pci_chipset_tag_t, pcitag_t, const pcireg_t *)); const struct pci_quirkdata * - pci_lookup_quirkdata __P((pci_vendor_id_t, pci_product_id_t)); + pci_lookup_quirkdata(pci_vendor_id_t, pci_product_id_t); /* * Helper functions for user access to the PCI bus. */ struct proc; -int pci_devioctl __P((pci_chipset_tag_t, pcitag_t, u_long, caddr_t, - int flag, struct proc *)); +int pci_devioctl(pci_chipset_tag_t, pcitag_t, u_long, caddr_t, + int flag, struct proc *); /* * Power Management (PCI 2.2) @@ -220,19 +219,19 @@ int pci_devioctl __P((pci_chipset_tag_t, pcitag_t, u_long, caddr_t, #define PCI_PWR_D1 1 #define PCI_PWR_D2 2 #define PCI_PWR_D3 3 -int pci_powerstate __P((pci_chipset_tag_t, pcitag_t, const int *, int *)); +int pci_powerstate(pci_chipset_tag_t, pcitag_t, const int *, int *); /* * Vital Product Data (PCI 2.2) */ -int pci_vpd_read __P((pci_chipset_tag_t, pcitag_t, int, int, pcireg_t *)); -int pci_vpd_write __P((pci_chipset_tag_t, pcitag_t, int, int, pcireg_t *)); +int pci_vpd_read(pci_chipset_tag_t, pcitag_t, int, int, pcireg_t *); +int pci_vpd_write(pci_chipset_tag_t, pcitag_t, int, int, pcireg_t *); /* * Misc. */ -const char *pci_findvendor __P((pcireg_t)); -const char *pci_findproduct __P((pcireg_t)); +const char *pci_findvendor(pcireg_t); +const char *pci_findproduct(pcireg_t); int pci_find_device(struct pci_attach_args *pa, int (*match)(struct pci_attach_args *)); int pci_dma64_available(struct pci_attach_args *); diff --git a/sys/dev/pci/plx9060var.h b/sys/dev/pci/plx9060var.h index bef97d23c56..bcbc8a7ae11 100644 --- a/sys/dev/pci/plx9060var.h +++ b/sys/dev/pci/plx9060var.h @@ -1,4 +1,4 @@ -/* $NetBSD: plx9060var.h,v 1.1 2000/05/17 17:47:00 thorpej Exp $ */ +/* $NetBSD: plx9060var.h,v 1.2 2005/02/04 02:10:45 perry Exp $ */ /*- * Copyright (c) 2000 Zembu Labs, Inc. @@ -48,9 +48,8 @@ struct plx9060_config { }; #ifdef notyet -void plx9060_read_eeprom __P((struct plx9060_config *, int, int, void *)); -void plx9060_write_eeprom __P((struct plx9060_config *, int, int, - const void *)); +void plx9060_read_eeprom(struct plx9060_config *, int, int, void *); +void plx9060_write_eeprom(struct plx9060_config *, int, int, const void *); #endif #endif /* _DEV_PCI_PLX9060VAR_H_ */ diff --git a/sys/dev/pci/ppb.c b/sys/dev/pci/ppb.c index ae08214214a..c771f8d1099 100644 --- a/sys/dev/pci/ppb.c +++ b/sys/dev/pci/ppb.c @@ -1,4 +1,4 @@ -/* $NetBSD: ppb.c,v 1.29 2004/08/30 15:05:20 drochner Exp $ */ +/* $NetBSD: ppb.c,v 1.30 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1996, 1998 Christopher G. Demetriou. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.29 2004/08/30 15:05:20 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.30 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -48,8 +48,8 @@ struct ppb_softc { pcitag_t sc_tag; /* ...and tag. */ }; -int ppbmatch __P((struct device *, struct cfdata *, void *)); -void ppbattach __P((struct device *, struct device *, void *)); +int ppbmatch(struct device *, struct cfdata *, void *); +void ppbattach(struct device *, struct device *, void *); CFATTACH_DECL(ppb, sizeof(struct ppb_softc), ppbmatch, ppbattach, NULL, NULL); diff --git a/sys/dev/pci/puc.c b/sys/dev/pci/puc.c index c9d5231ffc3..823446a45ef 100644 --- a/sys/dev/pci/puc.c +++ b/sys/dev/pci/puc.c @@ -1,4 +1,4 @@ -/* $NetBSD: puc.c,v 1.21 2004/09/13 12:55:48 drochner Exp $ */ +/* $NetBSD: puc.c,v 1.22 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1996, 1998, 1999 @@ -53,7 +53,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: puc.c,v 1.21 2004/09/13 12:55:48 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: puc.c,v 1.22 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -90,24 +90,24 @@ struct puc_softc { struct device *dev; /* filled in by port attachments */ - int (*ihand) __P((void *)); + int (*ihand)(void *); void *ihandarg; } sc_ports[PUC_MAX_PORTS]; }; -int puc_match __P((struct device *, struct cfdata *, void *)); -void puc_attach __P((struct device *, struct device *, void *)); -int puc_print __P((void *, const char *)); -int puc_submatch __P((struct device *, struct cfdata *, - const locdesc_t *, void *)); +int puc_match(struct device *, struct cfdata *, void *); +void puc_attach(struct device *, struct device *, void *); +int puc_print(void *, const char *); +int puc_submatch(struct device *, struct cfdata *, + const locdesc_t *, void *); CFATTACH_DECL(puc, sizeof(struct puc_softc), puc_match, puc_attach, NULL, NULL); const struct puc_device_description * - puc_find_description __P((pcireg_t, pcireg_t, pcireg_t, pcireg_t)); + puc_find_description(pcireg_t, pcireg_t, pcireg_t, pcireg_t); static const char * - puc_port_type_name __P((int)); + puc_port_type_name(int); int puc_match(parent, match, aux) diff --git a/sys/dev/pci/pucvar.h b/sys/dev/pci/pucvar.h index 6c7cc71cad4..3b2b07570b8 100644 --- a/sys/dev/pci/pucvar.h +++ b/sys/dev/pci/pucvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: pucvar.h,v 1.6 2004/02/03 19:51:39 fredb Exp $ */ +/* $NetBSD: pucvar.h,v 1.7 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved. @@ -106,4 +106,4 @@ struct puc_attach_args { extern const struct puc_device_description puc_devices[]; extern const struct puc_device_description * - puc_find_description __P((pcireg_t, pcireg_t, pcireg_t, pcireg_t)); + puc_find_description(pcireg_t, pcireg_t, pcireg_t, pcireg_t); diff --git a/sys/dev/pci/siop_pci.c b/sys/dev/pci/siop_pci.c index e92032f73af..6846de245e1 100644 --- a/sys/dev/pci/siop_pci.c +++ b/sys/dev/pci/siop_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: siop_pci.c,v 1.15 2003/04/09 00:29:30 thorpej Exp $ */ +/* $NetBSD: siop_pci.c,v 1.16 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 2000 Manuel Bouyer. @@ -32,7 +32,7 @@ /* SYM53c8xx PCI-SCSI I/O Processors driver: PCI front-end */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: siop_pci.c,v 1.15 2003/04/09 00:29:30 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: siop_pci.c,v 1.16 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -51,8 +51,8 @@ __KERNEL_RCSID(0, "$NetBSD: siop_pci.c,v 1.15 2003/04/09 00:29:30 thorpej Exp $" #include <dev/pci/siop_pci_common.h> #include <dev/ic/siopvar.h> -int siop_pci_match __P((struct device *, struct cfdata *, void *)); -void siop_pci_attach __P((struct device *, struct device *, void *)); +int siop_pci_match(struct device *, struct cfdata *, void *); +void siop_pci_attach(struct device *, struct device *, void *); struct siop_pci_softc { struct siop_softc siop; diff --git a/sys/dev/pci/siop_pci_common.c b/sys/dev/pci/siop_pci_common.c index e439b7c411c..9efaae3f8d8 100644 --- a/sys/dev/pci/siop_pci_common.c +++ b/sys/dev/pci/siop_pci_common.c @@ -1,4 +1,4 @@ -/* $NetBSD: siop_pci_common.c,v 1.22 2004/03/10 22:02:53 bouyer Exp $ */ +/* $NetBSD: siop_pci_common.c,v 1.23 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 2000 Manuel Bouyer. @@ -32,7 +32,7 @@ /* SYM53c8xx PCI-SCSI I/O Processors driver: PCI front-end */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: siop_pci_common.c,v 1.22 2004/03/10 22:02:53 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: siop_pci_common.c,v 1.23 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -237,7 +237,7 @@ siop_pci_attach_common(pci_sc, siop_sc, pa, intr) struct siop_pci_common_softc *pci_sc; struct siop_common_softc *siop_sc; struct pci_attach_args *pa; - int (*intr) __P((void*)); + int (*intr)(void*); { pci_chipset_tag_t pc = pa->pa_pc; diff --git a/sys/dev/pci/siop_pci_common.h b/sys/dev/pci/siop_pci_common.h index 83765a5c788..05b328f6eaf 100644 --- a/sys/dev/pci/siop_pci_common.h +++ b/sys/dev/pci/siop_pci_common.h @@ -1,4 +1,4 @@ -/* $NetBSD: siop_pci_common.h,v 1.4 2002/04/23 20:41:19 bouyer Exp $ */ +/* $NetBSD: siop_pci_common.h,v 1.5 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 2000 Manuel Bouyer. @@ -44,7 +44,7 @@ struct siop_product_desc { int ram_size; /* size of RAM, if appropriate */ }; -const struct siop_product_desc * siop_lookup_product __P((u_int32_t, int)); +const struct siop_product_desc * siop_lookup_product(u_int32_t, int); /* Driver internal state */ struct siop_pci_common_softc { @@ -54,7 +54,7 @@ struct siop_pci_common_softc { const struct siop_product_desc *sc_pp; /* Adapter description */ }; -int siop_pci_attach_common __P((struct siop_pci_common_softc *, +int siop_pci_attach_common(struct siop_pci_common_softc *, struct siop_common_softc *, struct pci_attach_args *, - int (*) __P((void *)))); -void siop_pci_reset __P((struct siop_common_softc *)); + int (*)(void *)); +void siop_pci_reset(struct siop_common_softc *); diff --git a/sys/dev/pci/tga.c b/sys/dev/pci/tga.c index 56681114baf..195095c3887 100644 --- a/sys/dev/pci/tga.c +++ b/sys/dev/pci/tga.c @@ -1,4 +1,4 @@ -/* $NetBSD: tga.c,v 1.58 2004/06/29 21:32:42 kleink Exp $ */ +/* $NetBSD: tga.c,v 1.59 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.58 2004/06/29 21:32:42 kleink Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.59 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -59,55 +59,55 @@ __KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.58 2004/06/29 21:32:42 kleink Exp $"); #include <dev/wsfont/wsfont.h> #include <uvm/uvm_extern.h> -int tgamatch __P((struct device *, struct cfdata *, void *)); -void tgaattach __P((struct device *, struct device *, void *)); -int tgaprint __P((void *, const char *)); +int tgamatch(struct device *, struct cfdata *, void *); +void tgaattach(struct device *, struct device *, void *); +int tgaprint(void *, const char *); CFATTACH_DECL(tga, sizeof(struct tga_softc), tgamatch, tgaattach, NULL, NULL); -static void tga_init __P((bus_space_tag_t memt, pci_chipset_tag_t pc, - pcitag_t tag, struct tga_devconfig *dc)); +static void tga_init(bus_space_tag_t memt, pci_chipset_tag_t pc, + pcitag_t tag, struct tga_devconfig *dc); -static int tga_matchcommon __P((bus_space_tag_t, pci_chipset_tag_t, pcitag_t)); -static void tga_mapaddrs __P((bus_space_tag_t memt, pci_chipset_tag_t pc, - pcitag_t, bus_size_t *pcisize, struct tga_devconfig *dc)); -unsigned tga_getdotclock __P((struct tga_devconfig *dc)); +static int tga_matchcommon(bus_space_tag_t, pci_chipset_tag_t, pcitag_t); +static void tga_mapaddrs(bus_space_tag_t memt, pci_chipset_tag_t pc, + pcitag_t, bus_size_t *pcisize, struct tga_devconfig *dc); +unsigned tga_getdotclock(struct tga_devconfig *dc); struct tga_devconfig tga_console_dc; -int tga_ioctl __P((void *, u_long, caddr_t, int, struct proc *)); -paddr_t tga_mmap __P((void *, off_t, int)); -static void tga_copyrows __P((void *, int, int, int)); -static void tga_copycols __P((void *, int, int, int, int)); -static int tga_alloc_screen __P((void *, const struct wsscreen_descr *, - void **, int *, int *, long *)); -static void tga_free_screen __P((void *, void *)); -static int tga_show_screen __P((void *, void *, int, - void (*) (void *, int, int), void *)); -static int tga_rop __P((struct rasops_info *, int, int, int, int, int, - struct rasops_info *, int, int)); -static int tga_rop_vtov __P((struct rasops_info *, int, int, int, int, - int, struct rasops_info *, int, int )); -static void tga_putchar __P((void *c, int row, int col, - u_int uc, long attr)); -static void tga_eraserows __P((void *, int, int, long)); -static void tga_erasecols __P((void *, int, int, int, long)); -void tga2_init __P((struct tga_devconfig *)); - -static void tga_config_interrupts __P((struct device *)); +int tga_ioctl(void *, u_long, caddr_t, int, struct proc *); +paddr_t tga_mmap(void *, off_t, int); +static void tga_copyrows(void *, int, int, int); +static void tga_copycols(void *, int, int, int, int); +static int tga_alloc_screen(void *, const struct wsscreen_descr *, + void **, int *, int *, long *); +static void tga_free_screen(void *, void *); +static int tga_show_screen(void *, void *, int, + void (*) (void *, int, int), void *); +static int tga_rop(struct rasops_info *, int, int, int, int, int, + struct rasops_info *, int, int); +static int tga_rop_vtov(struct rasops_info *, int, int, int, int, + int, struct rasops_info *, int, int); +static void tga_putchar(void *c, int row, int col, + u_int uc, long attr); +static void tga_eraserows(void *, int, int, long); +static void tga_erasecols(void *, int, int, int, long); +void tga2_init(struct tga_devconfig *); + +static void tga_config_interrupts(struct device *); /* RAMDAC interface functions */ -static int tga_sched_update __P((void *, void (*)(void *))); -static void tga_ramdac_wr __P((void *, u_int, u_int8_t)); -static u_int8_t tga_ramdac_rd __P((void *, u_int)); -static void tga_bt463_wr __P((void *, u_int, u_int8_t)); -static u_int8_t tga_bt463_rd __P((void *, u_int)); -static void tga2_ramdac_wr __P((void *, u_int, u_int8_t)); -static u_int8_t tga2_ramdac_rd __P((void *, u_int)); +static int tga_sched_update(void *, void (*)(void *)); +static void tga_ramdac_wr(void *, u_int, u_int8_t); +static u_int8_t tga_ramdac_rd(void *, u_int); +static void tga_bt463_wr(void *, u_int, u_int8_t); +static u_int8_t tga_bt463_rd(void *, u_int); +static void tga2_ramdac_wr(void *, u_int, u_int8_t); +static u_int8_t tga2_ramdac_rd(void *, u_int); /* Interrupt handler */ -static int tga_intr __P((void *)); +static int tga_intr(void *); /* The NULL entries will get filled in by rasops_init(). * XXX and the non-NULL ones will be overwritten; reset after calling it. @@ -149,8 +149,8 @@ struct wsdisplay_accessops tga_accessops = { 0 /* load_font */ }; -static void tga_blank __P((struct tga_devconfig *)); -static void tga_unblank __P((struct tga_devconfig *)); +static void tga_blank(struct tga_devconfig *); +static void tga_unblank(struct tga_devconfig *); int tga_cnmatch(iot, memt, pc, tag) @@ -604,7 +604,7 @@ tga_ioctl(v, cmd, data, flag, p) static int tga_sched_update(v, f) void *v; - void (*f) __P((void *)); + void (*f)(void *); { struct tga_devconfig *dc = v; @@ -718,7 +718,7 @@ tga_show_screen(v, cookie, waitok, cb, cbarg) void *v; void *cookie; int waitok; - void (*cb) __P((void *, int, int)); + void (*cb)(void *, int, int); void *cbarg; { @@ -1501,12 +1501,9 @@ tga2_ramdac_rd(v, btreg) } #include <dev/ic/decmonitors.c> -void tga2_ics9110_wr __P(( - struct tga_devconfig *dc, - int dotclock -)); +void tga2_ics9110_wr(struct tga_devconfig *dc, int dotclock); -struct monitor *tga_getmonitor __P((struct tga_devconfig *dc)); +struct monitor *tga_getmonitor(struct tga_devconfig *dc); void tga2_init(dc) diff --git a/sys/dev/pci/tgavar.h b/sys/dev/pci/tgavar.h index 997ed98091b..b1428918f48 100644 --- a/sys/dev/pci/tgavar.h +++ b/sys/dev/pci/tgavar.h @@ -1,4 +1,4 @@ -/* $NetBSD: tgavar.h,v 1.12 2001/12/12 07:50:05 elric Exp $ */ +/* $NetBSD: tgavar.h,v 1.13 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -42,7 +42,7 @@ struct fbcurpos; struct tga_conf { char *tgac_name; /* name for this board type */ - struct ramdac_funcs *(*ramdac_funcs) __P((void)); + struct ramdac_funcs *(*ramdac_funcs)(void); int tgac_phys_depth; /* physical frame buffer depth */ vsize_t tgac_cspace_size; /* core space size */ @@ -88,7 +88,7 @@ struct tga_devconfig { int dc_blanked; /* currently had video disabled */ void *dc_ramdac_private; /* RAMDAC private storage */ - void (*dc_ramdac_intr) __P((void *)); + void (*dc_ramdac_intr)(void *); int dc_intrenabled; /* can we depend on interrupts yet? */ }; @@ -117,24 +117,18 @@ struct tga_softc { PCI_PRODUCT(id) == PCI_PRODUCT_DEC_21030) || \ PCI_PRODUCT(id) == PCI_PRODUCT_DEC_PBXGB) ? 10 : 0) -int tga_cnmatch __P((bus_space_tag_t, bus_space_tag_t, pci_chipset_tag_t, - pcitag_t)); -int tga_cnattach __P((bus_space_tag_t, bus_space_tag_t, pci_chipset_tag_t, - int, int, int)); - -int tga_identify __P((struct tga_devconfig *)); -const struct tga_conf *tga_getconf __P((int)); - -int tga_builtin_set_cursor __P((struct tga_devconfig *, - struct wsdisplay_cursor *)); -int tga_builtin_get_cursor __P((struct tga_devconfig *, - struct wsdisplay_cursor *)); -int tga_builtin_set_curpos __P((struct tga_devconfig *, - struct wsdisplay_curpos *)); -int tga_builtin_get_curpos __P((struct tga_devconfig *, - struct wsdisplay_curpos *)); -int tga_builtin_get_curmax __P((struct tga_devconfig *, - struct wsdisplay_curpos *)); +int tga_cnmatch(bus_space_tag_t, bus_space_tag_t, pci_chipset_tag_t, pcitag_t); +int tga_cnattach(bus_space_tag_t, bus_space_tag_t, pci_chipset_tag_t, + int, int, int); + +int tga_identify(struct tga_devconfig *); +const struct tga_conf *tga_getconf(int); + +int tga_builtin_set_cursor(struct tga_devconfig *, struct wsdisplay_cursor *); +int tga_builtin_get_cursor(struct tga_devconfig *, struct wsdisplay_cursor *); +int tga_builtin_set_curpos(struct tga_devconfig *, struct wsdisplay_curpos *); +int tga_builtin_get_curpos(struct tga_devconfig *, struct wsdisplay_curpos *); +int tga_builtin_get_curmax(struct tga_devconfig *, struct wsdisplay_curpos *); /* Read a TGA register */ #define TGARREG(dc,reg) (bus_space_read_4((dc)->dc_memt, (dc)->dc_regs, \ diff --git a/sys/dev/pci/universe_pci.c b/sys/dev/pci/universe_pci.c index d43405339e7..1822a5ac4fa 100644 --- a/sys/dev/pci/universe_pci.c +++ b/sys/dev/pci/universe_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: universe_pci.c,v 1.5 2003/01/31 00:07:43 thorpej Exp $ */ +/* $NetBSD: universe_pci.c,v 1.6 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1999 @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: universe_pci.c,v 1.5 2003/01/31 00:07:43 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: universe_pci.c,v 1.6 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: universe_pci.c,v 1.5 2003/01/31 00:07:43 thorpej Exp #include <dev/ic/universereg.h> #include <dev/pci/universe_pci_var.h> -int univ_pci_intr __P((void *)); +int univ_pci_intr(void *); #define read_csr_4(d, reg) \ bus_space_read_4(d->csrt, d->csrh, offsetof(struct universereg, reg)) @@ -91,7 +91,7 @@ univ_pci_attach(d, pa, name, inthdl, intcookie) struct univ_pci_data *d; struct pci_attach_args *pa; const char *name; - void (*inthdl) __P((void *, int, int)); + void (*inthdl)(void *, int, int); void *intcookie; { pci_chipset_tag_t pc = pa->pa_pc; diff --git a/sys/dev/pci/universe_pci_var.h b/sys/dev/pci/universe_pci_var.h index ad42f2281b8..ffd436444f9 100644 --- a/sys/dev/pci/universe_pci_var.h +++ b/sys/dev/pci/universe_pci_var.h @@ -1,4 +1,4 @@ -/* $NetBSD: universe_pci_var.h,v 1.2 2000/03/12 11:21:03 drochner Exp $ */ +/* $NetBSD: universe_pci_var.h,v 1.3 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1999 @@ -38,17 +38,17 @@ struct univ_pci_data { bus_space_handle_t csrh; char devname [16]; void *ih; - void (*vmeinthandler) __P((void *, int, int)); + void (*vmeinthandler)(void *, int, int); void *vmeintcookie; }; -int univ_pci_attach __P((struct univ_pci_data *, struct pci_attach_args *, +int univ_pci_attach(struct univ_pci_data *, struct pci_attach_args *, const char *, - void (*)(void *, int, int), void *)); -int univ_pci_mapvme __P((struct univ_pci_data *, int, vme_addr_t, u_int32_t, - vme_am_t, vme_datasize_t, u_int32_t)); -void univ_pci_unmapvme __P((struct univ_pci_data *, int)); -int univ_pci_mappci __P((struct univ_pci_data *, int, u_int32_t, u_int32_t, - vme_addr_t, vme_am_t)); -void univ_pci_unmappci __P((struct univ_pci_data *, int)); -int univ_pci_vmebuserr __P((struct univ_pci_data *, int)); + void (*)(void *, int, int), void *); +int univ_pci_mapvme(struct univ_pci_data *, int, vme_addr_t, u_int32_t, + vme_am_t, vme_datasize_t, u_int32_t); +void univ_pci_unmapvme(struct univ_pci_data *, int); +int univ_pci_mappci(struct univ_pci_data *, int, u_int32_t, u_int32_t, + vme_addr_t, vme_am_t); +void univ_pci_unmappci(struct univ_pci_data *, int); +int univ_pci_vmebuserr(struct univ_pci_data *, int); diff --git a/sys/dev/pci/vga_pcivar.h b/sys/dev/pci/vga_pcivar.h index 22d3cd1c1a9..4a55674a6ce 100644 --- a/sys/dev/pci/vga_pcivar.h +++ b/sys/dev/pci/vga_pcivar.h @@ -1,4 +1,4 @@ -/* $NetBSD: vga_pcivar.h,v 1.1 1998/03/22 15:16:19 drochner Exp $ */ +/* $NetBSD: vga_pcivar.h,v 1.2 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -33,5 +33,5 @@ (PCI_CLASS(class) == PCI_CLASS_PREHISTORIC && \ PCI_SUBCLASS(class) == PCI_SUBCLASS_PREHISTORIC_VGA)) ? 1 : 0) -int vga_pci_cnattach __P((bus_space_tag_t, bus_space_tag_t, - pci_chipset_tag_t, int, int, int)); +int vga_pci_cnattach(bus_space_tag_t, bus_space_tag_t, + pci_chipset_tag_t, int, int, int); diff --git a/sys/dev/pcmcia/aic_pcmcia.c b/sys/dev/pcmcia/aic_pcmcia.c index 17fd0920700..81e5ca58121 100644 --- a/sys/dev/pcmcia/aic_pcmcia.c +++ b/sys/dev/pcmcia/aic_pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: aic_pcmcia.c,v 1.31 2004/08/10 22:49:12 mycroft Exp $ */ +/* $NetBSD: aic_pcmcia.c,v 1.32 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1997 Marc Horowitz. All rights reserved. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aic_pcmcia.c,v 1.31 2004/08/10 22:49:12 mycroft Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aic_pcmcia.c,v 1.32 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -62,11 +62,11 @@ struct aic_pcmcia_softc { #define AIC_PCMCIA_ATTACHED 3 }; -int aic_pcmcia_match __P((struct device *, struct cfdata *, void *)); -int aic_pcmcia_validate_config __P((struct pcmcia_config_entry *)); -void aic_pcmcia_attach __P((struct device *, struct device *, void *)); -int aic_pcmcia_detach __P((struct device *, int)); -int aic_pcmcia_enable __P((struct device *, int)); +int aic_pcmcia_match(struct device *, struct cfdata *, void *); +int aic_pcmcia_validate_config(struct pcmcia_config_entry *); +void aic_pcmcia_attach(struct device *, struct device *, void *); +int aic_pcmcia_detach(struct device *, int); +int aic_pcmcia_enable(struct device *, int); CFATTACH_DECL(aic_pcmcia, sizeof(struct aic_pcmcia_softc), aic_pcmcia_match, aic_pcmcia_attach, aic_pcmcia_detach, aic_activate); diff --git a/sys/dev/pcmcia/com_pcmcia.c b/sys/dev/pcmcia/com_pcmcia.c index 1446e2b750f..766d2bf7a3f 100644 --- a/sys/dev/pcmcia/com_pcmcia.c +++ b/sys/dev/pcmcia/com_pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: com_pcmcia.c,v 1.49 2004/08/11 04:25:28 mycroft Exp $ */ +/* $NetBSD: com_pcmcia.c,v 1.50 2005/02/04 02:10:45 perry Exp $ */ /*- * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc. @@ -68,7 +68,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: com_pcmcia.c,v 1.49 2004/08/11 04:25:28 mycroft Exp $"); +__KERNEL_RCSID(0, "$NetBSD: com_pcmcia.c,v 1.50 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -96,14 +96,14 @@ __KERNEL_RCSID(0, "$NetBSD: com_pcmcia.c,v 1.49 2004/08/11 04:25:28 mycroft Exp #include <dev/isa/isareg.h> -int com_pcmcia_match __P((struct device *, struct cfdata *, void *)); -int com_pcmcia_validate_config __P((struct pcmcia_config_entry *)); -void com_pcmcia_attach __P((struct device *, struct device *, void *)); -int com_pcmcia_detach __P((struct device *, int)); -void com_pcmcia_cleanup __P((void *)); +int com_pcmcia_match(struct device *, struct cfdata *, void *); +int com_pcmcia_validate_config(struct pcmcia_config_entry *); +void com_pcmcia_attach(struct device *, struct device *, void *); +int com_pcmcia_detach(struct device *, int); +void com_pcmcia_cleanup(void *); -int com_pcmcia_enable __P((struct com_softc *)); -void com_pcmcia_disable __P((struct com_softc *)); +int com_pcmcia_enable(struct com_softc *); +void com_pcmcia_disable(struct com_softc *); struct com_pcmcia_softc { struct com_softc sc_com; /* real "com" softc */ diff --git a/sys/dev/pcmcia/esp_pcmcia.c b/sys/dev/pcmcia/esp_pcmcia.c index 70e87a8dd71..c3c34943565 100644 --- a/sys/dev/pcmcia/esp_pcmcia.c +++ b/sys/dev/pcmcia/esp_pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: esp_pcmcia.c,v 1.24 2004/08/10 22:49:12 mycroft Exp $ */ +/* $NetBSD: esp_pcmcia.c,v 1.25 2005/02/04 02:10:45 perry Exp $ */ /*- * Copyright (c) 2000, 2004 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: esp_pcmcia.c,v 1.24 2004/08/10 22:49:12 mycroft Exp $"); +__KERNEL_RCSID(0, "$NetBSD: esp_pcmcia.c,v 1.25 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -82,12 +82,12 @@ struct esp_pcmcia_softc { #define ESP_PCMCIA_ATTACHED 3 }; -int esp_pcmcia_match __P((struct device *, struct cfdata *, void *)); -int esp_pcmcia_validate_config __P((struct pcmcia_config_entry *)); -void esp_pcmcia_attach __P((struct device *, struct device *, void *)); -void esp_pcmcia_init __P((struct esp_pcmcia_softc *)); -int esp_pcmcia_detach __P((struct device *, int)); -int esp_pcmcia_enable __P((struct device *, int)); +int esp_pcmcia_match(struct device *, struct cfdata *, void *); +int esp_pcmcia_validate_config(struct pcmcia_config_entry *); +void esp_pcmcia_attach(struct device *, struct device *, void *); +void esp_pcmcia_init(struct esp_pcmcia_softc *); +int esp_pcmcia_detach(struct device *, int); +int esp_pcmcia_enable(struct device *, int); CFATTACH_DECL(esp_pcmcia, sizeof(struct esp_pcmcia_softc), esp_pcmcia_match, esp_pcmcia_attach, esp_pcmcia_detach, NULL); @@ -96,18 +96,18 @@ CFATTACH_DECL(esp_pcmcia, sizeof(struct esp_pcmcia_softc), * Functions and the switch for the MI code. */ #ifdef ESP_PCMCIA_POLL -void esp_pcmcia_poll __P((void *)); +void esp_pcmcia_poll(void *); #endif -u_char esp_pcmcia_read_reg __P((struct ncr53c9x_softc *, int)); -void esp_pcmcia_write_reg __P((struct ncr53c9x_softc *, int, u_char)); -int esp_pcmcia_dma_isintr __P((struct ncr53c9x_softc *)); -void esp_pcmcia_dma_reset __P((struct ncr53c9x_softc *)); -int esp_pcmcia_dma_intr __P((struct ncr53c9x_softc *)); -int esp_pcmcia_dma_setup __P((struct ncr53c9x_softc *, caddr_t *, - size_t *, int, size_t *)); -void esp_pcmcia_dma_go __P((struct ncr53c9x_softc *)); -void esp_pcmcia_dma_stop __P((struct ncr53c9x_softc *)); -int esp_pcmcia_dma_isactive __P((struct ncr53c9x_softc *)); +u_char esp_pcmcia_read_reg(struct ncr53c9x_softc *, int); +void esp_pcmcia_write_reg(struct ncr53c9x_softc *, int, u_char); +int esp_pcmcia_dma_isintr(struct ncr53c9x_softc *); +void esp_pcmcia_dma_reset(struct ncr53c9x_softc *); +int esp_pcmcia_dma_intr(struct ncr53c9x_softc *); +int esp_pcmcia_dma_setup(struct ncr53c9x_softc *, caddr_t *, + size_t *, int, size_t *); +void esp_pcmcia_dma_go(struct ncr53c9x_softc *); +void esp_pcmcia_dma_stop(struct ncr53c9x_softc *); +int esp_pcmcia_dma_isactive(struct ncr53c9x_softc *); const struct ncr53c9x_glue esp_pcmcia_glue = { esp_pcmcia_read_reg, diff --git a/sys/dev/pcmcia/fdc_pcmcia.c b/sys/dev/pcmcia/fdc_pcmcia.c index 23fefdce83c..4f2108e18b9 100644 --- a/sys/dev/pcmcia/fdc_pcmcia.c +++ b/sys/dev/pcmcia/fdc_pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: fdc_pcmcia.c,v 1.14 2004/08/10 19:54:30 mycroft Exp $ */ +/* $NetBSD: fdc_pcmcia.c,v 1.15 2005/02/04 02:10:45 perry Exp $ */ /*- * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fdc_pcmcia.c,v 1.14 2004/08/10 19:54:30 mycroft Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fdc_pcmcia.c,v 1.15 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -64,10 +64,10 @@ struct fdc_pcmcia_softc { struct pcmcia_function *sc_pf; /* our PCMCIA function */ }; -int fdc_pcmcia_match __P((struct device *, struct cfdata *, void *)); -int fdc_pcmcia_validate_config __P((struct pcmcia_config_entry *)); -void fdc_pcmcia_attach __P((struct device *, struct device *, void *)); -static void fdc_conf __P((struct fdc_softc *)); +int fdc_pcmcia_match(struct device *, struct cfdata *, void *); +int fdc_pcmcia_validate_config(struct pcmcia_config_entry *); +void fdc_pcmcia_attach(struct device *, struct device *, void *); +static void fdc_conf(struct fdc_softc *); CFATTACH_DECL(fdc_pcmcia, sizeof(struct fdc_pcmcia_softc), fdc_pcmcia_match, fdc_pcmcia_attach, NULL, NULL); diff --git a/sys/dev/pcmcia/if_an_pcmcia.c b/sys/dev/pcmcia/if_an_pcmcia.c index d0e3eb6c84c..afded8bc128 100644 --- a/sys/dev/pcmcia/if_an_pcmcia.c +++ b/sys/dev/pcmcia/if_an_pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_an_pcmcia.c,v 1.25 2004/08/10 20:47:17 mycroft Exp $ */ +/* $NetBSD: if_an_pcmcia.c,v 1.26 2005/02/04 02:10:45 perry Exp $ */ /*- * Copyright (c) 2000, 2004 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_an_pcmcia.c,v 1.25 2004/08/10 20:47:17 mycroft Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_an_pcmcia.c,v 1.26 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -69,12 +69,12 @@ __KERNEL_RCSID(0, "$NetBSD: if_an_pcmcia.c,v 1.25 2004/08/10 20:47:17 mycroft Ex #include <dev/pcmcia/pcmciavar.h> #include <dev/pcmcia/pcmciadevs.h> -static int an_pcmcia_match __P((struct device *, struct cfdata *, void *)); -static int an_pcmcia_validate_config __P((struct pcmcia_config_entry *)); -static void an_pcmcia_attach __P((struct device *, struct device *, void *)); -static int an_pcmcia_detach __P((struct device *, int)); -static int an_pcmcia_enable __P((struct an_softc *)); -static void an_pcmcia_disable __P((struct an_softc *)); +static int an_pcmcia_match(struct device *, struct cfdata *, void *); +static int an_pcmcia_validate_config(struct pcmcia_config_entry *); +static void an_pcmcia_attach(struct device *, struct device *, void *); +static int an_pcmcia_detach(struct device *, int); +static int an_pcmcia_enable(struct an_softc *); +static void an_pcmcia_disable(struct an_softc *); struct an_pcmcia_softc { struct an_softc sc_an; /* real "an" softc */ diff --git a/sys/dev/pcmcia/if_cnw.c b/sys/dev/pcmcia/if_cnw.c index 05eaac2d95e..6fba4b84a77 100644 --- a/sys/dev/pcmcia/if_cnw.c +++ b/sys/dev/pcmcia/if_cnw.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_cnw.c,v 1.29 2004/10/30 18:10:06 thorpej Exp $ */ +/* $NetBSD: if_cnw.c,v 1.30 2005/02/04 02:10:45 perry Exp $ */ /*- * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc. @@ -112,7 +112,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.29 2004/10/30 18:10:06 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.30 2005/02/04 02:10:45 perry Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -184,11 +184,11 @@ int cnw_skey = CNW_SCRAMBLEKEY; /* Scramble key */ */ #define MEMORY_MAPPED -int cnw_match __P((struct device *, struct cfdata *, void *)); -void cnw_attach __P((struct device *, struct device *, void *)); -int cnw_detach __P((struct device *, int)); +int cnw_match(struct device *, struct cfdata *, void *); +void cnw_attach(struct device *, struct device *, void *); +int cnw_detach(struct device *, int); -int cnw_activate __P((struct device *, enum devact)); +int cnw_activate(struct device *, enum devact); struct cnw_softc { struct device sc_dev; /* Device glue (must be first) */ @@ -224,27 +224,27 @@ struct cnw_softc { CFATTACH_DECL(cnw, sizeof(struct cnw_softc), cnw_match, cnw_attach, cnw_detach, cnw_activate); -void cnw_reset __P((struct cnw_softc *)); -void cnw_init __P((struct cnw_softc *)); -int cnw_enable __P((struct cnw_softc *sc)); -void cnw_disable __P((struct cnw_softc *sc)); -void cnw_config __P((struct cnw_softc *sc, u_int8_t *)); -void cnw_start __P((struct ifnet *)); -void cnw_transmit __P((struct cnw_softc *, struct mbuf *)); -struct mbuf *cnw_read __P((struct cnw_softc *)); -void cnw_recv __P((struct cnw_softc *)); -int cnw_intr __P((void *arg)); -int cnw_ioctl __P((struct ifnet *, u_long, caddr_t)); -void cnw_watchdog __P((struct ifnet *)); -static int cnw_setdomain __P((struct cnw_softc *, int)); -static int cnw_setkey __P((struct cnw_softc *, int)); +void cnw_reset(struct cnw_softc *); +void cnw_init(struct cnw_softc *); +int cnw_enable(struct cnw_softc *sc); +void cnw_disable(struct cnw_softc *sc); +void cnw_config(struct cnw_softc *sc, u_int8_t *); +void cnw_start(struct ifnet *); +void cnw_transmit(struct cnw_softc *, struct mbuf *); +struct mbuf *cnw_read(struct cnw_softc *); +void cnw_recv(struct cnw_softc *); +int cnw_intr(void *arg); +int cnw_ioctl(struct ifnet *, u_long, caddr_t); +void cnw_watchdog(struct ifnet *); +static int cnw_setdomain(struct cnw_softc *, int); +static int cnw_setkey(struct cnw_softc *, int); /* ---------------------------------------------------------------- */ /* Help routines */ -static int wait_WOC __P((struct cnw_softc *, int)); -static int read16 __P((struct cnw_softc *, int)); -static int cnw_cmd __P((struct cnw_softc *, int, int, int, int)); +static int wait_WOC(struct cnw_softc *, int); +static int read16(struct cnw_softc *, int); +static int cnw_cmd(struct cnw_softc *, int, int, int, int); /* * Wait until the WOC (Write Operation Complete) bit in the diff --git a/sys/dev/pcmcia/if_ep_pcmcia.c b/sys/dev/pcmcia/if_ep_pcmcia.c index d6684abb9ae..f346e53bac1 100644 --- a/sys/dev/pcmcia/if_ep_pcmcia.c +++ b/sys/dev/pcmcia/if_ep_pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ep_pcmcia.c,v 1.52 2004/08/10 18:43:49 mycroft Exp $ */ +/* $NetBSD: if_ep_pcmcia.c,v 1.53 2005/02/04 02:10:45 perry Exp $ */ /*- * Copyright (c) 1998, 2000, 2004 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ep_pcmcia.c,v 1.52 2004/08/10 18:43:49 mycroft Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ep_pcmcia.c,v 1.53 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -97,15 +97,15 @@ __KERNEL_RCSID(0, "$NetBSD: if_ep_pcmcia.c,v 1.52 2004/08/10 18:43:49 mycroft Ex #include <dev/pcmcia/pcmciavar.h> #include <dev/pcmcia/pcmciadevs.h> -int ep_pcmcia_match __P((struct device *, struct cfdata *, void *)); -void ep_pcmcia_attach __P((struct device *, struct device *, void *)); -int ep_pcmcia_detach __P((struct device *, int)); +int ep_pcmcia_match(struct device *, struct cfdata *, void *); +void ep_pcmcia_attach(struct device *, struct device *, void *); +int ep_pcmcia_detach(struct device *, int); -int ep_pcmcia_get_enaddr __P((struct pcmcia_tuple *, void *)); -int ep_pcmcia_enable __P((struct ep_softc *)); -void ep_pcmcia_disable __P((struct ep_softc *)); +int ep_pcmcia_get_enaddr(struct pcmcia_tuple *, void *); +int ep_pcmcia_enable(struct ep_softc *); +void ep_pcmcia_disable(struct ep_softc *); -void ep_pcmcia_disable1 __P((struct ep_softc *)); +void ep_pcmcia_disable1(struct ep_softc *); struct ep_pcmcia_softc { struct ep_softc sc_ep; /* real "ep" softc */ diff --git a/sys/dev/pcmcia/if_mbe_pcmcia.c b/sys/dev/pcmcia/if_mbe_pcmcia.c index 1808015042e..59601b750f8 100644 --- a/sys/dev/pcmcia/if_mbe_pcmcia.c +++ b/sys/dev/pcmcia/if_mbe_pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_mbe_pcmcia.c,v 1.35 2004/08/11 03:56:03 mycroft Exp $ */ +/* $NetBSD: if_mbe_pcmcia.c,v 1.36 2005/02/04 02:10:45 perry Exp $ */ /*- * Copyright (c) 1998, 2000, 2004 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_mbe_pcmcia.c,v 1.35 2004/08/11 03:56:03 mycroft Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_mbe_pcmcia.c,v 1.36 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -58,10 +58,10 @@ __KERNEL_RCSID(0, "$NetBSD: if_mbe_pcmcia.c,v 1.35 2004/08/11 03:56:03 mycroft E #include <dev/pcmcia/pcmciavar.h> #include <dev/pcmcia/pcmciadevs.h> -int mbe_pcmcia_match __P((struct device *, struct cfdata *, void *)); -int mbe_pcmcia_validate_config __P((struct pcmcia_config_entry *)); -void mbe_pcmcia_attach __P((struct device *, struct device *, void *)); -int mbe_pcmcia_detach __P((struct device *, int)); +int mbe_pcmcia_match(struct device *, struct cfdata *, void *); +int mbe_pcmcia_validate_config(struct pcmcia_config_entry *); +void mbe_pcmcia_attach(struct device *, struct device *, void *); +int mbe_pcmcia_detach(struct device *, int); struct mbe_pcmcia_softc { struct mb86960_softc sc_mb86960; /* real "mb" softc */ @@ -76,18 +76,18 @@ struct mbe_pcmcia_softc { CFATTACH_DECL(mbe_pcmcia, sizeof(struct mbe_pcmcia_softc), mbe_pcmcia_match, mbe_pcmcia_attach, mbe_pcmcia_detach, mb86960_activate); -int mbe_pcmcia_enable __P((struct mb86960_softc *)); -void mbe_pcmcia_disable __P((struct mb86960_softc *)); +int mbe_pcmcia_enable(struct mb86960_softc *); +void mbe_pcmcia_disable(struct mb86960_softc *); struct mbe_pcmcia_get_enaddr_args { u_int8_t enaddr[ETHER_ADDR_LEN]; int maddr; }; -int mbe_pcmcia_get_enaddr_from_cis __P((struct pcmcia_tuple *, void *)); -int mbe_pcmcia_get_enaddr_from_mem __P((struct mbe_pcmcia_softc *, - struct mbe_pcmcia_get_enaddr_args *)); -int mbe_pcmcia_get_enaddr_from_io __P((struct mbe_pcmcia_softc *, - struct mbe_pcmcia_get_enaddr_args *)); +int mbe_pcmcia_get_enaddr_from_cis(struct pcmcia_tuple *, void *); +int mbe_pcmcia_get_enaddr_from_mem(struct mbe_pcmcia_softc *, + struct mbe_pcmcia_get_enaddr_args *); +int mbe_pcmcia_get_enaddr_from_io(struct mbe_pcmcia_softc *, + struct mbe_pcmcia_get_enaddr_args *); static const struct mbe_pcmcia_product { struct pcmcia_product mpp_product; diff --git a/sys/dev/pcmcia/if_ne_pcmcia.c b/sys/dev/pcmcia/if_ne_pcmcia.c index b630e6c45c0..02737848b4e 100644 --- a/sys/dev/pcmcia/if_ne_pcmcia.c +++ b/sys/dev/pcmcia/if_ne_pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ne_pcmcia.c,v 1.137 2004/10/15 00:25:06 enami Exp $ */ +/* $NetBSD: if_ne_pcmcia.c,v 1.138 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1997 Marc Horowitz. All rights reserved. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ne_pcmcia.c,v 1.137 2004/10/15 00:25:06 enami Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ne_pcmcia.c,v 1.138 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -64,13 +64,13 @@ __KERNEL_RCSID(0, "$NetBSD: if_ne_pcmcia.c,v 1.137 2004/10/15 00:25:06 enami Exp #include <dev/ic/ax88190reg.h> #include <dev/ic/ax88190var.h> -int ne_pcmcia_match __P((struct device *, struct cfdata *, void *)); -int ne_pcmcia_validate_config __P((struct pcmcia_config_entry *)); -void ne_pcmcia_attach __P((struct device *, struct device *, void *)); -int ne_pcmcia_detach __P((struct device *, int)); +int ne_pcmcia_match(struct device *, struct cfdata *, void *); +int ne_pcmcia_validate_config(struct pcmcia_config_entry *); +void ne_pcmcia_attach(struct device *, struct device *, void *); +int ne_pcmcia_detach(struct device *, int); -int ne_pcmcia_enable __P((struct dp8390_softc *)); -void ne_pcmcia_disable __P((struct dp8390_softc *)); +int ne_pcmcia_enable(struct dp8390_softc *); +void ne_pcmcia_disable(struct dp8390_softc *); struct ne_pcmcia_softc { struct ne2000_softc sc_ne2000; /* real "ne2000" softc */ @@ -82,12 +82,10 @@ struct ne_pcmcia_softc { #define NE_PCMCIA_ATTACHED 3 }; -u_int8_t * - ne_pcmcia_get_enaddr __P((struct ne_pcmcia_softc *, int, - u_int8_t [ETHER_ADDR_LEN])); -u_int8_t * - ne_pcmcia_dl10019_get_enaddr __P((struct ne_pcmcia_softc *, - u_int8_t [ETHER_ADDR_LEN])); +u_int8_t *ne_pcmcia_get_enaddr(struct ne_pcmcia_softc *, int, + u_int8_t [ETHER_ADDR_LEN]); +u_int8_t *ne_pcmcia_dl10019_get_enaddr(struct ne_pcmcia_softc *, + u_int8_t [ETHER_ADDR_LEN]); CFATTACH_DECL(ne_pcmcia, sizeof(struct ne_pcmcia_softc), ne_pcmcia_match, ne_pcmcia_attach, ne_pcmcia_detach, dp8390_activate); diff --git a/sys/dev/pcmcia/if_ray.c b/sys/dev/pcmcia/if_ray.c index c912ef2b2d6..3e90e44690e 100644 --- a/sys/dev/pcmcia/if_ray.c +++ b/sys/dev/pcmcia/if_ray.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ray.c,v 1.54 2004/10/30 18:10:06 thorpej Exp $ */ +/* $NetBSD: if_ray.c,v 1.55 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 2000 Christian E. Hopps @@ -57,7 +57,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.54 2004/10/30 18:10:06 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.55 2005/02/04 02:10:45 perry Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -279,70 +279,70 @@ typedef void (*ray_cmd_func_t)(struct ray_softc *); #define OPEN_AUTH_RESPONSE 2 #define BROADCAST_DEAUTH 0xc0 -static int ray_alloc_ccs __P((struct ray_softc *, bus_size_t *, u_int, u_int)); -static bus_size_t ray_fill_in_tx_ccs __P((struct ray_softc *, size_t, - u_int, u_int)); -static int ray_validate_config __P((struct pcmcia_config_entry *)); -static void ray_attach __P((struct device *, struct device *, void *)); -static ray_cmd_func_t ray_ccs_done __P((struct ray_softc *, bus_size_t)); -static void ray_check_ccs __P((void *)); -static void ray_check_scheduled __P((void *)); -static void ray_cmd_cancel __P((struct ray_softc *, int)); -static void ray_cmd_schedule __P((struct ray_softc *, int)); -static void ray_cmd_ran __P((struct ray_softc *, int)); -static int ray_cmd_is_running __P((struct ray_softc *, int)); -static int ray_cmd_is_scheduled __P((struct ray_softc *, int)); -static void ray_cmd_done __P((struct ray_softc *, int)); -static int ray_detach __P((struct device *, int)); -static int ray_activate __P((struct device *, enum devact)); -static void ray_disable __P((struct ray_softc *)); -static void ray_download_params __P((struct ray_softc *)); -static int ray_enable __P((struct ray_softc *)); -static u_int ray_find_free_tx_ccs __P((struct ray_softc *, u_int)); -static u_int8_t ray_free_ccs __P((struct ray_softc *, bus_size_t)); -static void ray_free_ccs_chain __P((struct ray_softc *, u_int)); -static void ray_if_start __P((struct ifnet *)); -static int ray_init __P((struct ray_softc *)); -static int ray_intr __P((void *)); -static void ray_intr_start __P((struct ray_softc *)); -static int ray_ioctl __P((struct ifnet *, u_long, caddr_t)); -static int ray_issue_cmd __P((struct ray_softc *, bus_size_t, u_int)); -static int ray_match __P((struct device *, struct cfdata *, void *)); -static int ray_media_change __P((struct ifnet *)); -static void ray_media_status __P((struct ifnet *, struct ifmediareq *)); -void ray_power __P((int, void *)); -static ray_cmd_func_t ray_rccs_intr __P((struct ray_softc *, bus_size_t)); -static void ray_read_region __P((struct ray_softc *, bus_size_t,void *,size_t)); -static void ray_recv __P((struct ray_softc *, bus_size_t)); -static void ray_recv_auth __P((struct ray_softc *, struct ieee80211_frame *)); -static void ray_report_params __P((struct ray_softc *)); -static void ray_reset __P((struct ray_softc *)); -static void ray_reset_resetloop __P((void *)); -static int ray_send_auth __P((struct ray_softc *, u_int8_t *, u_int8_t)); -static void ray_set_pending __P((struct ray_softc *, u_int)); -static void ray_shutdown __P((void *)); -static int ray_simple_cmd __P((struct ray_softc *, u_int, u_int)); -static void ray_start_assoc __P((struct ray_softc *)); -static void ray_start_join_net __P((struct ray_softc *)); -static ray_cmd_func_t ray_start_join_net_done __P((struct ray_softc *, - u_int, bus_size_t, u_int)); -static void ray_start_join_timo __P((void *)); -static void ray_stop __P((struct ray_softc *)); -static void ray_update_error_counters __P((struct ray_softc *)); -static void ray_update_mcast __P((struct ray_softc *)); -static ray_cmd_func_t ray_update_params_done __P((struct ray_softc *, - bus_size_t, u_int)); -static void ray_update_params __P((struct ray_softc *)); -static void ray_update_promisc __P((struct ray_softc *)); -static void ray_update_subcmd __P((struct ray_softc *)); -static int ray_user_report_params __P((struct ray_softc *, - struct ray_param_req *)); -static int ray_user_update_params __P((struct ray_softc *, - struct ray_param_req *)); -static void ray_write_region __P((struct ray_softc *,bus_size_t,void *,size_t)); +static int ray_alloc_ccs(struct ray_softc *, bus_size_t *, u_int, u_int); +static bus_size_t ray_fill_in_tx_ccs(struct ray_softc *, size_t, + u_int, u_int); +static int ray_validate_config(struct pcmcia_config_entry *); +static void ray_attach(struct device *, struct device *, void *); +static ray_cmd_func_t ray_ccs_done(struct ray_softc *, bus_size_t); +static void ray_check_ccs(void *); +static void ray_check_scheduled(void *); +static void ray_cmd_cancel(struct ray_softc *, int); +static void ray_cmd_schedule(struct ray_softc *, int); +static void ray_cmd_ran(struct ray_softc *, int); +static int ray_cmd_is_running(struct ray_softc *, int); +static int ray_cmd_is_scheduled(struct ray_softc *, int); +static void ray_cmd_done(struct ray_softc *, int); +static int ray_detach(struct device *, int); +static int ray_activate(struct device *, enum devact); +static void ray_disable(struct ray_softc *); +static void ray_download_params(struct ray_softc *); +static int ray_enable(struct ray_softc *); +static u_int ray_find_free_tx_ccs(struct ray_softc *, u_int); +static u_int8_t ray_free_ccs(struct ray_softc *, bus_size_t); +static void ray_free_ccs_chain(struct ray_softc *, u_int); +static void ray_if_start(struct ifnet *); +static int ray_init(struct ray_softc *); +static int ray_intr(void *); +static void ray_intr_start(struct ray_softc *); +static int ray_ioctl(struct ifnet *, u_long, caddr_t); +static int ray_issue_cmd(struct ray_softc *, bus_size_t, u_int); +static int ray_match(struct device *, struct cfdata *, void *); +static int ray_media_change(struct ifnet *); +static void ray_media_status(struct ifnet *, struct ifmediareq *); +void ray_power(int, void *); +static ray_cmd_func_t ray_rccs_intr(struct ray_softc *, bus_size_t); +static void ray_read_region(struct ray_softc *, bus_size_t,void *,size_t); +static void ray_recv(struct ray_softc *, bus_size_t); +static void ray_recv_auth(struct ray_softc *, struct ieee80211_frame *); +static void ray_report_params(struct ray_softc *); +static void ray_reset(struct ray_softc *); +static void ray_reset_resetloop(void *); +static int ray_send_auth(struct ray_softc *, u_int8_t *, u_int8_t); +static void ray_set_pending(struct ray_softc *, u_int); +static void ray_shutdown(void *); +static int ray_simple_cmd(struct ray_softc *, u_int, u_int); +static void ray_start_assoc(struct ray_softc *); +static void ray_start_join_net(struct ray_softc *); +static ray_cmd_func_t ray_start_join_net_done(struct ray_softc *, + u_int, bus_size_t, u_int); +static void ray_start_join_timo(void *); +static void ray_stop(struct ray_softc *); +static void ray_update_error_counters(struct ray_softc *); +static void ray_update_mcast(struct ray_softc *); +static ray_cmd_func_t ray_update_params_done(struct ray_softc *, + bus_size_t, u_int); +static void ray_update_params(struct ray_softc *); +static void ray_update_promisc(struct ray_softc *); +static void ray_update_subcmd(struct ray_softc *); +static int ray_user_report_params(struct ray_softc *, + struct ray_param_req *); +static int ray_user_update_params(struct ray_softc *, + struct ray_param_req *); +static void ray_write_region(struct ray_softc *,bus_size_t,void *,size_t); #ifdef RAY_DO_SIGLEV -static void ray_update_siglev __P((struct ray_softc *, u_int8_t *, u_int8_t)); +static void ray_update_siglev(struct ray_softc *, u_int8_t *, u_int8_t); #endif #ifdef RAY_DEBUG @@ -381,7 +381,7 @@ static struct timeval rtv, tv1, tv2, *ttp, *ltp; #define HEXDF_NOOFFSET 0x2 #define HEXDF_NOASCII 0x4 void hexdump(const u_int8_t *, int, int, int, int); -static void ray_dump_mbuf __P((struct ray_softc *, struct mbuf *)); +static void ray_dump_mbuf(struct ray_softc *, struct mbuf *); #else /* !RAY_DEBUG */ diff --git a/sys/dev/pcmcia/if_sm_pcmcia.c b/sys/dev/pcmcia/if_sm_pcmcia.c index 02bed7327a8..3a2d05acf18 100644 --- a/sys/dev/pcmcia/if_sm_pcmcia.c +++ b/sys/dev/pcmcia/if_sm_pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_sm_pcmcia.c,v 1.44 2004/08/10 18:43:49 mycroft Exp $ */ +/* $NetBSD: if_sm_pcmcia.c,v 1.45 2005/02/04 02:10:45 perry Exp $ */ /*- * Copyright (c) 1997, 1998, 2000, 2004 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_sm_pcmcia.c,v 1.44 2004/08/10 18:43:49 mycroft Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_sm_pcmcia.c,v 1.45 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -68,10 +68,10 @@ __KERNEL_RCSID(0, "$NetBSD: if_sm_pcmcia.c,v 1.44 2004/08/10 18:43:49 mycroft Ex #include <dev/pcmcia/pcmciavar.h> #include <dev/pcmcia/pcmciadevs.h> -int sm_pcmcia_match __P((struct device *, struct cfdata *, void *)); -int sm_pcmcia_validate_config __P((struct pcmcia_config_entry *)); -void sm_pcmcia_attach __P((struct device *, struct device *, void *)); -int sm_pcmcia_detach __P((struct device *, int)); +int sm_pcmcia_match(struct device *, struct cfdata *, void *); +int sm_pcmcia_validate_config(struct pcmcia_config_entry *); +void sm_pcmcia_attach(struct device *, struct device *, void *); +int sm_pcmcia_detach(struct device *, int); struct sm_pcmcia_softc { struct smc91cxx_softc sc_smc; /* real "smc" softc */ @@ -86,10 +86,10 @@ struct sm_pcmcia_softc { CFATTACH_DECL(sm_pcmcia, sizeof(struct sm_pcmcia_softc), sm_pcmcia_match, sm_pcmcia_attach, sm_pcmcia_detach, smc91cxx_activate); -int sm_pcmcia_enable __P((struct smc91cxx_softc *)); -void sm_pcmcia_disable __P((struct smc91cxx_softc *)); +int sm_pcmcia_enable(struct smc91cxx_softc *); +void sm_pcmcia_disable(struct smc91cxx_softc *); -int sm_pcmcia_ascii_enaddr __P((const char *, u_int8_t *)); +int sm_pcmcia_ascii_enaddr(const char *, u_int8_t *); const struct pcmcia_product sm_pcmcia_products[] = { { PCMCIA_VENDOR_MEGAHERTZ2, PCMCIA_PRODUCT_MEGAHERTZ2_EM1144, diff --git a/sys/dev/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c index 06f28b86aaf..cdb98fa10bb 100644 --- a/sys/dev/pcmcia/if_wi_pcmcia.c +++ b/sys/dev/pcmcia/if_wi_pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_wi_pcmcia.c,v 1.59 2005/01/21 20:27:03 imp Exp $ */ +/* $NetBSD: if_wi_pcmcia.c,v 1.60 2005/02/04 02:10:45 perry Exp $ */ /*- * Copyright (c) 2001, 2004 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.59 2005/01/21 20:27:03 imp Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.60 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -73,19 +73,19 @@ __KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.59 2005/01/21 20:27:03 imp Exp $" #include <dev/microcode/wi/spectrum24t_cf.h> -static int wi_pcmcia_match __P((struct device *, struct cfdata *, void *)); -static int wi_pcmcia_validate_config __P((struct pcmcia_config_entry *)); -static void wi_pcmcia_attach __P((struct device *, struct device *, void *)); -static int wi_pcmcia_detach __P((struct device *, int)); -static int wi_pcmcia_enable __P((struct wi_softc *)); -static void wi_pcmcia_disable __P((struct wi_softc *)); -static void wi_pcmcia_powerhook __P((int, void *)); -static void wi_pcmcia_shutdown __P((void *)); +static int wi_pcmcia_match(struct device *, struct cfdata *, void *); +static int wi_pcmcia_validate_config(struct pcmcia_config_entry *); +static void wi_pcmcia_attach(struct device *, struct device *, void *); +static int wi_pcmcia_detach(struct device *, int); +static int wi_pcmcia_enable(struct wi_softc *); +static void wi_pcmcia_disable(struct wi_softc *); +static void wi_pcmcia_powerhook(int, void *); +static void wi_pcmcia_shutdown(void *); /* support to download firmware for symbol CF card */ -static int wi_pcmcia_load_firm __P((struct wi_softc *, const void *, int, const void *, int)); -static int wi_pcmcia_write_firm __P((struct wi_softc *, const void *, int, const void *, int)); -static int wi_pcmcia_set_hcr __P((struct wi_softc *, int)); +static int wi_pcmcia_load_firm(struct wi_softc *, const void *, int, const void *, int); +static int wi_pcmcia_write_firm(struct wi_softc *, const void *, int, const void *, int); +static int wi_pcmcia_set_hcr(struct wi_softc *, int); struct wi_pcmcia_softc { struct wi_softc sc_wi; diff --git a/sys/dev/pcmcia/if_xi.c b/sys/dev/pcmcia/if_xi.c index 69a0338fd27..2db8c0466ac 100644 --- a/sys/dev/pcmcia/if_xi.c +++ b/sys/dev/pcmcia/if_xi.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_xi.c,v 1.50 2005/01/30 19:30:16 thorpej Exp $ */ +/* $NetBSD: if_xi.c,v 1.51 2005/02/04 02:10:45 perry Exp $ */ /* OpenBSD: if_xe.c,v 1.9 1999/09/16 11:28:42 niklas Exp */ /* @@ -55,7 +55,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.50 2005/01/30 19:30:16 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.51 2005/02/04 02:10:45 perry Exp $"); #include "opt_inet.h" #include "opt_ipx.h" @@ -146,24 +146,24 @@ int xidebug = 0; #define STATIC -STATIC int xi_enable __P((struct xi_softc *)); -STATIC void xi_disable __P((struct xi_softc *)); -STATIC void xi_cycle_power __P((struct xi_softc *)); -STATIC int xi_ether_ioctl __P((struct ifnet *, u_long cmd, caddr_t)); -STATIC void xi_full_reset __P((struct xi_softc *)); -STATIC void xi_init __P((struct xi_softc *)); -STATIC int xi_ioctl __P((struct ifnet *, u_long, caddr_t)); -STATIC int xi_mdi_read __P((struct device *, int, int)); -STATIC void xi_mdi_write __P((struct device *, int, int, int)); -STATIC int xi_mediachange __P((struct ifnet *)); -STATIC void xi_mediastatus __P((struct ifnet *, struct ifmediareq *)); -STATIC u_int16_t xi_get __P((struct xi_softc *)); -STATIC void xi_reset __P((struct xi_softc *)); -STATIC void xi_set_address __P((struct xi_softc *)); -STATIC void xi_start __P((struct ifnet *)); -STATIC void xi_statchg __P((struct device *)); -STATIC void xi_stop __P((struct xi_softc *)); -STATIC void xi_watchdog __P((struct ifnet *)); +STATIC int xi_enable(struct xi_softc *); +STATIC void xi_disable(struct xi_softc *); +STATIC void xi_cycle_power(struct xi_softc *); +STATIC int xi_ether_ioctl(struct ifnet *, u_long cmd, caddr_t); +STATIC void xi_full_reset(struct xi_softc *); +STATIC void xi_init(struct xi_softc *); +STATIC int xi_ioctl(struct ifnet *, u_long, caddr_t); +STATIC int xi_mdi_read(struct device *, int, int); +STATIC void xi_mdi_write(struct device *, int, int, int); +STATIC int xi_mediachange(struct ifnet *); +STATIC void xi_mediastatus(struct ifnet *, struct ifmediareq *); +STATIC u_int16_t xi_get(struct xi_softc *); +STATIC void xi_reset(struct xi_softc *); +STATIC void xi_set_address(struct xi_softc *); +STATIC void xi_start(struct ifnet *); +STATIC void xi_statchg(struct device *); +STATIC void xi_stop(struct xi_softc *); +STATIC void xi_watchdog(struct ifnet *); void xi_attach(sc, myea) @@ -536,7 +536,7 @@ xi_get(sc) */ /* Let the MII serial management be idle for one period. */ -static INLINE void xi_mdi_idle __P((struct xi_softc *)); +static INLINE void xi_mdi_idle(struct xi_softc *); static INLINE void xi_mdi_idle(sc) struct xi_softc *sc; @@ -554,7 +554,7 @@ xi_mdi_idle(sc) } /* Pulse out one bit of data. */ -static INLINE void xi_mdi_pulse __P((struct xi_softc *, int)); +static INLINE void xi_mdi_pulse(struct xi_softc *, int); static INLINE void xi_mdi_pulse(sc, data) struct xi_softc *sc; @@ -574,7 +574,7 @@ xi_mdi_pulse(sc, data) } /* Probe one bit of data. */ -static INLINE int xi_mdi_probe __P((struct xi_softc *sc)); +static INLINE int xi_mdi_probe(struct xi_softc *sc); static INLINE int xi_mdi_probe(sc) struct xi_softc *sc; @@ -596,7 +596,7 @@ xi_mdi_probe(sc) } /* Pulse out a sequence of data bits. */ -static INLINE void xi_mdi_pulse_bits __P((struct xi_softc *, u_int32_t, int)); +static INLINE void xi_mdi_pulse_bits(struct xi_softc *, u_int32_t, int); static INLINE void xi_mdi_pulse_bits(sc, data, len) struct xi_softc *sc; diff --git a/sys/dev/pcmcia/if_xivar.h b/sys/dev/pcmcia/if_xivar.h index 3324e3e0e68..16b29244b45 100644 --- a/sys/dev/pcmcia/if_xivar.h +++ b/sys/dev/pcmcia/if_xivar.h @@ -1,4 +1,4 @@ -/* $NetBSD: if_xivar.h,v 1.2 2004/08/12 19:42:03 mycroft Exp $ */ +/* $NetBSD: if_xivar.h,v 1.3 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 2004 Charles M. Hannum. All rights reserved. @@ -34,8 +34,8 @@ struct xi_softc { bus_space_handle_t sc_bsh; /* Bus I/O handle */ /* Power management hooks and state. */ - int (*sc_enable) __P((struct xi_softc *)); - void (*sc_disable) __P((struct xi_softc *)); + int (*sc_enable)(struct xi_softc *); + void (*sc_disable)(struct xi_softc *); int sc_enabled; int sc_chipset; /* Chipset type */ @@ -49,7 +49,7 @@ struct xi_softc { #endif }; -void xi_attach __P((struct xi_softc *, u_int8_t *)); -int xi_detach __P((struct device *, int)); -int xi_activate __P((struct device *, enum devact)); -int xi_intr __P((void *)); +void xi_attach(struct xi_softc *, u_int8_t *); +int xi_detach(struct device *, int); +int xi_activate(struct device *, enum devact); +int xi_intr(void *); diff --git a/sys/dev/pcmcia/isic_pcmcia.c b/sys/dev/pcmcia/isic_pcmcia.c index 0784c5cb354..bb0549e94a1 100644 --- a/sys/dev/pcmcia/isic_pcmcia.c +++ b/sys/dev/pcmcia/isic_pcmcia.c @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia.c,v 1.25 2004/08/10 18:43:49 mycroft Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia.c,v 1.26 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/errno.h> @@ -83,10 +83,10 @@ __KERNEL_RCSID(0, "$NetBSD: isic_pcmcia.c,v 1.25 2004/08/10 18:43:49 mycroft Exp extern const struct isdn_layer1_isdnif_driver isic_std_driver; -static int isic_pcmcia_match __P((struct device *, struct cfdata *, void *)); -static void isic_pcmcia_attach __P((struct device *, struct device *, void *)); -static const struct isic_pcmcia_card_entry * find_matching_card __P((struct pcmcia_attach_args *pa)); -static int isic_pcmcia_isdn_attach __P((struct isic_softc *sc, const char*)); +static int isic_pcmcia_match(struct device *, struct cfdata *, void *); +static void isic_pcmcia_attach(struct device *, struct device *, void *); +static const struct isic_pcmcia_card_entry * find_matching_card(struct pcmcia_attach_args *pa); +static int isic_pcmcia_isdn_attach(struct isic_softc *sc, const char*); static int isic_pcmcia_detach(struct device *self, int flags); static int isic_pcmcia_activate(struct device *self, enum devact act); diff --git a/sys/dev/pcmcia/isic_pcmcia_avm_fritz.c b/sys/dev/pcmcia/isic_pcmcia_avm_fritz.c index e305d1053c2..8f3bc765fad 100644 --- a/sys/dev/pcmcia/isic_pcmcia_avm_fritz.c +++ b/sys/dev/pcmcia/isic_pcmcia_avm_fritz.c @@ -33,7 +33,7 @@ * Fritz!Card pcmcia specific routines for isic driver * --------------------------------------------------- * - * $Id: isic_pcmcia_avm_fritz.c,v 1.6 2004/08/08 23:17:13 mycroft Exp $ + * $Id: isic_pcmcia_avm_fritz.c,v 1.7 2005/02/04 02:10:45 perry Exp $ * * last edit-date: [Fri Jan 5 11:39:32 2001] * @@ -43,7 +43,7 @@ *---------------------------------------------------------------------------*/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_avm_fritz.c,v 1.6 2004/08/08 23:17:13 mycroft Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_avm_fritz.c,v 1.7 2005/02/04 02:10:45 perry Exp $"); #include "opt_isicpcmcia.h" #ifdef ISICPCMCIA_AVM_A1 @@ -93,10 +93,10 @@ __KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_avm_fritz.c,v 1.6 2004/08/08 23:17:13 my #include <dev/pcmcia/isic_pcmcia.h> /* PCMCIA support routines */ -static u_int8_t avma1_pcmcia_read_reg __P((struct isic_softc *sc, int what, bus_size_t offs)); -static void avma1_pcmcia_write_reg __P((struct isic_softc *sc, int what, bus_size_t offs, u_int8_t data)); -static void avma1_pcmcia_read_fifo __P((struct isic_softc *sc, int what, void *buf, size_t size)); -static void avma1_pcmcia_write_fifo __P((struct isic_softc *sc, int what, const void *data, size_t size)); +static u_int8_t avma1_pcmcia_read_reg(struct isic_softc *sc, int what, bus_size_t offs); +static void avma1_pcmcia_write_reg(struct isic_softc *sc, int what, bus_size_t offs, u_int8_t data); +static void avma1_pcmcia_read_fifo(struct isic_softc *sc, int what, void *buf, size_t size); +static void avma1_pcmcia_write_fifo(struct isic_softc *sc, int what, const void *data, size_t size); #endif /*---------------------------------------------------------------------------* diff --git a/sys/dev/pcmcia/isic_pcmcia_elsa_isdnmc.c b/sys/dev/pcmcia/isic_pcmcia_elsa_isdnmc.c index 226640e09cd..90a0bc12265 100644 --- a/sys/dev/pcmcia/isic_pcmcia_elsa_isdnmc.c +++ b/sys/dev/pcmcia/isic_pcmcia_elsa_isdnmc.c @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_elsa_isdnmc.c,v 1.7 2004/08/08 23:17:13 mycroft Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_elsa_isdnmc.c,v 1.8 2005/02/04 02:10:45 perry Exp $"); #include "opt_isicpcmcia.h" #ifdef ISICPCMCIA_ELSA_ISDNMC @@ -86,11 +86,11 @@ __KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_elsa_isdnmc.c,v 1.7 2004/08/08 23:17:13 #ifndef __FreeBSD__ /* PCMCIA support routines */ -static u_int8_t elsa_isdnmc_read_reg __P((struct isic_softc *sc, int what, bus_size_t offs)); -static void elsa_isdnmc_write_reg __P((struct isic_softc *sc, int what, bus_size_t offs, u_int8_t data)); -static void elsa_isdnmc_read_fifo __P((struct isic_softc *sc, int what, void *buf, size_t size)); -static void elsa_isdnmc_write_fifo __P((struct isic_softc *sc, int what, const void *data, size_t size)); -static void elsa_isdnmc_clrirq __P((struct isic_softc *sc)); +static u_int8_t elsa_isdnmc_read_reg(struct isic_softc *sc, int what, bus_size_t offs); +static void elsa_isdnmc_write_reg(struct isic_softc *sc, int what, bus_size_t offs, u_int8_t data); +static void elsa_isdnmc_read_fifo(struct isic_softc *sc, int what, void *buf, size_t size); +static void elsa_isdnmc_write_fifo(struct isic_softc *sc, int what, const void *data, size_t size); +static void elsa_isdnmc_clrirq(struct isic_softc *sc); #endif /* diff --git a/sys/dev/pcmcia/isic_pcmcia_elsa_mcall.c b/sys/dev/pcmcia/isic_pcmcia_elsa_mcall.c index 72ea3c17e6c..a0aa597b5cc 100644 --- a/sys/dev/pcmcia/isic_pcmcia_elsa_mcall.c +++ b/sys/dev/pcmcia/isic_pcmcia_elsa_mcall.c @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_elsa_mcall.c,v 1.7 2004/08/08 23:17:13 mycroft Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_elsa_mcall.c,v 1.8 2005/02/04 02:10:45 perry Exp $"); #include "opt_isicpcmcia.h" #ifdef ISICPCMCIA_ELSA_MCALL @@ -87,10 +87,10 @@ __KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_elsa_mcall.c,v 1.7 2004/08/08 23:17:13 m #ifndef __FreeBSD__ /* PCMCIA support routines */ -static u_int8_t elsa_mcall_read_reg __P((struct isic_softc *sc, int what, bus_size_t offs)); -static void elsa_mcall_write_reg __P((struct isic_softc *sc, int what, bus_size_t offs, u_int8_t data)); -static void elsa_mcall_read_fifo __P((struct isic_softc *sc, int what, void *buf, size_t size)); -static void elsa_mcall_write_fifo __P((struct isic_softc *sc, int what, const void *data, size_t size)); +static u_int8_t elsa_mcall_read_reg(struct isic_softc *sc, int what, bus_size_t offs); +static void elsa_mcall_write_reg(struct isic_softc *sc, int what, bus_size_t offs, u_int8_t data); +static void elsa_mcall_read_fifo(struct isic_softc *sc, int what, void *buf, size_t size); +static void elsa_mcall_write_fifo(struct isic_softc *sc, int what, const void *data, size_t size); #endif /*---------------------------------------------------------------------------* diff --git a/sys/dev/pcmcia/mhzc.c b/sys/dev/pcmcia/mhzc.c index d18358782f0..7c6c99390e8 100644 --- a/sys/dev/pcmcia/mhzc.c +++ b/sys/dev/pcmcia/mhzc.c @@ -1,4 +1,4 @@ -/* $NetBSD: mhzc.c,v 1.29 2004/08/12 19:32:36 mycroft Exp $ */ +/* $NetBSD: mhzc.c,v 1.30 2005/02/04 02:10:45 perry Exp $ */ /*- * Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc. @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.29 2004/08/12 19:32:36 mycroft Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.30 2005/02/04 02:10:45 perry Exp $"); #include "opt_inet.h" #include "opt_ns.h" @@ -139,25 +139,25 @@ struct mhzc_softc { #define MHZC_MODEM_ALLOCED 0x10 #define MHZC_ETHERNET_ALLOCED 0x20 -int mhzc_match __P((struct device *, struct cfdata *, void *)); -void mhzc_attach __P((struct device *, struct device *, void *)); -int mhzc_detach __P((struct device *, int)); -int mhzc_activate __P((struct device *, enum devact)); +int mhzc_match(struct device *, struct cfdata *, void *); +void mhzc_attach(struct device *, struct device *, void *); +int mhzc_detach(struct device *, int); +int mhzc_activate(struct device *, enum devact); CFATTACH_DECL(mhzc, sizeof(struct mhzc_softc), mhzc_match, mhzc_attach, mhzc_detach, mhzc_activate); -int mhzc_em3336_enaddr __P((struct mhzc_softc *, u_int8_t *)); -int mhzc_em3336_enable __P((struct mhzc_softc *)); +int mhzc_em3336_enaddr(struct mhzc_softc *, u_int8_t *); +int mhzc_em3336_enable(struct mhzc_softc *); const struct mhzc_product { struct pcmcia_product mp_product; /* Get the Ethernet address for this card. */ - int (*mp_enaddr) __P((struct mhzc_softc *, u_int8_t *)); + int (*mp_enaddr)(struct mhzc_softc *, u_int8_t *); /* Perform any special `enable' magic. */ - int (*mp_enable) __P((struct mhzc_softc *)); + int (*mp_enable)(struct mhzc_softc *); } mhzc_products[] = { { { PCMCIA_VENDOR_MEGAHERTZ, PCMCIA_PRODUCT_MEGAHERTZ_EM3336, PCMCIA_CIS_INVALID }, @@ -166,15 +166,15 @@ const struct mhzc_product { static const size_t mhzc_nproducts = sizeof(mhzc_products) / sizeof(mhzc_products[0]); -int mhzc_print __P((void *, const char *)); +int mhzc_print(void *, const char *); -int mhzc_check_cfe __P((struct mhzc_softc *, struct pcmcia_config_entry *)); -int mhzc_alloc_ethernet __P((struct mhzc_softc *, struct pcmcia_config_entry *)); +int mhzc_check_cfe(struct mhzc_softc *, struct pcmcia_config_entry *); +int mhzc_alloc_ethernet(struct mhzc_softc *, struct pcmcia_config_entry *); -int mhzc_enable __P((struct mhzc_softc *, int)); -void mhzc_disable __P((struct mhzc_softc *, int)); +int mhzc_enable(struct mhzc_softc *, int); +void mhzc_disable(struct mhzc_softc *, int); -int mhzc_intr __P((void *)); +int mhzc_intr(void *); int mhzc_match(parent, match, aux) @@ -518,8 +518,8 @@ mhzc_disable(sc, flag) * Megahertz EM3336 (and compatibles) support *****************************************************************************/ -int mhzc_em3336_lannid_ciscallback __P((struct pcmcia_tuple *, void *)); -int mhzc_em3336_ascii_enaddr __P((const char *cisstr, u_int8_t *)); +int mhzc_em3336_lannid_ciscallback(struct pcmcia_tuple *, void *); +int mhzc_em3336_ascii_enaddr(const char *cisstr, u_int8_t *); int mhzc_em3336_enaddr(sc, myla) @@ -658,16 +658,16 @@ mhzc_em3336_ascii_enaddr(cisstr, myla) /****** Here begins the com attachment code. ******/ #if NCOM_MHZC > 0 -int com_mhzc_match __P((struct device *, struct cfdata *, void *)); -void com_mhzc_attach __P((struct device *, struct device *, void *)); -int com_mhzc_detach __P((struct device *, int)); +int com_mhzc_match(struct device *, struct cfdata *, void *); +void com_mhzc_attach(struct device *, struct device *, void *); +int com_mhzc_detach(struct device *, int); /* No mhzc-specific goo in the softc; it's all in the parent. */ CFATTACH_DECL(com_mhzc, sizeof(struct com_softc), com_mhzc_match, com_mhzc_attach, com_detach, com_activate); -int com_mhzc_enable __P((struct com_softc *)); -void com_mhzc_disable __P((struct com_softc *)); +int com_mhzc_enable(struct com_softc *); +void com_mhzc_disable(struct com_softc *); int com_mhzc_match(parent, match, aux) @@ -736,15 +736,15 @@ com_mhzc_disable(sc) /****** Here begins the sm attachment code. ******/ #if NSM_MHZC > 0 -int sm_mhzc_match __P((struct device *, struct cfdata *, void *)); -void sm_mhzc_attach __P((struct device *, struct device *, void *)); +int sm_mhzc_match(struct device *, struct cfdata *, void *); +void sm_mhzc_attach(struct device *, struct device *, void *); /* No mhzc-specific goo in the softc; it's all in the parent. */ CFATTACH_DECL(sm_mhzc, sizeof(struct smc91cxx_softc), sm_mhzc_match, sm_mhzc_attach, smc91cxx_detach, smc91cxx_activate); -int sm_mhzc_enable __P((struct smc91cxx_softc *)); -void sm_mhzc_disable __P((struct smc91cxx_softc *)); +int sm_mhzc_enable(struct smc91cxx_softc *); +void sm_mhzc_disable(struct smc91cxx_softc *); int sm_mhzc_match(parent, match, aux) diff --git a/sys/dev/pcmcia/nca_pcmcia.c b/sys/dev/pcmcia/nca_pcmcia.c index 59dc510f1fa..278f67e704f 100644 --- a/sys/dev/pcmcia/nca_pcmcia.c +++ b/sys/dev/pcmcia/nca_pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: nca_pcmcia.c,v 1.18 2004/08/10 22:49:12 mycroft Exp $ */ +/* $NetBSD: nca_pcmcia.c,v 1.19 2005/02/04 02:10:45 perry Exp $ */ /*- * Copyright (c) 2000, 2004 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nca_pcmcia.c,v 1.18 2004/08/10 22:49:12 mycroft Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nca_pcmcia.c,v 1.19 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -70,11 +70,11 @@ struct nca_pcmcia_softc { #define NCA_PCMCIA_ATTACHED 3 }; -int nca_pcmcia_match __P((struct device *, struct cfdata *, void *)); -int nca_pcmcia_validate_config __P((struct pcmcia_config_entry *)); -void nca_pcmcia_attach __P((struct device *, struct device *, void *)); -int nca_pcmcia_detach __P((struct device *, int)); -int nca_pcmcia_enable __P((struct device *, int)); +int nca_pcmcia_match(struct device *, struct cfdata *, void *); +int nca_pcmcia_validate_config(struct pcmcia_config_entry *); +void nca_pcmcia_attach(struct device *, struct device *, void *); +int nca_pcmcia_detach(struct device *, int); +int nca_pcmcia_enable(struct device *, int); CFATTACH_DECL(nca_pcmcia, sizeof(struct nca_pcmcia_softc), nca_pcmcia_match, nca_pcmcia_attach, nca_pcmcia_detach, NULL); diff --git a/sys/dev/pcmcia/pcmcia.c b/sys/dev/pcmcia/pcmcia.c index 219e8fdbe83..9205510c213 100644 --- a/sys/dev/pcmcia/pcmcia.c +++ b/sys/dev/pcmcia/pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: pcmcia.c,v 1.71 2004/08/18 12:01:13 drochner Exp $ */ +/* $NetBSD: pcmcia.c,v 1.72 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 2004 Charles M. Hannum. All rights reserved. @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.71 2004/08/18 12:01:13 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.72 2005/02/04 02:10:45 perry Exp $"); #include "opt_pcmciaverbose.h" @@ -78,13 +78,13 @@ int pcmcia_verbose = 1; int pcmcia_verbose = 0; #endif -int pcmcia_match __P((struct device *, struct cfdata *, void *)); -int pcmcia_submatch __P((struct device *, struct cfdata *, - const locdesc_t *, void *)); -void pcmcia_attach __P((struct device *, struct device *, void *)); +int pcmcia_match(struct device *, struct cfdata *, void *); +int pcmcia_submatch(struct device *, struct cfdata *, + const locdesc_t *, void *); +void pcmcia_attach(struct device *, struct device *, void *); int pcmcia_rescan(struct device *, const char *, const int *); void pcmcia_childdetached(struct device *, struct device *); -int pcmcia_print __P((void *, const char *)); +int pcmcia_print(void *, const char *); CFATTACH_DECL2(pcmcia, sizeof(struct pcmcia_softc), pcmcia_match, pcmcia_attach, NULL, NULL, @@ -760,7 +760,7 @@ void * pcmcia_intr_establish(pf, ipl, ih_fct, ih_arg) struct pcmcia_function *pf; int ipl; - int (*ih_fct) __P((void *)); + int (*ih_fct)(void *); void *ih_arg; { @@ -930,7 +930,7 @@ pcmcia_config_unmap(pf) int pcmcia_function_configure(pf, validator) struct pcmcia_function *pf; - int (*validator) __P((struct pcmcia_config_entry *)); + int (*validator)(struct pcmcia_config_entry *); { struct pcmcia_config_entry *cfe; int error = ENOENT; diff --git a/sys/dev/pcmcia/pcmcia_cis.c b/sys/dev/pcmcia/pcmcia_cis.c index 0411e80f002..78d77129bad 100644 --- a/sys/dev/pcmcia/pcmcia_cis.c +++ b/sys/dev/pcmcia/pcmcia_cis.c @@ -1,4 +1,4 @@ -/* $NetBSD: pcmcia_cis.c,v 1.37 2004/10/15 21:25:04 enami Exp $ */ +/* $NetBSD: pcmcia_cis.c,v 1.38 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1997 Marc Horowitz. All rights reserved. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pcmcia_cis.c,v 1.37 2004/10/15 21:25:04 enami Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pcmcia_cis.c,v 1.38 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -59,9 +59,9 @@ struct cis_state { struct pcmcia_function *pf; }; -int pcmcia_parse_cis_tuple __P((struct pcmcia_tuple *, void *)); -static int decode_funce __P((struct pcmcia_tuple *, struct pcmcia_function *)); -static void create_pf __P((struct cis_state *)); +int pcmcia_parse_cis_tuple(struct pcmcia_tuple *, void *); +static int decode_funce(struct pcmcia_tuple *, struct pcmcia_function *); +static void create_pf(struct cis_state *); static void @@ -124,7 +124,7 @@ pcmcia_read_cis(sc) int pcmcia_scan_cis(dev, fct, arg) struct device *dev; - int (*fct) __P((struct pcmcia_tuple *, void *)); + int (*fct)(struct pcmcia_tuple *, void *); void *arg; { struct pcmcia_softc *sc = (struct pcmcia_softc *) dev; diff --git a/sys/dev/pcmcia/pcmciachip.h b/sys/dev/pcmcia/pcmciachip.h index 26ad7ccd10f..0534767e3d1 100644 --- a/sys/dev/pcmcia/pcmciachip.h +++ b/sys/dev/pcmcia/pcmciachip.h @@ -1,4 +1,4 @@ -/* $NetBSD: pcmciachip.h,v 1.9 2004/09/13 12:55:48 drochner Exp $ */ +/* $NetBSD: pcmciachip.h,v 1.10 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1997 Marc Horowitz. All rights reserved. @@ -58,40 +58,40 @@ typedef int pcmcia_mem_handle_t; struct pcmcia_chip_functions { /* memory space allocation */ - int (*mem_alloc) __P((pcmcia_chipset_handle_t, bus_size_t, - struct pcmcia_mem_handle *)); - void (*mem_free) __P((pcmcia_chipset_handle_t, - struct pcmcia_mem_handle *)); + int (*mem_alloc)(pcmcia_chipset_handle_t, bus_size_t, + struct pcmcia_mem_handle *); + void (*mem_free)(pcmcia_chipset_handle_t, + struct pcmcia_mem_handle *); /* memory space window mapping */ - int (*mem_map) __P((pcmcia_chipset_handle_t, int, bus_addr_t, + int (*mem_map)(pcmcia_chipset_handle_t, int, bus_addr_t, bus_size_t, struct pcmcia_mem_handle *, - bus_size_t *, int *)); - void (*mem_unmap) __P((pcmcia_chipset_handle_t, int)); + bus_size_t *, int *); + void (*mem_unmap)(pcmcia_chipset_handle_t, int); /* I/O space allocation */ - int (*io_alloc) __P((pcmcia_chipset_handle_t, bus_addr_t, - bus_size_t, bus_size_t, struct pcmcia_io_handle *)); - void (*io_free) __P((pcmcia_chipset_handle_t, - struct pcmcia_io_handle *)); + int (*io_alloc)(pcmcia_chipset_handle_t, bus_addr_t, + bus_size_t, bus_size_t, struct pcmcia_io_handle *); + void (*io_free)(pcmcia_chipset_handle_t, + struct pcmcia_io_handle *); /* I/O space window mapping */ - int (*io_map) __P((pcmcia_chipset_handle_t, int, bus_addr_t, - bus_size_t, struct pcmcia_io_handle *, int *)); - void (*io_unmap) __P((pcmcia_chipset_handle_t, int)); + int (*io_map)(pcmcia_chipset_handle_t, int, bus_addr_t, + bus_size_t, struct pcmcia_io_handle *, int *); + void (*io_unmap)(pcmcia_chipset_handle_t, int); /* interrupt glue */ - void *(*intr_establish) __P((pcmcia_chipset_handle_t, - struct pcmcia_function *, int, int (*)(void *), void *)); - void (*intr_disestablish) __P((pcmcia_chipset_handle_t, void *)); + void *(*intr_establish)(pcmcia_chipset_handle_t, + struct pcmcia_function *, int, int (*)(void *), void *); + void (*intr_disestablish)(pcmcia_chipset_handle_t, void *); /* card enable/disable */ - void (*socket_enable) __P((pcmcia_chipset_handle_t)); - void (*socket_disable) __P((pcmcia_chipset_handle_t)); - void (*socket_settype) __P((pcmcia_chipset_handle_t, int)); + void (*socket_enable)(pcmcia_chipset_handle_t); + void (*socket_disable)(pcmcia_chipset_handle_t); + void (*socket_settype)(pcmcia_chipset_handle_t, int); /* card detection */ - int (*card_detect) __P((pcmcia_chipset_handle_t)); + int (*card_detect)(pcmcia_chipset_handle_t); }; /* Memory space functions. */ @@ -149,8 +149,8 @@ struct pcmciabus_attach_args { /* interfaces for the chipset to call pcmcia */ -int pcmcia_card_attach __P((struct device *)); -void pcmcia_card_detach __P((struct device *, int)); -void pcmcia_card_deactivate __P((struct device *)); +int pcmcia_card_attach(struct device *); +void pcmcia_card_detach(struct device *, int); +void pcmcia_card_deactivate(struct device *); #endif /* _PCMCIA_PCMCIACHIP_H_ */ diff --git a/sys/dev/pcmcia/pcmciavar.h b/sys/dev/pcmcia/pcmciavar.h index b891e251913..5cd04521fa8 100644 --- a/sys/dev/pcmcia/pcmciavar.h +++ b/sys/dev/pcmcia/pcmciavar.h @@ -1,4 +1,4 @@ -/* $NetBSD: pcmciavar.h,v 1.28 2004/08/12 19:59:07 mycroft Exp $ */ +/* $NetBSD: pcmciavar.h,v 1.29 2005/02/04 02:10:45 perry Exp $ */ /* * Copyright (c) 1997 Marc Horowitz. All rights reserved. @@ -236,20 +236,19 @@ struct pcmcia_product { const char *pp_cisinfo[4]; }; -typedef int (*pcmcia_product_match_fn) __P((struct pcmcia_attach_args *, - const struct pcmcia_product *, int)); +typedef int (*pcmcia_product_match_fn)(struct pcmcia_attach_args *, + const struct pcmcia_product *, int); -const void * - pcmcia_product_lookup __P((struct pcmcia_attach_args *, const void *, - size_t, size_t, pcmcia_product_match_fn)); +const void *pcmcia_product_lookup(struct pcmcia_attach_args *, const void *, + size_t, size_t, pcmcia_product_match_fn); -void pcmcia_devinfo __P((struct pcmcia_card *, int, char *, size_t)); +void pcmcia_devinfo(struct pcmcia_card *, int, char *, size_t); -void pcmcia_read_cis __P((struct pcmcia_softc *)); -void pcmcia_check_cis_quirks __P((struct pcmcia_softc *)); -void pcmcia_print_cis __P((struct pcmcia_softc *)); -int pcmcia_scan_cis __P((struct device *, - int (*) (struct pcmcia_tuple *, void *), void *)); +void pcmcia_read_cis(struct pcmcia_softc *); +void pcmcia_check_cis_quirks(struct pcmcia_softc *); +void pcmcia_print_cis(struct pcmcia_softc *); +int pcmcia_scan_cis(struct device *, + int (*) (struct pcmcia_tuple *, void *), void *); #define pcmcia_cis_read_1(tuple, idx0) \ (bus_space_read_1((tuple)->memt, (tuple)->memh, (tuple)->mult*(idx0))) @@ -281,30 +280,30 @@ int pcmcia_scan_cis __P((struct device *, #define PCMCIA_SPACE_MEMORY 1 #define PCMCIA_SPACE_IO 2 -int pcmcia_ccr_read __P((struct pcmcia_function *, int)); -void pcmcia_ccr_write __P((struct pcmcia_function *, int, int)); +int pcmcia_ccr_read(struct pcmcia_function *, int); +void pcmcia_ccr_write(struct pcmcia_function *, int, int); #define pcmcia_mfc(sc) (! SIMPLEQ_EMPTY(&(sc)->card.pf_head) && \ SIMPLEQ_NEXT(SIMPLEQ_FIRST(&(sc)->card.pf_head), pf_list)) -void pcmcia_socket_enable __P((struct device *)); -void pcmcia_socket_disable __P((struct device *)); -void pcmcia_socket_settype __P((struct device *, int)); +void pcmcia_socket_enable(struct device *); +void pcmcia_socket_disable(struct device *); +void pcmcia_socket_settype(struct device *, int); -int pcmcia_config_alloc __P((struct pcmcia_function *, - struct pcmcia_config_entry *)); -void pcmcia_config_free __P((struct pcmcia_function *)); -int pcmcia_config_map __P((struct pcmcia_function *)); -void pcmcia_config_unmap __P((struct pcmcia_function *)); +int pcmcia_config_alloc(struct pcmcia_function *, + struct pcmcia_config_entry *); +void pcmcia_config_free(struct pcmcia_function *); +int pcmcia_config_map(struct pcmcia_function *); +void pcmcia_config_unmap(struct pcmcia_function *); -int pcmcia_function_configure __P((struct pcmcia_function *, - int (*validator)(struct pcmcia_config_entry *))); -void pcmcia_function_unconfigure __P((struct pcmcia_function *)); -void pcmcia_function_init __P((struct pcmcia_function *, - struct pcmcia_config_entry *)); -int pcmcia_function_enable __P((struct pcmcia_function *)); -void pcmcia_function_disable __P((struct pcmcia_function *)); +int pcmcia_function_configure(struct pcmcia_function *, + int (*validator)(struct pcmcia_config_entry *)); +void pcmcia_function_unconfigure(struct pcmcia_function *); +void pcmcia_function_init(struct pcmcia_function *, + struct pcmcia_config_entry *); +int pcmcia_function_enable(struct pcmcia_function *); +void pcmcia_function_disable(struct pcmcia_function *); #define pcmcia_io_alloc(pf, start, size, align, pciop) \ (pcmcia_chip_io_alloc((pf)->sc->pct, pf->sc->pch, (start), \ @@ -313,11 +312,11 @@ void pcmcia_function_disable __P((struct pcmcia_function *)); #define pcmcia_io_free(pf, pciohp) \ (pcmcia_chip_io_free((pf)->sc->pct, (pf)->sc->pch, (pciohp))) -int pcmcia_io_map __P((struct pcmcia_function *, int, - struct pcmcia_io_handle *, int *)); -void pcmcia_io_unmap __P((struct pcmcia_function *, int)); +int pcmcia_io_map(struct pcmcia_function *, int, + struct pcmcia_io_handle *, int *); +void pcmcia_io_unmap(struct pcmcia_function *, int); -void pcmcia_free_pf __P((struct pcmcia_function_head *)); +void pcmcia_free_pf(struct pcmcia_function_head *); #define pcmcia_mem_alloc(pf, size, pcmhp) \ (pcmcia_chip_mem_alloc((pf)->sc->pct, (pf)->sc->pch, (size), (pcmhp))) @@ -332,6 +331,6 @@ void pcmcia_free_pf __P((struct pcmcia_function_head *)); #define pcmcia_mem_unmap(pf, window) \ (pcmcia_chip_mem_unmap((pf)->sc->pct, (pf)->sc->pch, (window))) -void *pcmcia_intr_establish __P((struct pcmcia_function *, int, - int (*) (void *), void *)); -void pcmcia_intr_disestablish __P((struct pcmcia_function *, void *)); +void *pcmcia_intr_establish(struct pcmcia_function *, int, + int (*) (void *), void *); +void pcmcia_intr_disestablish(struct pcmcia_function *, void *); diff --git a/sys/dev/pcmcia/pcmcom.c b/sys/dev/pcmcia/pcmcom.c index c0a9ac12ffd..dc4d1585146 100644 --- a/sys/dev/pcmcia/pcmcom.c +++ b/sys/dev/pcmcia/pcmcom.c @@ -1,4 +1,4 @@ -/* $NetBSD: pcmcom.c,v 1.20 2004/09/13 12:55:48 drochner Exp $ */ +/* $NetBSD: pcmcom.c,v 1.21 2005/02/04 02:10:45 perry Exp $ */ /*- * Copyright (c) 1998, 2000, 2004 The NetBSD Foundation, Inc. @@ -51,7 +51,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pcmcom.c,v 1.20 2004/09/13 12:55:48 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pcmcom.c,v 1.21 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -95,11 +95,11 @@ struct pcmcom_attach_args { int pca_slave; /* slave # */ }; -int pcmcom_match __P((struct device *, struct cfdata *, void *)); -int pcmcom_validate_config __P((struct pcmcia_config_entry *)); -void pcmcom_attach __P((struct device *, struct device *, void *)); -int pcmcom_detach __P((struct device *, int)); -int pcmcom_activate __P((struct device *, enum devact)); +int pcmcom_match(struct device *, struct cfdata *, void *); +int pcmcom_validate_config(struct pcmcia_config_entry *); +void pcmcom_attach(struct device *, struct device *, void *); +int pcmcom_detach(struct device *, int); +int pcmcom_activate(struct device *, enum devact); CFATTACH_DECL(pcmcom, sizeof(struct pcmcom_softc), pcmcom_match, pcmcom_attach, pcmcom_detach, pcmcom_activate); @@ -111,14 +111,14 @@ const struct pcmcia_product pcmcom_products[] = { const size_t pcmcom_nproducts = sizeof(pcmcom_products) / sizeof(pcmcom_products[0]); -int pcmcom_print __P((void *, const char *)); -int pcmcom_submatch __P((struct device *, struct cfdata *, - const locdesc_t *, void *)); +int pcmcom_print(void *, const char *); +int pcmcom_submatch(struct device *, struct cfdata *, + const locdesc_t *, void *); -int pcmcom_enable __P((struct pcmcom_softc *)); -void pcmcom_disable __P((struct pcmcom_softc *)); +int pcmcom_enable(struct pcmcom_softc *); +void pcmcom_disable(struct pcmcom_softc *); -int pcmcom_intr __P((void *)); +int pcmcom_intr(void *); int pcmcom_match(parent, cf, aux) @@ -351,15 +351,15 @@ pcmcom_disable(sc) /****** Here begins the com attachment code. ******/ #if NCOM_PCMCOM > 0 -int com_pcmcom_match __P((struct device *, struct cfdata *, void *)); -void com_pcmcom_attach __P((struct device *, struct device *, void *)); +int com_pcmcom_match(struct device *, struct cfdata *, void *); +void com_pcmcom_attach(struct device *, struct device *, void *); /* No pcmcom-specific goo in the softc; it's all in the parent. */ CFATTACH_DECL(com_pcmcom, sizeof(struct com_softc), com_pcmcom_match, com_pcmcom_attach, com_detach, com_activate); -int com_pcmcom_enable __P((struct com_softc *)); -void com_pcmcom_disable __P((struct com_softc *)); +int com_pcmcom_enable(struct com_softc *); +void com_pcmcom_disable(struct com_softc *); int com_pcmcom_match(parent, cf, aux) diff --git a/sys/dev/pcmcia/spc_pcmcia.c b/sys/dev/pcmcia/spc_pcmcia.c index 0bc2e576d3e..b0553193fcd 100644 --- a/sys/dev/pcmcia/spc_pcmcia.c +++ b/sys/dev/pcmcia/spc_pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: spc_pcmcia.c,v 1.12 2004/08/10 22:49:12 mycroft Exp $ */ +/* $NetBSD: spc_pcmcia.c,v 1.13 2005/02/04 02:10:45 perry Exp $ */ /*- * Copyright (c) 2000, 2004 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: spc_pcmcia.c,v 1.12 2004/08/10 22:49:12 mycroft Exp $"); +__KERNEL_RCSID(0, "$NetBSD: spc_pcmcia.c,v 1.13 2005/02/04 02:10:45 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -68,11 +68,11 @@ struct spc_pcmcia_softc { #define SPC_PCMCIA_ATTACHED 3 }; -int spc_pcmcia_match __P((struct device *, struct cfdata *, void *)); -int spc_pcmcia_validate_config __P((struct pcmcia_config_entry *)); -void spc_pcmcia_attach __P((struct device *, struct device *, void *)); -int spc_pcmcia_detach __P((struct device *, int)); -int spc_pcmcia_enable __P((struct device *, int)); +int spc_pcmcia_match(struct device *, struct cfdata *, void *); +int spc_pcmcia_validate_config(struct pcmcia_config_entry *); +void spc_pcmcia_attach(struct device *, struct device *, void *); +int spc_pcmcia_detach(struct device *, int); +int spc_pcmcia_enable(struct device *, int); CFATTACH_DECL(spc_pcmcia, sizeof(struct spc_pcmcia_softc), spc_pcmcia_match, spc_pcmcia_attach, spc_pcmcia_detach, spc_activate); diff --git a/sys/dev/pcmcia/xirc.c b/sys/dev/pcmcia/xirc.c index 2ee6eb44f91..45c9d2ffc7d 100644 --- a/sys/dev/pcmcia/xirc.c +++ b/sys/dev/pcmcia/xirc.c @@ -1,4 +1,4 @@ -/* $NetBSD: xirc.c,v 1.11 2004/08/10 18:43:50 mycroft Exp $ */ +/* $NetBSD: xirc.c,v 1.12 2005/02/04 02:10:45 perry Exp $ */ /*- * Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.11 2004/08/10 18:43:50 mycroft Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.12 2005/02/04 02:10:45 perry Exp $"); #include "opt_inet.h" #include "opt_ns.h" @@ -133,28 +133,28 @@ struct xirc_softc { #define XIRC_ETHERNET_ALLOCED 0x20 }; -int xirc_match __P((struct device *, struct cfdata *, void *)); -void xirc_attach __P((struct device *, struct device *, void *)); -int xirc_detach __P((struct device *, int)); -int xirc_activate __P((struct device *, enum devact)); +int xirc_match(struct device *, struct cfdata *, void *); +void xirc_attach(struct device *, struct device *, void *); +int xirc_detach(struct device *, int); +int xirc_activate(struct device *, enum devact); CFATTACH_DECL(xirc, sizeof(struct xirc_softc), xirc_match, xirc_attach, xirc_detach, xirc_activate); -int xirc_print __P((void *, const char *)); +int xirc_print(void *, const char *); -int xirc_manfid_ciscallback __P((struct pcmcia_tuple *, void *)); +int xirc_manfid_ciscallback(struct pcmcia_tuple *, void *); struct pcmcia_config_entry * - xirc_mako_alloc __P((struct xirc_softc *)); + xirc_mako_alloc(struct xirc_softc *); struct pcmcia_config_entry * - xirc_dingo_alloc_modem __P((struct xirc_softc *)); + xirc_dingo_alloc_modem(struct xirc_softc *); struct pcmcia_config_entry * - xirc_dingo_alloc_ethernet __P((struct xirc_softc *)); + xirc_dingo_alloc_ethernet(struct xirc_softc *); -int xirc_enable __P((struct xirc_softc *, int, int)); -void xirc_disable __P((struct xirc_softc *, int, int)); +int xirc_enable(struct xirc_softc *, int, int); +void xirc_disable(struct xirc_softc *, int, int); -int xirc_intr __P((void *)); +int xirc_intr(void *); int xirc_match(parent, match, aux) @@ -579,16 +579,16 @@ xirc_disable(sc, flag, media) /****** Here begins the com attachment code. ******/ #if NCOM_XIRC > 0 -int com_xirc_match __P((struct device *, struct cfdata *, void *)); -void com_xirc_attach __P((struct device *, struct device *, void *)); -int com_xirc_detach __P((struct device *, int)); +int com_xirc_match(struct device *, struct cfdata *, void *); +void com_xirc_attach(struct device *, struct device *, void *); +int com_xirc_detach(struct device *, int); /* No xirc-specific goo in the softc; it's all in the parent. */ CFATTACH_DECL(com_xirc, sizeof(struct com_softc), com_xirc_match, com_xirc_attach, com_detach, com_activate); -int com_xirc_enable __P((struct com_softc *)); -void com_xirc_disable __P((struct com_softc *)); +int com_xirc_enable(struct com_softc *); +void com_xirc_disable(struct com_softc *); int com_xirc_match(parent, match, aux) @@ -656,16 +656,16 @@ com_xirc_disable(sc) /****** Here begins the xi attachment code. ******/ #if NXI_XIRC > 0 -int xi_xirc_match __P((struct device *, struct cfdata *, void *)); -void xi_xirc_attach __P((struct device *, struct device *, void *)); +int xi_xirc_match(struct device *, struct cfdata *, void *); +void xi_xirc_attach(struct device *, struct device *, void *); /* No xirc-specific goo in the softc; it's all in the parent. */ CFATTACH_DECL(xi_xirc, sizeof(struct xi_softc), xi_xirc_match, xi_xirc_attach, xi_detach, xi_activate); -int xi_xirc_enable __P((struct xi_softc *)); -void xi_xirc_disable __P((struct xi_softc *)); -int xi_xirc_lan_nid_ciscallback __P((struct pcmcia_tuple *, void *)); +int xi_xirc_enable(struct xi_softc *); +void xi_xirc_disable(struct xi_softc *); +int xi_xirc_lan_nid_ciscallback(struct pcmcia_tuple *, void *); int xi_xirc_match(parent, match, aux) diff --git a/sys/dev/qbus/dhu.c b/sys/dev/qbus/dhu.c index f2e15964f66..01bb49b36bd 100644 --- a/sys/dev/qbus/dhu.c +++ b/sys/dev/qbus/dhu.c @@ -1,4 +1,4 @@ -/* $NetBSD: dhu.c,v 1.36 2004/05/12 00:45:04 wiz Exp $ */ +/* $NetBSD: dhu.c,v 1.37 2005/02/04 02:10:47 perry Exp $ */ /* * Copyright (c) 2003, Hugh Graham. * Copyright (c) 1992, 1993 @@ -68,7 +68,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dhu.c,v 1.36 2004/05/12 00:45:04 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dhu.c,v 1.37 2005/02/04 02:10:47 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -170,14 +170,14 @@ static const struct speedtab dhuspeedtab[] = { { -1, -1 } }; -static int dhu_match __P((struct device *, struct cfdata *, void *)); -static void dhu_attach __P((struct device *, struct device *, void *)); -static void dhurint __P((void *)); -static void dhuxint __P((void *)); -static void dhustart __P((struct tty *)); -static int dhuparam __P((struct tty *, struct termios *)); -static int dhuiflow __P((struct tty *, int)); -static unsigned dhumctl __P((struct dhu_softc *,int, int, int)); +static int dhu_match(struct device *, struct cfdata *, void *); +static void dhu_attach(struct device *, struct device *, void *); +static void dhurint(void *); +static void dhuxint(void *); +static void dhustart(struct tty *); +static int dhuparam(struct tty *, struct termios *); +static int dhuiflow(struct tty *, int); +static unsigned dhumctl(struct dhu_softc *,int, int, int); CFATTACH_DECL(dhu, sizeof(struct dhu_softc), dhu_match, dhu_attach, NULL, NULL); diff --git a/sys/dev/qbus/dz_uba.c b/sys/dev/qbus/dz_uba.c index ab151167bf4..b6ec5953262 100644 --- a/sys/dev/qbus/dz_uba.c +++ b/sys/dev/qbus/dz_uba.c @@ -1,4 +1,4 @@ -/* $NetBSD: dz_uba.c,v 1.20 2003/12/13 23:02:33 ad Exp $ */ +/* $NetBSD: dz_uba.c,v 1.21 2005/02/04 02:10:47 perry Exp $ */ /* * Copyright (c) 1998 Ludd, University of Lule}, Sweden. All rights reserved. * Copyright (c) 1996 Ken C. Wellsch. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dz_uba.c,v 1.20 2003/12/13 23:02:33 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dz_uba.c,v 1.21 2005/02/04 02:10:47 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -58,8 +58,8 @@ __KERNEL_RCSID(0, "$NetBSD: dz_uba.c,v 1.20 2003/12/13 23:02:33 ad Exp $"); #include "ioconf.h" -static int dz_uba_match __P((struct device *, struct cfdata *, void *)); -static void dz_uba_attach __P((struct device *, struct device *, void *)); +static int dz_uba_match(struct device *, struct cfdata *, void *); +static void dz_uba_attach(struct device *, struct device *, void *); CFATTACH_DECL(dz_uba, sizeof(struct dz_softc), dz_uba_match, dz_uba_attach, NULL, NULL); diff --git a/sys/dev/qbus/qd.c b/sys/dev/qbus/qd.c index 7d423686c27..50103179fe2 100644 --- a/sys/dev/qbus/qd.c +++ b/sys/dev/qbus/qd.c @@ -1,4 +1,4 @@ -/* $NetBSD: qd.c,v 1.31 2003/08/07 16:31:16 agc Exp $ */ +/* $NetBSD: qd.c,v 1.32 2005/02/04 02:10:47 perry Exp $ */ /*- * Copyright (c) 1988 Regents of the University of California. @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: qd.c,v 1.31 2003/08/07 16:31:16 agc Exp $"); +__KERNEL_RCSID(0, "$NetBSD: qd.c,v 1.32 2005/02/04 02:10:47 perry Exp $"); #include "opt_ddb.h" @@ -234,12 +234,12 @@ int QDlast_DMAtype; /* type of the last DMA operation */ */ #define TOY ((time.tv_sec * 100) + (time.tv_usec / 10000)) -void qd_attach __P((struct device *, struct device *, void *)); -static int qd_match __P((struct device *, struct cfdata *, void *)); +void qd_attach(struct device *, struct device *, void *); +static int qd_match(struct device *, struct cfdata *, void *); -static void qddint __P((void *)); /* DMA gate array intrpt service */ -static void qdaint __P((void *)); /* Dragon ADDER intrpt service */ -static void qdiint __P((void *)); +static void qddint(void *); /* DMA gate array intrpt service */ +static void qdaint(void *); /* Dragon ADDER intrpt service */ +static void qdiint(void *); #define QDPRIOR (PZERO-1) /* must be negative */ #define FALSE 0 @@ -323,17 +323,17 @@ extern char *q_special[]; */ extern struct cdevsw *consops; cons_decl(qd); -void setup_dragon __P((int)); -void init_shared __P((int)); -void clear_qd_screen __P((int)); -void ldfont __P((int)); -void ldcursor __P((int, short *)); -void setup_input __P((int)); -void blitc __P((int, u_char)); -void scroll_up __P((volatile struct adder *)); -void write_ID __P((volatile struct adder *, short, short)); -int wait_status __P((volatile struct adder *, int)); -void led_control __P((int, int, int)); +void setup_dragon(int); +void init_shared(int); +void clear_qd_screen(int); +void ldfont(int); +void ldcursor(int, short *); +void setup_input(int); +void blitc(int, u_char); +void scroll_up(volatile struct adder *); +void write_ID(volatile struct adder *, short, short); +int wait_status(volatile struct adder *, int); +void led_control(int, int, int); void qdstart(struct tty *); void qdearly(void); int qdpolling = 0; diff --git a/sys/dev/qbus/rlvar.h b/sys/dev/qbus/rlvar.h index 61670857073..28165e3a8f4 100644 --- a/sys/dev/qbus/rlvar.h +++ b/sys/dev/qbus/rlvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: rlvar.h,v 1.2 2002/07/22 21:48:39 hannken Exp $ */ +/* $NetBSD: rlvar.h,v 1.3 2005/02/04 02:10:47 perry Exp $ */ /* * Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rlvar.h,v 1.2 2002/07/22 21:48:39 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rlvar.h,v 1.3 2005/02/04 02:10:47 perry Exp $"); struct rlc_softc { struct device sc_dev; diff --git a/sys/dev/qbus/ubavar.h b/sys/dev/qbus/ubavar.h index e679eee6e88..9957186fc6c 100644 --- a/sys/dev/qbus/ubavar.h +++ b/sys/dev/qbus/ubavar.h @@ -1,4 +1,4 @@ -/* $NetBSD: ubavar.h,v 1.34 2003/08/28 14:59:07 ragge Exp $ */ +/* $NetBSD: ubavar.h,v 1.35 2005/02/04 02:10:47 perry Exp $ */ /* * Copyright (c) 1982, 1986 Regents of the University of California. @@ -69,11 +69,11 @@ struct uba_softc { SIMPLEQ_HEAD(, uba_unit) uh_resq; /* resource wait chain */ SIMPLEQ_HEAD(, uba_reset) uh_resetq; /* ubareset queue */ int uh_lastiv; /* last free interrupt vector */ - int (*uh_errchk) __P((struct uba_softc *)); - void (*uh_beforescan) __P((struct uba_softc *)); - void (*uh_afterscan) __P((struct uba_softc *)); - void (*uh_ubainit) __P((struct uba_softc *)); - void (*uh_ubapurge) __P((struct uba_softc *, int)); + int (*uh_errchk)(struct uba_softc *); + void (*uh_beforescan)(struct uba_softc *); + void (*uh_afterscan)(struct uba_softc *); + void (*uh_ubainit)(struct uba_softc *); + void (*uh_ubapurge)(struct uba_softc *, int); short uh_nr; /* Unibus sequential number */ short uh_type; /* Type of bus */ bus_space_tag_t uh_iot; /* Tag for this Unibus */ @@ -92,7 +92,7 @@ struct uba_unit { SIMPLEQ_ENTRY(uba_unit) uu_resq;/* Queue while waiting for resources */ void *uu_softc; /* Pointer to units softc */ int uu_bdp; /* for controllers that hang on to bdp's */ - int (*uu_ready) __P((struct uba_unit *)); + int (*uu_ready)(struct uba_unit *); void *uu_ref; /* Buffer this is related to */ short uu_xclu; /* want exclusive use of bdp's */ short uu_keepbdp; /* hang on to bdp's once allocated */ diff --git a/sys/dev/rasops/rasops.c b/sys/dev/rasops/rasops.c index fb305334d61..b7fde3deb6c 100644 --- a/sys/dev/rasops/rasops.c +++ b/sys/dev/rasops/rasops.c @@ -1,4 +1,4 @@ -/* $NetBSD: rasops.c,v 1.44 2003/11/08 22:49:28 uwe Exp $ */ +/* $NetBSD: rasops.c,v 1.45 2005/02/04 02:10:47 perry Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.44 2003/11/08 22:49:28 uwe Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.45 2005/02/04 02:10:47 perry Exp $"); #include "opt_rasops.h" #include "rasops_glue.h" @@ -126,13 +126,13 @@ const u_char rasops_isgray[16] = { }; /* Generic functions */ -static void rasops_copyrows __P((void *, int, int, int)); -static int rasops_mapchar __P((void *, int, u_int *)); -static void rasops_cursor __P((void *, int, int, int)); -static int rasops_allocattr_color __P((void *, int, int, int, long *)); -static int rasops_allocattr_mono __P((void *, int, int, int, long *)); -static void rasops_do_cursor __P((struct rasops_info *)); -static void rasops_init_devcmap __P((struct rasops_info *)); +static void rasops_copyrows(void *, int, int, int); +static int rasops_mapchar(void *, int, u_int *); +static void rasops_cursor(void *, int, int, int); +static int rasops_allocattr_color(void *, int, int, int, long *); +static int rasops_allocattr_mono(void *, int, int, int, long *); +static void rasops_do_cursor(struct rasops_info *); +static void rasops_init_devcmap(struct rasops_info *); /* * Initialize a 'rasops_info' descriptor. diff --git a/sys/dev/rasops/rasops.h b/sys/dev/rasops/rasops.h index 4d110a1bce7..6af90fe741e 100644 --- a/sys/dev/rasops/rasops.h +++ b/sys/dev/rasops/rasops.h @@ -1,4 +1,4 @@ -/* $NetBSD: rasops.h,v 1.16 2004/03/05 08:33:53 petrov Exp $ */ +/* $NetBSD: rasops.h,v 1.17 2005/02/04 02:10:47 perry Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -103,7 +103,7 @@ struct rasops_info { int ri_caps; /* Callbacks so we can share some code */ - void (*ri_do_cursor) __P((struct rasops_info *)); + void (*ri_do_cursor)(struct rasops_info *); }; #define DELTA(p, d, cast) ((p) = (cast)((caddr_t)(p) + (d))) @@ -130,21 +130,21 @@ struct rasops_info { * Per-depth initialization functions. These should not be called outside * the rasops code. */ -void rasops1_init __P((struct rasops_info *)); -void rasops2_init __P((struct rasops_info *)); -void rasops4_init __P((struct rasops_info *)); -void rasops8_init __P((struct rasops_info *)); -void rasops15_init __P((struct rasops_info *)); -void rasops24_init __P((struct rasops_info *)); -void rasops32_init __P((struct rasops_info *)); +void rasops1_init(struct rasops_info *); +void rasops2_init(struct rasops_info *); +void rasops4_init(struct rasops_info *); +void rasops8_init(struct rasops_info *); +void rasops15_init(struct rasops_info *); +void rasops24_init(struct rasops_info *); +void rasops32_init(struct rasops_info *); /* rasops.c */ -int rasops_init __P((struct rasops_info *, int, int)); -int rasops_reconfig __P((struct rasops_info *, int, int)); -void rasops_unpack_attr __P((long, int *, int *, int *)); -void rasops_eraserows __P((void *, int, int, long)); -void rasops_erasecols __P((void *, int, int, int, long)); -void rasops_copycols __P((void *, int, int, int, int)); +int rasops_init(struct rasops_info *, int, int); +int rasops_reconfig(struct rasops_info *, int, int); +void rasops_unpack_attr(long, int *, int *, int *); +void rasops_eraserows(void *, int, int, long); +void rasops_erasecols(void *, int, int, int, long); +void rasops_copycols(void *, int, int, int, int); extern const u_char rasops_isgray[16]; extern const u_char rasops_cmap[256*3]; diff --git a/sys/dev/rasops/rasops1.c b/sys/dev/rasops/rasops1.c index c9cf6ab6b42..0ac41c71229 100644 --- a/sys/dev/rasops/rasops1.c +++ b/sys/dev/rasops/rasops1.c @@ -1,4 +1,4 @@ -/* $NetBSD: rasops1.c,v 1.15 2001/11/15 09:48:14 lukem Exp $ */ +/* $NetBSD: rasops1.c,v 1.16 2005/02/04 02:10:47 perry Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rasops1.c,v 1.15 2001/11/15 09:48:14 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rasops1.c,v 1.16 2005/02/04 02:10:47 perry Exp $"); #include "opt_rasops.h" @@ -51,13 +51,13 @@ __KERNEL_RCSID(0, "$NetBSD: rasops1.c,v 1.15 2001/11/15 09:48:14 lukem Exp $"); #include <dev/rasops/rasops.h> #include <dev/rasops/rasops_masks.h> -static void rasops1_copycols __P((void *, int, int, int, int)); -static void rasops1_erasecols __P((void *, int, int, int, long)); -static void rasops1_do_cursor __P((struct rasops_info *)); -static void rasops1_putchar __P((void *, int, int col, u_int, long)); +static void rasops1_copycols(void *, int, int, int, int); +static void rasops1_erasecols(void *, int, int, int, long); +static void rasops1_do_cursor(struct rasops_info *); +static void rasops1_putchar(void *, int, int col, u_int, long); #ifndef RASOPS_SMALL -static void rasops1_putchar8 __P((void *, int, int col, u_int, long)); -static void rasops1_putchar16 __P((void *, int, int col, u_int, long)); +static void rasops1_putchar8(void *, int, int col, u_int, long); +static void rasops1_putchar16(void *, int, int col, u_int, long); #endif /* diff --git a/sys/dev/rasops/rasops15.c b/sys/dev/rasops/rasops15.c index bf9c6b8db5b..6de06b20526 100644 --- a/sys/dev/rasops/rasops15.c +++ b/sys/dev/rasops/rasops15.c @@ -1,4 +1,4 @@ -/* $NetBSD: rasops15.c,v 1.11 2001/11/15 09:48:14 lukem Exp $ */ +/* $NetBSD: rasops15.c,v 1.12 2005/02/04 02:10:47 perry Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rasops15.c,v 1.11 2001/11/15 09:48:14 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rasops15.c,v 1.12 2005/02/04 02:10:47 perry Exp $"); #include "opt_rasops.h" @@ -49,12 +49,12 @@ __KERNEL_RCSID(0, "$NetBSD: rasops15.c,v 1.11 2001/11/15 09:48:14 lukem Exp $"); #include <dev/wscons/wsconsio.h> #include <dev/rasops/rasops.h> -static void rasops15_putchar __P((void *, int, int, u_int, long attr)); +static void rasops15_putchar(void *, int, int, u_int, long attr); #ifndef RASOPS_SMALL -static void rasops15_putchar8 __P((void *, int, int, u_int, long attr)); -static void rasops15_putchar12 __P((void *, int, int, u_int, long attr)); -static void rasops15_putchar16 __P((void *, int, int, u_int, long attr)); -static void rasops15_makestamp __P((struct rasops_info *, long)); +static void rasops15_putchar8(void *, int, int, u_int, long attr); +static void rasops15_putchar12(void *, int, int, u_int, long attr); +static void rasops15_putchar16(void *, int, int, u_int, long attr); +static void rasops15_makestamp(struct rasops_info *, long); #endif /* diff --git a/sys/dev/rasops/rasops2.c b/sys/dev/rasops/rasops2.c index 7dd77a1eef4..bfee62cff70 100644 --- a/sys/dev/rasops/rasops2.c +++ b/sys/dev/rasops/rasops2.c @@ -1,4 +1,4 @@ -/* $NetBSD: rasops2.c,v 1.9 2001/11/15 09:48:14 lukem Exp $ */ +/* $NetBSD: rasops2.c,v 1.10 2005/02/04 02:10:47 perry Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rasops2.c,v 1.9 2001/11/15 09:48:14 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rasops2.c,v 1.10 2005/02/04 02:10:47 perry Exp $"); #include "opt_rasops.h" @@ -51,15 +51,15 @@ __KERNEL_RCSID(0, "$NetBSD: rasops2.c,v 1.9 2001/11/15 09:48:14 lukem Exp $"); #include <dev/rasops/rasops.h> #include <dev/rasops/rasops_masks.h> -static void rasops2_copycols __P((void *, int, int, int, int)); -static void rasops2_erasecols __P((void *, int, int, int, long)); -static void rasops2_do_cursor __P((struct rasops_info *)); -static void rasops2_putchar __P((void *, int, int col, u_int, long)); +static void rasops2_copycols(void *, int, int, int, int); +static void rasops2_erasecols(void *, int, int, int, long); +static void rasops2_do_cursor(struct rasops_info *); +static void rasops2_putchar(void *, int, int col, u_int, long); #ifndef RASOPS_SMALL -static void rasops2_putchar8 __P((void *, int, int col, u_int, long)); -static void rasops2_putchar12 __P((void *, int, int col, u_int, long)); -static void rasops2_putchar16 __P((void *, int, int col, u_int, long)); -static void rasops2_makestamp __P((struct rasops_info *, long)); +static void rasops2_putchar8(void *, int, int col, u_int, long); +static void rasops2_putchar12(void *, int, int col, u_int, long); +static void rasops2_putchar16(void *, int, int col, u_int, long); +static void rasops2_makestamp(struct rasops_info *, long); /* * 4x1 stamp for optimized character blitting diff --git a/sys/dev/rasops/rasops24.c b/sys/dev/rasops/rasops24.c index 98b475f99df..c2d0c47aac8 100644 --- a/sys/dev/rasops/rasops24.c +++ b/sys/dev/rasops/rasops24.c @@ -1,4 +1,4 @@ -/* $NetBSD: rasops24.c,v 1.17 2002/09/05 08:02:29 petrov Exp $ */ +/* $NetBSD: rasops24.c,v 1.18 2005/02/04 02:10:47 perry Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rasops24.c,v 1.17 2002/09/05 08:02:29 petrov Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rasops24.c,v 1.18 2005/02/04 02:10:47 perry Exp $"); #include "opt_rasops.h" @@ -52,14 +52,14 @@ __KERNEL_RCSID(0, "$NetBSD: rasops24.c,v 1.17 2002/09/05 08:02:29 petrov Exp $") #include <dev/wscons/wsconsio.h> #include <dev/rasops/rasops.h> -static void rasops24_erasecols __P((void *, int, int, int, long)); -static void rasops24_eraserows __P((void *, int, int, long)); -static void rasops24_putchar __P((void *, int, int, u_int, long attr)); +static void rasops24_erasecols(void *, int, int, int, long); +static void rasops24_eraserows(void *, int, int, long); +static void rasops24_putchar(void *, int, int, u_int, long attr); #ifndef RASOPS_SMALL -static void rasops24_putchar8 __P((void *, int, int, u_int, long attr)); -static void rasops24_putchar12 __P((void *, int, int, u_int, long attr)); -static void rasops24_putchar16 __P((void *, int, int, u_int, long attr)); -static void rasops24_makestamp __P((struct rasops_info *, long)); +static void rasops24_putchar8(void *, int, int, u_int, long attr); +static void rasops24_putchar12(void *, int, int, u_int, long attr); +static void rasops24_putchar16(void *, int, int, u_int, long attr); +static void rasops24_makestamp(struct rasops_info *, long); #endif /* diff --git a/sys/dev/rasops/rasops32.c b/sys/dev/rasops/rasops32.c index e6c788400ce..33503b3197a 100644 --- a/sys/dev/rasops/rasops32.c +++ b/sys/dev/rasops/rasops32.c @@ -1,4 +1,4 @@ -/* $NetBSD: rasops32.c,v 1.12 2003/04/16 23:28:41 petrov Exp $ */ +/* $NetBSD: rasops32.c,v 1.13 2005/02/04 02:10:47 perry Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rasops32.c,v 1.12 2003/04/16 23:28:41 petrov Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rasops32.c,v 1.13 2005/02/04 02:10:47 perry Exp $"); #include "opt_rasops.h" @@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: rasops32.c,v 1.12 2003/04/16 23:28:41 petrov Exp $") #include <dev/wscons/wsconsio.h> #include <dev/rasops/rasops.h> -static void rasops32_putchar __P((void *, int, int, u_int, long attr)); +static void rasops32_putchar(void *, int, int, u_int, long attr); /* * Initialize a 'rasops_info' descriptor for this depth. diff --git a/sys/dev/rasops/rasops4.c b/sys/dev/rasops/rasops4.c index d031bf298a1..c03f3bc6a5f 100644 --- a/sys/dev/rasops/rasops4.c +++ b/sys/dev/rasops/rasops4.c @@ -1,4 +1,4 @@ -/* $NetBSD: rasops4.c,v 1.4 2001/11/15 09:48:15 lukem Exp $ */ +/* $NetBSD: rasops4.c,v 1.5 2005/02/04 02:10:47 perry Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rasops4.c,v 1.4 2001/11/15 09:48:15 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rasops4.c,v 1.5 2005/02/04 02:10:47 perry Exp $"); #include "opt_rasops.h" @@ -51,15 +51,15 @@ __KERNEL_RCSID(0, "$NetBSD: rasops4.c,v 1.4 2001/11/15 09:48:15 lukem Exp $"); #include <dev/rasops/rasops.h> #include <dev/rasops/rasops_masks.h> -static void rasops4_copycols __P((void *, int, int, int, int)); -static void rasops4_erasecols __P((void *, int, int, int, long)); -static void rasops4_do_cursor __P((struct rasops_info *)); -static void rasops4_putchar __P((void *, int, int col, u_int, long)); +static void rasops4_copycols(void *, int, int, int, int); +static void rasops4_erasecols(void *, int, int, int, long); +static void rasops4_do_cursor(struct rasops_info *); +static void rasops4_putchar(void *, int, int col, u_int, long); #ifndef RASOPS_SMALL -static void rasops4_putchar8 __P((void *, int, int col, u_int, long)); -static void rasops4_putchar12 __P((void *, int, int col, u_int, long)); -static void rasops4_putchar16 __P((void *, int, int col, u_int, long)); -static void rasops4_makestamp __P((struct rasops_info *, long)); +static void rasops4_putchar8(void *, int, int col, u_int, long); +static void rasops4_putchar12(void *, int, int col, u_int, long); +static void rasops4_putchar16(void *, int, int col, u_int, long); +static void rasops4_makestamp(struct rasops_info *, long); /* * 4x1 stamp for optimized character blitting diff --git a/sys/dev/rasops/rasops8.c b/sys/dev/rasops/rasops8.c index 125c7bb43a9..db84b58c7e5 100644 --- a/sys/dev/rasops/rasops8.c +++ b/sys/dev/rasops/rasops8.c @@ -1,4 +1,4 @@ -/* $NetBSD: rasops8.c,v 1.17 2004/03/05 08:33:53 petrov Exp $ */ +/* $NetBSD: rasops8.c,v 1.18 2005/02/04 02:10:47 perry Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rasops8.c,v 1.17 2004/03/05 08:33:53 petrov Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rasops8.c,v 1.18 2005/02/04 02:10:47 perry Exp $"); #include "opt_rasops.h" @@ -50,12 +50,12 @@ __KERNEL_RCSID(0, "$NetBSD: rasops8.c,v 1.17 2004/03/05 08:33:53 petrov Exp $"); #include <dev/wscons/wsconsio.h> #include <dev/rasops/rasops.h> -static void rasops8_putchar __P((void *, int, int, u_int, long attr)); +static void rasops8_putchar(void *, int, int, u_int, long attr); #ifndef RASOPS_SMALL -static void rasops8_putchar8 __P((void *, int, int, u_int, long attr)); -static void rasops8_putchar12 __P((void *, int, int, u_int, long attr)); -static void rasops8_putchar16 __P((void *, int, int, u_int, long attr)); -static void rasops8_makestamp __P((struct rasops_info *ri, long)); +static void rasops8_putchar8(void *, int, int, u_int, long attr); +static void rasops8_putchar12(void *, int, int, u_int, long attr); +static void rasops8_putchar16(void *, int, int, u_int, long attr); +static void rasops8_makestamp(struct rasops_info *ri, long); /* * 4x1 stamp for optimized character blitting diff --git a/sys/dev/rcons/raster_op.c b/sys/dev/rcons/raster_op.c index 7caedcf49e3..c2c264ef0aa 100644 --- a/sys/dev/rcons/raster_op.c +++ b/sys/dev/rcons/raster_op.c @@ -1,4 +1,4 @@ -/* $NetBSD: raster_op.c,v 1.12 2003/08/07 16:31:20 agc Exp $ */ +/* $NetBSD: raster_op.c,v 1.13 2005/02/04 02:10:47 perry Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: raster_op.c,v 1.12 2003/08/07 16:31:20 agc Exp $"); +__KERNEL_RCSID(0, "$NetBSD: raster_op.c,v 1.13 2005/02/04 02:10:47 perry Exp $"); #include <sys/types.h> #ifdef _KERNEL @@ -547,9 +547,9 @@ static u_int32_t twobytemask[2] = { 0x0000ffff, 0xffff0000 }; /* Forward routines. */ -static int raster_blit __P((struct raster *, u_int32_t *, int, int, int, - struct raster *, u_int32_t *, int, int, int, - int, int)); +static int raster_blit(struct raster *, u_int32_t *, int, int, int, + struct raster *, u_int32_t *, int, int, int, + int, int); /* Raster operations. */ diff --git a/sys/dev/rcons/rcons.h b/sys/dev/rcons/rcons.h index 731a66cbb19..e777be6a013 100644 --- a/sys/dev/rcons/rcons.h +++ b/sys/dev/rcons/rcons.h @@ -1,4 +1,4 @@ -/* $NetBSD: rcons.h,v 1.13 2003/08/07 16:31:20 agc Exp $ */ +/* $NetBSD: rcons.h,v 1.14 2005/02/04 02:10:47 perry Exp $ */ /* * Copyright (c) 1992, 1993 @@ -53,7 +53,7 @@ struct rconsole { /* This section must be filled in by the framebugger device */ u_int rc_maxrow; /* emulator height of screen */ u_int rc_maxcol; /* emulator width of screen */ - void (*rc_bell)__P((int)); /* ring the bell */ + void (*rc_bell)(int); /* ring the bell */ struct wsdisplay_emulops *rc_ops;/* output ops */ void *rc_cookie; /* cookie thereof */ u_int rc_width; /* width in pixels */ @@ -96,28 +96,28 @@ struct rconsole { #define FB_P1 0x800 /* working on param 1 */ /* rcons_kern.c */ -void rcons_cnputc __P((int)); -void rcons_bell __P((struct rconsole *)); -void rcons_init __P((struct rconsole *, int)); -void rcons_ttyinit __P((struct tty *)); +void rcons_cnputc(int); +void rcons_bell(struct rconsole *); +void rcons_init(struct rconsole *, int); +void rcons_ttyinit(struct tty *); /* rcons_subr.c */ -void rcons_init_ops __P((struct rconsole *rc)); -void rcons_puts __P((struct rconsole *, unsigned char *, int)); -void rcons_pctrl __P((struct rconsole *, int)); -void rcons_esc __P((struct rconsole *, int)); -void rcons_doesc __P((struct rconsole *, int)); -void rcons_sgresc __P((struct rconsole *, int)); -void rcons_text __P((struct rconsole *, unsigned char *, int)); -void rcons_cursor __P((struct rconsole *)); -void rcons_invert __P((struct rconsole *, int)); -void rcons_clear2eop __P((struct rconsole *)); -void rcons_clear2eol __P((struct rconsole *)); -void rcons_scroll __P((struct rconsole *, int)); -void rcons_delchar __P((struct rconsole *, int)); -void rcons_delline __P((struct rconsole *, int)); -void rcons_insertchar __P((struct rconsole *, int)); -void rcons_insertline __P((struct rconsole *, int)); -void rcons_setcolor __P((struct rconsole *, int, int)); +void rcons_init_ops(struct rconsole *rc); +void rcons_puts(struct rconsole *, unsigned char *, int); +void rcons_pctrl(struct rconsole *, int); +void rcons_esc(struct rconsole *, int); +void rcons_doesc(struct rconsole *, int); +void rcons_sgresc(struct rconsole *, int); +void rcons_text(struct rconsole *, unsigned char *, int); +void rcons_cursor(struct rconsole *); +void rcons_invert(struct rconsole *, int); +void rcons_clear2eop(struct rconsole *); +void rcons_clear2eol(struct rconsole *); +void rcons_scroll(struct rconsole *, int); +void rcons_delchar(struct rconsole *, int); +void rcons_delline(struct rconsole *, int); +void rcons_insertchar(struct rconsole *, int); +void rcons_insertline(struct rconsole *, int); +void rcons_setcolor(struct rconsole *, int, int); #endif /* !defined _RCONS_H_ */ diff --git a/sys/dev/rcons/rcons_kern.c b/sys/dev/rcons/rcons_kern.c index fec99746f77..8392a970e24 100644 --- a/sys/dev/rcons/rcons_kern.c +++ b/sys/dev/rcons/rcons_kern.c @@ -1,4 +1,4 @@ -/* $NetBSD: rcons_kern.c,v 1.14 2003/08/07 16:31:21 agc Exp $ */ +/* $NetBSD: rcons_kern.c,v 1.15 2005/02/04 02:10:47 perry Exp $ */ /* * Copyright (c) 1991, 1993 @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rcons_kern.c,v 1.14 2003/08/07 16:31:21 agc Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rcons_kern.c,v 1.15 2005/02/04 02:10:47 perry Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: rcons_kern.c,v 1.14 2003/08/07 16:31:21 agc Exp $"); static void rcons_belltmr(void *); static struct rconsole *mydevicep; /* XXX */ -static void rcons_output __P((struct tty *)); +static void rcons_output(struct tty *); void rcons_cnputc(c) diff --git a/sys/dev/rnd.c b/sys/dev/rnd.c index bb90dcfa421..cc470ad82cf 100644 --- a/sys/dev/rnd.c +++ b/sys/dev/rnd.c @@ -1,4 +1,4 @@ -/* $NetBSD: rnd.c,v 1.44 2004/11/29 13:33:37 yamt Exp $ */ +/* $NetBSD: rnd.c,v 1.45 2005/02/04 02:10:35 perry Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rnd.c,v 1.44 2004/11/29 13:33:37 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rnd.c,v 1.45 2005/02/04 02:10:35 perry Exp $"); #include <sys/param.h> #include <sys/ioctl.h> @@ -154,7 +154,7 @@ static rndsource_t rnd_source_no_collect = { struct callout rnd_callout = CALLOUT_INITIALIZER; -void rndattach __P((int)); +void rndattach(int); dev_type_open(rndopen); dev_type_read(rndread); diff --git a/sys/dev/sbus/be.c b/sys/dev/sbus/be.c index ce0889b11e0..08a977a9be6 100644 --- a/sys/dev/sbus/be.c +++ b/sys/dev/sbus/be.c @@ -1,4 +1,4 @@ -/* $NetBSD: be.c,v 1.44 2004/10/30 18:10:06 thorpej Exp $ */ +/* $NetBSD: be.c,v 1.45 2005/02/04 02:10:47 perry Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -64,7 +64,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.44 2004/10/30 18:10:06 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.45 2005/02/04 02:10:47 perry Exp $"); #include "opt_ddb.h" #include "opt_inet.h" @@ -173,50 +173,50 @@ struct be_softc { #endif }; -int bematch __P((struct device *, struct cfdata *, void *)); -void beattach __P((struct device *, struct device *, void *)); +int bematch(struct device *, struct cfdata *, void *); +void beattach(struct device *, struct device *, void *); -void beinit __P((struct be_softc *)); -void bestart __P((struct ifnet *)); -void bestop __P((struct be_softc *)); -void bewatchdog __P((struct ifnet *)); -int beioctl __P((struct ifnet *, u_long, caddr_t)); -void bereset __P((struct be_softc *)); +void beinit(struct be_softc *); +void bestart(struct ifnet *); +void bestop(struct be_softc *); +void bewatchdog(struct ifnet *); +int beioctl(struct ifnet *, u_long, caddr_t); +void bereset(struct be_softc *); -int beintr __P((void *)); -int berint __P((struct be_softc *)); -int betint __P((struct be_softc *)); -int beqint __P((struct be_softc *, u_int32_t)); -int beeint __P((struct be_softc *, u_int32_t)); +int beintr(void *); +int berint(struct be_softc *); +int betint(struct be_softc *); +int beqint(struct be_softc *, u_int32_t); +int beeint(struct be_softc *, u_int32_t); -static void be_read __P((struct be_softc *, int, int)); -static int be_put __P((struct be_softc *, int, struct mbuf *)); -static struct mbuf *be_get __P((struct be_softc *, int, int)); +static void be_read(struct be_softc *, int, int); +static int be_put(struct be_softc *, int, struct mbuf *); +static struct mbuf *be_get(struct be_softc *, int, int); -void be_pal_gate __P((struct be_softc *, int)); +void be_pal_gate(struct be_softc *, int); /* ifmedia callbacks */ -void be_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); -int be_ifmedia_upd __P((struct ifnet *)); +void be_ifmedia_sts(struct ifnet *, struct ifmediareq *); +int be_ifmedia_upd(struct ifnet *); -void be_mcreset __P((struct be_softc *)); +void be_mcreset(struct be_softc *); /* MII methods & callbacks */ -static int be_mii_readreg __P((struct device *, int, int)); -static void be_mii_writereg __P((struct device *, int, int, int)); -static void be_mii_statchg __P((struct device *)); +static int be_mii_readreg(struct device *, int, int); +static void be_mii_writereg(struct device *, int, int, int); +static void be_mii_statchg(struct device *); /* MII helpers */ -static void be_mii_sync __P((struct be_softc *)); -static void be_mii_sendbits __P((struct be_softc *, int, u_int32_t, int)); -static int be_mii_reset __P((struct be_softc *, int)); -static int be_tcvr_read_bit __P((struct be_softc *, int)); -static void be_tcvr_write_bit __P((struct be_softc *, int, int)); - -void be_tick __P((void *)); -void be_intphy_auto __P((struct be_softc *)); -void be_intphy_status __P((struct be_softc *)); -int be_intphy_service __P((struct be_softc *, struct mii_data *, int)); +static void be_mii_sync(struct be_softc *); +static void be_mii_sendbits(struct be_softc *, int, u_int32_t, int); +static int be_mii_reset(struct be_softc *, int); +static int be_tcvr_read_bit(struct be_softc *, int); +static void be_tcvr_write_bit(struct be_softc *, int, int); + +void be_tick(void *); +void be_intphy_auto(struct be_softc *); +void be_intphy_status(struct be_softc *); +int be_intphy_service(struct be_softc *, struct mii_data *, int); CFATTACH_DECL(be, sizeof(struct be_softc), diff --git a/sys/dev/sbus/bpp.c b/sys/dev/sbus/bpp.c index 4b8e3a2f0e5..96ec7887191 100644 --- a/sys/dev/sbus/bpp.c +++ b/sys/dev/sbus/bpp.c @@ -1,4 +1,4 @@ -/* $NetBSD: bpp.c,v 1.22 2004/03/17 17:04:58 pk Exp $ */ +/* $NetBSD: bpp.c,v 1.23 2005/02/04 02:10:47 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bpp.c,v 1.22 2004/03/17 17:04:58 pk Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bpp.c,v 1.23 2005/02/04 02:10:47 perry Exp $"); #include <sys/param.h> #include <sys/ioctl.h> @@ -114,10 +114,10 @@ struct bpp_softc { struct hwstate sc_hwcurrent; }; -static int bppmatch __P((struct device *, struct cfdata *, void *)); -static void bppattach __P((struct device *, struct device *, void *)); -static int bppintr __P((void *)); -static void bpp_setparams __P((struct bpp_softc *, struct hwstate *)); +static int bppmatch(struct device *, struct cfdata *, void *); +static void bppattach(struct device *, struct device *, void *); +static int bppintr (void *); +static void bpp_setparams(struct bpp_softc *, struct hwstate *); CFATTACH_DECL(bpp, sizeof(struct bpp_softc), bppmatch, bppattach, NULL, NULL); diff --git a/sys/dev/sbus/cgsix_sbus.c b/sys/dev/sbus/cgsix_sbus.c index f3e3d2a325c..86ec8e7af77 100644 --- a/sys/dev/sbus/cgsix_sbus.c +++ b/sys/dev/sbus/cgsix_sbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: cgsix_sbus.c,v 1.13 2004/03/17 17:04:58 pk Exp $ */ +/* $NetBSD: cgsix_sbus.c,v 1.14 2005/02/04 02:10:47 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cgsix_sbus.c,v 1.13 2004/03/17 17:04:58 pk Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cgsix_sbus.c,v 1.14 2005/02/04 02:10:47 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -71,8 +71,8 @@ __KERNEL_RCSID(0, "$NetBSD: cgsix_sbus.c,v 1.13 2004/03/17 17:04:58 pk Exp $"); #include <dev/sun/cgsixvar.h> /* autoconfiguration driver */ -static int cgsixmatch __P((struct device *, struct cfdata *, void *)); -static void cgsixattach __P((struct device *, struct device *, void *)); +static int cgsixmatch(struct device *, struct cfdata *, void *); +static void cgsixattach(struct device *, struct device *, void *); /* Allocate an `sbusdev' in addition to the cgsix softc */ struct cgsix_sbus_softc { diff --git a/sys/dev/sbus/dma_sbus.c b/sys/dev/sbus/dma_sbus.c index a6a05e59595..5da3f0de7a6 100644 --- a/sys/dev/sbus/dma_sbus.c +++ b/sys/dev/sbus/dma_sbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: dma_sbus.c,v 1.23 2004/06/30 21:16:38 pk Exp $ */ +/* $NetBSD: dma_sbus.c,v 1.24 2005/02/04 02:10:47 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dma_sbus.c,v 1.23 2004/06/30 21:16:38 pk Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dma_sbus.c,v 1.24 2005/02/04 02:10:47 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -89,18 +89,18 @@ struct dma_softc { struct sbusdev sc_sd; /* sbus device */ }; -int dmamatch_sbus __P((struct device *, struct cfdata *, void *)); -void dmaattach_sbus __P((struct device *, struct device *, void *)); +int dmamatch_sbus(struct device *, struct cfdata *, void *); +void dmaattach_sbus(struct device *, struct device *, void *); -int dmaprint_sbus __P((void *, const char *)); +int dmaprint_sbus(void *, const char *); -void *dmabus_intr_establish __P(( +void *dmabus_intr_establish( bus_space_tag_t, int, /*bus interrupt priority*/ int, /*`device class' level*/ - int (*) __P((void *)), /*handler*/ + int (*)(void *), /*handler*/ void *, /*handler arg*/ - void (*) __P((void)))); /*optional fast trap handler*/ + void (*) (void)); /*optional fast trap handler*/ CFATTACH_DECL(dma_sbus, sizeof(struct dma_softc), dmamatch_sbus, dmaattach_sbus, NULL, NULL); @@ -234,9 +234,9 @@ dmabus_intr_establish(t, pri, level, handler, arg, fastvec) bus_space_tag_t t; int pri; int level; - int (*handler) __P((void *)); + int (*handler)(void *); void *arg; - void (*fastvec) __P((void)); /* ignored */ + void (*fastvec)(void); /* ignored */ { struct lsi64854_softc *sc = t->cookie; diff --git a/sys/dev/sbus/esp_sbus.c b/sys/dev/sbus/esp_sbus.c index 29900823fc2..c4f752807b3 100644 --- a/sys/dev/sbus/esp_sbus.c +++ b/sys/dev/sbus/esp_sbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: esp_sbus.c,v 1.29 2004/03/17 17:04:58 pk Exp $ */ +/* $NetBSD: esp_sbus.c,v 1.30 2005/02/04 02:10:47 perry Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: esp_sbus.c,v 1.29 2004/03/17 17:04:58 pk Exp $"); +__KERNEL_RCSID(0, "$NetBSD: esp_sbus.c,v 1.30 2005/02/04 02:10:47 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -78,9 +78,9 @@ struct esp_softc { int sc_pri; /* SBUS priority */ }; -void espattach_sbus __P((struct device *, struct device *, void *)); -void espattach_dma __P((struct device *, struct device *, void *)); -int espmatch_sbus __P((struct device *, struct cfdata *, void *)); +void espattach_sbus(struct device *, struct device *, void *); +void espattach_dma(struct device *, struct device *, void *); +int espmatch_sbus(struct device *, struct cfdata *, void *); CFATTACH_DECL(esp_sbus, sizeof(struct esp_softc), @@ -92,18 +92,18 @@ CFATTACH_DECL(esp_dma, sizeof(struct esp_softc), /* * Functions and the switch for the MI code. */ -static u_char esp_read_reg __P((struct ncr53c9x_softc *, int)); -static void esp_write_reg __P((struct ncr53c9x_softc *, int, u_char)); -static u_char esp_rdreg1 __P((struct ncr53c9x_softc *, int)); -static void esp_wrreg1 __P((struct ncr53c9x_softc *, int, u_char)); -static int esp_dma_isintr __P((struct ncr53c9x_softc *)); -static void esp_dma_reset __P((struct ncr53c9x_softc *)); -static int esp_dma_intr __P((struct ncr53c9x_softc *)); -static int esp_dma_setup __P((struct ncr53c9x_softc *, caddr_t *, - size_t *, int, size_t *)); -static void esp_dma_go __P((struct ncr53c9x_softc *)); -static void esp_dma_stop __P((struct ncr53c9x_softc *)); -static int esp_dma_isactive __P((struct ncr53c9x_softc *)); +static u_char esp_read_reg(struct ncr53c9x_softc *, int); +static void esp_write_reg(struct ncr53c9x_softc *, int, u_char); +static u_char esp_rdreg1(struct ncr53c9x_softc *, int); +static void esp_wrreg1(struct ncr53c9x_softc *, int, u_char); +static int esp_dma_isintr(struct ncr53c9x_softc *); +static void esp_dma_reset(struct ncr53c9x_softc *); +static int esp_dma_intr(struct ncr53c9x_softc *); +static int esp_dma_setup(struct ncr53c9x_softc *, caddr_t *, + size_t *, int, size_t *); +static void esp_dma_go(struct ncr53c9x_softc *); +static void esp_dma_stop(struct ncr53c9x_softc *); +static int esp_dma_isactive(struct ncr53c9x_softc *); static struct ncr53c9x_glue esp_sbus_glue = { esp_read_reg, @@ -131,7 +131,7 @@ static struct ncr53c9x_glue esp_sbus_glue1 = { NULL, /* gl_clear_latched_intr */ }; -static void espattach __P((struct esp_softc *, struct ncr53c9x_glue *)); +static void espattach(struct esp_softc *, struct ncr53c9x_glue *); int espmatch_sbus(parent, cf, aux) @@ -721,7 +721,7 @@ esp_dma_isactive(sc) #include <machine/db_machdep.h> #include <ddb/db_output.h> -void db_esp __P((db_expr_t, int, db_expr_t, char*)); +void db_esp(db_expr_t, int, db_expr_t, char*); void db_esp(addr, have_addr, count, modif) diff --git a/sys/dev/sbus/if_en.c b/sys/dev/sbus/if_en.c index af138b0ebf2..2d5e164e379 100644 --- a/sys/dev/sbus/if_en.c +++ b/sys/dev/sbus/if_en.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_en.c,v 1.18 2002/12/10 13:44:47 pk Exp $ */ +/* $NetBSD: if_en.c,v 1.19 2005/02/04 02:10:47 perry Exp $ */ /* * @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_en.c,v 1.18 2002/12/10 13:44:47 pk Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_en.c,v 1.19 2005/02/04 02:10:47 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -79,8 +79,8 @@ struct en_sbus_softc { /* * prototypes */ -static int en_sbus_match __P((struct device *, struct cfdata *, void *)); -static void en_sbus_attach __P((struct device *, struct device *, void *)); +static int en_sbus_match(struct device *, struct cfdata *, void *); +static void en_sbus_attach(struct device *, struct device *, void *); /* * SBus autoconfig attachments diff --git a/sys/dev/sbus/if_hme_sbus.c b/sys/dev/sbus/if_hme_sbus.c index d90ea21293f..e65b9a4ac66 100644 --- a/sys/dev/sbus/if_hme_sbus.c +++ b/sys/dev/sbus/if_hme_sbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_hme_sbus.c,v 1.19 2004/03/17 17:04:58 pk Exp $ */ +/* $NetBSD: if_hme_sbus.c,v 1.20 2005/02/04 02:10:47 perry Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_hme_sbus.c,v 1.19 2004/03/17 17:04:58 pk Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_hme_sbus.c,v 1.20 2005/02/04 02:10:47 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -70,8 +70,8 @@ struct hmesbus_softc { struct sbusdev hsc_sbus; /* SBus device */ }; -int hmematch_sbus __P((struct device *, struct cfdata *, void *)); -void hmeattach_sbus __P((struct device *, struct device *, void *)); +int hmematch_sbus(struct device *, struct cfdata *, void *); +void hmeattach_sbus(struct device *, struct device *, void *); CFATTACH_DECL(hme_sbus, sizeof(struct hmesbus_softc), hmematch_sbus, hmeattach_sbus, NULL, NULL); diff --git a/sys/dev/sbus/if_le.c b/sys/dev/sbus/if_le.c index 98c05f0e37f..1c1b406c1ce 100644 --- a/sys/dev/sbus/if_le.c +++ b/sys/dev/sbus/if_le.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_le.c,v 1.30 2004/03/17 17:04:58 pk Exp $ */ +/* $NetBSD: if_le.c,v 1.31 2005/02/04 02:10:47 perry Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.30 2004/03/17 17:04:58 pk Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.31 2005/02/04 02:10:47 perry Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -84,8 +84,8 @@ struct le_softc { #define MEMSIZE 0x4000 /* LANCE memory size */ -int lematch_sbus __P((struct device *, struct cfdata *, void *)); -void leattach_sbus __P((struct device *, struct device *, void *)); +int lematch_sbus(struct device *, struct cfdata *, void *); +void leattach_sbus(struct device *, struct device *, void *); /* * Media types supported. @@ -104,8 +104,8 @@ extern struct cfdriver le_cd; #include "opt_ddb.h" #endif -static void lewrcsr __P((struct lance_softc *, u_int16_t, u_int16_t)); -static u_int16_t lerdcsr __P((struct lance_softc *, u_int16_t)); +static void lewrcsr(struct lance_softc *, u_int16_t, u_int16_t); +static u_int16_t lerdcsr(struct lance_softc *, u_int16_t); static void lewrcsr(sc, port, val) diff --git a/sys/dev/sbus/if_le_lebuffer.c b/sys/dev/sbus/if_le_lebuffer.c index 31cd7a0bb75..8ed74065c2d 100644 --- a/sys/dev/sbus/if_le_lebuffer.c +++ b/sys/dev/sbus/if_le_lebuffer.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_le_lebuffer.c,v 1.19 2004/03/17 17:04:58 pk Exp $ */ +/* $NetBSD: if_le_lebuffer.c,v 1.20 2005/02/04 02:10:47 perry Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_le_lebuffer.c,v 1.19 2004/03/17 17:04:58 pk Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_le_lebuffer.c,v 1.20 2005/02/04 02:10:47 perry Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -87,8 +87,8 @@ struct le_softc { }; -int lematch_lebuffer __P((struct device *, struct cfdata *, void *)); -void leattach_lebuffer __P((struct device *, struct device *, void *)); +int lematch_lebuffer(struct device *, struct cfdata *, void *); +void leattach_lebuffer(struct device *, struct device *, void *); /* * Media types supported. @@ -107,8 +107,8 @@ extern struct cfdriver le_cd; #include "opt_ddb.h" #endif -static void lewrcsr __P((struct lance_softc *, u_int16_t, u_int16_t)); -static u_int16_t lerdcsr __P((struct lance_softc *, u_int16_t)); +static void lewrcsr(struct lance_softc *, u_int16_t, u_int16_t); +static u_int16_t lerdcsr(struct lance_softc *, u_int16_t); static void lewrcsr(sc, port, val) diff --git a/sys/dev/sbus/if_le_ledma.c b/sys/dev/sbus/if_le_ledma.c index aa66c496073..4be7a1cc2da 100644 --- a/sys/dev/sbus/if_le_ledma.c +++ b/sys/dev/sbus/if_le_ledma.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_le_ledma.c,v 1.24 2004/03/15 23:51:12 pk Exp $ */ +/* $NetBSD: if_le_ledma.c,v 1.25 2005/02/04 02:10:47 perry Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_le_ledma.c,v 1.24 2004/03/15 23:51:12 pk Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_le_ledma.c,v 1.25 2005/02/04 02:10:47 perry Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -93,8 +93,8 @@ struct le_softc { #define MEMSIZE (16*1024) /* LANCE memory size */ #define LEDMA_BOUNDARY (16*1024*1024) /* must not cross 16MB boundary */ -int lematch_ledma __P((struct device *, struct cfdata *, void *)); -void leattach_ledma __P((struct device *, struct device *, void *)); +int lematch_ledma(struct device *, struct cfdata *, void *); +void leattach_ledma(struct device *, struct device *, void *); /* * Media types supported by the Sun4m. @@ -106,11 +106,11 @@ static int lemedia[] = { }; #define NLEMEDIA (sizeof(lemedia) / sizeof(lemedia[0])) -void lesetutp __P((struct lance_softc *)); -void lesetaui __P((struct lance_softc *)); +void lesetutp(struct lance_softc *); +void lesetaui(struct lance_softc *); -int lemediachange __P((struct lance_softc *)); -void lemediastatus __P((struct lance_softc *, struct ifmediareq *)); +int lemediachange(struct lance_softc *); +void lemediastatus(struct lance_softc *, struct ifmediareq *); CFATTACH_DECL(le_ledma, sizeof(struct le_softc), lematch_ledma, leattach_ledma, NULL, NULL); @@ -121,11 +121,11 @@ extern struct cfdriver le_cd; #include "opt_ddb.h" #endif -static void lewrcsr __P((struct lance_softc *, u_int16_t, u_int16_t)); -static u_int16_t lerdcsr __P((struct lance_softc *, u_int16_t)); -static void lehwreset __P((struct lance_softc *)); -static void lehwinit __P((struct lance_softc *)); -static void lenocarrier __P((struct lance_softc *)); +static void lewrcsr(struct lance_softc *, u_int16_t, u_int16_t); +static u_int16_t lerdcsr(struct lance_softc *, u_int16_t); +static void lehwreset(struct lance_softc *); +static void lehwinit(struct lance_softc *); +static void lenocarrier(struct lance_softc *); static void lewrcsr(sc, port, val) diff --git a/sys/dev/sbus/lebuffer.c b/sys/dev/sbus/lebuffer.c index 94f1975863e..856132252c4 100644 --- a/sys/dev/sbus/lebuffer.c +++ b/sys/dev/sbus/lebuffer.c @@ -1,4 +1,4 @@ -/* $NetBSD: lebuffer.c,v 1.22 2004/07/19 13:33:35 pk Exp $ */ +/* $NetBSD: lebuffer.c,v 1.23 2005/02/04 02:10:47 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lebuffer.c,v 1.22 2004/07/19 13:33:35 pk Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lebuffer.c,v 1.23 2005/02/04 02:10:47 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -53,9 +53,9 @@ __KERNEL_RCSID(0, "$NetBSD: lebuffer.c,v 1.22 2004/07/19 13:33:35 pk Exp $"); #include <dev/sbus/sbusvar.h> #include <dev/sbus/lebuffervar.h> -int lebufprint __P((void *, const char *)); -int lebufmatch __P((struct device *, struct cfdata *, void *)); -void lebufattach __P((struct device *, struct device *, void *)); +int lebufprint(void *, const char *); +int lebufmatch(struct device *, struct cfdata *, void *); +void lebufattach(struct device *, struct device *, void *); CFATTACH_DECL(lebuffer, sizeof(struct lebuf_softc), lebufmatch, lebufattach, NULL, NULL); diff --git a/sys/dev/sbus/magmareg.h b/sys/dev/sbus/magmareg.h index 72e057f3482..535c15a725c 100644 --- a/sys/dev/sbus/magmareg.h +++ b/sys/dev/sbus/magmareg.h @@ -1,4 +1,4 @@ -/* $NetBSD: magmareg.h,v 1.7 2003/02/22 05:11:16 tsutsui Exp $ */ +/* $NetBSD: magmareg.h,v 1.8 2005/02/04 02:10:47 perry Exp $ */ /* magmareg.h * * Copyright (c) 1998 Iain Hibbert @@ -203,28 +203,28 @@ struct mbpp_softc { /* internal function prototypes */ -int cd1400_compute_baud __P((speed_t, int, int *, int *)); -__inline void cd1400_write_ccr __P((struct cd1400 *, u_char)); -__inline u_char cd1400_read_reg __P((struct cd1400 *, int)); -__inline void cd1400_write_reg __P((struct cd1400 *, int, u_char)); -void cd1400_enable_transmitter __P((struct cd1400 *, int)); - -int magma_match __P((struct device *, struct cfdata *, void *)); -void magma_attach __P((struct device *, struct device *, void *)); -int magma_hard __P((void *)); -void magma_soft __P((void *)); - -int mtty_match __P((struct device *, struct cfdata *, void *)); -void mtty_attach __P((struct device *, struct device *, void *)); -int mtty_modem_control __P((struct mtty_port *, int, int)); -int mtty_param __P((struct tty *, struct termios *)); -void mtty_start __P((struct tty *)); - -int mbpp_match __P((struct device *, struct cfdata *, void *)); -void mbpp_attach __P((struct device *, struct device *, void *)); -void mbpp_timeout __P((void *)); -void mbpp_start __P((void *)); -int mbpp_send __P((struct mbpp_port *, caddr_t, int)); -int mbpp_recv __P((struct mbpp_port *, caddr_t, int)); -int mbpp_hztoms __P((int)); -int mbpp_mstohz __P((int)); +int cd1400_compute_baud(speed_t, int, int *, int *); +__inline void cd1400_write_ccr(struct cd1400 *, u_char); +__inline u_char cd1400_read_reg(struct cd1400 *, int); +__inline void cd1400_write_reg(struct cd1400 *, int, u_char); +void cd1400_enable_transmitter(struct cd1400 *, int); + +int magma_match(struct device *, struct cfdata *, void *); +void magma_attach(struct device *, struct device *, void *); +int magma_hard(void *); +void magma_soft(void *); + +int mtty_match(struct device *, struct cfdata *, void *); +void mtty_attach(struct device *, struct device *, void *); +int mtty_modem_control(struct mtty_port *, int, int); +int mtty_param(struct tty *, struct termios *); +void mtty_start(struct tty *); + +int mbpp_match(struct device *, struct cfdata *, void *); +void mbpp_attach(struct device *, struct device *, void *); +void mbpp_timeout(void *); +void mbpp_start(void *); +int mbpp_send(struct mbpp_port *, caddr_t, int); +int mbpp_recv(struct mbpp_port *, caddr_t, int); +int mbpp_hztoms(int); +int mbpp_mstohz(int); diff --git a/sys/dev/sbus/qe.c b/sys/dev/sbus/qe.c index e5eaa9629ed..8d220b9796c 100644 --- a/sys/dev/sbus/qe.c +++ b/sys/dev/sbus/qe.c @@ -1,4 +1,4 @@ -/* $NetBSD: qe.c,v 1.33 2004/10/30 18:10:06 thorpej Exp $ */ +/* $NetBSD: qe.c,v 1.34 2005/02/04 02:10:47 perry Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.33 2004/10/30 18:10:06 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.34 2005/02/04 02:10:47 perry Exp $"); #define QEDEBUG @@ -163,29 +163,29 @@ struct qe_softc { #endif }; -int qematch __P((struct device *, struct cfdata *, void *)); -void qeattach __P((struct device *, struct device *, void *)); +int qematch(struct device *, struct cfdata *, void *); +void qeattach(struct device *, struct device *, void *); -void qeinit __P((struct qe_softc *)); -void qestart __P((struct ifnet *)); -void qestop __P((struct qe_softc *)); -void qewatchdog __P((struct ifnet *)); -int qeioctl __P((struct ifnet *, u_long, caddr_t)); -void qereset __P((struct qe_softc *)); +void qeinit(struct qe_softc *); +void qestart(struct ifnet *); +void qestop(struct qe_softc *); +void qewatchdog(struct ifnet *); +int qeioctl(struct ifnet *, u_long, caddr_t); +void qereset(struct qe_softc *); -int qeintr __P((void *)); -int qe_eint __P((struct qe_softc *, u_int32_t)); -int qe_rint __P((struct qe_softc *)); -int qe_tint __P((struct qe_softc *)); -void qe_mcreset __P((struct qe_softc *)); +int qeintr(void *); +int qe_eint(struct qe_softc *, u_int32_t); +int qe_rint(struct qe_softc *); +int qe_tint(struct qe_softc *); +void qe_mcreset(struct qe_softc *); -static int qe_put __P((struct qe_softc *, int, struct mbuf *)); -static void qe_read __P((struct qe_softc *, int, int)); -static struct mbuf *qe_get __P((struct qe_softc *, int, int)); +static int qe_put(struct qe_softc *, int, struct mbuf *); +static void qe_read(struct qe_softc *, int, int); +static struct mbuf *qe_get(struct qe_softc *, int, int); /* ifmedia callbacks */ -void qe_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); -int qe_ifmedia_upd __P((struct ifnet *)); +void qe_ifmedia_sts(struct ifnet *, struct ifmediareq *); +int qe_ifmedia_upd(struct ifnet *); CFATTACH_DECL(qe, sizeof(struct qe_softc), qematch, qeattach, NULL, NULL); diff --git a/sys/dev/sbus/qec.c b/sys/dev/sbus/qec.c index 38d88a238c6..e5d684c27a5 100644 --- a/sys/dev/sbus/qec.c +++ b/sys/dev/sbus/qec.c @@ -1,4 +1,4 @@ -/* $NetBSD: qec.c,v 1.31 2004/06/30 21:16:38 pk Exp $ */ +/* $NetBSD: qec.c,v 1.32 2005/02/04 02:10:47 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.31 2004/06/30 21:16:38 pk Exp $"); +__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.32 2005/02/04 02:10:47 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -54,25 +54,25 @@ __KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.31 2004/06/30 21:16:38 pk Exp $"); #include <dev/sbus/qecreg.h> #include <dev/sbus/qecvar.h> -static int qecprint __P((void *, const char *)); -static int qecmatch __P((struct device *, struct cfdata *, void *)); -static void qecattach __P((struct device *, struct device *, void *)); -void qec_init __P((struct qec_softc *)); +static int qecprint(void *, const char *); +static int qecmatch(struct device *, struct cfdata *, void *); +static void qecattach(struct device *, struct device *, void *); +void qec_init(struct qec_softc *); -static int qec_bus_map __P(( +static int qec_bus_map( bus_space_tag_t, bus_addr_t, /*coded slot+offset*/ bus_size_t, /*size*/ int, /*flags*/ vaddr_t, /*preferred virtual address */ - bus_space_handle_t *)); -static void *qec_intr_establish __P(( + bus_space_handle_t *); +static void *qec_intr_establish( bus_space_tag_t, int, /*bus interrupt priority*/ int, /*`device class' interrupt level*/ - int (*) __P((void *)), /*handler*/ + int (*)(void *), /*handler*/ void *, /*arg*/ - void (*) __P((void)))); /*optional fast trap handler*/ + void (*)(void)); /*optional fast trap handler*/ CFATTACH_DECL(qec, sizeof(struct qec_softc), qecmatch, qecattach, NULL, NULL); @@ -249,9 +249,9 @@ qec_intr_establish(t, pri, level, handler, arg, fastvec) bus_space_tag_t t; int pri; int level; - int (*handler) __P((void *)); + int (*handler)(void *); void *arg; - void (*fastvec) __P((void)); /* ignored */ + void (*fastvec)(void); /* ignored */ { struct qec_softc *sc = t->cookie; diff --git a/sys/dev/sbus/qecvar.h b/sys/dev/sbus/qecvar.h index cce2434c2da..691ebc78007 100644 --- a/sys/dev/sbus/qecvar.h +++ b/sys/dev/sbus/qecvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: qecvar.h,v 1.7 2004/06/30 21:41:36 pk Exp $ */ +/* $NetBSD: qecvar.h,v 1.8 2005/02/04 02:10:47 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -72,4 +72,4 @@ struct qec_ring { int rb_td_nbusy; }; -void qec_meminit __P((struct qec_ring *, unsigned int)); +void qec_meminit(struct qec_ring *, unsigned int); diff --git a/sys/dev/sbus/sbusvar.h b/sys/dev/sbus/sbusvar.h index 5cdebbac908..62b5bf1ac69 100644 --- a/sys/dev/sbus/sbusvar.h +++ b/sys/dev/sbus/sbusvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: sbusvar.h,v 1.20 2003/08/01 12:21:59 pk Exp $ */ +/* $NetBSD: sbusvar.h,v 1.21 2005/02/04 02:10:47 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -53,7 +53,7 @@ struct sbus_softc; struct sbusdev { struct device *sd_dev; /* backpointer to generic */ struct sbusdev *sd_bchain; /* forward link in bus chain */ - void (*sd_reset) __P((struct device *)); + void (*sd_reset)(struct device *); }; typedef u_int32_t sbus_slot_t; @@ -85,26 +85,26 @@ struct sbus_attach_args { }; /* sbus_attach_internal() is also used from obio.c */ -void sbus_attach_common __P((struct sbus_softc *, char *, int, - const char * const *)); -int sbus_print __P((void *, const char *)); +void sbus_attach_common(struct sbus_softc *, char *, int, + const char * const *); +int sbus_print(void *, const char *); -void sbus_establish __P((struct sbusdev *, struct device *)); +void sbus_establish(struct sbusdev *, struct device *); -int sbus_setup_attach_args __P(( +int sbus_setup_attach_args( struct sbus_softc *, bus_space_tag_t, bus_dma_tag_t, int, /*node*/ - struct sbus_attach_args *)); + struct sbus_attach_args *); -void sbus_destroy_attach_args __P((struct sbus_attach_args *)); +void sbus_destroy_attach_args(struct sbus_attach_args *); #define sbus_bus_map(tag, slot, offset, sz, flags, hp) \ bus_space_map(tag, BUS_ADDR(slot,offset), sz, flags, hp) -bus_addr_t sbus_bus_addr __P((bus_space_tag_t, u_int, u_int)); -void sbus_promaddr_to_handle __P((bus_space_tag_t, u_int, - bus_space_handle_t *)); +bus_addr_t sbus_bus_addr(bus_space_tag_t, u_int, u_int); +void sbus_promaddr_to_handle(bus_space_tag_t, u_int, + bus_space_handle_t *); #if notyet /* variables per Sbus */ diff --git a/sys/dev/sbus/sio16.c b/sys/dev/sbus/sio16.c index e574b88d70b..1fd667a076f 100644 --- a/sys/dev/sbus/sio16.c +++ b/sys/dev/sbus/sio16.c @@ -1,4 +1,4 @@ -/* $NetBSD: sio16.c,v 1.12 2004/03/17 17:04:59 pk Exp $ */ +/* $NetBSD: sio16.c,v 1.13 2005/02/04 02:10:47 perry Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sio16.c,v 1.12 2004/03/17 17:04:59 pk Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sio16.c,v 1.13 2005/02/04 02:10:47 perry Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -66,8 +66,8 @@ __KERNEL_RCSID(0, "$NetBSD: sio16.c,v 1.12 2004/03/17 17:04:59 pk Exp $"); * device cfattach and cfdriver definitions, plus the routine we pass * to the cd18xx code or interrupt acknowledgement. */ -static int sio16_match __P((struct device *, struct cfdata *, void *)); -static void sio16_attach __P((struct device *, struct device *, void *)); +static int sio16_match(struct device *, struct cfdata *, void *); +static void sio16_attach(struct device *, struct device *, void *); static u_char sio16_ackfunc(void *, int who); /* diff --git a/sys/dev/sbus/stp4020.c b/sys/dev/sbus/stp4020.c index 70964dcea35..ef4448fce95 100644 --- a/sys/dev/sbus/stp4020.c +++ b/sys/dev/sbus/stp4020.c @@ -1,4 +1,4 @@ -/* $NetBSD: stp4020.c,v 1.41 2004/08/11 00:59:40 mycroft Exp $ */ +/* $NetBSD: stp4020.c,v 1.42 2005/02/04 02:10:47 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.41 2004/08/11 00:59:40 mycroft Exp $"); +__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.42 2005/02/04 02:10:47 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -112,7 +112,7 @@ struct stp4020_socket { bus_space_tag_t pcmciat; /* io space for pcmcia */ struct device *pcmcia; /* Associated PCMCIA device */ int (*intrhandler) /* Card driver interrupt handler */ - __P((void *)); + (void *); void *intrarg; /* Card interrupt handler argument */ void *softint; /* cookie for the softintr */ @@ -134,10 +134,10 @@ struct stp4020_softc { }; -static int stp4020print __P((void *, const char *)); -static int stp4020match __P((struct device *, struct cfdata *, void *)); -static void stp4020attach __P((struct device *, struct device *, void *)); -static int stp4020_intr __P((void *)); +static int stp4020print(void *, const char *); +static int stp4020match(struct device *, struct cfdata *, void *); +static void stp4020attach(struct device *, struct device *, void *); +static int stp4020_intr(void *); static void stp4020_map_window(struct stp4020_socket *h, int win, int speed); static void stp4020_calc_speed(int bus_speed, int ns, int *length, int *delay); static void stp4020_intr_dispatch(void *arg); @@ -146,45 +146,45 @@ CFATTACH_DECL(nell, sizeof(struct stp4020_softc), stp4020match, stp4020attach, NULL, NULL); #ifdef STP4020_DEBUG -static void stp4020_dump_regs __P((struct stp4020_socket *)); +static void stp4020_dump_regs(struct stp4020_socket *); #endif -static int stp4020_rd_sockctl __P((struct stp4020_socket *, int)); -static void stp4020_wr_sockctl __P((struct stp4020_socket *, int, int)); -static int stp4020_rd_winctl __P((struct stp4020_socket *, int, int)); -static void stp4020_wr_winctl __P((struct stp4020_socket *, int, int, int)); - -void stp4020_delay __P((unsigned int)); -void stp4020_attach_socket __P((struct stp4020_socket *, int)); -void stp4020_create_event_thread __P((void *)); -void stp4020_event_thread __P((void *)); -void stp4020_queue_event __P((struct stp4020_softc *, int, int)); - -int stp4020_chip_mem_alloc __P((pcmcia_chipset_handle_t, bus_size_t, - struct pcmcia_mem_handle *)); -void stp4020_chip_mem_free __P((pcmcia_chipset_handle_t, - struct pcmcia_mem_handle *)); -int stp4020_chip_mem_map __P((pcmcia_chipset_handle_t, int, bus_addr_t, +static int stp4020_rd_sockctl(struct stp4020_socket *, int); +static void stp4020_wr_sockctl(struct stp4020_socket *, int, int); +static int stp4020_rd_winctl(struct stp4020_socket *, int, int); +static void stp4020_wr_winctl(struct stp4020_socket *, int, int, int); + +void stp4020_delay(unsigned int); +void stp4020_attach_socket(struct stp4020_socket *, int); +void stp4020_create_event_thread(void *); +void stp4020_event_thread(void *); +void stp4020_queue_event(struct stp4020_softc *, int, int); + +int stp4020_chip_mem_alloc(pcmcia_chipset_handle_t, bus_size_t, + struct pcmcia_mem_handle *); +void stp4020_chip_mem_free(pcmcia_chipset_handle_t, + struct pcmcia_mem_handle *); +int stp4020_chip_mem_map(pcmcia_chipset_handle_t, int, bus_addr_t, bus_size_t, struct pcmcia_mem_handle *, - bus_size_t *, int *)); -void stp4020_chip_mem_unmap __P((pcmcia_chipset_handle_t, int)); + bus_size_t *, int *); +void stp4020_chip_mem_unmap(pcmcia_chipset_handle_t, int); -int stp4020_chip_io_alloc __P((pcmcia_chipset_handle_t, +int stp4020_chip_io_alloc(pcmcia_chipset_handle_t, bus_addr_t, bus_size_t, bus_size_t, - struct pcmcia_io_handle *)); -void stp4020_chip_io_free __P((pcmcia_chipset_handle_t, - struct pcmcia_io_handle *)); -int stp4020_chip_io_map __P((pcmcia_chipset_handle_t, int, bus_addr_t, - bus_size_t, struct pcmcia_io_handle *, int *)); -void stp4020_chip_io_unmap __P((pcmcia_chipset_handle_t, int)); - -void stp4020_chip_socket_enable __P((pcmcia_chipset_handle_t)); -void stp4020_chip_socket_disable __P((pcmcia_chipset_handle_t)); -void stp4020_chip_socket_settype __P((pcmcia_chipset_handle_t, int)); -void *stp4020_chip_intr_establish __P((pcmcia_chipset_handle_t, + struct pcmcia_io_handle *); +void stp4020_chip_io_free(pcmcia_chipset_handle_t, + struct pcmcia_io_handle *); +int stp4020_chip_io_map(pcmcia_chipset_handle_t, int, bus_addr_t, + bus_size_t, struct pcmcia_io_handle *, int *); +void stp4020_chip_io_unmap(pcmcia_chipset_handle_t, int); + +void stp4020_chip_socket_enable(pcmcia_chipset_handle_t); +void stp4020_chip_socket_disable(pcmcia_chipset_handle_t); +void stp4020_chip_socket_settype(pcmcia_chipset_handle_t, int); +void *stp4020_chip_intr_establish(pcmcia_chipset_handle_t, struct pcmcia_function *, int, - int (*) __P((void *)), void *)); -void stp4020_chip_intr_disestablish __P((pcmcia_chipset_handle_t, void *)); + int (*)(void *), void *); +void stp4020_chip_intr_disestablish(pcmcia_chipset_handle_t, void *); /* Our PCMCIA chipset methods */ static struct pcmcia_chip_functions stp4020_functions = { @@ -1076,7 +1076,7 @@ stp4020_chip_intr_establish(pch, pf, ipl, handler, arg) pcmcia_chipset_handle_t pch; struct pcmcia_function *pf; int ipl; - int (*handler) __P((void *)); + int (*handler)(void *); void *arg; { struct stp4020_socket *h = (struct stp4020_socket *)pch; diff --git a/sys/dev/sbus/tcx.c b/sys/dev/sbus/tcx.c index c8a51489e11..79402b41138 100644 --- a/sys/dev/sbus/tcx.c +++ b/sys/dev/sbus/tcx.c @@ -1,4 +1,4 @@ -/* $NetBSD: tcx.c,v 1.16 2004/07/14 19:07:29 pk Exp $ */ +/* $NetBSD: tcx.c,v 1.17 2005/02/04 02:10:47 perry Exp $ */ /* * Copyright (c) 1996,1998 The NetBSD Foundation, Inc. @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.16 2004/07/14 19:07:29 pk Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.17 2005/02/04 02:10:47 perry Exp $"); /* * define for cg8 emulation on S24 (24-bit version of tcx) for the SS5; @@ -113,9 +113,9 @@ struct tcx_softc { #define TCX_CTL_PIXELMASK 0x00FFFFFF /* mask for index/level */ /* autoconfiguration driver */ -static void tcxattach __P((struct device *, struct device *, void *)); -static int tcxmatch __P((struct device *, struct cfdata *, void *)); -static void tcx_unblank __P((struct device *)); +static void tcxattach(struct device *, struct device *, void *); +static int tcxmatch(struct device *, struct cfdata *, void *); +static void tcx_unblank(struct device *); CFATTACH_DECL(tcx, sizeof(struct tcx_softc), tcxmatch, tcxattach, NULL, NULL); @@ -138,8 +138,8 @@ static struct fbdriver tcx_fbdriver = { nokqfilter }; -static void tcx_reset __P((struct tcx_softc *)); -static void tcx_loadcmap __P((struct tcx_softc *, int, int)); +static void tcx_reset(struct tcx_softc *); +static void tcx_loadcmap(struct tcx_softc *, int, int); #define OBPNAME "SUNW,tcx" diff --git a/sys/dev/sbus/xbox.c b/sys/dev/sbus/xbox.c index 5a699560f8d..99f08d70baa 100644 --- a/sys/dev/sbus/xbox.c +++ b/sys/dev/sbus/xbox.c @@ -1,4 +1,4 @@ -/* $NetBSD: xbox.c,v 1.11 2004/03/17 17:04:59 pk Exp $ */ +/* $NetBSD: xbox.c,v 1.12 2005/02/04 02:10:47 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: xbox.c,v 1.11 2004/03/17 17:04:59 pk Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xbox.c,v 1.12 2005/02/04 02:10:47 perry Exp $"); #include <sys/param.h> #include <sys/malloc.h> @@ -98,9 +98,9 @@ struct xbox_softc { }; /* autoconfiguration driver */ -int xbox_match __P((struct device *, struct cfdata *, void *)); -void xbox_attach __P((struct device *, struct device *, void *)); -int xbox_print __P(( void *, const char *)); +int xbox_match(struct device *, struct cfdata *, void *); +void xbox_attach(struct device *, struct device *, void *); +int xbox_print( void *, const char *); CFATTACH_DECL(xbox, sizeof(struct xbox_softc), xbox_match, xbox_attach, NULL, NULL); diff --git a/sys/dev/scsipi/if_se.c b/sys/dev/scsipi/if_se.c index 32e8fb6e9a6..fd71f087c69 100644 --- a/sys/dev/scsipi/if_se.c +++ b/sys/dev/scsipi/if_se.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_se.c,v 1.55 2005/02/01 00:19:34 reinoud Exp $ */ +/* $NetBSD: if_se.c,v 1.56 2005/02/04 02:10:47 perry Exp $ */ /* * Copyright (c) 1997 Ian W. Dall <ian.dall@dsto.defence.gov.au> @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.55 2005/02/01 00:19:34 reinoud Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.56 2005/02/04 02:10:47 perry Exp $"); #include "opt_inet.h" #include "opt_atalk.h" @@ -206,41 +206,41 @@ struct se_softc { int sc_enabled; }; -static int sematch __P((struct device *, struct cfdata *, void *)); -static void seattach __P((struct device *, struct device *, void *)); - -static void se_ifstart __P((struct ifnet *)); -static void sestart __P((struct scsipi_periph *)); - -static void sedone __P((struct scsipi_xfer *, int)); -static int se_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void sewatchdog __P((struct ifnet *)); - -static __inline u_int16_t ether_cmp __P((void *, void *)); -static void se_recv __P((void *)); -static struct mbuf *se_get __P((struct se_softc *, char *, int)); -static int se_read __P((struct se_softc *, char *, int)); -static int se_reset __P((struct se_softc *)); -static int se_add_proto __P((struct se_softc *, int)); -static int se_get_addr __P((struct se_softc *, u_int8_t *)); -static int se_set_media __P((struct se_softc *, int)); -static int se_init __P((struct se_softc *)); -static int se_set_multi __P((struct se_softc *, u_int8_t *)); -static int se_remove_multi __P((struct se_softc *, u_int8_t *)); +static int sematch(struct device *, struct cfdata *, void *); +static void seattach(struct device *, struct device *, void *); + +static void se_ifstart(struct ifnet *); +static void sestart(struct scsipi_periph *); + +static void sedone(struct scsipi_xfer *, int); +static int se_ioctl(struct ifnet *, u_long, caddr_t); +static void sewatchdog(struct ifnet *); + +static __inline u_int16_t ether_cmp(void *, void *); +static void se_recv(void *); +static struct mbuf *se_get(struct se_softc *, char *, int); +static int se_read(struct se_softc *, char *, int); +static int se_reset(struct se_softc *); +static int se_add_proto(struct se_softc *, int); +static int se_get_addr(struct se_softc *, u_int8_t *); +static int se_set_media(struct se_softc *, int); +static int se_init(struct se_softc *); +static int se_set_multi(struct se_softc *, u_int8_t *); +static int se_remove_multi(struct se_softc *, u_int8_t *); #if 0 -static int sc_set_all_multi __P((struct se_softc *, int)); +static int sc_set_all_multi(struct se_softc *, int); #endif -static void se_stop __P((struct se_softc *)); -static __inline int se_scsipi_cmd __P((struct scsipi_periph *periph, +static void se_stop(struct se_softc *); +static __inline int se_scsipi_cmd(struct scsipi_periph *periph, struct scsipi_generic *scsipi_cmd, int cmdlen, u_char *data_addr, int datalen, int retries, int timeout, struct buf *bp, - int flags)); -static void se_delayed_ifstart __P((void *)); + int flags); +static void se_delayed_ifstart(void *); static int se_set_mode(struct se_softc *, int, int); -int se_enable __P((struct se_softc *)); -void se_disable __P((struct se_softc *)); +int se_enable(struct se_softc *); +void se_disable(struct se_softc *); CFATTACH_DECL(se, sizeof(struct se_softc), sematch, seattach, NULL, NULL); diff --git a/sys/dev/sequencer.c b/sys/dev/sequencer.c index 0758a767c2e..ce5c2386e1e 100644 --- a/sys/dev/sequencer.c +++ b/sys/dev/sequencer.c @@ -1,4 +1,4 @@ -/* $NetBSD: sequencer.c,v 1.25 2003/12/04 13:57:30 keihan Exp $ */ +/* $NetBSD: sequencer.c,v 1.26 2005/02/04 02:10:35 perry Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.25 2003/12/04 13:57:30 keihan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.26 2005/02/04 02:10:35 perry Exp $"); #include "sequencer.h" @@ -111,43 +111,41 @@ int sequencerdebug = 0; struct sequencer_softc seqdevs[NSEQUENCER]; -void sequencerattach __P((int)); -void seq_reset __P((struct sequencer_softc *)); -int seq_do_command __P((struct sequencer_softc *, seq_event_rec *)); -int seq_do_extcommand __P((struct sequencer_softc *, seq_event_rec *)); -int seq_do_chnvoice __P((struct sequencer_softc *, seq_event_rec *)); -int seq_do_chncommon __P((struct sequencer_softc *, seq_event_rec *)); -int seq_do_timing __P((struct sequencer_softc *, seq_event_rec *)); -int seq_do_local __P((struct sequencer_softc *, seq_event_rec *)); -int seq_do_sysex __P((struct sequencer_softc *, seq_event_rec *)); -int seq_do_fullsize __P((struct sequencer_softc *, seq_event_rec *, - struct uio *)); -int seq_timer __P((struct sequencer_softc *, int, int, seq_event_rec *)); -static int seq_input_event __P((struct sequencer_softc *, seq_event_rec *)); -int seq_drain __P((struct sequencer_softc *)); -void seq_startoutput __P((struct sequencer_softc *)); -void seq_timeout __P((void *)); -int seq_to_new __P((seq_event_rec *, struct uio *)); +void sequencerattach(int); +void seq_reset(struct sequencer_softc *); +int seq_do_command(struct sequencer_softc *, seq_event_rec *); +int seq_do_extcommand(struct sequencer_softc *, seq_event_rec *); +int seq_do_chnvoice(struct sequencer_softc *, seq_event_rec *); +int seq_do_chncommon(struct sequencer_softc *, seq_event_rec *); +int seq_do_timing(struct sequencer_softc *, seq_event_rec *); +int seq_do_local(struct sequencer_softc *, seq_event_rec *); +int seq_do_sysex(struct sequencer_softc *, seq_event_rec *); +int seq_do_fullsize(struct sequencer_softc *, seq_event_rec *, struct uio *); +int seq_timer(struct sequencer_softc *, int, int, seq_event_rec *); +static int seq_input_event(struct sequencer_softc *, seq_event_rec *); +int seq_drain(struct sequencer_softc *); +void seq_startoutput(struct sequencer_softc *); +void seq_timeout(void *); +int seq_to_new(seq_event_rec *, struct uio *); static int seq_sleep_timo(int *, char *, int); static int seq_sleep(int *, char *); static void seq_wakeup(int *); struct midi_softc; -int midiseq_out __P((struct midi_dev *, u_char *, u_int, int)); -struct midi_dev *midiseq_open __P((int, int)); -void midiseq_close __P((struct midi_dev *)); -void midiseq_reset __P((struct midi_dev *)); -int midiseq_noteon __P((struct midi_dev *, int, int, int)); -int midiseq_noteoff __P((struct midi_dev *, int, int, int)); -int midiseq_keypressure __P((struct midi_dev *, int, int, int)); -int midiseq_pgmchange __P((struct midi_dev *, int, int)); -int midiseq_chnpressure __P((struct midi_dev *, int, int)); -int midiseq_ctlchange __P((struct midi_dev *, int, int, int)); -int midiseq_pitchbend __P((struct midi_dev *, int, int)); -int midiseq_loadpatch __P((struct midi_dev *, struct sysex_info *, - struct uio *)); -int midiseq_putc __P((struct midi_dev *, int)); -void midiseq_in __P((struct midi_dev *, u_char *, int)); +int midiseq_out(struct midi_dev *, u_char *, u_int, int); +struct midi_dev *midiseq_open(int, int); +void midiseq_close(struct midi_dev *); +void midiseq_reset(struct midi_dev *); +int midiseq_noteon(struct midi_dev *, int, int, int); +int midiseq_noteoff(struct midi_dev *, int, int, int); +int midiseq_keypressure(struct midi_dev *, int, int, int); +int midiseq_pgmchange(struct midi_dev *, int, int); +int midiseq_chnpressure(struct midi_dev *, int, int); +int midiseq_ctlchange(struct midi_dev *, int, int, int); +int midiseq_pitchbend(struct midi_dev *, int, int); +int midiseq_loadpatch(struct midi_dev *, struct sysex_info *, struct uio *); +int midiseq_putc(struct midi_dev *, int); +void midiseq_in(struct midi_dev *, u_char *, int); dev_type_open(sequenceropen); dev_type_close(sequencerclose); diff --git a/sys/dev/sequencervar.h b/sys/dev/sequencervar.h index 7e03d7665fb..faf5765e74e 100644 --- a/sys/dev/sequencervar.h +++ b/sys/dev/sequencervar.h @@ -1,4 +1,4 @@ -/* $NetBSD: sequencervar.h,v 1.7 2003/12/04 13:57:30 keihan Exp $ */ +/* $NetBSD: sequencervar.h,v 1.8 2005/02/04 02:10:35 perry Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -106,7 +106,7 @@ struct sequencer_softc { u_long input_stamp; }; -void seq_event_intr __P((void *, seq_event_rec *)); +void seq_event_intr(void *, seq_event_rec *); #define SEQUENCERUNIT(d) ((d) & 0x7f) #define SEQ_IS_OLD(d) ((d) & 0x80) diff --git a/sys/dev/sun/disksubr.c b/sys/dev/sun/disksubr.c index 1035d469702..abcc1615ad3 100644 --- a/sys/dev/sun/disksubr.c +++ b/sys/dev/sun/disksubr.c @@ -1,4 +1,4 @@ -/* $NetBSD: disksubr.c,v 1.2 2003/12/10 16:35:20 jdolecek Exp $ */ +/* $NetBSD: disksubr.c,v 1.3 2005/02/04 02:10:47 perry Exp $ */ /* * Copyright (c) 1982, 1986, 1988 Regents of the University of California. @@ -55,7 +55,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.2 2003/12/10 16:35:20 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.3 2005/02/04 02:10:47 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -72,8 +72,8 @@ __KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.2 2003/12/10 16:35:20 jdolecek Exp $" #error "Default value of LABELSECTOR no longer zero?" #endif -static char *disklabel_sun_to_bsd __P((char *, struct disklabel *)); -static int disklabel_bsd_to_sun __P((struct disklabel *, char *)); +static char *disklabel_sun_to_bsd(char *, struct disklabel *); +static int disklabel_bsd_to_sun(struct disklabel *, char *); /* * Attempt to read a disk label from a device @@ -90,7 +90,7 @@ static int disklabel_bsd_to_sun __P((struct disklabel *, char *)); const char * readdisklabel(dev, strat, lp, clp) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); struct disklabel *lp; struct cpu_disklabel *clp; { @@ -217,7 +217,7 @@ setdisklabel(olp, nlp, openmask, clp) int writedisklabel(dev, strat, lp, clp) dev_t dev; - void (*strat) __P((struct buf *)); + void (*strat)(struct buf *); struct disklabel *lp; struct cpu_disklabel *clp; { diff --git a/sys/dev/sun/event.c b/sys/dev/sun/event.c index dd5c4cbad4a..67c4b2f2c3f 100644 --- a/sys/dev/sun/event.c +++ b/sys/dev/sun/event.c @@ -1,4 +1,4 @@ -/* $NetBSD: event.c,v 1.15 2003/08/07 16:31:23 agc Exp $ */ +/* $NetBSD: event.c,v 1.16 2005/02/04 02:10:47 perry Exp $ */ /* * Copyright (c) 1992, 1993 @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.15 2003/08/07 16:31:23 agc Exp $"); +__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.16 2005/02/04 02:10:47 perry Exp $"); #include <sys/param.h> #include <sys/fcntl.h> @@ -59,7 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: event.c,v 1.15 2003/08/07 16:31:23 agc Exp $"); #include <dev/sun/vuid_event.h> #include <dev/sun/event_var.h> -int (*ev_out32_hook) __P((struct firm_event *, int, struct uio *)); +int (*ev_out32_hook)(struct firm_event *, int, struct uio *); /* * Initialize a firm_event queue. diff --git a/sys/dev/sun/event_var.h b/sys/dev/sun/event_var.h index fef1d8cde0a..26fb7a3e9a6 100644 --- a/sys/dev/sun/event_var.h +++ b/sys/dev/sun/event_var.h @@ -1,4 +1,4 @@ -/* $NetBSD: event_var.h,v 1.7 2003/08/07 16:31:24 agc Exp $ */ +/* $NetBSD: event_var.h,v 1.8 2005/02/04 02:10:47 perry Exp $ */ /* * Copyright (c) 1992, 1993 @@ -72,16 +72,16 @@ struct evvar { psignal((ev)->ev_io, SIGIO); \ } -void ev_init __P((struct evvar *)); -void ev_fini __P((struct evvar *)); -int ev_read __P((struct evvar *, struct uio *, int)); -int ev_poll __P((struct evvar *, int, struct proc *)); -int ev_kqfilter __P((struct evvar *, struct knote *)); +void ev_init(struct evvar *); +void ev_fini(struct evvar *); +int ev_read(struct evvar *, struct uio *, int); +int ev_poll(struct evvar *, int, struct proc *); +int ev_kqfilter(struct evvar *, struct knote *); /* * Hook for 32-bit compatibility on a 64-bit kernel. */ -extern int (*ev_out32_hook) __P((struct firm_event *, int, struct uio *)); +extern int (*ev_out32_hook)(struct firm_event *, int, struct uio *); /* * PEVENT is set just above PSOCK, which is just above TTIPRI, on the diff --git a/sys/dev/sun/fb.c b/sys/dev/sun/fb.c index 51d15758ce7..09aedcf74e1 100644 --- a/sys/dev/sun/fb.c +++ b/sys/dev/sun/fb.c @@ -1,4 +1,4 @@ -/* $NetBSD: fb.c,v 1.19 2004/03/19 16:05:25 pk Exp $ */ +/* $NetBSD: fb.c,v 1.20 2005/02/04 02:10:47 perry Exp $ */ /* * Copyright (c) 1992, 1993 @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.19 2004/03/19 16:05:25 pk Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.20 2005/02/04 02:10:47 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -258,7 +258,7 @@ fbmmap(dev, off, prot) off_t off; int prot; { - paddr_t (*map)__P((dev_t, off_t, int)) = devfb->fb_driver->fbd_mmap; + paddr_t (*map)(dev_t, off_t, int) = devfb->fb_driver->fbd_mmap; if (map == NULL) return (-1); @@ -338,7 +338,7 @@ fb_setsize_eeprom(fb, depth, def_width, def_height) #ifdef RASTERCONSOLE #include <machine/kbd.h> -static void fb_bell __P((int)); +static void fb_bell(int); static void fb_bell(on) diff --git a/sys/dev/sun/kbd.c b/sys/dev/sun/kbd.c index 3796bcfd569..ef868dedeef 100644 --- a/sys/dev/sun/kbd.c +++ b/sys/dev/sun/kbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: kbd.c,v 1.41 2004/12/31 14:18:35 bjh21 Exp $ */ +/* $NetBSD: kbd.c,v 1.42 2005/02/04 02:10:47 perry Exp $ */ /* * Copyright (c) 1992, 1993 @@ -47,7 +47,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.41 2004/12/31 14:18:35 bjh21 Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.42 2005/02/04 02:10:47 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -91,13 +91,13 @@ const struct cdevsw kbd_cdevsw = { }; #if NWSKBD > 0 -int wssunkbd_enable __P((void *, int)); -void wssunkbd_set_leds __P((void *, int)); -int wssunkbd_ioctl __P((void *, u_long, caddr_t, int, struct proc *)); +int wssunkbd_enable(void *, int); +void wssunkbd_set_leds(void *, int); +int wssunkbd_ioctl(void *, u_long, caddr_t, int, struct proc *); -void sunkbd_wskbd_cngetc __P((void *, u_int *, int *)); -void sunkbd_wskbd_cnpollc __P((void *, int)); -void sunkbd_wskbd_cnbell __P((void *, u_int, u_int, u_int)); +void sunkbd_wskbd_cngetc(void *, u_int *, int *); +void sunkbd_wskbd_cnpollc(void *, int); +void sunkbd_wskbd_cnbell(void *, u_int, u_int, u_int); static void sunkbd_bell_off(void *v); const struct wskbd_accessops sunkbd_wskbd_accessops = { diff --git a/sys/dev/sun/kbd_xlate.h b/sys/dev/sun/kbd_xlate.h index 2f89b9fab29..35ae7faa852 100644 --- a/sys/dev/sun/kbd_xlate.h +++ b/sys/dev/sun/kbd_xlate.h @@ -1,4 +1,4 @@ -/* $NetBSD: kbd_xlate.h,v 1.5 2003/08/07 16:31:25 agc Exp $ */ +/* $NetBSD: kbd_xlate.h,v 1.6 2005/02/04 02:10:47 perry Exp $ */ /* * Copyright (c) 1992, 1993 @@ -71,5 +71,5 @@ struct kbd_state { }; -extern void kbd_xlate_init __P((struct kbd_state *ks)); -extern int kbd_code_to_keysym __P((struct kbd_state *ks, int c)); +extern void kbd_xlate_init(struct kbd_state *ks); +extern int kbd_code_to_keysym(struct kbd_state *ks, int c); diff --git a/sys/dev/sun/kbd_zs.c b/sys/dev/sun/kbd_zs.c index 8a4830aabcd..cd6048642ec 100644 --- a/sys/dev/sun/kbd_zs.c +++ b/sys/dev/sun/kbd_zs.c @@ -1,4 +1,4 @@ -/* $NetBSD: kbd_zs.c,v 1.16 2003/08/07 16:31:25 agc Exp $ */ +/* $NetBSD: kbd_zs.c,v 1.17 2005/02/04 02:10:47 perry Exp $ */ /* * Copyright (c) 1992, 1993 @@ -53,7 +53,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kbd_zs.c,v 1.16 2003/08/07 16:31:25 agc Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kbd_zs.c,v 1.17 2005/02/04 02:10:47 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -82,10 +82,10 @@ __KERNEL_RCSID(0, "$NetBSD: kbd_zs.c,v 1.16 2003/08/07 16:31:25 agc Exp $"); * Interface to the lower layer (zscc) ****************************************************************/ -static void kbd_zs_rxint __P((struct zs_chanstate *)); -static void kbd_zs_stint __P((struct zs_chanstate *, int)); -static void kbd_zs_txint __P((struct zs_chanstate *)); -static void kbd_zs_softint __P((struct zs_chanstate *)); +static void kbd_zs_rxint(struct zs_chanstate *); +static void kbd_zs_stint(struct zs_chanstate *, int); +static void kbd_zs_txint(struct zs_chanstate *); +static void kbd_zs_softint(struct zs_chanstate *); struct zsops zsops_kbd = { kbd_zs_rxint, /* receive char available */ @@ -96,7 +96,7 @@ struct zsops zsops_kbd = { static int kbd_zs_match(struct device *, struct cfdata *, void *); static void kbd_zs_attach(struct device *, struct device *, void *); -static void kbd_zs_write_data __P((struct kbd_sun_softc *, int)); +static void kbd_zs_write_data(struct kbd_sun_softc *, int); CFATTACH_DECL(kbd_zs, sizeof(struct kbd_sun_softc), kbd_zs_match, kbd_zs_attach, NULL, NULL); diff --git a/sys/dev/sun/ms_zs.c b/sys/dev/sun/ms_zs.c index 355bd50cffe..6babb3efeaa 100644 --- a/sys/dev/sun/ms_zs.c +++ b/sys/dev/sun/ms_zs.c @@ -1,4 +1,4 @@ -/* $NetBSD: ms_zs.c,v 1.10 2003/08/07 16:31:26 agc Exp $ */ +/* $NetBSD: ms_zs.c,v 1.11 2005/02/04 02:10:47 perry Exp $ */ /* * Copyright (c) 1992, 1993 @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ms_zs.c,v 1.10 2003/08/07 16:31:26 agc Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ms_zs.c,v 1.11 2005/02/04 02:10:47 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -74,10 +74,10 @@ __KERNEL_RCSID(0, "$NetBSD: ms_zs.c,v 1.10 2003/08/07 16:31:26 agc Exp $"); #include <dev/sun/event_var.h> #include <dev/sun/msvar.h> -static void ms_zs_rxint __P((struct zs_chanstate *)); -static void ms_zs_stint __P((struct zs_chanstate *, int)); -static void ms_zs_txint __P((struct zs_chanstate *)); -static void ms_zs_softint __P((struct zs_chanstate *)); +static void ms_zs_rxint(struct zs_chanstate *); +static void ms_zs_stint(struct zs_chanstate *, int); +static void ms_zs_txint(struct zs_chanstate *); +static void ms_zs_softint(struct zs_chanstate *); struct zsops zsops_ms = { ms_zs_rxint, /* receive char available */ diff --git a/sys/dev/sun/msvar.h b/sys/dev/sun/msvar.h index f0ad9f0c6f7..0af11bcb2e5 100644 --- a/sys/dev/sun/msvar.h +++ b/sys/dev/sun/msvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: msvar.h,v 1.5 2003/08/07 16:31:26 agc Exp $ */ +/* $NetBSD: msvar.h,v 1.6 2005/02/04 02:10:47 perry Exp $ */ /* * Copyright (c) 1992, 1993 @@ -77,8 +77,8 @@ struct ms_softc { * by the lower level driver and used as a back door * when opening and closing the internal device. */ - int (*ms_deviopen) __P((struct device *, int)); - int (*ms_deviclose) __P((struct device *, int)); + int (*ms_deviopen) (struct device *, int); + int (*ms_deviclose) (struct device *, int); /* Flags to communicate with ms_softintr() */ volatile int ms_intr_flags; @@ -112,4 +112,4 @@ struct ms_softc { }; /* front-end call back for mouse input */ -void ms_input __P((struct ms_softc *, int c)); +void ms_input(struct ms_softc *, int c); diff --git a/sys/dev/tc/asc_tc.c b/sys/dev/tc/asc_tc.c index 0512b9af767..a6a3ae381ee 100644 --- a/sys/dev/tc/asc_tc.c +++ b/sys/dev/tc/asc_tc.c @@ -1,4 +1,4 @@ -/* $NetBSD: asc_tc.c,v 1.23 2003/02/22 05:13:35 tsutsui Exp $ */ +/* $NetBSD: asc_tc.c,v 1.24 2005/02/04 02:10:48 perry Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: asc_tc.c,v 1.23 2003/02/22 05:13:35 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: asc_tc.c,v 1.24 2005/02/04 02:10:48 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -72,23 +72,23 @@ struct asc_softc { caddr_t sc_base, sc_bounce, sc_target; }; -static int asc_tc_match __P((struct device *, struct cfdata *, void *)); -static void asc_tc_attach __P((struct device *, struct device *, void *)); +static int asc_tc_match(struct device *, struct cfdata *, void *); +static void asc_tc_attach(struct device *, struct device *, void *); CFATTACH_DECL(asc_tc, sizeof(struct asc_softc), asc_tc_match, asc_tc_attach, NULL, NULL); -static u_char asc_read_reg __P((struct ncr53c9x_softc *, int)); -static void asc_write_reg __P((struct ncr53c9x_softc *, int, u_char)); -static int asc_dma_isintr __P((struct ncr53c9x_softc *)); -static void asc_tc_reset __P((struct ncr53c9x_softc *)); -static int asc_tc_intr __P((struct ncr53c9x_softc *)); -static int asc_tc_setup __P((struct ncr53c9x_softc *, caddr_t *, - size_t *, int, size_t *)); -static void asc_tc_go __P((struct ncr53c9x_softc *)); -static void asc_tc_stop __P((struct ncr53c9x_softc *)); -static int asc_dma_isactive __P((struct ncr53c9x_softc *)); -static void asc_clear_latched_intr __P((struct ncr53c9x_softc *)); +static u_char asc_read_reg(struct ncr53c9x_softc *, int); +static void asc_write_reg(struct ncr53c9x_softc *, int, u_char); +static int asc_dma_isintr(struct ncr53c9x_softc *); +static void asc_tc_reset(struct ncr53c9x_softc *); +static int asc_tc_intr(struct ncr53c9x_softc *); +static int asc_tc_setup(struct ncr53c9x_softc *, caddr_t *, + size_t *, int, size_t *); +static void asc_tc_go(struct ncr53c9x_softc *); +static void asc_tc_stop(struct ncr53c9x_softc *); +static int asc_dma_isactive(struct ncr53c9x_softc *); +static void asc_clear_latched_intr(struct ncr53c9x_softc *); static struct ncr53c9x_glue asc_tc_glue = { asc_read_reg, diff --git a/sys/dev/tc/asc_tcds.c b/sys/dev/tc/asc_tcds.c index 3c974402275..1bd805318c5 100644 --- a/sys/dev/tc/asc_tcds.c +++ b/sys/dev/tc/asc_tcds.c @@ -1,4 +1,4 @@ -/* $NetBSD: asc_tcds.c,v 1.11 2003/05/03 18:11:40 wiz Exp $ */ +/* $NetBSD: asc_tcds.c,v 1.12 2005/02/04 02:10:48 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: asc_tcds.c,v 1.11 2003/05/03 18:11:40 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: asc_tcds.c,v 1.12 2005/02/04 02:10:48 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -105,8 +105,8 @@ struct asc_softc { struct tcds_slotconfig *sc_tcds; /* DMA/slot info lives here */ }; -static int asc_tcds_match __P((struct device *, struct cfdata *, void *)); -static void asc_tcds_attach __P((struct device *, struct device *, void *)); +static int asc_tcds_match (struct device *, struct cfdata *, void *); +static void asc_tcds_attach(struct device *, struct device *, void *); CFATTACH_DECL(asc_tcds, sizeof(struct asc_softc), asc_tcds_match, asc_tcds_attach, NULL, NULL); @@ -114,17 +114,17 @@ CFATTACH_DECL(asc_tcds, sizeof(struct asc_softc), /* * Functions and the switch for the MI code. */ -static u_char asc_read_reg __P((struct ncr53c9x_softc *, int)); -static void asc_write_reg __P((struct ncr53c9x_softc *, int, u_char)); -static int tcds_dma_isintr __P((struct ncr53c9x_softc *)); -static void tcds_dma_reset __P((struct ncr53c9x_softc *)); -static int tcds_dma_intr __P((struct ncr53c9x_softc *)); -static int tcds_dma_setup __P((struct ncr53c9x_softc *, caddr_t *, - size_t *, int, size_t *)); -static void tcds_dma_go __P((struct ncr53c9x_softc *)); -static void tcds_dma_stop __P((struct ncr53c9x_softc *)); -static int tcds_dma_isactive __P((struct ncr53c9x_softc *)); -static void tcds_clear_latched_intr __P((struct ncr53c9x_softc *)); +static u_char asc_read_reg(struct ncr53c9x_softc *, int); +static void asc_write_reg(struct ncr53c9x_softc *, int, u_char); +static int tcds_dma_isintr(struct ncr53c9x_softc *); +static void tcds_dma_reset(struct ncr53c9x_softc *); +static int tcds_dma_intr(struct ncr53c9x_softc *); +static int tcds_dma_setup(struct ncr53c9x_softc *, caddr_t *, + size_t *, int, size_t *); +static void tcds_dma_go(struct ncr53c9x_softc *); +static void tcds_dma_stop(struct ncr53c9x_softc *); +static int tcds_dma_isactive(struct ncr53c9x_softc *); +static void tcds_clear_latched_intr(struct ncr53c9x_softc *); static struct ncr53c9x_glue asc_tcds_glue = { asc_read_reg, diff --git a/sys/dev/tc/ascvar.h b/sys/dev/tc/ascvar.h index 4ede10f9f49..ef37e95c123 100644 --- a/sys/dev/tc/ascvar.h +++ b/sys/dev/tc/ascvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: ascvar.h,v 1.8 2003/05/03 18:11:40 wiz Exp $ */ +/* $NetBSD: ascvar.h,v 1.9 2005/02/04 02:10:48 perry Exp $ */ /* @@ -59,12 +59,12 @@ struct asc_softc { ScsiCmd *cmd[ASC_NCMD]; /* active command indexed by SCSI ID */ State st[ASC_NCMD]; /* state info for each active command */ /* Start DMA routine */ - int (*dma_start) __P((struct asc_softc *asc, + int (*dma_start)(struct asc_softc *asc, struct scsi_state *state, - caddr_t cp, int flag, int len, int off)); + caddr_t cp, int flag, int len, int off); /* End DMA routine */ - void (*dma_end) __P((struct asc_softc *asc, - struct scsi_state *state, int flag)); + void (*dma_end)(struct asc_softc *asc, + struct scsi_state *state, int flag); u_char *dma_next; int dma_xfer; /* DMA len still to go */ @@ -85,8 +85,8 @@ typedef struct asc_softc *asc_softc_t; #define ASC_SPEED_25_MHZ 250 #define ASC_SPEED_12_5_MHZ 125 -void ascattach __P((struct asc_softc *asc, int bus_speed)); -int asc_intr __P ((void *asc)); +void ascattach(struct asc_softc *asc, int bus_speed); +int asc_intr(void *asc); /* * DMA operations. diff --git a/sys/dev/tc/if_le_ioasic.c b/sys/dev/tc/if_le_ioasic.c index 89810a15fa1..b848b915c92 100644 --- a/sys/dev/tc/if_le_ioasic.c +++ b/sys/dev/tc/if_le_ioasic.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_le_ioasic.c,v 1.21 2002/10/02 16:53:03 thorpej Exp $ */ +/* $NetBSD: if_le_ioasic.c,v 1.22 2005/02/04 02:10:48 perry Exp $ */ /* * Copyright (c) 1996 Carnegie-Mellon University. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_le_ioasic.c,v 1.21 2002/10/02 16:53:03 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_le_ioasic.c,v 1.22 2005/02/04 02:10:48 perry Exp $"); #include "opt_inet.h" @@ -71,21 +71,18 @@ struct le_ioasic_softc { bus_dmamap_t sc_dmamap; /* bus dmamap */ }; -static int le_ioasic_match __P((struct device *, struct cfdata *, void *)); -static void le_ioasic_attach __P((struct device *, struct device *, void *)); +static int le_ioasic_match(struct device *, struct cfdata *, void *); +static void le_ioasic_attach(struct device *, struct device *, void *); CFATTACH_DECL(le_ioasic, sizeof(struct le_softc), le_ioasic_match, le_ioasic_attach, NULL, NULL); -static void le_ioasic_copytobuf_gap2 __P((struct lance_softc *, void *, - int, int)); -static void le_ioasic_copyfrombuf_gap2 __P((struct lance_softc *, void *, - int, int)); -static void le_ioasic_copytobuf_gap16 __P((struct lance_softc *, void *, - int, int)); -static void le_ioasic_copyfrombuf_gap16 __P((struct lance_softc *, void *, - int, int)); -static void le_ioasic_zerobuf_gap16 __P((struct lance_softc *, int, int)); +static void le_ioasic_copytobuf_gap2(struct lance_softc *, void *, int, int); +static void le_ioasic_copyfrombuf_gap2(struct lance_softc *, void *, int, int); +static void le_ioasic_copytobuf_gap16(struct lance_softc *, void *, int, int); +static void le_ioasic_copyfrombuf_gap16(struct lance_softc *, void *, + int, int); +static void le_ioasic_zerobuf_gap16(struct lance_softc *, int, int); static int le_ioasic_match(parent, match, aux) diff --git a/sys/dev/tc/if_le_tc.c b/sys/dev/tc/if_le_tc.c index 7aabb31dc16..858fd580b8b 100644 --- a/sys/dev/tc/if_le_tc.c +++ b/sys/dev/tc/if_le_tc.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_le_tc.c,v 1.16 2003/01/22 08:06:21 mhitch Exp $ */ +/* $NetBSD: if_le_tc.c,v 1.17 2005/02/04 02:10:48 perry Exp $ */ /* * Copyright (c) 1996 Carnegie-Mellon University. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_le_tc.c,v 1.16 2003/01/22 08:06:21 mhitch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_le_tc.c,v 1.17 2005/02/04 02:10:48 perry Exp $"); #include "opt_inet.h" @@ -60,8 +60,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_tc.c,v 1.16 2003/01/22 08:06:21 mhitch Exp $") #include <dev/tc/if_levar.h> #include <dev/tc/tcvar.h> -int le_tc_match __P((struct device *, struct cfdata *, void *)); -void le_tc_attach __P((struct device *, struct device *, void *)); +int le_tc_match(struct device *, struct cfdata *, void *); +void le_tc_attach(struct device *, struct device *, void *); CFATTACH_DECL(le_tc, sizeof(struct le_softc), le_tc_match, le_tc_attach, NULL, NULL); diff --git a/sys/dev/tc/if_levar.h b/sys/dev/tc/if_levar.h index 1dc0593e30f..a2d647095bb 100644 --- a/sys/dev/tc/if_levar.h +++ b/sys/dev/tc/if_levar.h @@ -1,4 +1,4 @@ -/* $NetBSD: if_levar.h,v 1.5 2003/08/07 16:31:27 agc Exp $ */ +/* $NetBSD: if_levar.h,v 1.6 2005/02/04 02:10:48 perry Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -61,4 +61,4 @@ struct le_softc { struct lereg1 *sc_r1; /* LANCE registers */ }; -void dec_le_common_attach __P((struct am7990_softc *, u_char *)); +void dec_le_common_attach(struct am7990_softc *, u_char *); diff --git a/sys/dev/tc/ioasicvar.h b/sys/dev/tc/ioasicvar.h index 91b75aead6a..70adb5a1c5c 100644 --- a/sys/dev/tc/ioasicvar.h +++ b/sys/dev/tc/ioasicvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: ioasicvar.h,v 1.16 2004/08/26 18:06:20 drochner Exp $ */ +/* $NetBSD: ioasicvar.h,v 1.17 2005/02/04 02:10:48 perry Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. @@ -60,11 +60,11 @@ extern struct cfdriver ioasic_cd; */ extern tc_addr_t ioasic_base; -const struct evcnt *ioasic_intr_evcnt __P((struct device *, void *)); -void ioasic_intr_establish __P((struct device *, void *, - int, int (*)(void *), void *)); -void ioasic_intr_disestablish __P((struct device *, void *)); -void ioasic_attach_devs __P((struct ioasic_softc *, - struct ioasic_dev *, int)); +const struct evcnt *ioasic_intr_evcnt(struct device *, void *); +void ioasic_intr_establish(struct device *, void *, + int, int (*)(void *), void *); +void ioasic_intr_disestablish(struct device *, void *); +void ioasic_attach_devs(struct ioasic_softc *, + struct ioasic_dev *, int); #endif /* _DEV_TC_IOASICVAR_ */ diff --git a/sys/dev/tc/sfbplus.c b/sys/dev/tc/sfbplus.c index 2a824a5c38e..0d36a88cded 100644 --- a/sys/dev/tc/sfbplus.c +++ b/sys/dev/tc/sfbplus.c @@ -1,4 +1,4 @@ -/* $NetBSD: sfbplus.c,v 1.20 2003/12/17 03:59:33 ad Exp $ */ +/* $NetBSD: sfbplus.c,v 1.21 2005/02/04 02:10:48 perry Exp $ */ /* * Copyright (c) 1999, 2000, 2001 Tohru Nishimura. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.20 2003/12/17 03:59:33 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.21 2005/02/04 02:10:48 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -98,12 +98,12 @@ struct hwcursor64 { }; struct hwops { - void (*setlut) __P((caddr_t, struct hwcmap256 *)); - void (*getlut) __P((caddr_t, struct hwcmap256 *)); - void (*visible) __P((caddr_t, int)); - void (*locate) __P((caddr_t, struct hwcursor64 *)); - void (*shape) __P((caddr_t, struct wsdisplay_curpos *, u_int64_t *)); - void (*color) __P((caddr_t, u_int8_t *)); + void (*setlut)(caddr_t, struct hwcmap256 *); + void (*getlut)(caddr_t, struct hwcmap256 *); + void (*visible)(caddr_t, int); + void (*locate)(caddr_t, struct hwcursor64 *); + void (*shape)(caddr_t, struct wsdisplay_curpos *, u_int64_t *); + void (*color)(caddr_t, u_int8_t *); }; struct sfbp_softc { @@ -124,13 +124,13 @@ struct sfbp_softc { #define HX_MAGIC_X 368 #define HX_MAGIC_Y 38 -static int sfbpmatch __P((struct device *, struct cfdata *, void *)); -static void sfbpattach __P((struct device *, struct device *, void *)); +static int sfbpmatch(struct device *, struct cfdata *, void *); +static void sfbpattach(struct device *, struct device *, void *); CFATTACH_DECL(sfbp, sizeof(struct sfbp_softc), sfbpmatch, sfbpattach, NULL, NULL); -static void sfbp_common_init __P((struct rasops_info *)); +static void sfbp_common_init(struct rasops_info *); static struct rasops_info sfbp_console_ri; static tc_addr_t sfbp_consaddr; @@ -149,18 +149,18 @@ static const struct wsscreen_list sfb_screenlist = { sizeof(_sfb_scrlist) / sizeof(struct wsscreen_descr *), _sfb_scrlist }; -static int sfbioctl __P((void *, u_long, caddr_t, int, struct proc *)); -static paddr_t sfbmmap __P((void *, off_t, int)); +static int sfbioctl(void *, u_long, caddr_t, int, struct proc *); +static paddr_t sfbmmap(void *, off_t, int); -static int sfb_alloc_screen __P((void *, const struct wsscreen_descr *, - void **, int *, int *, long *)); -static void sfb_free_screen __P((void *, void *)); -static int sfb_show_screen __P((void *, void *, int, - void (*) (void *, int, int), void *)); -static void sfbp_putchar __P((void *, int, int, u_int, long)); -static void sfbp_erasecols __P((void *, int, int, int, long)); -static void sfbp_eraserows __P((void *, int, int, long)); -static void sfbp_copyrows __P((void *, int, int, int)); +static int sfb_alloc_screen(void *, const struct wsscreen_descr *, + void **, int *, int *, long *); +static void sfb_free_screen(void *, void *); +static int sfb_show_screen(void *, void *, int, + void (*) (void *, int, int), void *); +static void sfbp_putchar(void *, int, int, u_int, long); +static void sfbp_erasecols(void *, int, int, int, long); +static void sfbp_eraserows(void *, int, int, long); +static void sfbp_copyrows(void *, int, int, int); static const struct wsdisplay_accessops sfb_accessops = { sfbioctl, @@ -171,30 +171,30 @@ static const struct wsdisplay_accessops sfb_accessops = { 0 /* load_font */ }; -static void bt459init __P((caddr_t)); -static void bt459visible __P((caddr_t, int)); -static void bt459locate __P((caddr_t, struct hwcursor64 *)); -static void bt459shape __P((caddr_t, struct wsdisplay_curpos *, u_int64_t *)); -static void bt459color __P((caddr_t, u_int8_t *)); -static void bt459setlut __P((caddr_t, struct hwcmap256 *)); - -static void sfbpvisible __P((caddr_t, int)); -static void sfbplocate __P((caddr_t, struct hwcursor64 *)); -static void sfbpshape __P((caddr_t, struct wsdisplay_curpos *, u_int64_t *)); -static void bt463init __P((caddr_t)); -static void bt463color __P((caddr_t, u_int8_t *)); -static void noplut __P((caddr_t, struct hwcmap256 *)); - -/* EXPORT */ int sfbp_cnattach __P((tc_addr_t)); -static int sfbpintr __P((void *)); -static void sfbp_cmap_init __P((struct sfbp_softc *)); -static void sfbp_screenblank __P((struct sfbp_softc *, int)); - -static int get_cmap __P((struct sfbp_softc *, struct wsdisplay_cmap *)); -static int set_cmap __P((struct sfbp_softc *, struct wsdisplay_cmap *)); -static int set_cursor __P((struct sfbp_softc *, struct wsdisplay_cursor *)); -static int get_cursor __P((struct sfbp_softc *, struct wsdisplay_cursor *)); -static void set_curpos __P((struct sfbp_softc *, struct wsdisplay_curpos *)); +static void bt459init(caddr_t); +static void bt459visible(caddr_t, int); +static void bt459locate(caddr_t, struct hwcursor64 *); +static void bt459shape(caddr_t, struct wsdisplay_curpos *, u_int64_t *); +static void bt459color(caddr_t, u_int8_t *); +static void bt459setlut(caddr_t, struct hwcmap256 *); + +static void sfbpvisible(caddr_t, int); +static void sfbplocate(caddr_t, struct hwcursor64 *); +static void sfbpshape(caddr_t, struct wsdisplay_curpos *, u_int64_t *); +static void bt463init(caddr_t); +static void bt463color(caddr_t, u_int8_t *); +static void noplut(caddr_t, struct hwcmap256 *); + +/* EXPORT */ int sfbp_cnattach(tc_addr_t); +static int sfbpintr(void *); +static void sfbp_cmap_init(struct sfbp_softc *); +static void sfbp_screenblank(struct sfbp_softc *, int); + +static int get_cmap(struct sfbp_softc *, struct wsdisplay_cmap *); +static int set_cmap(struct sfbp_softc *, struct wsdisplay_cmap *); +static int set_cursor(struct sfbp_softc *, struct wsdisplay_cursor *); +static int get_cursor(struct sfbp_softc *, struct wsdisplay_cursor *); +static void set_curpos(struct sfbp_softc *, struct wsdisplay_curpos *); /* * Compose 2 bit/pixel cursor image. Bit order will be reversed. @@ -573,7 +573,7 @@ sfb_show_screen(v, cookie, waitok, cb, cbarg) void *v; void *cookie; int waitok; - void (*cb) __P((void *, int, int)); + void (*cb)(void *, int, int); void *cbarg; { diff --git a/sys/dev/tc/tc.c b/sys/dev/tc/tc.c index e0f2433cb2a..56567cf5b6d 100644 --- a/sys/dev/tc/tc.c +++ b/sys/dev/tc/tc.c @@ -1,4 +1,4 @@ -/* $NetBSD: tc.c,v 1.39 2004/08/26 17:57:00 drochner Exp $ */ +/* $NetBSD: tc.c,v 1.40 2005/02/04 02:10:48 perry Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.39 2004/08/26 17:57:00 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.40 2005/02/04 02:10:48 perry Exp $"); #include "opt_tcverbose.h" @@ -43,17 +43,17 @@ __KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.39 2004/08/26 17:57:00 drochner Exp $"); #include "locators.h" /* Definition of the driver for autoconfig. */ -int tcmatch __P((struct device *, struct cfdata *, void *)); +int tcmatch(struct device *, struct cfdata *, void *); CFATTACH_DECL(tc, sizeof(struct tc_softc), tcmatch, tcattach, NULL, NULL); extern struct cfdriver tc_cd; -int tcprint __P((void *, const char *)); -int tcsubmatch __P((struct device *, struct cfdata *, - const locdesc_t *, void *)); -void tc_devinfo __P((const char *, char *, size_t)); +int tcprint(void *, const char *); +int tcsubmatch(struct device *, struct cfdata *, + const locdesc_t *, void *); +void tc_devinfo(const char *, char *, size_t); int tcmatch(parent, cf, aux) @@ -285,7 +285,7 @@ tc_intr_establish(dev, cookie, level, handler, arg) struct device *dev; void *cookie, *arg; int level; - int (*handler) __P((void *)); + int (*handler)(void *); { struct tc_softc *sc = tc_cd.cd_devs[0]; diff --git a/sys/dev/tc/tcds.c b/sys/dev/tc/tcds.c index 9121c0f00ca..26e58e568eb 100644 --- a/sys/dev/tc/tcds.c +++ b/sys/dev/tc/tcds.c @@ -1,4 +1,4 @@ -/* $NetBSD: tcds.c,v 1.12 2004/09/13 14:08:39 drochner Exp $ */ +/* $NetBSD: tcds.c,v 1.13 2005/02/04 02:10:48 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tcds.c,v 1.12 2004/09/13 14:08:39 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tcds.c,v 1.13 2005/02/04 02:10:48 perry Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -106,17 +106,17 @@ struct tcds_softc { #define TCDSF_FASTSCSI 0x02 /* supports Fast SCSI */ /* Definition of the driver for autoconfig. */ -int tcdsmatch __P((struct device *, struct cfdata *, void *)); -void tcdsattach __P((struct device *, struct device *, void *)); -int tcdsprint __P((void *, const char *)); -int tcdssubmatch __P((struct device *, struct cfdata *, - const locdesc_t *, void *)); +int tcdsmatch(struct device *, struct cfdata *, void *); +void tcdsattach(struct device *, struct device *, void *); +int tcdsprint(void *, const char *); +int tcdssubmatch(struct device *, struct cfdata *, + const locdesc_t *, void *); CFATTACH_DECL(tcds, sizeof(struct tcds_softc), tcdsmatch, tcdsattach, NULL, NULL); -/*static*/ int tcds_intr __P((void *)); -/*static*/ int tcds_intrnull __P((void *)); +/*static*/ int tcds_intr(void *); +/*static*/ int tcds_intrnull(void *); struct tcds_device { const char *td_name; @@ -131,8 +131,8 @@ struct tcds_device { { NULL, 0 }, }; -struct tcds_device *tcds_lookup __P((const char *)); -void tcds_params __P((struct tcds_softc *, int, int *, int *)); +struct tcds_device *tcds_lookup(const char *); +void tcds_params(struct tcds_softc *, int, int *, int *); struct tcds_device * tcds_lookup(modname) @@ -360,7 +360,7 @@ void tcds_intr_establish(tcds, slot, func, arg) struct device *tcds; int slot; - int (*func) __P((void *)); + int (*func)(void *); void *arg; { struct tcds_softc *sc = (struct tcds_softc *)tcds; diff --git a/sys/dev/tc/tcdsreg.h b/sys/dev/tc/tcdsreg.h index f04a4241725..3e03732a773 100644 --- a/sys/dev/tc/tcdsreg.h +++ b/sys/dev/tc/tcdsreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: tcdsreg.h,v 1.4 2004/02/24 15:16:05 wiz Exp $ */ +/* $NetBSD: tcdsreg.h,v 1.5 2005/02/04 02:10:48 perry Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -123,14 +123,14 @@ #define TCDS_DUD_BYTE11 0xff000000 /* byte 11 mask */ #if 0 -int tcds_scsi_iserr __P((struct dma_softc *)); -int tcds_scsi_isintr __P((int, int)); -void tcds_dma_disable __P((int)); -void tcds_dma_enable __P((int)); -void tcds_dma_init __P((struct dma_softc *, int)); -void tcds_scsi_disable __P((int)); -void tcds_scsi_enable __P((int)); -void tcds_scsi_reset __P((int)); +int tcds_scsi_iserr(struct dma_softc *); +int tcds_scsi_isintr(int, int); +void tcds_dma_disable(int); +void tcds_dma_enable(int); +void tcds_dma_init(struct dma_softc *, int); +void tcds_scsi_disable(int); +void tcds_scsi_enable(int); +void tcds_scsi_reset(int); /* * XXX diff --git a/sys/dev/tc/tcdsvar.h b/sys/dev/tc/tcdsvar.h index 485b1829a94..6c1f14ca78d 100644 --- a/sys/dev/tc/tcdsvar.h +++ b/sys/dev/tc/tcdsvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: tcdsvar.h,v 1.2 2001/08/22 05:00:27 nisimura Exp $ */ +/* $NetBSD: tcdsvar.h,v 1.3 2005/02/04 02:10:48 perry Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -36,7 +36,7 @@ struct tcds_slotconfig { bus_space_tag_t sc_bst; /* to frob TCDS regs */ bus_space_handle_t sc_bsh; - int (*sc_intrhand) __P((void *)); /* intr. handler */ + int (*sc_intrhand)(void *); /* intr. handler */ void *sc_intrarg; /* intr. handler arg. */ struct evcnt sc_evcnt; /* intr. count */ char sc_name[8]; /* ev_name */ @@ -76,11 +76,10 @@ struct tcdsdev_attach_args { /* * TCDS functions. */ -void tcds_intr_establish __P((struct device *, int, - int (*)(void *), void *)); -void tcds_intr_disestablish __P((struct device *, int)); -void tcds_dma_enable __P((struct tcds_slotconfig *, int)); -void tcds_scsi_enable __P((struct tcds_slotconfig *, int)); -int tcds_scsi_iserr __P((struct tcds_slotconfig *)); -int tcds_scsi_isintr __P((struct tcds_slotconfig *, int)); -void tcds_scsi_reset __P((struct tcds_slotconfig *)); +void tcds_intr_establish(struct device *, int, int (*)(void *), void *); +void tcds_intr_disestablish(struct device *, int); +void tcds_dma_enable(struct tcds_slotconfig *, int); +void tcds_scsi_enable(struct tcds_slotconfig *, int); +int tcds_scsi_iserr(struct tcds_slotconfig *); +int tcds_scsi_isintr(struct tcds_slotconfig *, int); +void tcds_scsi_reset(struct tcds_slotconfig *); diff --git a/sys/dev/tc/zs_ioasic.c b/sys/dev/tc/zs_ioasic.c index 9db1269949b..c67e65b6747 100644 --- a/sys/dev/tc/zs_ioasic.c +++ b/sys/dev/tc/zs_ioasic.c @@ -1,4 +1,4 @@ -/* $NetBSD: zs_ioasic.c,v 1.23 2004/09/13 12:55:48 drochner Exp $ */ +/* $NetBSD: zs_ioasic.c,v 1.24 2005/02/04 02:10:48 perry Exp $ */ /*- * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc. @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,v 1.23 2004/09/13 12:55:48 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,v 1.24 2005/02/04 02:10:48 perry Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -90,10 +90,10 @@ __KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,v 1.23 2004/09/13 12:55:48 drochner Exp /* * Helpers for console support. */ -void zs_ioasic_cninit __P((tc_addr_t, tc_offset_t, int)); -int zs_ioasic_cngetc __P((dev_t)); -void zs_ioasic_cnputc __P((dev_t, int)); -void zs_ioasic_cnpollc __P((dev_t, int)); +void zs_ioasic_cninit(tc_addr_t, tc_offset_t, int); +int zs_ioasic_cngetc(dev_t); +void zs_ioasic_cnputc(dev_t, int); +void zs_ioasic_cnpollc(dev_t, int); struct consdev zs_ioasic_cons = { NULL, NULL, zs_ioasic_cngetc, zs_ioasic_cnputc, @@ -105,9 +105,9 @@ int zs_ioasic_console_channel; int zs_ioasic_console; struct zs_chanstate zs_ioasic_conschanstate_store; -int zs_ioasic_isconsole __P((tc_offset_t, int)); -int zs_getc __P((struct zs_chanstate *)); -void zs_putc __P((struct zs_chanstate *, int)); +int zs_ioasic_isconsole(tc_offset_t, int); +int zs_getc(struct zs_chanstate *); +void zs_putc(struct zs_chanstate *, int); /* * Some warts needed by z8530tty.c @@ -160,7 +160,7 @@ static u_char zs_ioasic_init_reg[16] = { ZSWR15_BREAK_IE, }; -struct zshan *zs_ioasic_get_chan_addr __P((tc_addr_t, int)); +struct zshan *zs_ioasic_get_chan_addr(tc_addr_t, int); struct zshan * zs_ioasic_get_chan_addr(zsaddr, channel) @@ -191,18 +191,18 @@ zs_ioasic_get_chan_addr(zsaddr, channel) ****************************************************************/ /* Definition of the driver for autoconfig. */ -int zs_ioasic_match __P((struct device *, struct cfdata *, void *)); -void zs_ioasic_attach __P((struct device *, struct device *, void *)); -int zs_ioasic_print __P((void *, const char *name)); -int zs_ioasic_submatch __P((struct device *, struct cfdata *, - const locdesc_t *, void *)); +int zs_ioasic_match(struct device *, struct cfdata *, void *); +void zs_ioasic_attach(struct device *, struct device *, void *); +int zs_ioasic_print(void *, const char *name); +int zs_ioasic_submatch(struct device *, struct cfdata *, + const locdesc_t *, void *); CFATTACH_DECL(zsc_ioasic, sizeof(struct zsc_softc), zs_ioasic_match, zs_ioasic_attach, NULL, NULL); /* Interrupt handlers. */ -int zs_ioasic_hardintr __P((void *)); -void zs_ioasic_softintr __P((void *)); +int zs_ioasic_hardintr(void *); +void zs_ioasic_softintr(void *); /* * Is the zs chip present? diff --git a/sys/dev/tc/zs_ioasicvar.h b/sys/dev/tc/zs_ioasicvar.h index 4d03b7685e8..dafddaa6ab2 100644 --- a/sys/dev/tc/zs_ioasicvar.h +++ b/sys/dev/tc/zs_ioasicvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: zs_ioasicvar.h,v 1.3 2002/09/24 13:23:32 ad Exp $ */ +/* $NetBSD: zs_ioasicvar.h,v 1.4 2005/02/04 02:10:48 perry Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -44,7 +44,7 @@ #define ZIP_FLAGS_DCDCTS 0x01 /* channel has DCD and CTS signals */ #define ZIP_FLAGS_DTRRTS 0x02 /* channel has DTR and RTS signals */ -extern void zs_ioasic_cnattach __P((tc_addr_t, tc_offset_t, int)); -extern int zs_ioasic_lk201_cnattach __P((tc_addr_t, tc_offset_t, int)); -extern int zskbd_cnattach __P((struct zs_chanstate *)); -extern int zs_getc __P((struct zs_chanstate *)); +extern void zs_ioasic_cnattach(tc_addr_t, tc_offset_t, int); +extern int zs_ioasic_lk201_cnattach(tc_addr_t, tc_offset_t, int); +extern int zskbd_cnattach(struct zs_chanstate *); +extern int zs_getc(struct zs_chanstate *); diff --git a/sys/dev/tc/zskbd.c b/sys/dev/tc/zskbd.c index 714e9584db3..bb56cd3a5bd 100644 --- a/sys/dev/tc/zskbd.c +++ b/sys/dev/tc/zskbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: zskbd.c,v 1.9 2003/08/07 16:31:28 agc Exp $ */ +/* $NetBSD: zskbd.c,v 1.10 2005/02/04 02:10:48 perry Exp $ */ /* * Copyright (c) 1992, 1993 @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zskbd.c,v 1.9 2003/08/07 16:31:28 agc Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zskbd.c,v 1.10 2005/02/04 02:10:48 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -118,17 +118,17 @@ struct zskbd_softc { struct zsops zsops_zskbd; -static void zskbd_input __P((struct zskbd_softc *, int)); +static void zskbd_input(struct zskbd_softc *, int); -static int zskbd_match __P((struct device *, struct cfdata *, void *)); -static void zskbd_attach __P((struct device *, struct device *, void *)); +static int zskbd_match(struct device *, struct cfdata *, void *); +static void zskbd_attach(struct device *, struct device *, void *); CFATTACH_DECL(zskbd, sizeof(struct zskbd_softc), zskbd_match, zskbd_attach, NULL, NULL); -static int zskbd_enable __P((void *, int)); -static void zskbd_set_leds __P((void *, int)); -static int zskbd_ioctl __P((void *, u_long, caddr_t, int, struct proc *)); +static int zskbd_enable(void *, int); +static void zskbd_set_leds(void *, int); +static int zskbd_ioctl(void *, u_long, caddr_t, int, struct proc *); const struct wskbd_accessops zskbd_accessops = { zskbd_enable, @@ -144,7 +144,7 @@ const struct wskbd_consops zskbd_consops = { zskbd_cnpollc, }; -static int zskbd_sendchar __P((void *, u_char)); +static int zskbd_sendchar(void *, u_char); const struct wskbd_mapdata zskbd_keymapdata = { lkkbd_keydesctab, @@ -155,7 +155,7 @@ const struct wskbd_mapdata zskbd_keymapdata = { #endif }; -int zskbd_cnattach __P((struct zs_chanstate *)); /* EXPORTED */ +int zskbd_cnattach(struct zs_chanstate *); /* EXPORTED */ /* * kbd_match: how is this zs channel configured? @@ -370,10 +370,10 @@ zskbd_input(sc, data) * Interface to the lower layer (zscc) ****************************************************************/ -static void zskbd_rxint __P((struct zs_chanstate *)); -static void zskbd_stint __P((struct zs_chanstate *, int)); -static void zskbd_txint __P((struct zs_chanstate *)); -static void zskbd_softint __P((struct zs_chanstate *)); +static void zskbd_rxint(struct zs_chanstate *); +static void zskbd_stint(struct zs_chanstate *, int); +static void zskbd_txint(struct zs_chanstate *); +static void zskbd_softint(struct zs_chanstate *); static void zskbd_rxint(cs) diff --git a/sys/dev/tc/zsms.c b/sys/dev/tc/zsms.c index a666a617246..895fcb079c7 100644 --- a/sys/dev/tc/zsms.c +++ b/sys/dev/tc/zsms.c @@ -1,4 +1,4 @@ -/* $NetBSD: zsms.c,v 1.10 2003/08/07 16:31:28 agc Exp $ */ +/* $NetBSD: zsms.c,v 1.11 2005/02/04 02:10:48 perry Exp $ */ /* * Copyright (c) 1992, 1993 @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zsms.c,v 1.10 2003/08/07 16:31:28 agc Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zsms.c,v 1.11 2005/02/04 02:10:48 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -110,16 +110,16 @@ struct zsms_softc { /* driver status information */ struct zsops zsops_zsms; -static int zsms_match __P((struct device *, struct cfdata *, void *)); -static void zsms_attach __P((struct device *, struct device *, void *)); -static void zsms_input __P((void *, int)); +static int zsms_match(struct device *, struct cfdata *, void *); +static void zsms_attach(struct device *, struct device *, void *); +static void zsms_input(void *, int); CFATTACH_DECL(zsms, sizeof(struct zsms_softc), zsms_match, zsms_attach, NULL, NULL); -static int zsms_enable __P((void *)); -static int zsms_ioctl __P((void *, u_long, caddr_t, int, struct proc *)); -static void zsms_disable __P((void *)); +static int zsms_enable(void *); +static int zsms_ioctl(void *, u_long, caddr_t, int, struct proc *); +static void zsms_disable(void *); const struct wsmouse_accessops zsms_accessops = { zsms_enable, @@ -289,10 +289,10 @@ zsms_input(vsc, data) * Interface to the lower layer (zscc) ****************************************************************/ -static void zsms_rxint __P((struct zs_chanstate *)); -static void zsms_stint __P((struct zs_chanstate *, int)); -static void zsms_txint __P((struct zs_chanstate *)); -static void zsms_softint __P((struct zs_chanstate *)); +static void zsms_rxint(struct zs_chanstate *); +static void zsms_stint(struct zs_chanstate *, int); +static void zsms_txint(struct zs_chanstate *); +static void zsms_softint(struct zs_chanstate *); static void zsms_rxint(cs) diff --git a/sys/dev/vinum/vinumext.h b/sys/dev/vinum/vinumext.h index 61c5186557c..1beb844e84a 100644 --- a/sys/dev/vinum/vinumext.h +++ b/sys/dev/vinum/vinumext.h @@ -33,7 +33,7 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinumext.h,v 1.2 2003/10/15 01:31:39 grog Exp $ + * $Id: vinumext.h,v 1.3 2005/02/04 02:10:49 perry Exp $ */ /* vinumext.h: external definitions */ @@ -164,7 +164,7 @@ void longjmp(label_t *); /* the kernel doesn't define this */ #endif char *basename(char *); -typedef int cmp_t __P((const void *, const void *)); +typedef int cmp_t(const void *, const void *); void qsort(void *a, size_t n, size_t es, cmp_t * cmp); void expand_table(void **, int, int); diff --git a/sys/dev/vme/if_ie_vme.c b/sys/dev/vme/if_ie_vme.c index 0fa5fc3d663..deedcf55504 100644 --- a/sys/dev/vme/if_ie_vme.c +++ b/sys/dev/vme/if_ie_vme.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ie_vme.c,v 1.18 2004/03/15 23:51:12 pk Exp $ */ +/* $NetBSD: if_ie_vme.c,v 1.19 2005/02/04 02:10:49 perry Exp $ */ /*- * Copyright (c) 1995 Charles D. Cranor @@ -145,7 +145,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ie_vme.c,v 1.18 2004/03/15 23:51:12 pk Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ie_vme.c,v 1.19 2005/02/04 02:10:49 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -233,13 +233,13 @@ static int media[] = { */ -static void ie_vmereset __P((struct ie_softc *, int)); -static void ie_vmeattend __P((struct ie_softc *, int)); -static void ie_vmerun __P((struct ie_softc *)); -static int ie_vmeintr __P((struct ie_softc *, int)); +static void ie_vmereset(struct ie_softc *, int); +static void ie_vmeattend(struct ie_softc *, int); +static void ie_vmerun(struct ie_softc *); +static int ie_vmeintr(struct ie_softc *, int); -int ie_vme_match __P((struct device *, struct cfdata *, void *)); -void ie_vme_attach __P((struct device *, struct device *, void *)); +int ie_vme_match(struct device *, struct cfdata *, void *); +void ie_vme_attach(struct device *, struct device *, void *); struct ie_vme_softc { struct ie_softc ie; @@ -315,8 +315,8 @@ ie_vmeintr(sc, where) return (0); } -void ie_memcopyin __P((struct ie_softc *, void *, int, size_t)); -void ie_memcopyout __P((struct ie_softc *, const void *, int, size_t)); +void ie_memcopyin(struct ie_softc *, void *, int, size_t); +void ie_memcopyout(struct ie_softc *, const void *, int, size_t); /* * Copy board memory to kernel. @@ -387,10 +387,10 @@ ie_memcopyout(sc, p, offset, size) } /* read a 16-bit value at BH offset */ -u_int16_t ie_vme_read16 __P((struct ie_softc *, int offset)); +u_int16_t ie_vme_read16(struct ie_softc *, int offset); /* write a 16-bit value at BH offset */ -void ie_vme_write16 __P((struct ie_softc *, int offset, u_int16_t value)); -void ie_vme_write24 __P((struct ie_softc *, int offset, int addr)); +void ie_vme_write16(struct ie_softc *, int offset, u_int16_t value); +void ie_vme_write24(struct ie_softc *, int offset, int addr); u_int16_t ie_vme_read16(sc, offset) diff --git a/sys/dev/vme/sc_vme.c b/sys/dev/vme/sc_vme.c index 32ada7d00d3..af1e3b1bd45 100644 --- a/sys/dev/vme/sc_vme.c +++ b/sys/dev/vme/sc_vme.c @@ -1,4 +1,4 @@ -/* $NetBSD: sc_vme.c,v 1.9 2003/05/03 18:11:42 wiz Exp $ */ +/* $NetBSD: sc_vme.c,v 1.10 2005/02/04 02:10:49 perry Exp $ */ /*- * Copyright (c) 1996,2000,2001 The NetBSD Foundation, Inc. @@ -69,7 +69,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sc_vme.c,v 1.9 2003/05/03 18:11:42 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sc_vme.c,v 1.10 2005/02/04 02:10:49 perry Exp $"); #include "opt_ddb.h" @@ -112,9 +112,9 @@ __KERNEL_RCSID(0, "$NetBSD: sc_vme.c,v 1.9 2003/05/03 18:11:42 wiz Exp $"); int sunsc_vme_options = 0; -static int sc_vme_match __P((struct device *, struct cfdata *, void *)); -static void sc_vme_attach __P((struct device *, struct device *, void *)); -static int sc_vme_intr __P((void *)); +static int sc_vme_match(struct device *, struct cfdata *, void *); +static void sc_vme_attach(struct device *, struct device *, void *); +static int sc_vme_intr(void *); /* Auto-configuration glue. */ CFATTACH_DECL(sc_vme, sizeof(struct sunscpal_softc), diff --git a/sys/dev/vme/si.c b/sys/dev/vme/si.c index 81023a33c44..21ad72164e2 100644 --- a/sys/dev/vme/si.c +++ b/sys/dev/vme/si.c @@ -1,4 +1,4 @@ -/* $NetBSD: si.c,v 1.13 2003/05/03 18:11:42 wiz Exp $ */ +/* $NetBSD: si.c,v 1.14 2005/02/04 02:10:49 perry Exp $ */ /*- * Copyright (c) 1996,2000 The NetBSD Foundation, Inc. @@ -80,7 +80,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: si.c,v 1.13 2003/05/03 18:11:42 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: si.c,v 1.14 2005/02/04 02:10:49 perry Exp $"); #include "opt_ddb.h" @@ -172,22 +172,22 @@ struct si_softc { #define SI_OPTIONS_BITS "\10\3RESELECT\2DMA_INTR\1DMA" int si_options = SI_ENABLE_DMA|SI_DMA_INTR|SI_DO_RESELECT; -static int si_match __P((struct device *, struct cfdata *, void *)); -static void si_attach __P((struct device *, struct device *, void *)); -static int si_intr __P((void *)); -static void si_reset_adapter __P((struct ncr5380_softc *)); +static int si_match(struct device *, struct cfdata *, void *); +static void si_attach(struct device *, struct device *, void *); +static int si_intr(void *); +static void si_reset_adapter(struct ncr5380_softc *); -void si_dma_alloc __P((struct ncr5380_softc *)); -void si_dma_free __P((struct ncr5380_softc *)); -void si_dma_poll __P((struct ncr5380_softc *)); +void si_dma_alloc(struct ncr5380_softc *); +void si_dma_free(struct ncr5380_softc *); +void si_dma_poll(struct ncr5380_softc *); -void si_dma_setup __P((struct ncr5380_softc *)); -void si_dma_start __P((struct ncr5380_softc *)); -void si_dma_eop __P((struct ncr5380_softc *)); -void si_dma_stop __P((struct ncr5380_softc *)); +void si_dma_setup(struct ncr5380_softc *); +void si_dma_start(struct ncr5380_softc *); +void si_dma_eop(struct ncr5380_softc *); +void si_dma_stop(struct ncr5380_softc *); -void si_intr_on __P((struct ncr5380_softc *)); -void si_intr_off __P((struct ncr5380_softc *)); +void si_intr_on (struct ncr5380_softc *); +void si_intr_off(struct ncr5380_softc *); /* * Shorthand bus space access diff --git a/sys/dev/vme/vme.c b/sys/dev/vme/vme.c index 73d74632540..fa56a1cd1b3 100644 --- a/sys/dev/vme/vme.c +++ b/sys/dev/vme/vme.c @@ -1,4 +1,4 @@ -/* $NetBSD: vme.c,v 1.14 2004/09/15 09:01:53 drochner Exp $ */ +/* $NetBSD: vme.c,v 1.15 2005/02/04 02:10:49 perry Exp $ */ /* * Copyright (c) 1999 @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.14 2004/09/15 09:01:53 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.15 2005/02/04 02:10:49 perry Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -41,18 +41,18 @@ __KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.14 2004/09/15 09:01:53 drochner Exp $"); #include <dev/vme/vmereg.h> #include <dev/vme/vmevar.h> -static void vme_extractlocators __P((int*, struct vme_attach_args*)); -static int vmeprint __P((struct vme_attach_args*, char*)); -static int vmesubmatch1 __P((struct device*, struct cfdata*, - const locdesc_t *, void*)); -static int vmesubmatch __P((struct device*, struct cfdata*, - const locdesc_t *, void*)); -int vmematch __P((struct device *, struct cfdata *, void *)); -void vmeattach __P((struct device*, struct device*,void*)); -static struct extent *vme_select_map __P((struct vmebus_softc*, vme_am_t)); +static void vme_extractlocators(int*, struct vme_attach_args*); +static int vmeprint(struct vme_attach_args*, char*); +static int vmesubmatch1(struct device*, struct cfdata*, + const locdesc_t *, void*); +static int vmesubmatch(struct device*, struct cfdata*, + const locdesc_t *, void*); +int vmematch(struct device *, struct cfdata *, void *); +void vmeattach(struct device*, struct device*,void*); +static struct extent *vme_select_map(struct vmebus_softc*, vme_am_t); #ifdef notyet -int vmedetach __P((struct device*)); +int vmedetach(struct device*); #endif #define VME_SLAVE_DUMMYDRV "vme_slv" diff --git a/sys/dev/vme/vmevar.h b/sys/dev/vme/vmevar.h index 32360da2a61..b5fb79386a7 100644 --- a/sys/dev/vme/vmevar.h +++ b/sys/dev/vme/vmevar.h @@ -1,4 +1,4 @@ -/* $NetBSD: vmevar.h,v 1.9 2000/06/25 00:23:13 pk Exp $ */ +/* $NetBSD: vmevar.h,v 1.10 2005/02/04 02:10:49 perry Exp $ */ /* * Copyright (c) 1999 @@ -61,28 +61,28 @@ typedef void *vme_intr_handle_t; typedef struct vme_chipset_tag { void *cookie; - int (*vct_map) __P((void *, vme_addr_t, vme_size_t, - vme_am_t, vme_datasize_t, vme_swap_t, - bus_space_tag_t *, bus_space_handle_t *, - vme_mapresc_t *)); - void (*vct_unmap) __P((void *, vme_mapresc_t)); - - int (*vct_probe) __P((void *, vme_addr_t, vme_size_t, - vme_am_t, vme_datasize_t, - int (*)(void *, bus_space_tag_t, bus_space_handle_t), - void *)); - - int (*vct_int_map) __P((void *, int, int, vme_intr_handle_t *)); - const struct evcnt *(*vct_int_evcnt) __P((void *, vme_intr_handle_t)); - void *(*vct_int_establish) __P((void *, vme_intr_handle_t, int, - int (*)(void *), void *)); - void (*vct_int_disestablish) __P((void *, void *)); - - int (*vct_dmamap_create) __P((void *, vme_size_t, - vme_am_t, vme_datasize_t, vme_swap_t, - int, vme_size_t, vme_addr_t, - int, bus_dmamap_t *)); - void (*vct_dmamap_destroy) __P((void *, bus_dmamap_t)); + int (*vct_map)(void *, vme_addr_t, vme_size_t, + vme_am_t, vme_datasize_t, vme_swap_t, + bus_space_tag_t *, bus_space_handle_t *, + vme_mapresc_t *); + void (*vct_unmap)(void *, vme_mapresc_t); + + int (*vct_probe)(void *, vme_addr_t, vme_size_t, + vme_am_t, vme_datasize_t, + int (*)(void *, bus_space_tag_t, bus_space_handle_t), + void *); + + int (*vct_int_map)(void *, int, int, vme_intr_handle_t *); + const struct evcnt *(*vct_int_evcnt)(void *, vme_intr_handle_t); + void *(*vct_int_establish)(void *, vme_intr_handle_t, int, + int (*)(void *), void *); + void (*vct_int_disestablish)(void *, void *); + + int (*vct_dmamap_create)(void *, vme_size_t, + vme_am_t, vme_datasize_t, vme_swap_t, + int, vme_size_t, vme_addr_t, + int, bus_dmamap_t *); + void (*vct_dmamap_destroy)(void *, bus_dmamap_t); /* * This sucks: we have to give all the VME specific arguments @@ -90,10 +90,10 @@ typedef struct vme_chipset_tag { * give a "dmamap" argument here, meaning: "allocate memory which * can be accessed through this DMA map". */ - int (*vct_dmamem_alloc) __P((void *, vme_size_t, - vme_am_t, vme_datasize_t, vme_swap_t, - bus_dma_segment_t *, int, int *, int)); - void (*vct_dmamem_free) __P((void *, bus_dma_segment_t *, int)); + int (*vct_dmamem_alloc)(void *, vme_size_t, + vme_am_t, vme_datasize_t, vme_swap_t, + bus_dma_segment_t *, int, int *, int); + void (*vct_dmamem_free)(void *, bus_dma_segment_t *, int); struct vmebus_softc *bus; } *vme_chipset_tag_t; @@ -154,8 +154,8 @@ typedef struct vme_chipset_tag { */ struct vme_attach_args; -typedef void (*vme_slaveconf_callback) __P((struct device *, - struct vme_attach_args *)); +typedef void (*vme_slaveconf_callback)(struct device *, + struct vme_attach_args *); struct vmebus_attach_args { vme_chipset_tag_t va_vct; @@ -197,12 +197,10 @@ struct vme_attach_args { /* * Address space accounting. */ -int _vme_space_alloc __P((struct vmebus_softc *, vme_addr_t, - vme_size_t, vme_am_t)); -void _vme_space_free __P((struct vmebus_softc *, vme_addr_t, - vme_size_t, vme_am_t)); -int _vme_space_get __P((struct vmebus_softc *, vme_size_t, vme_am_t, - u_long, vme_addr_t*)); +int _vme_space_alloc(struct vmebus_softc *, vme_addr_t, vme_size_t, vme_am_t); +void _vme_space_free(struct vmebus_softc *, vme_addr_t, vme_size_t, vme_am_t); +int _vme_space_get(struct vmebus_softc *, vme_size_t, vme_am_t, + u_long, vme_addr_t*); #define vme_space_alloc(tag, addr, size, ams) \ _vme_space_alloc(tag->bus, addr, size, ams) diff --git a/sys/dev/vme/xd.c b/sys/dev/vme/xd.c index e22c7f070cd..12c5a463e09 100644 --- a/sys/dev/vme/xd.c +++ b/sys/dev/vme/xd.c @@ -1,4 +1,4 @@ -/* $NetBSD: xd.c,v 1.55 2004/10/28 07:07:46 yamt Exp $ */ +/* $NetBSD: xd.c,v 1.56 2005/02/04 02:10:49 perry Exp $ */ /* * @@ -51,7 +51,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.55 2004/10/28 07:07:46 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.56 2005/02/04 02:10:49 perry Exp $"); #undef XDC_DEBUG /* full debug */ #define XDC_DIAG /* extra sanity checks */ @@ -212,24 +212,24 @@ __KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.55 2004/10/28 07:07:46 yamt Exp $"); extern int pil_to_vme[]; /* from obio.c */ /* internals */ -int xdc_cmd __P((struct xdc_softc *, int, int, int, int, int, char *, int)); -char *xdc_e2str __P((int)); -int xdc_error __P((struct xdc_softc *, struct xd_iorq *, - struct xd_iopb *, int, int)); -int xdc_ioctlcmd __P((struct xd_softc *, dev_t dev, struct xd_iocmd *)); -void xdc_perror __P((struct xd_iorq *, struct xd_iopb *, int)); -int xdc_piodriver __P((struct xdc_softc *, int, int)); -int xdc_remove_iorq __P((struct xdc_softc *)); -int xdc_reset __P((struct xdc_softc *, int, int, int, struct xd_softc *)); -inline void xdc_rqinit __P((struct xd_iorq *, struct xdc_softc *, - struct xd_softc *, int, u_long, int, - caddr_t, struct buf *)); -void xdc_rqtopb __P((struct xd_iorq *, struct xd_iopb *, int, int)); -void xdc_start __P((struct xdc_softc *, int)); -int xdc_startbuf __P((struct xdc_softc *, struct xd_softc *, struct buf *)); -int xdc_submit_iorq __P((struct xdc_softc *, int, int)); -void xdc_tick __P((void *)); -void xdc_xdreset __P((struct xdc_softc *, struct xd_softc *)); +int xdc_cmd(struct xdc_softc *, int, int, int, int, int, char *, int); +char *xdc_e2str(int); +int xdc_error(struct xdc_softc *, struct xd_iorq *, + struct xd_iopb *, int, int); +int xdc_ioctlcmd(struct xd_softc *, dev_t dev, struct xd_iocmd *); +void xdc_perror(struct xd_iorq *, struct xd_iopb *, int); +int xdc_piodriver(struct xdc_softc *, int, int); +int xdc_remove_iorq(struct xdc_softc *); +int xdc_reset(struct xdc_softc *, int, int, int, struct xd_softc *); +inline void xdc_rqinit(struct xd_iorq *, struct xdc_softc *, + struct xd_softc *, int, u_long, int, + caddr_t, struct buf *); +void xdc_rqtopb(struct xd_iorq *, struct xd_iopb *, int, int); +void xdc_start(struct xdc_softc *, int); +int xdc_startbuf(struct xdc_softc *, struct xd_softc *, struct buf *); +int xdc_submit_iorq(struct xdc_softc *, int, int); +void xdc_tick(void *); +void xdc_xdreset(struct xdc_softc *, struct xd_softc *); int xd_dmamem_alloc(bus_dma_tag_t, bus_dmamap_t, bus_dma_segment_t *, int *, bus_size_t, caddr_t *, bus_addr_t *); void xd_dmamem_free(bus_dma_tag_t, bus_dmamap_t, bus_dma_segment_t *, @@ -237,20 +237,20 @@ void xd_dmamem_free(bus_dma_tag_t, bus_dmamap_t, bus_dma_segment_t *, /* machine interrupt hook */ -int xdcintr __P((void *)); +int xdcintr(void *); /* autoconf */ -int xdcmatch __P((struct device *, struct cfdata *, void *)); -void xdcattach __P((struct device *, struct device *, void *)); -int xdmatch __P((struct device *, struct cfdata *, void *)); -void xdattach __P((struct device *, struct device *, void *)); -static int xdc_probe __P((void *, bus_space_tag_t, bus_space_handle_t)); +int xdcmatch(struct device *, struct cfdata *, void *); +void xdcattach(struct device *, struct device *, void *); +int xdmatch(struct device *, struct cfdata *, void *); +void xdattach(struct device *, struct device *, void *); +static int xdc_probe(void *, bus_space_tag_t, bus_space_handle_t); -static void xddummystrat __P((struct buf *)); -int xdgetdisklabel __P((struct xd_softc *, void *)); +static void xddummystrat(struct buf *); +int xdgetdisklabel(struct xd_softc *, void *); /* XXX - think about this more.. xd_machdep? */ -void xdc_md_setup __P((void)); +void xdc_md_setup(void); int XDC_DELAY; #if defined(__sparc__) diff --git a/sys/dev/vme/xdvar.h b/sys/dev/vme/xdvar.h index cf27ca88524..337d44ecae6 100644 --- a/sys/dev/vme/xdvar.h +++ b/sys/dev/vme/xdvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: xdvar.h,v 1.7 2002/07/23 20:49:55 hannken Exp $ */ +/* $NetBSD: xdvar.h,v 1.8 2005/02/04 02:10:49 perry Exp $ */ /* * diff --git a/sys/dev/vme/xy.c b/sys/dev/vme/xy.c index 0bf12d80587..6363e40c4f2 100644 --- a/sys/dev/vme/xy.c +++ b/sys/dev/vme/xy.c @@ -1,4 +1,4 @@ -/* $NetBSD: xy.c,v 1.56 2004/10/28 07:07:46 yamt Exp $ */ +/* $NetBSD: xy.c,v 1.57 2005/02/04 02:10:49 perry Exp $ */ /* * @@ -51,7 +51,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.56 2004/10/28 07:07:46 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.57 2005/02/04 02:10:49 perry Exp $"); #undef XYC_DEBUG /* full debug */ #undef XYC_DIAG /* extra sanity checks */ @@ -150,45 +150,45 @@ __KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.56 2004/10/28 07:07:46 yamt Exp $"); extern int pil_to_vme[]; /* from obio.c */ /* internals */ -struct xy_iopb *xyc_chain __P((struct xyc_softc *, struct xy_iorq *)); -int xyc_cmd __P((struct xyc_softc *, int, int, int, int, int, char *, int)); -char *xyc_e2str __P((int)); -int xyc_entoact __P((int)); -int xyc_error __P((struct xyc_softc *, struct xy_iorq *, - struct xy_iopb *, int)); -int xyc_ioctlcmd __P((struct xy_softc *, dev_t dev, struct xd_iocmd *)); -void xyc_perror __P((struct xy_iorq *, struct xy_iopb *, int)); -int xyc_piodriver __P((struct xyc_softc *, struct xy_iorq *)); -int xyc_remove_iorq __P((struct xyc_softc *)); -int xyc_reset __P((struct xyc_softc *, int, struct xy_iorq *, int, - struct xy_softc *)); -inline void xyc_rqinit __P((struct xy_iorq *, struct xyc_softc *, - struct xy_softc *, int, u_long, int, - caddr_t, struct buf *)); -void xyc_rqtopb __P((struct xy_iorq *, struct xy_iopb *, int, int)); -void xyc_start __P((struct xyc_softc *, struct xy_iorq *)); -int xyc_startbuf __P((struct xyc_softc *, struct xy_softc *, struct buf *)); -int xyc_submit_iorq __P((struct xyc_softc *, struct xy_iorq *, int)); -void xyc_tick __P((void *)); -int xyc_unbusy __P((struct xyc *, int)); -void xyc_xyreset __P((struct xyc_softc *, struct xy_softc *)); +struct xy_iopb *xyc_chain(struct xyc_softc *, struct xy_iorq *); +int xyc_cmd(struct xyc_softc *, int, int, int, int, int, char *, int); +char *xyc_e2str(int); +int xyc_entoact(int); +int xyc_error(struct xyc_softc *, struct xy_iorq *, + struct xy_iopb *, int); +int xyc_ioctlcmd(struct xy_softc *, dev_t dev, struct xd_iocmd *); +void xyc_perror(struct xy_iorq *, struct xy_iopb *, int); +int xyc_piodriver(struct xyc_softc *, struct xy_iorq *); +int xyc_remove_iorq(struct xyc_softc *); +int xyc_reset(struct xyc_softc *, int, struct xy_iorq *, int, + struct xy_softc *); +inline void xyc_rqinit(struct xy_iorq *, struct xyc_softc *, + struct xy_softc *, int, u_long, int, + caddr_t, struct buf *); +void xyc_rqtopb(struct xy_iorq *, struct xy_iopb *, int, int); +void xyc_start(struct xyc_softc *, struct xy_iorq *); +int xyc_startbuf(struct xyc_softc *, struct xy_softc *, struct buf *); +int xyc_submit_iorq(struct xyc_softc *, struct xy_iorq *, int); +void xyc_tick(void *); +int xyc_unbusy(struct xyc *, int); +void xyc_xyreset(struct xyc_softc *, struct xy_softc *); int xy_dmamem_alloc(bus_dma_tag_t, bus_dmamap_t, bus_dma_segment_t *, int *, bus_size_t, caddr_t *, bus_addr_t *); void xy_dmamem_free(bus_dma_tag_t, bus_dmamap_t, bus_dma_segment_t *, int, bus_size_t, caddr_t); /* machine interrupt hook */ -int xycintr __P((void *)); +int xycintr(void *); /* autoconf */ -int xycmatch __P((struct device *, struct cfdata *, void *)); -void xycattach __P((struct device *, struct device *, void *)); -int xymatch __P((struct device *, struct cfdata *, void *)); -void xyattach __P((struct device *, struct device *, void *)); -static int xyc_probe __P((void *, bus_space_tag_t, bus_space_handle_t)); - -static void xydummystrat __P((struct buf *)); -int xygetdisklabel __P((struct xy_softc *, void *)); +int xycmatch(struct device *, struct cfdata *, void *); +void xycattach(struct device *, struct device *, void *); +int xymatch(struct device *, struct cfdata *, void *); +void xyattach(struct device *, struct device *, void *); +static int xyc_probe(void *, bus_space_tag_t, bus_space_handle_t); + +static void xydummystrat(struct buf *); +int xygetdisklabel(struct xy_softc *, void *); /* * cfattach's: device driver interface to autoconfig diff --git a/sys/dev/vme/xyvar.h b/sys/dev/vme/xyvar.h index 253007848de..bec11632ed7 100644 --- a/sys/dev/vme/xyvar.h +++ b/sys/dev/vme/xyvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: xyvar.h,v 1.8 2002/07/23 20:49:55 hannken Exp $ */ +/* $NetBSD: xyvar.h,v 1.9 2005/02/04 02:10:49 perry Exp $ */ /* * diff --git a/sys/dev/wscons/wsdisplayvar.h b/sys/dev/wscons/wsdisplayvar.h index aaa79269fd7..31f5ff30dd8 100644 --- a/sys/dev/wscons/wsdisplayvar.h +++ b/sys/dev/wscons/wsdisplayvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: wsdisplayvar.h,v 1.29 2004/07/29 22:29:37 jmmv Exp $ */ +/* $NetBSD: wsdisplayvar.h,v 1.30 2005/02/04 02:10:49 perry Exp $ */ /* * Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved. @@ -112,7 +112,7 @@ struct wsdisplay_accessops { void (*pollc)(void *, int); int (*getwschar)(void *, struct wsdisplay_char *); int (*putwschar)(void *, struct wsdisplay_char *); - void (*scroll) __P((void *, void *, int)); + void (*scroll)(void *, void *, int); u_int (*getborder)(void *); int (*setborder)(void *, u_int); }; |
