diff options
| author | cegger <cegger@NetBSD.org> | 2009-05-12 12:10:29 +0000 |
|---|---|---|
| committer | cegger <cegger@NetBSD.org> | 2009-05-12 12:10:29 +0000 |
| commit | 32c4940900e916e597f71e482edcd7a7b26a1074 (patch) | |
| tree | 2e945988987a53b270f9cea894f3e08fff13fbc8 /sys/dev | |
| parent | d4da6c3d2efe21fdd8f994f4add0a78250fd6c3e (diff) | |
struct cfdata * -> cfdata_t, no functional changes intended.
Diffstat (limited to 'sys/dev')
70 files changed, 287 insertions, 287 deletions
diff --git a/sys/dev/ata/ata.c b/sys/dev/ata/ata.c index 81be70e8a6c..b38a5559cc8 100644 --- a/sys/dev/ata/ata.c +++ b/sys/dev/ata/ata.c @@ -1,4 +1,4 @@ -/* $NetBSD: ata.c,v 1.105 2009/04/07 18:01:20 dyoung Exp $ */ +/* $NetBSD: ata.c,v 1.106 2009/05/12 12:10:29 cegger Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.105 2009/04/07 18:01:20 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.106 2009/05/12 12:10:29 cegger Exp $"); #include "opt_ata.h" @@ -415,7 +415,7 @@ atabus_thread(void *arg) * Autoconfiguration match routine. */ static int -atabus_match(device_t parent, struct cfdata *cf, void *aux) +atabus_match(device_t parent, cfdata_t cf, void *aux) { struct ata_channel *chp = aux; diff --git a/sys/dev/ata/ld_ataraid.c b/sys/dev/ata/ld_ataraid.c index 4d0edf2f1fd..f5d1d39c563 100644 --- a/sys/dev/ata/ld_ataraid.c +++ b/sys/dev/ata/ld_ataraid.c @@ -1,4 +1,4 @@ -/* $NetBSD: ld_ataraid.c,v 1.33 2008/10/15 06:51:20 wrstuden Exp $ */ +/* $NetBSD: ld_ataraid.c,v 1.34 2009/05/12 12:10:29 cegger Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -47,7 +47,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ld_ataraid.c,v 1.33 2008/10/15 06:51:20 wrstuden Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ld_ataraid.c,v 1.34 2009/05/12 12:10:29 cegger Exp $"); #include "bio.h" #include "rnd.h" @@ -92,7 +92,7 @@ struct ld_ataraid_softc { void (*sc_iodone)(struct buf *); }; -static int ld_ataraid_match(struct device *, struct cfdata *, void *); +static int ld_ataraid_match(struct device *, cfdata_t, void *); static void ld_ataraid_attach(struct device *, struct device *, void *); static int ld_ataraid_dump(struct ld_softc *, void *, int, int); diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c index e863411b63f..b4fec35052a 100644 --- a/sys/dev/ata/wd.c +++ b/sys/dev/ata/wd.c @@ -1,4 +1,4 @@ -/* $NetBSD: wd.c,v 1.371 2009/04/02 00:09:32 dyoung Exp $ */ +/* $NetBSD: wd.c,v 1.372 2009/05/12 12:10:29 cegger Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved. @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.371 2009/04/02 00:09:32 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.372 2009/05/12 12:10:29 cegger Exp $"); #include "opt_ata.h" @@ -126,7 +126,7 @@ int wdcdebug_wd_mask = 0x0; #define ATADEBUG_PRINT(args, level) #endif -int wdprobe(struct device *, struct cfdata *, void *); +int wdprobe(struct device *, cfdata_t, void *); void wdattach(struct device *, struct device *, void *); int wddetach(struct device *, int); int wdactivate(struct device *, enum devact); @@ -274,7 +274,7 @@ wd_lookup_quirks(const char *name) } int -wdprobe(struct device *parent, struct cfdata *match, void *aux) +wdprobe(struct device *parent, cfdata_t match, void *aux) { struct ata_device *adev = aux; diff --git a/sys/dev/bluetooth/bcsp.c b/sys/dev/bluetooth/bcsp.c index 01ce36c8bff..f4bfc37454a 100644 --- a/sys/dev/bluetooth/bcsp.c +++ b/sys/dev/bluetooth/bcsp.c @@ -1,4 +1,4 @@ -/* $NetBSD: bcsp.c,v 1.17 2009/05/07 18:01:57 elad Exp $ */ +/* $NetBSD: bcsp.c,v 1.18 2009/05/12 12:10:46 cegger Exp $ */ /* * Copyright (c) 2007 KIYOHARA Takashi * All rights reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bcsp.c,v 1.17 2009/05/07 18:01:57 elad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bcsp.c,v 1.18 2009/05/12 12:10:46 cegger Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -132,7 +132,7 @@ struct bcsp_softc { #define BCSP_ENABLED (1 << 1) /* is enabled */ void bcspattach(int); -static int bcsp_match(device_t, struct cfdata *, void *); +static int bcsp_match(device_t, cfdata_t, void *); static void bcsp_attach(device_t, device_t, void *); static int bcsp_detach(device_t, int); @@ -246,7 +246,7 @@ bcspattach(int num __unused) */ /* ARGSUSED */ static int -bcsp_match(device_t self __unused, struct cfdata *cfdata __unused, +bcsp_match(device_t self __unused, cfdata_t cfdata __unused, void *arg __unused) { @@ -373,7 +373,7 @@ bcspopen(dev_t device __unused, struct tty *tp) { struct bcsp_softc *sc; device_t dev; - struct cfdata *cfdata; + cfdata_t cfdata; struct lwp *l = curlwp; /* XXX */ int error, unit, s; static char name[] = "bcsp"; @@ -436,7 +436,7 @@ static int bcspclose(struct tty *tp, int flag __unused) { struct bcsp_softc *sc = tp->t_sc; - struct cfdata *cfdata; + cfdata_t cfdata; int s; /* terminate link-establishment */ diff --git a/sys/dev/bluetooth/bthidev.c b/sys/dev/bluetooth/bthidev.c index 6f9ef561e48..be6c3a05306 100644 --- a/sys/dev/bluetooth/bthidev.c +++ b/sys/dev/bluetooth/bthidev.c @@ -1,4 +1,4 @@ -/* $NetBSD: bthidev.c,v 1.16 2008/08/06 15:01:23 plunky Exp $ */ +/* $NetBSD: bthidev.c,v 1.17 2009/05/12 12:10:46 cegger Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bthidev.c,v 1.16 2008/08/06 15:01:23 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bthidev.c,v 1.17 2009/05/12 12:10:46 cegger Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -109,7 +109,7 @@ static int bthidev_output(struct bthidev *, uint8_t *, int); static void bthidev_null(struct bthidev *, uint8_t *, int); /* autoconf(9) glue */ -static int bthidev_match(device_t, struct cfdata *, void *); +static int bthidev_match(device_t, cfdata_t, void *); static void bthidev_attach(device_t, device_t, void *); static int bthidev_detach(device_t, int); static int bthidev_print(void *, const char *); @@ -155,7 +155,7 @@ static const struct btproto bthidev_int_proto = { */ static int -bthidev_match(device_t self, struct cfdata *cfdata, void *aux) +bthidev_match(device_t self, cfdata_t cfdata, void *aux) { prop_dictionary_t dict = aux; prop_object_t obj; diff --git a/sys/dev/bluetooth/bthub.c b/sys/dev/bluetooth/bthub.c index 176472bebd4..d81c5c96c61 100644 --- a/sys/dev/bluetooth/bthub.c +++ b/sys/dev/bluetooth/bthub.c @@ -1,4 +1,4 @@ -/* $NetBSD: bthub.c,v 1.14 2008/06/12 21:47:11 cegger Exp $ */ +/* $NetBSD: bthub.c,v 1.15 2009/05/12 12:10:46 cegger Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bthub.c,v 1.14 2008/06/12 21:47:11 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bthub.c,v 1.15 2009/05/12 12:10:46 cegger Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -59,7 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: bthub.c,v 1.14 2008/06/12 21:47:11 cegger Exp $"); */ /* autoconf(9) glue */ -static int bthub_match(device_t, struct cfdata *, void *); +static int bthub_match(device_t, cfdata_t, void *); static void bthub_attach(device_t, device_t, void *); static int bthub_detach(device_t, int); @@ -86,7 +86,7 @@ static int bthub_pioctl(dev_t, unsigned long, prop_dictionary_t, int, struct lwp */ static int -bthub_match(device_t self, struct cfdata *cfdata, void *arg) +bthub_match(device_t self, cfdata_t cfdata, void *arg) { return 1; diff --git a/sys/dev/bluetooth/btkbd.c b/sys/dev/bluetooth/btkbd.c index cd535349645..72fc4b404b2 100644 --- a/sys/dev/bluetooth/btkbd.c +++ b/sys/dev/bluetooth/btkbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: btkbd.c,v 1.10 2008/09/09 03:54:56 cube Exp $ */ +/* $NetBSD: btkbd.c,v 1.11 2009/05/12 12:10:46 cegger Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: btkbd.c,v 1.10 2008/09/09 03:54:56 cube Exp $"); +__KERNEL_RCSID(0, "$NetBSD: btkbd.c,v 1.11 2009/05/12 12:10:46 cegger Exp $"); #include <sys/param.h> #include <sys/callout.h> @@ -144,7 +144,7 @@ struct btkbd_softc { }; /* autoconf(9) methods */ -static int btkbd_match(device_t, struct cfdata *, void *); +static int btkbd_match(device_t, cfdata_t, void *); static void btkbd_attach(device_t, device_t, void *); static int btkbd_detach(device_t, int); @@ -194,7 +194,7 @@ static void btkbd_repeat(void *); */ static int -btkbd_match(device_t self, struct cfdata *cfdata, void *aux) +btkbd_match(device_t self, cfdata_t cfdata, void *aux) { struct bthidev_attach_args *ba = aux; diff --git a/sys/dev/bluetooth/btms.c b/sys/dev/bluetooth/btms.c index 0fa545fd357..cf209046508 100644 --- a/sys/dev/bluetooth/btms.c +++ b/sys/dev/bluetooth/btms.c @@ -1,4 +1,4 @@ -/* $NetBSD: btms.c,v 1.8 2008/09/09 03:54:56 cube Exp $ */ +/* $NetBSD: btms.c,v 1.9 2009/05/12 12:10:46 cegger Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: btms.c,v 1.8 2008/09/09 03:54:56 cube Exp $"); +__KERNEL_RCSID(0, "$NetBSD: btms.c,v 1.9 2009/05/12 12:10:46 cegger Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -114,7 +114,7 @@ struct btms_softc { #define BTMS_HASW (1 << 2) /* has W direction */ /* autoconf(9) methods */ -static int btms_match(device_t, struct cfdata *, void *); +static int btms_match(device_t, cfdata_t, void *); static void btms_attach(device_t, device_t, void *); static int btms_detach(device_t, int); @@ -141,7 +141,7 @@ static void btms_input(struct bthidev *, uint8_t *, int); */ static int -btms_match(device_t parent, struct cfdata *match, void *aux) +btms_match(device_t parent, cfdata_t match, void *aux) { struct bthidev_attach_args *ba = aux; diff --git a/sys/dev/bluetooth/btsco.c b/sys/dev/bluetooth/btsco.c index f3740e5aa61..c9d0ef713c3 100644 --- a/sys/dev/bluetooth/btsco.c +++ b/sys/dev/bluetooth/btsco.c @@ -1,4 +1,4 @@ -/* $NetBSD: btsco.c,v 1.22 2008/08/06 15:01:23 plunky Exp $ */ +/* $NetBSD: btsco.c,v 1.23 2009/05/12 12:10:46 cegger Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.22 2008/08/06 15:01:23 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: btsco.c,v 1.23 2009/05/12 12:10:46 cegger Exp $"); #include <sys/param.h> #include <sys/audioio.h> @@ -134,7 +134,7 @@ struct btsco_softc { #define BTSCO_LISTEN (1 << 1) /* autoconf(9) glue */ -static int btsco_match(device_t, struct cfdata *, void *); +static int btsco_match(device_t, cfdata_t, void *); static void btsco_attach(device_t, device_t, void *); static int btsco_detach(device_t, int); @@ -259,7 +259,7 @@ static void btsco_intr(void *); */ static int -btsco_match(device_t self, struct cfdata *cfdata, void *aux) +btsco_match(device_t self, cfdata_t cfdata, void *aux) { prop_dictionary_t dict = aux; prop_object_t obj; diff --git a/sys/dev/bluetooth/btuart.c b/sys/dev/bluetooth/btuart.c index 2dc8136681e..e98d16a4aa0 100644 --- a/sys/dev/bluetooth/btuart.c +++ b/sys/dev/bluetooth/btuart.c @@ -1,4 +1,4 @@ -/* $NetBSD: btuart.c,v 1.22 2009/05/07 18:01:57 elad Exp $ */ +/* $NetBSD: btuart.c,v 1.23 2009/05/12 12:10:46 cegger Exp $ */ /*- * Copyright (c) 2006, 2007 KIYOHARA Takashi @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: btuart.c,v 1.22 2009/05/07 18:01:57 elad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: btuart.c,v 1.23 2009/05/12 12:10:46 cegger Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -82,7 +82,7 @@ struct btuart_softc { #define BTUART_RECV_EVENT_DATA 6 /* event packet data */ void btuartattach(int); -static int btuart_match(device_t, struct cfdata *, void *); +static int btuart_match(device_t, cfdata_t, void *); static void btuart_attach(device_t, device_t, void *); static int btuart_detach(device_t, int); @@ -164,7 +164,7 @@ btuartattach(int num __unused) * Autoconf match routine. */ static int -btuart_match(device_t self __unused, struct cfdata *cfdata __unused, +btuart_match(device_t self __unused, cfdata_t cfdata __unused, void *arg __unused) { @@ -222,7 +222,7 @@ btuartopen(dev_t devno __unused, struct tty *tp) { struct btuart_softc *sc; device_t dev; - struct cfdata *cfdata; + cfdata_t cfdata; struct lwp *l = curlwp; /* XXX */ int error, unit, s; @@ -281,7 +281,7 @@ static int btuartclose(struct tty *tp, int flag __unused) { struct btuart_softc *sc = tp->t_sc; - struct cfdata *cfdata; + cfdata_t cfdata; int s; s = spltty(); diff --git a/sys/dev/cardbus/adv_cardbus.c b/sys/dev/cardbus/adv_cardbus.c index 01482c495f4..6f3e6e01ebc 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.20 2009/03/14 15:36:16 dsl Exp $ */ +/* $NetBSD: adv_cardbus.c,v 1.21 2009/05/12 12:11:17 cegger Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: adv_cardbus.c,v 1.20 2009/03/14 15:36:16 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: adv_cardbus.c,v 1.21 2009/05/12 12:11:17 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -82,7 +82,7 @@ struct adv_cardbus_softc { bus_size_t sc_size; }; -int adv_cardbus_match(struct device *, struct cfdata *, void *); +int adv_cardbus_match(struct device *, cfdata_t, void *); void adv_cardbus_attach(struct device *, struct device *, void *); int adv_cardbus_detach(struct device *, int); @@ -90,7 +90,7 @@ CFATTACH_DECL(adv_cardbus, sizeof(struct adv_cardbus_softc), adv_cardbus_match, adv_cardbus_attach, adv_cardbus_detach, NULL); int -adv_cardbus_match(struct device *parent, struct cfdata *match, +adv_cardbus_match(struct device *parent, cfdata_t match, void *aux) { struct cardbus_attach_args *ca = aux; diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c index 45114de0d6b..d63a4fc08b2 100644 --- a/sys/dev/cardbus/cardbus.c +++ b/sys/dev/cardbus/cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: cardbus.c,v 1.96 2009/04/02 00:09:33 dyoung Exp $ */ +/* $NetBSD: cardbus.c,v 1.97 2009/05/12 12:11:17 cegger Exp $ */ /* * Copyright (c) 1997, 1998, 1999 and 2000 @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.96 2009/04/02 00:09:33 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.97 2009/05/12 12:11:17 cegger Exp $"); #include "opt_cardbus.h" @@ -71,7 +71,7 @@ __KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.96 2009/04/02 00:09:33 dyoung Exp $"); STATIC void cardbusattach(device_t, device_t, void *); STATIC int cardbusdetach(device_t, int); -STATIC int cardbusmatch(device_t, struct cfdata *, void *); +STATIC int cardbusmatch(device_t, cfdata_t, void *); int cardbus_rescan(device_t, const char *, const int *); void cardbus_childdetached(device_t, device_t); static int cardbusprint(void *, const char *); @@ -103,7 +103,7 @@ struct cfdriver cardbus_cd = { STATIC int -cardbusmatch(device_t parent, struct cfdata *cf, void *aux) +cardbusmatch(device_t parent, cfdata_t cf, void *aux) { return (1); diff --git a/sys/dev/cardbus/cardslot.c b/sys/dev/cardbus/cardslot.c index 9235d9d490a..7bbc82ebf22 100644 --- a/sys/dev/cardbus/cardslot.c +++ b/sys/dev/cardbus/cardslot.c @@ -1,4 +1,4 @@ -/* $NetBSD: cardslot.c,v 1.47 2009/04/02 00:09:33 dyoung Exp $ */ +/* $NetBSD: cardslot.c,v 1.48 2009/05/12 12:11:17 cegger Exp $ */ /* * Copyright (c) 1999 and 2000 @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.47 2009/04/02 00:09:33 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.48 2009/05/12 12:11:17 cegger Exp $"); #include "opt_cardslot.h" @@ -67,12 +67,12 @@ __KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.47 2009/04/02 00:09:33 dyoung Exp $") STATIC void cardslotattach(struct device *, struct device *, void *); STATIC int cardslotdetach(device_t, int); -STATIC int cardslotmatch(struct device *, struct cfdata *, void *); +STATIC int cardslotmatch(struct device *, cfdata_t, void *); static void cardslot_event_thread(void *arg); 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 *, +static int cardslot_16_submatch(struct device *, cfdata_t, const int *, void *); CFATTACH_DECL3_NEW(cardslot, sizeof(struct cardslot_softc), @@ -80,7 +80,7 @@ CFATTACH_DECL3_NEW(cardslot, sizeof(struct cardslot_softc), DVF_DETACH_SHUTDOWN); STATIC int -cardslotmatch(struct device *parent, struct cfdata *cf, +cardslotmatch(struct device *parent, cfdata_t cf, void *aux) { struct cardslot_attach_args *caa = aux; @@ -204,7 +204,7 @@ cardslot_cb_print(void *aux, const char *pnp) static int -cardslot_16_submatch(struct device *parent, struct cfdata *cf, +cardslot_16_submatch(struct device *parent, cfdata_t cf, const int *ldesc, void *aux) { diff --git a/sys/dev/cardbus/ehci_cardbus.c b/sys/dev/cardbus/ehci_cardbus.c index 4215a0e1e21..1ef1586cec3 100644 --- a/sys/dev/cardbus/ehci_cardbus.c +++ b/sys/dev/cardbus/ehci_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: ehci_cardbus.c,v 1.22 2008/06/24 19:44:52 drochner Exp $ */ +/* $NetBSD: ehci_cardbus.c,v 1.23 2009/05/12 12:11:17 cegger Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.22 2008/06/24 19:44:52 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.23 2009/05/12 12:11:17 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -65,7 +65,7 @@ extern int ehcidebug; #define DPRINTF(x) #endif -int ehci_cardbus_match(device_t, struct cfdata *, void *); +int ehci_cardbus_match(device_t, cfdata_t, void *); void ehci_cardbus_attach(device_t, device_t, void *); int ehci_cardbus_detach(device_t, int); @@ -89,7 +89,7 @@ static TAILQ_HEAD(, usb_cardbus) ehci_cardbus_alldevs = TAILQ_HEAD_INITIALIZER(ehci_cardbus_alldevs); int -ehci_cardbus_match(device_t parent, struct cfdata *match, void *aux) +ehci_cardbus_match(device_t parent, cfdata_t match, void *aux) { struct cardbus_attach_args *ca = (struct cardbus_attach_args *)aux; diff --git a/sys/dev/cardbus/fwohci_cardbus.c b/sys/dev/cardbus/fwohci_cardbus.c index 33fdd157ec2..fe867be075a 100644 --- a/sys/dev/cardbus/fwohci_cardbus.c +++ b/sys/dev/cardbus/fwohci_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: fwohci_cardbus.c,v 1.26 2008/07/11 17:50:45 kiyohara Exp $ */ +/* $NetBSD: fwohci_cardbus.c,v 1.27 2009/05/12 12:11:17 cegger Exp $ */ /*- * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fwohci_cardbus.c,v 1.26 2008/07/11 17:50:45 kiyohara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fwohci_cardbus.c,v 1.27 2009/05/12 12:11:17 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -62,7 +62,7 @@ struct fwohci_cardbus_softc { void *sc_ih; }; -static int fwohci_cardbus_match(device_t, struct cfdata *, void *); +static int fwohci_cardbus_match(device_t, cfdata_t, void *); static void fwohci_cardbus_attach(device_t, device_t, void *); static int fwohci_cardbus_detach(device_t, int); @@ -75,7 +75,7 @@ CFATTACH_DECL_NEW(fwohci_cardbus, sizeof(struct fwohci_cardbus_softc), #define cardbus_devinfo pci_devinfo static int -fwohci_cardbus_match(device_t parent, struct cfdata *match, void *aux) +fwohci_cardbus_match(device_t parent, cfdata_t match, void *aux) { struct cardbus_attach_args *ca = (struct cardbus_attach_args *)aux; diff --git a/sys/dev/cardbus/if_ath_cardbus.c b/sys/dev/cardbus/if_ath_cardbus.c index 7c9a955c9fe..a43e68c2f18 100644 --- a/sys/dev/cardbus/if_ath_cardbus.c +++ b/sys/dev/cardbus/if_ath_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ath_cardbus.c,v 1.32 2008/12/11 05:45:29 alc Exp $ */ +/* $NetBSD: if_ath_cardbus.c,v 1.33 2009/05/12 12:11:17 cegger Exp $ */ /* * Copyright (c) 2003 * Ichiro FUKUHARA <ichiro@ichiro.org>. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.32 2008/12/11 05:45:29 alc Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.33 2009/05/12 12:11:17 cegger Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -152,7 +152,7 @@ ath_cardbus_resume(device_t self PMF_FN_ARGS) } int -ath_cardbus_match(device_t parent, struct cfdata *match, void *aux) +ath_cardbus_match(device_t parent, cfdata_t match, void *aux) { struct cardbus_attach_args *ca = aux; const char *devname; diff --git a/sys/dev/cardbus/if_fxp_cardbus.c b/sys/dev/cardbus/if_fxp_cardbus.c index bf528e42f3c..d03b7c0730e 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.37 2009/03/07 15:03:25 tsutsui Exp $ */ +/* $NetBSD: if_fxp_cardbus.c,v 1.38 2009/05/12 12:11:17 cegger Exp $ */ /* * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.37 2009/03/07 15:03:25 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.38 2009/05/12 12:11:17 cegger Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -111,7 +111,7 @@ CFATTACH_DECL_NEW(fxp_cardbus, sizeof(struct fxp_cardbus_softc), #endif static int -fxp_cardbus_match(struct device *parent, struct cfdata *match, +fxp_cardbus_match(struct device *parent, cfdata_t match, void *aux) { struct cardbus_attach_args *ca = aux; diff --git a/sys/dev/cardbus/if_ral_cardbus.c b/sys/dev/cardbus/if_ral_cardbus.c index 77ca13a723f..521bf7c5376 100644 --- a/sys/dev/cardbus/if_ral_cardbus.c +++ b/sys/dev/cardbus/if_ral_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ral_cardbus.c,v 1.14 2008/10/12 02:15:02 dholland Exp $ */ +/* $NetBSD: if_ral_cardbus.c,v 1.15 2009/05/12 12:11:17 cegger Exp $ */ /* $OpenBSD: if_ral_cardbus.c,v 1.6 2006/01/09 20:03:31 damien Exp $ */ /*- @@ -22,7 +22,7 @@ * CardBus front-end for the Ralink RT2560/RT2561/RT2561S/RT2661 driver. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ral_cardbus.c,v 1.14 2008/10/12 02:15:02 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ral_cardbus.c,v 1.15 2009/05/12 12:11:17 cegger Exp $"); #include "bpfilter.h" @@ -93,7 +93,7 @@ struct ral_cardbus_softc { cardbus_intr_line_t sc_intrline; }; -int ral_cardbus_match(struct device *, struct cfdata *, void *); +int ral_cardbus_match(struct device *, cfdata_t, void *); void ral_cardbus_attach(struct device *, struct device *, void *); int ral_cardbus_detach(struct device *, int); @@ -107,7 +107,7 @@ void ral_cardbus_setup(struct ral_cardbus_softc *); int ral_cardbus_match(struct device *parent, - struct cfdata *cfdata, void *aux) + cfdata_t cfdata, void *aux) { struct cardbus_attach_args *ca = aux; diff --git a/sys/dev/cardbus/if_rtw_cardbus.c b/sys/dev/cardbus/if_rtw_cardbus.c index b3ecdd08731..47d7df653f5 100644 --- a/sys/dev/cardbus/if_rtw_cardbus.c +++ b/sys/dev/cardbus/if_rtw_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_rtw_cardbus.c,v 1.28 2009/02/06 01:55:19 dyoung Exp $ */ +/* $NetBSD: if_rtw_cardbus.c,v 1.29 2009/05/12 12:11:17 cegger Exp $ */ /*- * Copyright (c) 2004, 2005 David Young. All rights reserved. @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.28 2009/02/06 01:55:19 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.29 2009/05/12 12:11:17 cegger Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -140,7 +140,7 @@ struct rtw_cardbus_softc { cardbus_intr_line_t sc_intrline; /* interrupt line */ }; -int rtw_cardbus_match(device_t, struct cfdata *, void *); +int rtw_cardbus_match(device_t, cfdata_t, void *); void rtw_cardbus_attach(device_t, device_t, void *); int rtw_cardbus_detach(device_t, int); @@ -186,7 +186,7 @@ rtw_cardbus_lookup(const struct cardbus_attach_args *ca) } int -rtw_cardbus_match(device_t parent, struct cfdata *match, void *aux) +rtw_cardbus_match(device_t parent, cfdata_t match, void *aux) { struct cardbus_attach_args *ca = aux; diff --git a/sys/dev/cardbus/ohci_cardbus.c b/sys/dev/cardbus/ohci_cardbus.c index c5e39a762ca..a7c8dee8a9f 100644 --- a/sys/dev/cardbus/ohci_cardbus.c +++ b/sys/dev/cardbus/ohci_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: ohci_cardbus.c,v 1.31 2008/07/11 20:57:51 dyoung Exp $ */ +/* $NetBSD: ohci_cardbus.c,v 1.32 2009/05/12 12:11:17 cegger Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.31 2008/07/11 20:57:51 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.32 2009/05/12 12:11:17 cegger Exp $"); #include "ehci_cardbus.h" @@ -67,7 +67,7 @@ __KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.31 2008/07/11 20:57:51 dyoung Exp #include <dev/usb/ohcireg.h> #include <dev/usb/ohcivar.h> -int ohci_cardbus_match(device_t, struct cfdata *, void *); +int ohci_cardbus_match(device_t, cfdata_t, void *); void ohci_cardbus_attach(device_t, device_t, void *); int ohci_cardbus_detach(device_t, int); @@ -91,7 +91,7 @@ CFATTACH_DECL_NEW(ohci_cardbus, sizeof(struct ohci_cardbus_softc), #define cardbus_devinfo pci_devinfo int -ohci_cardbus_match(device_t parent, struct cfdata *match, void *aux) +ohci_cardbus_match(device_t parent, cfdata_t match, void *aux) { struct cardbus_attach_args *ca = (struct cardbus_attach_args *)aux; diff --git a/sys/dev/cardbus/rbus_ppb.c b/sys/dev/cardbus/rbus_ppb.c index 88f6cb1ea5a..1706c049106 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.29 2009/03/18 16:00:17 cegger Exp $ */ +/* $NetBSD: rbus_ppb.c,v 1.30 2009/05/12 12:11:17 cegger Exp $ */ /* * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.29 2009/03/18 16:00:17 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.30 2009/05/12 12:11:17 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -75,7 +75,7 @@ __KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.29 2009/03/18 16:00:17 cegger Exp $") struct ppb_softc; -static int ppb_cardbus_match(struct device *, struct cfdata *, void *); +static int ppb_cardbus_match(struct device *, cfdata_t, 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); @@ -116,7 +116,7 @@ int rbus_ppb_debug = 0; /* hack with kdb */ #endif static int -ppb_cardbus_match(struct device *parent, struct cfdata *match, void *aux) +ppb_cardbus_match(struct device *parent, cfdata_t match, void *aux) { struct cardbus_attach_args *ca = aux; diff --git a/sys/dev/cardbus/uhci_cardbus.c b/sys/dev/cardbus/uhci_cardbus.c index a93d7f08f34..a6ab3d07c4b 100644 --- a/sys/dev/cardbus/uhci_cardbus.c +++ b/sys/dev/cardbus/uhci_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: uhci_cardbus.c,v 1.12 2008/07/11 21:02:53 dyoung Exp $ */ +/* $NetBSD: uhci_cardbus.c,v 1.13 2009/05/12 12:11:17 cegger Exp $ */ /* * Copyright (c) 1998-2005 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uhci_cardbus.c,v 1.12 2008/07/11 21:02:53 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uhci_cardbus.c,v 1.13 2009/05/12 12:11:17 cegger Exp $"); #include "ehci_cardbus.h" @@ -67,7 +67,7 @@ struct uhci_cardbus_softc { void *sc_ih; /* interrupt vectoring */ }; -static int uhci_cardbus_match(device_t, struct cfdata *, void *); +static int uhci_cardbus_match(device_t, cfdata_t, void *); static void uhci_cardbus_attach(device_t, device_t, void *); static int uhci_cardbus_detach(device_t, int); @@ -80,7 +80,7 @@ CFATTACH_DECL_NEW(uhci_cardbus, sizeof(struct uhci_cardbus_softc), #define cardbus_devinfo pci_devinfo static int -uhci_cardbus_match(device_t parent, struct cfdata *match, void *aux) +uhci_cardbus_match(device_t parent, cfdata_t match, void *aux) { struct cardbus_attach_args *ca = (struct cardbus_attach_args *)aux; diff --git a/sys/dev/dec/dzkbd.c b/sys/dev/dec/dzkbd.c index 023bcae1333..d1d51bbf7bb 100644 --- a/sys/dev/dec/dzkbd.c +++ b/sys/dev/dec/dzkbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: dzkbd.c,v 1.21 2009/03/14 15:36:17 dsl Exp $ */ +/* $NetBSD: dzkbd.c,v 1.22 2009/05/12 12:11:54 cegger Exp $ */ /* * Copyright (c) 1992, 1993 @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.21 2009/03/14 15:36:17 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.22 2009/05/12 12:11:54 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -91,7 +91,7 @@ struct dzkbd_softc { static int dzkbd_input(void *, int); -static int dzkbd_match(struct device *, struct cfdata *, void *); +static int dzkbd_match(struct device *, cfdata_t, void *); static void dzkbd_attach(struct device *, struct device *, void *); CFATTACH_DECL(dzkbd, sizeof(struct dzkbd_softc), @@ -130,7 +130,7 @@ const struct wskbd_mapdata dzkbd_keymapdata = { * kbd_match: how is this dz line configured? */ static int -dzkbd_match(struct device *parent, struct cfdata *cf, void *aux) +dzkbd_match(struct device *parent, cfdata_t cf, void *aux) { struct dzkm_attach_args *daa = aux; diff --git a/sys/dev/dec/dzms.c b/sys/dev/dec/dzms.c index f1c82cc6a3b..1f48c1d5ce8 100644 --- a/sys/dev/dec/dzms.c +++ b/sys/dev/dec/dzms.c @@ -1,4 +1,4 @@ -/* $NetBSD: dzms.c,v 1.19 2009/03/14 21:04:19 dsl Exp $ */ +/* $NetBSD: dzms.c,v 1.20 2009/05/12 12:11:54 cegger Exp $ */ /* * Copyright (c) 1992, 1993 @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dzms.c,v 1.19 2009/03/14 21:04:19 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dzms.c,v 1.20 2009/05/12 12:11:54 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -82,7 +82,7 @@ struct dzms_softc { /* driver status information */ struct device *sc_wsmousedev; }; -static int dzms_match(struct device *, struct cfdata *, void *); +static int dzms_match(struct device *, cfdata_t, void *); static void dzms_attach(struct device *, struct device *, void *); static int dzms_input(void *, int); @@ -100,7 +100,7 @@ const struct wsmouse_accessops dzms_accessops = { }; static int -dzms_match(struct device *parent, struct cfdata *cf, void *aux) +dzms_match(struct device *parent, cfdata_t cf, void *aux) { struct dzkm_attach_args *daa = aux; diff --git a/sys/dev/dkwedge/dk.c b/sys/dev/dkwedge/dk.c index 4236b17a42b..5b35b27dae2 100644 --- a/sys/dev/dkwedge/dk.c +++ b/sys/dev/dkwedge/dk.c @@ -1,4 +1,4 @@ -/* $NetBSD: dk.c,v 1.43 2009/01/13 13:35:53 yamt Exp $ */ +/* $NetBSD: dk.c,v 1.44 2009/05/12 12:12:26 cegger Exp $ */ /*- * Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.43 2009/01/13 13:35:53 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.44 2009/05/12 12:12:26 cegger Exp $"); #include "opt_dkwedge.h" @@ -125,7 +125,7 @@ static krwlock_t dkwedge_discovery_methods_lock; * Autoconfiguration match function for pseudo-device glue. */ static int -dkwedge_match(struct device *parent, struct cfdata *match, +dkwedge_match(struct device *parent, cfdata_t match, void *aux) { diff --git a/sys/dev/ebus/cs4231_ebus.c b/sys/dev/ebus/cs4231_ebus.c index 69b1a43ff0a..831cb7369b8 100644 --- a/sys/dev/ebus/cs4231_ebus.c +++ b/sys/dev/ebus/cs4231_ebus.c @@ -1,4 +1,4 @@ -/* $NetBSD: cs4231_ebus.c,v 1.31 2009/01/31 10:35:38 martin Exp $ */ +/* $NetBSD: cs4231_ebus.c,v 1.32 2009/05/12 12:12:38 cegger Exp $ */ /* * Copyright (c) 2002 Valeriy E. Ushakov @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cs4231_ebus.c,v 1.31 2009/01/31 10:35:38 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cs4231_ebus.c,v 1.32 2009/05/12 12:12:38 cegger Exp $"); #ifdef _KERNEL_OPT #include "opt_sparc_arch.h" @@ -74,7 +74,7 @@ struct cs4231_ebus_softc { void cs4231_ebus_attach(struct device *, struct device *, void *); -int cs4231_ebus_match(struct device *, struct cfdata *, void *); +int cs4231_ebus_match(struct device *, cfdata_t, void *); static int cs4231_ebus_pint(void *); static int cs4231_ebus_rint(void *); @@ -144,7 +144,7 @@ static int cs4231_ebus_intr(void *); int -cs4231_ebus_match(struct device *parent, struct cfdata *cf, void *aux) +cs4231_ebus_match(struct device *parent, cfdata_t cf, void *aux) { struct ebus_attach_args *ea; char *compat; diff --git a/sys/dev/eisa/ahb.c b/sys/dev/eisa/ahb.c index a29896ae981..68ef7b464b5 100644 --- a/sys/dev/eisa/ahb.c +++ b/sys/dev/eisa/ahb.c @@ -1,4 +1,4 @@ -/* $NetBSD: ahb.c,v 1.54 2009/04/18 14:58:02 tsutsui Exp $ */ +/* $NetBSD: ahb.c,v 1.55 2009/05/12 12:12:52 cegger Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ahb.c,v 1.54 2009/04/18 14:58:02 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ahb.c,v 1.55 2009/05/12 12:12:52 cegger Exp $"); #include "opt_ddb.h" @@ -137,7 +137,7 @@ static int ahb_create_ecbs(struct ahb_softc *, struct ahb_ecb *, int); static int ahb_init_ecb(struct ahb_softc *, struct ahb_ecb *); -static int ahbmatch(struct device *, struct cfdata *, void *); +static int ahbmatch(struct device *, cfdata_t, void *); static void ahbattach(struct device *, struct device *, void *); CFATTACH_DECL(ahb, sizeof(struct ahb_softc), @@ -151,7 +151,7 @@ CFATTACH_DECL(ahb, sizeof(struct ahb_softc), * the actual probe routine to check it out. */ static int -ahbmatch(struct device *parent, struct cfdata *match, +ahbmatch(struct device *parent, cfdata_t match, void *aux) { struct eisa_attach_args *ea = aux; diff --git a/sys/dev/eisa/bha_eisa.c b/sys/dev/eisa/bha_eisa.c index 2301feea6b3..e017d180258 100644 --- a/sys/dev/eisa/bha_eisa.c +++ b/sys/dev/eisa/bha_eisa.c @@ -1,4 +1,4 @@ -/* $NetBSD: bha_eisa.c,v 1.31 2008/04/28 20:23:48 martin Exp $ */ +/* $NetBSD: bha_eisa.c,v 1.32 2009/05/12 12:12:52 cegger Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bha_eisa.c,v 1.31 2008/04/28 20:23:48 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bha_eisa.c,v 1.32 2009/05/12 12:12:52 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -55,7 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: bha_eisa.c,v 1.31 2008/04/28 20:23:48 martin Exp $") #define BHA_EISA_IOCONF 0x0c static int bha_eisa_address(bus_space_tag_t, bus_space_handle_t, int *); -static int bha_eisa_match(struct device *, struct cfdata *, void *); +static int bha_eisa_match(struct device *, cfdata_t, void *); static void bha_eisa_attach(struct device *, struct device *, void *); CFATTACH_DECL(bha_eisa, sizeof(struct bha_softc), @@ -99,7 +99,7 @@ bha_eisa_address(bus_space_tag_t iot, bus_space_handle_t ioh, int *portp) * the actual probe routine to check it out. */ static int -bha_eisa_match(struct device *parent, struct cfdata *match, +bha_eisa_match(struct device *parent, cfdata_t match, void *aux) { struct eisa_attach_args *ea = aux; diff --git a/sys/dev/eisa/cac_eisa.c b/sys/dev/eisa/cac_eisa.c index 92727c01908..69d41d7d65e 100644 --- a/sys/dev/eisa/cac_eisa.c +++ b/sys/dev/eisa/cac_eisa.c @@ -1,4 +1,4 @@ -/* $NetBSD: cac_eisa.c,v 1.19 2008/04/28 20:23:48 martin Exp $ */ +/* $NetBSD: cac_eisa.c,v 1.20 2009/05/12 12:12:52 cegger Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cac_eisa.c,v 1.19 2008/04/28 20:23:48 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cac_eisa.c,v 1.20 2009/05/12 12:12:52 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -81,7 +81,7 @@ __KERNEL_RCSID(0, "$NetBSD: cac_eisa.c,v 1.19 2008/04/28 20:23:48 martin Exp $") #define CAC_EISA_IOCONF 0x38 static void cac_eisa_attach(struct device *, struct device *, void *); -static int cac_eisa_match(struct device *, struct cfdata *, void *); +static int cac_eisa_match(struct device *, cfdata_t, void *); static struct cac_ccb *cac_eisa_l0_completed(struct cac_softc *); static int cac_eisa_l0_fifo_full(struct cac_softc *); @@ -113,7 +113,7 @@ static struct cac_eisa_type { }; static int -cac_eisa_match(struct device *parent, struct cfdata *match, +cac_eisa_match(struct device *parent, cfdata_t match, void *aux) { struct eisa_attach_args *ea; diff --git a/sys/dev/eisa/dpt_eisa.c b/sys/dev/eisa/dpt_eisa.c index d114feb2be7..9faaa687e97 100644 --- a/sys/dev/eisa/dpt_eisa.c +++ b/sys/dev/eisa/dpt_eisa.c @@ -1,4 +1,4 @@ -/* $NetBSD: dpt_eisa.c,v 1.18 2008/04/06 08:54:43 cegger Exp $ */ +/* $NetBSD: dpt_eisa.c,v 1.19 2009/05/12 12:12:52 cegger Exp $ */ /* * Copyright (c) 1999, 2000, 2001 Andrew Doran <ad@NetBSD.org> @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dpt_eisa.c,v 1.18 2008/04/06 08:54:43 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dpt_eisa.c,v 1.19 2009/05/12 12:12:52 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -59,7 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: dpt_eisa.c,v 1.18 2008/04/06 08:54:43 cegger Exp $") static void dpt_eisa_attach(struct device *, struct device *, void *); static int dpt_eisa_irq(bus_space_tag_t, bus_space_handle_t, int *); -static int dpt_eisa_match(struct device *, struct cfdata *, void *); +static int dpt_eisa_match(struct device *, cfdata_t, void *); CFATTACH_DECL(dpt_eisa, sizeof(struct dpt_softc), dpt_eisa_match, dpt_eisa_attach, NULL, NULL); @@ -103,7 +103,7 @@ dpt_eisa_irq(bus_space_tag_t iot, bus_space_handle_t ioh, int *irq) } static int -dpt_eisa_match(struct device *parent, struct cfdata *match, +dpt_eisa_match(struct device *parent, cfdata_t match, void *aux) { struct eisa_attach_args *ea; diff --git a/sys/dev/eisa/if_fea.c b/sys/dev/eisa/if_fea.c index d2d559c5bf9..453e4011368 100644 --- a/sys/dev/eisa/if_fea.c +++ b/sys/dev/eisa/if_fea.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_fea.c,v 1.39 2009/04/18 14:58:02 tsutsui Exp $ */ +/* $NetBSD: if_fea.c,v 1.40 2009/05/12 12:12:52 cegger Exp $ */ /*- * Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com> @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_fea.c,v 1.39 2009/04/18 14:58:02 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_fea.c,v 1.40 2009/05/12 12:12:52 cegger Exp $"); #include "opt_inet.h" @@ -333,7 +333,7 @@ pdq_eisa_shutdown( static int pdq_eisa_probe( struct device *parent, - struct cfdata *cf, + cfdata_t cf, void *aux) { struct isa_attach_args *ia = (struct isa_attach_args *) aux; @@ -445,7 +445,7 @@ struct cfdriver feacd = { static int pdq_eisa_match( struct device *parent, - struct cfdata *match, + cfdata_t match, void *aux) { const struct eisa_attach_args * const ea = (struct eisa_attach_args *) aux; diff --git a/sys/dev/eisa/mlx_eisa.c b/sys/dev/eisa/mlx_eisa.c index 115f7eac156..7728825449a 100644 --- a/sys/dev/eisa/mlx_eisa.c +++ b/sys/dev/eisa/mlx_eisa.c @@ -1,4 +1,4 @@ -/* $NetBSD: mlx_eisa.c,v 1.20 2008/04/28 20:23:48 martin Exp $ */ +/* $NetBSD: mlx_eisa.c,v 1.21 2009/05/12 12:12:52 cegger Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mlx_eisa.c,v 1.20 2008/04/28 20:23:48 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mlx_eisa.c,v 1.21 2009/05/12 12:12:52 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -64,7 +64,7 @@ __KERNEL_RCSID(0, "$NetBSD: mlx_eisa.c,v 1.20 2008/04/28 20:23:48 martin Exp $") #define MLX_EISA_CFG10 (0x0c95 - MLX_EISA_SLOT_OFFSET) static void mlx_eisa_attach(struct device *, struct device *, void *); -static int mlx_eisa_match(struct device *, struct cfdata *, void *); +static int mlx_eisa_match(struct device *, cfdata_t, void *); static int mlx_v1_submit(struct mlx_softc *, struct mlx_ccb *); static int mlx_v1_findcomplete(struct mlx_softc *, u_int *, u_int *); @@ -92,7 +92,7 @@ static struct mlx_eisa_prod { }; static int -mlx_eisa_match(struct device *parent, struct cfdata *match, +mlx_eisa_match(struct device *parent, cfdata_t match, void *aux) { struct eisa_attach_args *ea; diff --git a/sys/dev/eisa/uha_eisa.c b/sys/dev/eisa/uha_eisa.c index 849fcbdbd63..c9120942377 100644 --- a/sys/dev/eisa/uha_eisa.c +++ b/sys/dev/eisa/uha_eisa.c @@ -1,4 +1,4 @@ -/* $NetBSD: uha_eisa.c,v 1.29 2008/04/28 20:23:48 martin Exp $ */ +/* $NetBSD: uha_eisa.c,v 1.30 2009/05/12 12:12:52 cegger Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uha_eisa.c,v 1.29 2008/04/28 20:23:48 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uha_eisa.c,v 1.30 2009/05/12 12:12:52 cegger Exp $"); #include "opt_ddb.h" @@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: uha_eisa.c,v 1.29 2008/04/28 20:23:48 martin Exp $") #define UHA_EISA_SLOT_OFFSET 0xc80 #define UHA_EISA_IOSIZE 0x020 -static int uha_eisa_match(struct device *, struct cfdata *, void *); +static int uha_eisa_match(struct device *, cfdata_t, void *); static void uha_eisa_attach(struct device *, struct device *, void *); CFATTACH_DECL(uha_eisa, sizeof(struct uha_softc), @@ -80,7 +80,7 @@ static void u24_init(struct uha_softc *); * the actual probe routine to check it out. */ static int -uha_eisa_match(struct device *parent, struct cfdata *match, +uha_eisa_match(struct device *parent, cfdata_t match, void *aux) { struct eisa_attach_args *ea = aux; diff --git a/sys/dev/gpib/cs80bus.c b/sys/dev/gpib/cs80bus.c index 1a79a185156..74e08c55d35 100644 --- a/sys/dev/gpib/cs80bus.c +++ b/sys/dev/gpib/cs80bus.c @@ -1,4 +1,4 @@ -/* $NetBSD: cs80bus.c,v 1.12 2009/03/14 21:04:19 dsl Exp $ */ +/* $NetBSD: cs80bus.c,v 1.13 2009/05/12 12:13:21 cegger Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cs80bus.c,v 1.12 2009/03/14 21:04:19 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cs80bus.c,v 1.13 2009/05/12 12:13:21 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -57,14 +57,14 @@ int cs80busdebug = 0xff; #define cs80buscf_slave cf_loc[CS80BUSCF_SLAVE] #define cs80buscf_punit cf_loc[CS80BUSCF_PUNIT] -int cs80busmatch(struct device *, struct cfdata *, void *); +int cs80busmatch(struct device *, cfdata_t, void *); void cs80busattach(struct device *, struct device *, void *); CFATTACH_DECL(cs80bus, sizeof(struct cs80bus_softc), cs80busmatch, cs80busattach, NULL, NULL); static int cs80bus_alloc(struct cs80bus_softc *, int, int); -static int cs80bussearch(struct device *, struct cfdata *, +static int cs80bussearch(struct device *, cfdata_t, const int *, void *); static int cs80busprint(void *, const char *); @@ -91,7 +91,7 @@ static int cs80busprint(void *, const char *); */ int -cs80busmatch(struct device *parent, struct cfdata *match, void *aux) +cs80busmatch(struct device *parent, cfdata_t match, void *aux) { return (1); @@ -135,7 +135,7 @@ cs80busattach(struct device *parent, struct device *self, void *aux) } int -cs80bussearch(struct device *parent, struct cfdata *cf, const int *ldesc, void *aux) +cs80bussearch(struct device *parent, cfdata_t cf, const int *ldesc, void *aux) { struct cs80bus_softc *sc = (struct cs80bus_softc *)parent; struct cs80bus_attach_args *ca = aux; diff --git a/sys/dev/gpib/ct.c b/sys/dev/gpib/ct.c index c05036ca595..5004232836a 100644 --- a/sys/dev/gpib/ct.c +++ b/sys/dev/gpib/ct.c @@ -1,4 +1,4 @@ -/* $NetBSD: ct.c,v 1.19 2009/03/14 21:04:19 dsl Exp $ */ +/* $NetBSD: ct.c,v 1.20 2009/05/12 12:13:21 cegger Exp $ */ /*- * Copyright (c) 1996-2003 The NetBSD Foundation, Inc. @@ -121,7 +121,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.19 2009/03/14 21:04:19 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.20 2009/05/12 12:13:21 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -191,7 +191,7 @@ struct ct_softc { int sc_eofs[EOFS]; }; -int ctmatch(struct device *, struct cfdata *, void *); +int ctmatch(struct device *, cfdata_t, void *); void ctattach(struct device *, struct device *, void *); CFATTACH_DECL(ct, sizeof(struct ct_softc), @@ -262,7 +262,7 @@ ctlookup(int id, int slave, int punit) } int -ctmatch(struct device *parent, struct cfdata *match, void *aux) +ctmatch(struct device *parent, cfdata_t match, void *aux) { struct cs80bus_attach_args *ca = aux; int i; diff --git a/sys/dev/gpib/gpib.c b/sys/dev/gpib/gpib.c index 0fc429f4a62..84c3f0bca41 100644 --- a/sys/dev/gpib/gpib.c +++ b/sys/dev/gpib/gpib.c @@ -1,4 +1,4 @@ -/* $NetBSD: gpib.c,v 1.15 2009/03/14 21:04:19 dsl Exp $ */ +/* $NetBSD: gpib.c,v 1.16 2009/05/12 12:13:21 cegger Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gpib.c,v 1.15 2009/03/14 21:04:19 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gpib.c,v 1.16 2009/05/12 12:13:21 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -58,15 +58,15 @@ int gpibdebug = 0xff; #define DPRINTF(mask, str) /* nothing */ #endif -int gpibmatch(struct device *, struct cfdata *, void *); +int gpibmatch(struct device *, cfdata_t, void *); void gpibattach(struct device *, struct device *, void *); CFATTACH_DECL(gpib, sizeof(struct gpib_softc), gpibmatch, gpibattach, NULL, NULL); -static int gpibsubmatch1(struct device *, struct cfdata *, +static int gpibsubmatch1(struct device *, cfdata_t, const int *, void *); -static int gpibsubmatch2(struct device *, struct cfdata *, +static int gpibsubmatch2(struct device *, cfdata_t, const int *, void *); static int gpibprint(void *, const char *); @@ -89,7 +89,7 @@ extern struct cfdriver gpib_cd; int gpibtimeout = 100000; /* # of status tests before we give up */ int -gpibmatch(struct device *parent, struct cfdata *match, void *aux) +gpibmatch(struct device *parent, cfdata_t match, void *aux) { return (1); @@ -99,7 +99,7 @@ void gpibattach(struct device *parent, struct device *self, void *aux) { struct gpib_softc *sc = device_private(self); - struct cfdata *cf = device_cfdata(&sc->sc_dev); + cfdata_t cf = device_cfdata(&sc->sc_dev); struct gpibdev_attach_args *gda = aux; struct gpib_attach_args ga; int address; @@ -138,7 +138,7 @@ gpibattach(struct device *parent, struct device *self, void *aux) } int -gpibsubmatch1(struct device *parent, struct cfdata *cf, const int *ldesc, void *aux) +gpibsubmatch1(struct device *parent, cfdata_t cf, const int *ldesc, void *aux) { struct gpib_softc *sc = (struct gpib_softc *)parent; struct gpib_attach_args *ga = aux; @@ -159,7 +159,7 @@ gpibsubmatch1(struct device *parent, struct cfdata *cf, const int *ldesc, void * } int -gpibsubmatch2(struct device *parent, struct cfdata *cf, const int *ldesc, void *aux) +gpibsubmatch2(struct device *parent, cfdata_t cf, const int *ldesc, void *aux) { struct gpib_attach_args *ga = aux; diff --git a/sys/dev/gpib/hil_gpib.c b/sys/dev/gpib/hil_gpib.c index 27b0f4759f7..fd57f53bebf 100644 --- a/sys/dev/gpib/hil_gpib.c +++ b/sys/dev/gpib/hil_gpib.c @@ -1,7 +1,7 @@ -/* $NetBSD: hil_gpib.c,v 1.9 2009/03/14 21:04:19 dsl Exp $ */ +/* $NetBSD: hil_gpib.c,v 1.10 2009/05/12 12:13:21 cegger Exp $ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hil_gpib.c,v 1.9 2009/03/14 21:04:19 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hil_gpib.c,v 1.10 2009/05/12 12:13:21 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -39,7 +39,7 @@ struct hil_softc { #define HILF_DELAY 0x10 }; -int hilmatch(struct device *, struct cfdata *, void *); +int hilmatch(struct device *, cfdata_t, void *); void hilattach(struct device *, struct device *, void *); const struct cfattach hil_ca = { @@ -50,7 +50,7 @@ void hilcallback(void *, int); void hilstart(void *); int -hilmatch(struct device *parent, struct cfdata *match, void *aux) +hilmatch(struct device *parent, cfdata_t match, void *aux) { struct gpib_attach_args *ga = aux; u_int8_t *cmd = "SE;"; diff --git a/sys/dev/gpib/mt.c b/sys/dev/gpib/mt.c index 89e015347d5..1227439b820 100644 --- a/sys/dev/gpib/mt.c +++ b/sys/dev/gpib/mt.c @@ -1,4 +1,4 @@ -/* $NetBSD: mt.c,v 1.18 2009/03/14 21:04:19 dsl Exp $ */ +/* $NetBSD: mt.c,v 1.19 2009/05/12 12:13:21 cegger Exp $ */ /*- * Copyright (c) 1996-2003 The NetBSD Foundation, Inc. @@ -114,7 +114,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.18 2009/03/14 21:04:19 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.19 2009/05/12 12:13:21 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -174,7 +174,7 @@ struct mt_softc { #define B_CMD B_DEVPRIVATE /* command buf instead of data */ #define b_cmd b_blkno /* blkno holds cmd when B_CMD */ -int mtmatch(struct device *, struct cfdata *, void *); +int mtmatch(struct device *, cfdata_t, void *); void mtattach(struct device *, struct device *, void *); CFATTACH_DECL(mt, sizeof(struct mt_softc), @@ -237,7 +237,7 @@ mtlookup(int id, int slave, int punit) } int -mtmatch(struct device *parent, struct cfdata *match, void *aux) +mtmatch(struct device *parent, cfdata_t match, void *aux) { struct cs80bus_attach_args *ca = aux; diff --git a/sys/dev/gpib/ppi.c b/sys/dev/gpib/ppi.c index f928fa31801..7522a2d80e4 100644 --- a/sys/dev/gpib/ppi.c +++ b/sys/dev/gpib/ppi.c @@ -1,4 +1,4 @@ -/* $NetBSD: ppi.c,v 1.15 2009/03/14 21:04:19 dsl Exp $ */ +/* $NetBSD: ppi.c,v 1.16 2009/05/12 12:13:21 cegger Exp $ */ /*- * Copyright (c) 1996-2003 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.15 2009/03/14 21:04:19 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.16 2009/05/12 12:13:21 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -103,7 +103,7 @@ struct ppi_softc { #define PPIF_TIMO 0x08 #define PPIF_DELAY 0x10 -int ppimatch(struct device *, struct cfdata *, void *); +int ppimatch(struct device *, cfdata_t, void *); void ppiattach(struct device *, struct device *, void *); CFATTACH_DECL(ppi, sizeof(struct ppi_softc), @@ -143,7 +143,7 @@ int ppidebug = 0x80; #endif int -ppimatch(struct device *parent, struct cfdata *match, void *aux) +ppimatch(struct device *parent, cfdata_t match, void *aux) { return (1); diff --git a/sys/dev/gpib/rd.c b/sys/dev/gpib/rd.c index 57ecbb6400e..6ba02aa35b1 100644 --- a/sys/dev/gpib/rd.c +++ b/sys/dev/gpib/rd.c @@ -1,4 +1,4 @@ -/* $NetBSD: rd.c,v 1.24 2009/03/14 21:04:19 dsl Exp $ */ +/* $NetBSD: rd.c,v 1.25 2009/05/12 12:13:21 cegger Exp $ */ /*- * Copyright (c) 1996-2003 The NetBSD Foundation, Inc. @@ -111,7 +111,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.24 2009/03/14 21:04:19 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.25 2009/05/12 12:13:21 cegger Exp $"); #include "rnd.h" @@ -283,7 +283,7 @@ void rdstart(struct rd_softc *); void rdintr(struct rd_softc *); int rderror(struct rd_softc *); -int rdmatch(struct device *, struct cfdata *, void *); +int rdmatch(struct device *, cfdata_t, void *); void rdattach(struct device *, struct device *, void *); CFATTACH_DECL(rd, sizeof(struct rd_softc), @@ -325,7 +325,7 @@ rdlookup(int id, int slave, int punit) } int -rdmatch(struct device *parent, struct cfdata *match, void *aux) +rdmatch(struct device *parent, cfdata_t match, void *aux) { struct cs80bus_attach_args *ca = aux; diff --git a/sys/dev/hpc/bivideo.c b/sys/dev/hpc/bivideo.c index 282fda451be..7e7e38c6d53 100644 --- a/sys/dev/hpc/bivideo.c +++ b/sys/dev/hpc/bivideo.c @@ -1,4 +1,4 @@ -/* $NetBSD: bivideo.c,v 1.28 2008/04/06 20:28:36 cegger Exp $ */ +/* $NetBSD: bivideo.c,v 1.29 2009/05/12 12:13:49 cegger Exp $ */ /*- * Copyright (c) 1999-2001 @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bivideo.c,v 1.28 2008/04/06 20:28:36 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bivideo.c,v 1.29 2009/05/12 12:13:49 cegger Exp $"); #ifdef _KERNEL_OPT #include "opt_hpcfb.h" @@ -79,7 +79,7 @@ int bivideo_dont_attach = 0; /* * function prototypes */ -int bivideomatch(struct device *, struct cfdata *, void *); +int bivideomatch(struct device *, cfdata_t, void *); void bivideoattach(struct device *, struct device *, void *); int bivideo_ioctl(void *, u_long, void *, int, struct lwp *); paddr_t bivideo_mmap(void *, off_t, int); @@ -140,7 +140,7 @@ static int attach_flag = 0; * function bodies */ int -bivideomatch(struct device *parent, struct cfdata *match, void *aux) +bivideomatch(struct device *parent, cfdata_t match, void *aux) { struct mainbus_attach_args *ma = aux; diff --git a/sys/dev/hpc/btnmgr.c b/sys/dev/hpc/btnmgr.c index bdf3e7ee9ac..ff3002a0cc7 100644 --- a/sys/dev/hpc/btnmgr.c +++ b/sys/dev/hpc/btnmgr.c @@ -1,4 +1,4 @@ -/* $NetBSD: btnmgr.c,v 1.23 2009/04/05 00:34:42 uwe Exp $ */ +/* $NetBSD: btnmgr.c,v 1.24 2009/05/12 12:13:49 cegger Exp $ */ /*- * Copyright (c) 1999 @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: btnmgr.c,v 1.23 2009/04/05 00:34:42 uwe Exp $"); +__KERNEL_RCSID(0, "$NetBSD: btnmgr.c,v 1.24 2009/05/12 12:13:49 cegger Exp $"); #ifdef _KERNEL_OPT #include "opt_btnmgr.h" @@ -83,7 +83,7 @@ struct btnmgr_softc { #endif }; -int btnmgrmatch(struct device *, struct cfdata *, void *); +int btnmgrmatch(struct device *, cfdata_t, void *); void btnmgrattach(struct device *, struct device *, void *); const char *btnmgr_name(long); static int btnmgr_hook(void *, int, long, void *); @@ -173,7 +173,7 @@ struct wskbd_mapdata btnmgr_keymapdata = { * function bodies */ int -btnmgrmatch(struct device *parent, struct cfdata *match, void *aux) +btnmgrmatch(struct device *parent, cfdata_t match, void *aux) { struct mainbus_attach_args *ma = aux; diff --git a/sys/dev/hpc/button.c b/sys/dev/hpc/button.c index f0f79d9ca81..0155d78743c 100644 --- a/sys/dev/hpc/button.c +++ b/sys/dev/hpc/button.c @@ -1,4 +1,4 @@ -/* $NetBSD: button.c,v 1.13 2007/10/19 11:59:42 ad Exp $ */ +/* $NetBSD: button.c,v 1.14 2009/05/12 12:13:49 cegger Exp $ */ /*- * Copyright (c) 1999-2001 @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: button.c,v 1.13 2007/10/19 11:59:42 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: button.c,v 1.14 2009/05/12 12:13:49 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -62,7 +62,7 @@ struct button_softc { config_hook_tag sc_ghook_tag; }; -static int button_match(struct device *, struct cfdata *, void *); +static int button_match(struct device *, cfdata_t, void *); static void button_attach(struct device *, struct device *, void *); static int button_intr(void *); static int button_state(void *, int, long, void *); @@ -71,7 +71,7 @@ CFATTACH_DECL(button, sizeof(struct button_softc), button_match, button_attach, NULL, NULL); int -button_match(struct device *parent, struct cfdata *match, void *aux) +button_match(struct device *parent, cfdata_t match, void *aux) { struct hpcio_attach_args *haa = aux; platid_mask_t mask; diff --git a/sys/dev/hpc/hpcapm.c b/sys/dev/hpc/hpcapm.c index 9dd665c1524..6049b24f23e 100644 --- a/sys/dev/hpc/hpcapm.c +++ b/sys/dev/hpc/hpcapm.c @@ -1,4 +1,4 @@ -/* $NetBSD: hpcapm.c,v 1.16 2009/04/05 02:04:40 uwe Exp $ */ +/* $NetBSD: hpcapm.c,v 1.17 2009/05/12 12:13:49 cegger Exp $ */ /* * Copyright (c) 2000 Takemura Shin @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hpcapm.c,v 1.16 2009/04/05 02:04:40 uwe Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hpcapm.c,v 1.17 2009/05/12 12:13:49 cegger Exp $"); #ifdef _KERNEL_OPT #include "opt_hpcapm.h" @@ -61,7 +61,7 @@ int hpcapm_debug = HPCAPMDEBUG_CONF; #endif /* Definition of the driver for autoconfig. */ -static int hpcapm_match(struct device *, struct cfdata *, void *); +static int hpcapm_match(struct device *, cfdata_t, void *); static void hpcapm_attach(struct device *, struct device *, void *); static int hpcapm_hook(void *, int, long, void *); @@ -107,7 +107,7 @@ extern struct cfdriver hpcapm_cd; static int hpcapm_match(struct device *parent, - struct cfdata *cf, void *aux) + cfdata_t cf, void *aux) { return 1; diff --git a/sys/dev/hpc/hpcin.c b/sys/dev/hpc/hpcin.c index e60c7fc03db..75dbc96cfc0 100644 --- a/sys/dev/hpc/hpcin.c +++ b/sys/dev/hpc/hpcin.c @@ -1,4 +1,4 @@ -/* $NetBSD: hpcin.c,v 1.12 2008/04/28 20:23:48 martin Exp $ */ +/* $NetBSD: hpcin.c,v 1.13 2009/05/12 12:13:49 cegger Exp $ */ /*- * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hpcin.c,v 1.12 2008/04/28 20:23:48 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hpcin.c,v 1.13 2009/05/12 12:13:49 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: hpcin.c,v 1.12 2008/04/28 20:23:48 martin Exp $"); #include "locators.h" -int hpcin_match(struct device *, struct cfdata *, void *); +int hpcin_match(struct device *, cfdata_t, void *); void hpcin_attach(struct device *, struct device *, void *); int hpcin_intr(void *); @@ -69,7 +69,7 @@ CFATTACH_DECL(hpcin, sizeof(struct hpcin_softc), hpcin_match, hpcin_attach, NULL, NULL); int -hpcin_match(struct device *parent, struct cfdata *cf, void *aux) +hpcin_match(struct device *parent, cfdata_t cf, void *aux) { return (1); } diff --git a/sys/dev/hpc/hpcioman.c b/sys/dev/hpc/hpcioman.c index 801ba7233cb..89c40b1d069 100644 --- a/sys/dev/hpc/hpcioman.c +++ b/sys/dev/hpc/hpcioman.c @@ -1,4 +1,4 @@ -/* $NetBSD: hpcioman.c,v 1.16 2008/04/28 20:23:48 martin Exp $ */ +/* $NetBSD: hpcioman.c,v 1.17 2009/05/12 12:13:49 cegger Exp $ */ /*- * Copyright (c) 1999-2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hpcioman.c,v 1.16 2008/04/28 20:23:48 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hpcioman.c,v 1.17 2009/05/12 12:13:49 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -46,10 +46,10 @@ __KERNEL_RCSID(0, "$NetBSD: hpcioman.c,v 1.16 2008/04/28 20:23:48 martin Exp $") #include "locators.h" -int hpcioman_match(struct device *, struct cfdata *, void *); +int hpcioman_match(struct device *, cfdata_t, void *); void hpcioman_attach(struct device *, struct device *, void *); int hpcioman_print(void *, const char *); -int hpcioman_search(struct device *, struct cfdata *, +int hpcioman_search(struct device *, cfdata_t, const int *, void *); struct hpcioman_softc { @@ -60,7 +60,7 @@ CFATTACH_DECL(hpcioman, sizeof(struct hpcioman_softc), hpcioman_match, hpcioman_attach, NULL, NULL); int -hpcioman_match(struct device *parent, struct cfdata *cf, void *aux) +hpcioman_match(struct device *parent, cfdata_t cf, void *aux) { struct hpcio_attach_args *haa = aux; platid_mask_t mask; @@ -82,7 +82,7 @@ hpcioman_attach(struct device *parent, struct device *self, void *aux) } int -hpcioman_search(struct device *parent, struct cfdata *cf, +hpcioman_search(struct device *parent, cfdata_t cf, const int *ldesc, void *aux) { //struct hpcioman_softc *sc = (struct hpcioman_softc *)parent; diff --git a/sys/dev/hpc/hpckbd.c b/sys/dev/hpc/hpckbd.c index b09bbd3dee6..982726ed09a 100644 --- a/sys/dev/hpc/hpckbd.c +++ b/sys/dev/hpc/hpckbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: hpckbd.c,v 1.26 2009/04/05 02:17:18 uwe Exp $ */ +/* $NetBSD: hpckbd.c,v 1.27 2009/05/12 12:13:49 cegger Exp $ */ /*- * Copyright (c) 1999-2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hpckbd.c,v 1.26 2009/04/05 02:17:18 uwe Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hpckbd.c,v 1.27 2009/05/12 12:13:49 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -92,7 +92,7 @@ struct hpckbd_softc { struct hpckbd_core sc_coredata; }; -int hpckbd_match(struct device *, struct cfdata *, void *); +int hpckbd_match(struct device *, cfdata_t, void *); void hpckbd_attach(struct device *, struct device *, void *); void hpckbd_initcore(struct hpckbd_core *, struct hpckbd_ic_if *, int); @@ -140,7 +140,7 @@ struct wskbd_mapdata hpckbd_keymapdata = { int hpckbd_match(struct device *parent, - struct cfdata *cf, void *aux) + cfdata_t cf, void *aux) { return (1); } diff --git a/sys/dev/hpc/hpcout.c b/sys/dev/hpc/hpcout.c index fd5b6b51a24..11a940c118d 100644 --- a/sys/dev/hpc/hpcout.c +++ b/sys/dev/hpc/hpcout.c @@ -1,4 +1,4 @@ -/* $NetBSD: hpcout.c,v 1.13 2008/04/28 20:23:48 martin Exp $ */ +/* $NetBSD: hpcout.c,v 1.14 2009/05/12 12:13:49 cegger Exp $ */ /*- * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hpcout.c,v 1.13 2008/04/28 20:23:48 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hpcout.c,v 1.14 2009/05/12 12:13:49 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: hpcout.c,v 1.13 2008/04/28 20:23:48 martin Exp $"); #include "locators.h" -int hpcout_match(struct device *, struct cfdata *, void *); +int hpcout_match(struct device *, cfdata_t, void *); void hpcout_attach(struct device *, struct device *, void *); int hpcout_hook(void *, int, long, void *); @@ -66,7 +66,7 @@ CFATTACH_DECL(hpcout, sizeof(struct hpcout_softc), hpcout_match, hpcout_attach, NULL, NULL); int -hpcout_match(struct device *parent, struct cfdata *cf, void *aux) +hpcout_match(struct device *parent, cfdata_t cf, void *aux) { return (1); } diff --git a/sys/dev/hpc/hpf1275a_tty.c b/sys/dev/hpc/hpf1275a_tty.c index fb668f06ab8..5790533b0c9 100644 --- a/sys/dev/hpc/hpf1275a_tty.c +++ b/sys/dev/hpc/hpf1275a_tty.c @@ -1,4 +1,4 @@ -/* $NetBSD: hpf1275a_tty.c,v 1.23 2008/04/06 20:28:36 cegger Exp $ */ +/* $NetBSD: hpf1275a_tty.c,v 1.24 2009/05/12 12:13:49 cegger Exp $ */ /* * Copyright (c) 2004 Valeriy E. Ushakov @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hpf1275a_tty.c,v 1.23 2008/04/06 20:28:36 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hpf1275a_tty.c,v 1.24 2009/05/12 12:13:49 cegger Exp $"); #include "opt_wsdisplay_compat.h" @@ -76,7 +76,7 @@ static int hpf1275a_close(struct tty *, int); static int hpf1275a_input(int, struct tty *); /* autoconf(9) methods */ -static int hpf1275a_match(struct device *, struct cfdata *, void *); +static int hpf1275a_match(struct device *, cfdata_t, void *); static void hpf1275a_attach(struct device *, struct device *, void *); static int hpf1275a_detach(struct device *, int); @@ -245,7 +245,7 @@ hpf1275aattach(int n) */ static int hpf1275a_match(struct device *self, - struct cfdata *cfdata, void *arg) + cfdata_t cfdata, void *arg) { /* pseudo-device; always present */ diff --git a/sys/dev/hpc/pwctl.c b/sys/dev/hpc/pwctl.c index 519a5a60188..f7403cca50c 100644 --- a/sys/dev/hpc/pwctl.c +++ b/sys/dev/hpc/pwctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: pwctl.c,v 1.17 2007/10/19 11:59:43 ad Exp $ */ +/* $NetBSD: pwctl.c,v 1.18 2009/05/12 12:13:49 cegger Exp $ */ /*- * Copyright (c) 1999-2001 @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pwctl.c,v 1.17 2007/10/19 11:59:43 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pwctl.c,v 1.18 2009/05/12 12:13:49 cegger Exp $"); #ifdef _KERNEL_OPT #include "opt_pwctl.h" @@ -82,7 +82,7 @@ struct pwctl_softc { int sc_initvalue; }; -static int pwctl_match(struct device *, struct cfdata *, void *); +static int pwctl_match(struct device *, cfdata_t, void *); static void pwctl_attach(struct device *, struct device *, void *); static int pwctl_hook(void *, int, long, void *); static int pwctl_ghook(void *, int, long, void *); @@ -92,7 +92,7 @@ CFATTACH_DECL(pwctl, sizeof(struct pwctl_softc), pwctl_match, pwctl_attach, NULL, NULL); int -pwctl_match(struct device *parent, struct cfdata *match, void *aux) +pwctl_match(struct device *parent, cfdata_t match, void *aux) { struct hpcio_attach_args *haa = aux; platid_mask_t mask; diff --git a/sys/dev/i2o/dpti.c b/sys/dev/i2o/dpti.c index e485536fa5a..4f53b645c13 100644 --- a/sys/dev/i2o/dpti.c +++ b/sys/dev/i2o/dpti.c @@ -1,4 +1,4 @@ -/* $NetBSD: dpti.c,v 1.40 2008/09/08 23:36:54 gmcgarry Exp $ */ +/* $NetBSD: dpti.c,v 1.41 2009/05/12 12:14:18 cegger Exp $ */ /*- * Copyright (c) 2001, 2007 The NetBSD Foundation, Inc. @@ -57,7 +57,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.40 2008/09/08 23:36:54 gmcgarry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.41 2009/05/12 12:14:18 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -131,7 +131,7 @@ static struct dpt_sig dpti_sig = { void dpti_attach(struct device *, struct device *, void *); int dpti_blinkled(struct dpti_softc *); int dpti_ctlrinfo(struct dpti_softc *, int, void *); -int dpti_match(struct device *, struct cfdata *, void *); +int dpti_match(struct device *, cfdata_t, void *); int dpti_passthrough(struct dpti_softc *, void *, struct proc *); int dpti_sysinfo(struct dpti_softc *, int, void *); @@ -149,7 +149,7 @@ CFATTACH_DECL(dpti, sizeof(struct dpti_softc), dpti_match, dpti_attach, NULL, NULL); int -dpti_match(struct device *parent, struct cfdata *match, void *aux) +dpti_match(struct device *parent, cfdata_t match, void *aux) { struct iop_attach_args *ia; struct iop_softc *iop; diff --git a/sys/dev/i2o/iopsp.c b/sys/dev/i2o/iopsp.c index c45dbe484f2..3a9df956f2e 100644 --- a/sys/dev/i2o/iopsp.c +++ b/sys/dev/i2o/iopsp.c @@ -1,4 +1,4 @@ -/* $NetBSD: iopsp.c,v 1.33 2008/09/08 23:36:54 gmcgarry Exp $ */ +/* $NetBSD: iopsp.c,v 1.34 2009/05/12 12:14:18 cegger Exp $ */ /*- * Copyright (c) 2000, 2001, 2007 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: iopsp.c,v 1.33 2008/09/08 23:36:54 gmcgarry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iopsp.c,v 1.34 2009/05/12 12:14:18 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -67,7 +67,7 @@ static void iopsp_attach(struct device *, struct device *, void *); static void iopsp_intr(struct device *, struct iop_msg *, void *); static int iopsp_ioctl(struct scsipi_channel *, u_long, void *, int, struct proc *); -static int iopsp_match(struct device *, struct cfdata *, void *); +static int iopsp_match(struct device *, cfdata_t, void *); static int iopsp_rescan(struct iopsp_softc *); static int iopsp_reconfig(struct device *); static void iopsp_scsipi_request(struct scsipi_channel *, @@ -80,7 +80,7 @@ CFATTACH_DECL(iopsp, sizeof(struct iopsp_softc), * Match a supported device. */ static int -iopsp_match(struct device *parent, struct cfdata *match, void *aux) +iopsp_match(struct device *parent, cfdata_t match, void *aux) { struct iop_attach_args *ia; struct { diff --git a/sys/dev/ic/cpc700.c b/sys/dev/ic/cpc700.c index 0a6a9cb37ac..d907a83c882 100644 --- a/sys/dev/ic/cpc700.c +++ b/sys/dev/ic/cpc700.c @@ -1,4 +1,4 @@ -/* $NetBSD: cpc700.c,v 1.14 2008/04/28 20:23:49 martin Exp $ */ +/* $NetBSD: cpc700.c,v 1.15 2009/05/12 12:15:37 cegger Exp $ */ /* * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cpc700.c,v 1.14 2008/04/28 20:23:49 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpc700.c,v 1.15 2009/05/12 12:15:37 cegger Exp $"); #include "pci.h" #include "opt_pci.h" @@ -104,7 +104,7 @@ cpc_print(void *aux, const char *pnp) } static int -cpc_submatch(struct device *parent, struct cfdata *cf, +cpc_submatch(struct device *parent, cfdata_t cf, const int *ldesc, void *aux) { struct cpcbus_attach_args *caa = aux; diff --git a/sys/dev/ic/icpsp.c b/sys/dev/ic/icpsp.c index 2dd62853262..e80d7a4e39b 100644 --- a/sys/dev/ic/icpsp.c +++ b/sys/dev/ic/icpsp.c @@ -1,4 +1,4 @@ -/* $NetBSD: icpsp.c,v 1.21 2008/04/28 20:23:50 martin Exp $ */ +/* $NetBSD: icpsp.c,v 1.22 2009/05/12 12:15:37 cegger Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: icpsp.c,v 1.21 2008/04/28 20:23:50 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: icpsp.c,v 1.22 2009/05/12 12:15:37 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -67,7 +67,7 @@ struct icpsp_softc { void icpsp_attach(struct device *, struct device *, void *); void icpsp_intr(struct icp_ccb *); -int icpsp_match(struct device *, struct cfdata *, void *); +int icpsp_match(struct device *, cfdata_t, void *); void icpsp_scsipi_request(struct scsipi_channel *, scsipi_adapter_req_t, void *); @@ -81,7 +81,7 @@ static const struct icp_servicecb icpsp_servicecb = { }; int -icpsp_match(struct device *parent, struct cfdata *match, +icpsp_match(struct device *parent, cfdata_t match, void *aux) { struct icp_attach_args *icpa; diff --git a/sys/dev/ic/iic_cpcbus.c b/sys/dev/ic/iic_cpcbus.c index cdb66856b85..4eba6a936e1 100644 --- a/sys/dev/ic/iic_cpcbus.c +++ b/sys/dev/ic/iic_cpcbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: iic_cpcbus.c,v 1.10 2008/04/28 20:23:50 martin Exp $ */ +/* $NetBSD: iic_cpcbus.c,v 1.11 2009/05/12 12:15:37 cegger Exp $ */ /* * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: iic_cpcbus.c,v 1.10 2008/04/28 20:23:50 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iic_cpcbus.c,v 1.11 2009/05/12 12:15:37 cegger Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -47,14 +47,14 @@ struct iic_cpcbus_softc { void *sc_ih; }; -static int iic_cpcbus_match(struct device *, struct cfdata *, void *); +static int iic_cpcbus_match(struct device *, cfdata_t, void *); static void iic_cpcbus_attach(struct device *, struct device *, void *); CFATTACH_DECL(iic_cpcbus, sizeof(struct iic_cpcbus_softc), iic_cpcbus_match, iic_cpcbus_attach, NULL, NULL); int -iic_cpcbus_match(struct device *parent, struct cfdata *cf, void *aux) +iic_cpcbus_match(struct device *parent, cfdata_t cf, void *aux) { struct cpcbus_attach_args *caa = aux; diff --git a/sys/dev/ic/timer_cpcbus.c b/sys/dev/ic/timer_cpcbus.c index a896792a72b..6fe90bd2087 100644 --- a/sys/dev/ic/timer_cpcbus.c +++ b/sys/dev/ic/timer_cpcbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: timer_cpcbus.c,v 1.9 2008/04/28 20:23:51 martin Exp $ */ +/* $NetBSD: timer_cpcbus.c,v 1.10 2009/05/12 12:15:37 cegger Exp $ */ /* * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: timer_cpcbus.c,v 1.9 2008/04/28 20:23:51 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: timer_cpcbus.c,v 1.10 2009/05/12 12:15:37 cegger Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -44,14 +44,14 @@ struct cpctim_softc { void *sc_ih; }; -static int cpctim_match(struct device *, struct cfdata *, void *); +static int cpctim_match(struct device *, cfdata_t, void *); static void cpctim_attach(struct device *, struct device *, void *); CFATTACH_DECL(cpctim, sizeof(struct cpctim_softc), cpctim_match, cpctim_attach, NULL, NULL); int -cpctim_match(struct device *parent, struct cfdata *cf, void *aux) +cpctim_match(struct device *parent, cfdata_t cf, void *aux) { struct cpcbus_attach_args *caa = aux; diff --git a/sys/dev/ic/z8530tty.c b/sys/dev/ic/z8530tty.c index 61ce22c70c5..4b99a0aaf16 100644 --- a/sys/dev/ic/z8530tty.c +++ b/sys/dev/ic/z8530tty.c @@ -1,4 +1,4 @@ -/* $NetBSD: z8530tty.c,v 1.124 2009/03/20 16:28:57 tsutsui Exp $ */ +/* $NetBSD: z8530tty.c,v 1.125 2009/05/12 12:15:37 cegger 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.124 2009/03/20 16:28:57 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: z8530tty.c,v 1.125 2009/05/12 12:15:37 cegger Exp $"); #include "opt_kgdb.h" #include "opt_ntp.h" @@ -318,7 +318,7 @@ zstty_attach(device_t parent, device_t self, void *aux) { struct zstty_softc *zst = device_private(self); struct zsc_softc *zsc = device_private(parent); - struct cfdata *cf = device_cfdata(self); + cfdata_t cf = device_cfdata(self); struct zsc_attach_args *args = aux; struct zs_chanstate *cs; struct tty *tp; diff --git a/sys/dev/ieee1394/firewire.c b/sys/dev/ieee1394/firewire.c index 46184c260db..ec5cee0cbbc 100644 --- a/sys/dev/ieee1394/firewire.c +++ b/sys/dev/ieee1394/firewire.c @@ -1,4 +1,4 @@ -/* $NetBSD: firewire.c,v 1.24 2009/03/18 16:00:18 cegger Exp $ */ +/* $NetBSD: firewire.c,v 1.25 2009/05/12 12:16:55 cegger Exp $ */ /*- * Copyright (c) 2003 Hidetoshi Shimokawa * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: firewire.c,v 1.24 2009/03/18 16:00:18 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: firewire.c,v 1.25 2009/05/12 12:16:55 cegger Exp $"); #if defined(__FreeBSD__) #include <sys/param.h> @@ -196,7 +196,7 @@ static int firewire_shutdown (device_t); #endif static device_t firewire_add_child (device_t, int, const char *, int); #elif defined(__NetBSD__) -int firewirematch (device_t, struct cfdata *, void *); +int firewirematch (device_t, cfdata_t, void *); void firewireattach (device_t, device_t, void *); int firewiredetach (device_t, int); int firewire_print (void *, const char *); @@ -452,7 +452,7 @@ firewire_probe(device_t dev) } #elif defined(__NetBSD__) int -firewirematch(device_t parent, struct cfdata *cf, void *aux) +firewirematch(device_t parent, cfdata_t cf, void *aux) { struct fwbus_attach_args *faa = (struct fwbus_attach_args *)aux; diff --git a/sys/dev/ieee1394/if_fwip.c b/sys/dev/ieee1394/if_fwip.c index d74cee4363b..440a3435136 100644 --- a/sys/dev/ieee1394/if_fwip.c +++ b/sys/dev/ieee1394/if_fwip.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_fwip.c,v 1.18 2009/03/18 16:00:18 cegger Exp $ */ +/* $NetBSD: if_fwip.c,v 1.19 2009/05/12 12:16:55 cegger Exp $ */ /*- * Copyright (c) 2004 * Doug Rabson @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_fwip.c,v 1.18 2009/03/18 16:00:18 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_fwip.c,v 1.19 2009/05/12 12:16:55 cegger Exp $"); #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -114,7 +114,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_fwip.c,v 1.18 2009/03/18 16:00:18 cegger Exp $"); #define TX_MAX_QUEUE (FWMAXQUEUE - 1) #if defined(__NetBSD__) -int fwipmatch (device_t, struct cfdata *, void *); +int fwipmatch (device_t, cfdata_t, void *); void fwipattach (device_t, device_t, void *); int fwipdetach (device_t, int); int fwipactivate (device_t, enum devact); @@ -243,7 +243,7 @@ fwip_probe(device_t dev) } #elif defined(__NetBSD__) int -fwipmatch(device_t parent, struct cfdata *cf, void *aux) +fwipmatch(device_t parent, cfdata_t cf, void *aux) { struct fw_attach_args *fwa = aux; diff --git a/sys/dev/ieee1394/sbp.c b/sys/dev/ieee1394/sbp.c index 0433f43dd13..704ec84f6e9 100644 --- a/sys/dev/ieee1394/sbp.c +++ b/sys/dev/ieee1394/sbp.c @@ -1,4 +1,4 @@ -/* $NetBSD: sbp.c,v 1.27 2009/04/18 14:58:02 tsutsui Exp $ */ +/* $NetBSD: sbp.c,v 1.28 2009/05/12 12:16:55 cegger Exp $ */ /*- * Copyright (c) 2003 Hidetoshi Shimokawa * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sbp.c,v 1.27 2009/04/18 14:58:02 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sbp.c,v 1.28 2009/05/12 12:16:55 cegger Exp $"); #if defined(__FreeBSD__) #include <sys/param.h> @@ -438,7 +438,7 @@ struct sbp_softc { #define SBP_UNLOCK(sbp) fw_mtx_unlock(&(sbp)->mtx) #if defined(__NetBSD__) -int sbpmatch (device_t, struct cfdata *, void *); +int sbpmatch (device_t, cfdata_t, void *); void sbpattach (device_t parent, device_t self, void *aux); int sbpdetach (device_t self, int flags); #endif @@ -579,7 +579,7 @@ END_DEBUG } #elif defined(__NetBSD__) int -sbpmatch(device_t parent, struct cfdata *cf, void *aux) +sbpmatch(device_t parent, cfdata_t cf, void *aux) { struct fw_attach_args *fwa = aux; diff --git a/sys/dev/if_ndis/if_ndis_pci.c b/sys/dev/if_ndis/if_ndis_pci.c index 613dcdd3117..326459b5987 100644 --- a/sys/dev/if_ndis/if_ndis_pci.c +++ b/sys/dev/if_ndis/if_ndis_pci.c @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ndis_pci.c,v 1.13 2009/03/27 16:15:24 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ndis_pci.c,v 1.14 2009/05/12 12:17:51 cegger Exp $"); #ifdef __FreeBSD__ __FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_pci.c,v 1.8.2.3 2005/03/31 04:24:36 wpaul Exp $"); #endif @@ -86,7 +86,7 @@ static struct ndis_pci_type ndis_devs[] = { }; /*static*/ int ndis_probe_pci(struct device *parent, - struct cfdata *match, + cfdata_t match, void *aux); /*static*/ void ndis_attach_pci(struct device *parent, struct device *self, @@ -145,7 +145,7 @@ void load_ndisdrv(void *arg) } /*static*/ int -ndis_probe_pci(struct device *parent, struct cfdata *match, void *aux) +ndis_probe_pci(struct device *parent, cfdata_t match, void *aux) { struct pci_attach_args *pa = aux; int vendor = PCI_VENDOR(pa->pa_id); diff --git a/sys/dev/ir/cir.c b/sys/dev/ir/cir.c index bd436f9b4b7..ff56363cbda 100644 --- a/sys/dev/ir/cir.c +++ b/sys/dev/ir/cir.c @@ -1,4 +1,4 @@ -/* $NetBSD: cir.c,v 1.23 2008/10/10 21:50:09 jmcneill Exp $ */ +/* $NetBSD: cir.c,v 1.24 2009/05/12 12:18:09 cegger Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cir.c,v 1.23 2008/10/10 21:50:09 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cir.c,v 1.24 2009/05/12 12:18:09 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -59,7 +59,7 @@ const struct cdevsw cir_cdevsw = { D_OTHER }; -int cir_match(struct device *parent, struct cfdata *match, void *aux); +int cir_match(struct device *parent, cfdata_t match, void *aux); void cir_attach(struct device *parent, struct device *self, void *aux); int cir_activate(struct device *self, enum devact act); int cir_detach(struct device *self, int flags); @@ -72,7 +72,7 @@ extern struct cfdriver cir_cd; #define CIRUNIT(dev) (minor(dev)) int -cir_match(struct device *parent, struct cfdata *match, void *aux) +cir_match(struct device *parent, cfdata_t match, void *aux) { struct ir_attach_args *ia = aux; diff --git a/sys/dev/ir/irframe_tty.c b/sys/dev/ir/irframe_tty.c index 66318abb8c5..38ba4647a4b 100644 --- a/sys/dev/ir/irframe_tty.c +++ b/sys/dev/ir/irframe_tty.c @@ -1,4 +1,4 @@ -/* $NetBSD: irframe_tty.c,v 1.56 2009/01/11 14:28:13 mlelstv Exp $ */ +/* $NetBSD: irframe_tty.c,v 1.57 2009/05/12 12:18:09 cegger Exp $ */ /* * TODO @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: irframe_tty.c,v 1.56 2009/01/11 14:28:13 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: irframe_tty.c,v 1.57 2009/05/12 12:18:09 cegger Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -269,7 +269,7 @@ irframetopen(dev_t dev, struct tty *tp) struct lwp *l = curlwp; /* XXX */ struct irframet_softc *sc; int error, s; - struct cfdata *cfdata; + cfdata_t cfdata; struct ir_attach_args ia; device_t d; diff --git a/sys/dev/marvell/gt.c b/sys/dev/marvell/gt.c index 22d1e70f00c..c39de267ef7 100644 --- a/sys/dev/marvell/gt.c +++ b/sys/dev/marvell/gt.c @@ -1,4 +1,4 @@ -/* $NetBSD: gt.c,v 1.19 2009/03/18 10:22:40 cegger Exp $ */ +/* $NetBSD: gt.c,v 1.20 2009/05/12 12:18:45 cegger Exp $ */ /* * Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.19 2009/03/18 10:22:40 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.20 2009/05/12 12:18:45 cegger Exp $"); #include "opt_marvell.h" #include "locators.h" @@ -115,7 +115,7 @@ gt_cfprint (void *aux, const char *pnp) static int -gt_cfsearch(struct device *parent, struct cfdata *cf, +gt_cfsearch(struct device *parent, cfdata_t cf, const int *ldesc, void *aux) { struct gt_softc *gt = (struct gt_softc *) parent; diff --git a/sys/dev/marvell/gti2c.c b/sys/dev/marvell/gti2c.c index 5a7f630f6ca..9b0f6435b4d 100644 --- a/sys/dev/marvell/gti2c.c +++ b/sys/dev/marvell/gti2c.c @@ -1,4 +1,4 @@ -/* $NetBSD: gti2c.c,v 1.10 2008/04/08 20:40:42 cegger Exp $ */ +/* $NetBSD: gti2c.c,v 1.11 2009/05/12 12:18:45 cegger Exp $ */ /* * Copyright (c) 2005 Brocade Communcations, inc. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gti2c.c,v 1.10 2008/04/08 20:40:42 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gti2c.c,v 1.11 2009/05/12 12:18:45 cegger Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -57,7 +57,7 @@ struct gti2c_softc { kmutex_t sc_lock; }; -static int gt_i2c_match(struct device *, struct cfdata *, void *); +static int gt_i2c_match(struct device *, cfdata_t, void *); static void gt_i2c_attach(struct device *, struct device *, void *); CFATTACH_DECL(gtiic, sizeof(struct gti2c_softc), @@ -231,7 +231,7 @@ gt_i2c_intr(void *aux) } int -gt_i2c_match(struct device *parent, struct cfdata *cfdata, void *aux) +gt_i2c_match(struct device *parent, cfdata_t cfdata, void *aux) { struct gt_softc * const gt = device_private(parent); struct gt_attach_args * const ga = aux; diff --git a/sys/dev/marvell/gtidma.c b/sys/dev/marvell/gtidma.c index 65fe302fbf8..109188f3fdf 100644 --- a/sys/dev/marvell/gtidma.c +++ b/sys/dev/marvell/gtidma.c @@ -1,4 +1,4 @@ -/* $NetBSD: gtidma.c,v 1.16 2009/03/18 10:22:40 cegger Exp $ */ +/* $NetBSD: gtidma.c,v 1.17 2009/05/12 12:18:45 cegger 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.16 2009/03/18 10:22:40 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gtidma.c,v 1.17 2009/05/12 12:18:45 cegger Exp $"); #include "opt_idma.h" #include "opt_ddb.h" @@ -229,7 +229,7 @@ idma_list_sync_post(idma_chan_t * const idcp, idma_desch_t *iddhp) STATIC void idma_attach (struct device *, struct device *, void *); -STATIC int idma_match (struct device *, struct cfdata *, void *); +STATIC int idma_match (struct device *, cfdata_t, void *); STATIC void idma_chan_init (idma_softc_t *, idma_chan_t *, unsigned int); STATIC void idma_arb_init(idma_softc_t *); @@ -266,7 +266,7 @@ idma_softc_t *idma_sc = 0; STATIC int idma_match( struct device * const parent, - struct cfdata * const self, + cfdata_t const self, void *const aux) { struct gt_attach_args * const ga = (struct gt_attach_args *)aux; diff --git a/sys/dev/marvell/gtmpsc.c b/sys/dev/marvell/gtmpsc.c index 33ee398209c..937f10c97f7 100644 --- a/sys/dev/marvell/gtmpsc.c +++ b/sys/dev/marvell/gtmpsc.c @@ -1,4 +1,4 @@ -/* $NetBSD: gtmpsc.c,v 1.35 2009/04/18 14:58:03 tsutsui Exp $ */ +/* $NetBSD: gtmpsc.c,v 1.36 2009/05/12 12:18:45 cegger Exp $ */ /* * Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc. @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gtmpsc.c,v 1.35 2009/04/18 14:58:03 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gtmpsc.c,v 1.36 2009/05/12 12:18:45 cegger Exp $"); #include "opt_kgdb.h" @@ -118,7 +118,7 @@ unsigned int gtmpsc_debug = 0; #define GTMPSCDIALOUT(x) (minor(x) & GTMPSCDIALOUT_MASK) STATIC void gtmpscinit(struct gtmpsc_softc *); -STATIC int gtmpscmatch(struct device *, struct cfdata *, void *); +STATIC int gtmpscmatch(struct device *, cfdata_t, void *); STATIC void gtmpscattach(struct device *, struct device *, void *); STATIC int compute_cdv(unsigned int); STATIC void gtmpsc_loadchannelregs(struct gtmpsc_softc *); @@ -419,7 +419,7 @@ gtmpsc_loadchannelregs(struct gtmpsc_softc *sc) } STATIC int -gtmpscmatch(struct device *parent, struct cfdata *self, void *aux) +gtmpscmatch(struct device *parent, cfdata_t self, void *aux) { struct gt_softc *gt = device_private(parent); struct gt_attach_args *ga = aux; diff --git a/sys/dev/marvell/gtpci.c b/sys/dev/marvell/gtpci.c index 442adc15a25..372904fd96d 100644 --- a/sys/dev/marvell/gtpci.c +++ b/sys/dev/marvell/gtpci.c @@ -1,4 +1,4 @@ -/* $NetBSD: gtpci.c,v 1.19 2008/04/11 06:25:25 he Exp $ */ +/* $NetBSD: gtpci.c,v 1.20 2009/05/12 12:18:45 cegger Exp $ */ /* * Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gtpci.c,v 1.19 2008/04/11 06:25:25 he Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gtpci.c,v 1.20 2009/05/12 12:18:45 cegger Exp $"); #include "opt_marvell.h" #include <sys/param.h> @@ -87,7 +87,7 @@ struct gtpci_softc { }; static int gtpci_cfprint(void *, const char *); -static int gtpci_match(struct device *, struct cfdata *, void *); +static int gtpci_match(struct device *, cfdata_t, void *); static void gtpci_attach(struct device *, struct device *, void *); CFATTACH_DECL(gtpci, sizeof(struct gtpci_softc), @@ -194,7 +194,7 @@ static const struct pci_init { }; int -gtpci_match(struct device *parent, struct cfdata *self, void *aux) +gtpci_match(struct device *parent, cfdata_t self, void *aux) { struct gt_softc * const gt = device_private(parent); struct gt_attach_args * const ga = aux; diff --git a/sys/dev/marvell/if_gfe.c b/sys/dev/marvell/if_gfe.c index bdd07dd13bb..da4251a2954 100644 --- a/sys/dev/marvell/if_gfe.c +++ b/sys/dev/marvell/if_gfe.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_gfe.c,v 1.31 2008/11/07 00:20:07 dyoung Exp $ */ +/* $NetBSD: if_gfe.c,v 1.32 2009/05/12 12:18:45 cegger Exp $ */ /* * Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.31 2008/11/07 00:20:07 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.32 2009/05/12 12:18:45 cegger Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -144,7 +144,7 @@ enum gfe_hash_op { #define STATIC -STATIC int gfe_match (struct device *, struct cfdata *, void *); +STATIC int gfe_match (struct device *, cfdata_t, void *); STATIC void gfe_attach (struct device *, struct device *, void *); STATIC int gfe_dmamem_alloc(struct gfe_softc *, struct gfe_dmamem *, int, @@ -196,7 +196,7 @@ CFATTACH_DECL(gfe, sizeof(struct gfe_softc), extern struct cfdriver gfe_cd; int -gfe_match(struct device *parent, struct cfdata *cf, void *aux) +gfe_match(struct device *parent, cfdata_t cf, void *aux) { struct gt_softc *gt = (struct gt_softc *) parent; struct gt_attach_args *ga = aux; diff --git a/sys/dev/marvell/obio.c b/sys/dev/marvell/obio.c index abcf8c4448c..b4701d1971a 100644 --- a/sys/dev/marvell/obio.c +++ b/sys/dev/marvell/obio.c @@ -1,4 +1,4 @@ -/* $NetBSD: obio.c,v 1.10 2007/10/19 12:00:34 ad Exp $ */ +/* $NetBSD: obio.c,v 1.11 2009/05/12 12:18:45 cegger Exp $ */ /* * Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.10 2007/10/19 12:00:34 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.11 2009/05/12 12:18:45 cegger Exp $"); #include "opt_marvell.h" @@ -71,8 +71,8 @@ __KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.10 2007/10/19 12:00:34 ad Exp $"); #include "locators.h" static int obio_cfprint(void *, const char *); -static int obio_cfmatch(struct device *, struct cfdata *, void *); -static int obio_cfsearch(struct device *, struct cfdata *, +static int obio_cfmatch(struct device *, cfdata_t, void *); +static int obio_cfsearch(struct device *, cfdata_t, const int *, void *); static void obio_cfattach(struct device *, struct device *, void *); @@ -118,7 +118,7 @@ obio_cfprint(void *aux, const char *pnp) int -obio_cfsearch(struct device *parent, struct cfdata *cf, +obio_cfsearch(struct device *parent, cfdata_t cf, const int *ldesc, void *aux) { struct obio_softc *sc = (struct obio_softc *) parent; @@ -137,7 +137,7 @@ obio_cfsearch(struct device *parent, struct cfdata *cf, } int -obio_cfmatch(struct device *parent, struct cfdata *cf, void *aux) +obio_cfmatch(struct device *parent, cfdata_t cf, void *aux) { struct gt_softc * const gt = (struct gt_softc *)parent; struct gt_attach_args * const ga = aux; |
