diff options
| author | cegger <cegger@NetBSD.org> | 2009-05-12 14:38:26 +0000 |
|---|---|---|
| committer | cegger <cegger@NetBSD.org> | 2009-05-12 14:38:26 +0000 |
| commit | 7cf2991222ea44a8a722cf40f50f32f50785265e (patch) | |
| tree | 731d31e467e3cddc3965b328d7fa313614de7008 /sys/dev | |
| parent | 99747a8099a6916ccfc458619170aec025801090 (diff) | |
struct device * -> device_t, no functional changes intended.
Diffstat (limited to 'sys/dev')
107 files changed, 692 insertions, 711 deletions
diff --git a/sys/dev/mvme/clmpcc_pcctwo.c b/sys/dev/mvme/clmpcc_pcctwo.c index 8e0ad752244..dedc513ad38 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.17 2009/05/12 13:16:45 cegger Exp $ */ +/* $NetBSD: clmpcc_pcctwo.c,v 1.18 2009/05/12 14:38:26 cegger Exp $ */ /*- * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clmpcc_pcctwo.c,v 1.17 2009/05/12 13:16:45 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clmpcc_pcctwo.c,v 1.18 2009/05/12 14:38:26 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -68,8 +68,8 @@ __KERNEL_RCSID(0, "$NetBSD: clmpcc_pcctwo.c,v 1.17 2009/05/12 13:16:45 cegger Ex /* Definition of the driver for autoconfig. */ -int clmpcc_pcctwo_match(struct device *, cfdata_t, void *); -void clmpcc_pcctwo_attach(struct device *, struct device *, void *); +int clmpcc_pcctwo_match(device_t, cfdata_t, void *); +void clmpcc_pcctwo_attach(device_t, device_t, void *); void clmpcc_pcctwo_iackhook(struct clmpcc_softc *, int); void clmpcc_pcctwo_consiackhook(struct clmpcc_softc *, int); @@ -90,7 +90,7 @@ cons_decl(clmpcc); * Is the CD2401 chip present? */ int -clmpcc_pcctwo_match(struct device *parent, cfdata_t cf, void *aux) +clmpcc_pcctwo_match(device_t parent, cfdata_t cf, void *aux) { struct pcctwo_attach_args *pa; @@ -108,7 +108,7 @@ clmpcc_pcctwo_match(struct device *parent, cfdata_t cf, void *aux) * Attach a found CD2401. */ void -clmpcc_pcctwo_attach(struct device *parent, struct device *self, void *aux) +clmpcc_pcctwo_attach(device_t parent, device_t self, void *aux) { struct clmpcc_softc *sc; struct pcctwo_attach_args *pa = aux; diff --git a/sys/dev/mvme/clock_pcctwo.c b/sys/dev/mvme/clock_pcctwo.c index 083e423e89c..d2e1410ef9d 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.15 2009/05/12 13:16:45 cegger Exp $ */ +/* $NetBSD: clock_pcctwo.c,v 1.16 2009/05/12 14:38:26 cegger Exp $ */ /*- * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clock_pcctwo.c,v 1.15 2009/05/12 13:16:45 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clock_pcctwo.c,v 1.16 2009/05/12 14:38:26 cegger Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -52,8 +52,8 @@ __KERNEL_RCSID(0, "$NetBSD: clock_pcctwo.c,v 1.15 2009/05/12 13:16:45 cegger Exp #include <dev/mvme/pcctworeg.h> -int clock_pcctwo_match(struct device *, cfdata_t, void *); -void clock_pcctwo_attach(struct device *, struct device *, void *); +int clock_pcctwo_match(device_t, cfdata_t, void *); +void clock_pcctwo_attach(device_t, device_t, void *); struct clock_pcctwo_softc { struct device sc_dev; @@ -78,7 +78,7 @@ static uint32_t clock_pcctwo_count; /* ARGSUSED */ int -clock_pcctwo_match(struct device *parent, cfdata_t cf, void *aux) +clock_pcctwo_match(device_t parent, cfdata_t cf, void *aux) { struct pcctwo_attach_args *pa = aux; @@ -96,7 +96,7 @@ clock_pcctwo_match(struct device *parent, cfdata_t cf, void *aux) /* ARGSUSED */ void -clock_pcctwo_attach(struct device *parent, struct device *self, void *aux) +clock_pcctwo_attach(device_t parent, device_t self, void *aux) { struct clock_pcctwo_softc *sc; struct pcctwo_attach_args *pa; diff --git a/sys/dev/mvme/clockvar.h b/sys/dev/mvme/clockvar.h index 93edecd83d6..9535f8b8180 100644 --- a/sys/dev/mvme/clockvar.h +++ b/sys/dev/mvme/clockvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: clockvar.h,v 1.8 2008/04/28 20:23:54 martin Exp $ */ +/* $NetBSD: clockvar.h,v 1.9 2009/05/12 14:38:26 cegger Exp $ */ /*- * Copyright (c) 1996, 2002 The NetBSD Foundation, Inc. @@ -49,7 +49,7 @@ struct clock_attach_args { void *ca_arg; }; -void clock_config(struct device *, struct clock_attach_args *, +void clock_config(device_t, struct clock_attach_args *, struct evcnt *); /* diff --git a/sys/dev/mvme/if_ie_mvme.c b/sys/dev/mvme/if_ie_mvme.c index 132717a3c6f..32e24c3f5a0 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.15 2009/05/12 13:16:45 cegger Exp $ */ +/* $NetBSD: if_ie_mvme.c,v 1.16 2009/05/12 14:38:26 cegger Exp $ */ /*- * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ie_mvme.c,v 1.15 2009/05/12 13:16:45 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ie_mvme.c,v 1.16 2009/05/12 14:38:26 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -60,8 +60,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_ie_mvme.c,v 1.15 2009/05/12 13:16:45 cegger Exp $ #include <dev/mvme/pcctworeg.h> -int ie_pcctwo_match(struct device *, cfdata_t, void *); -void ie_pcctwo_attach(struct device *, struct device *, void *); +int ie_pcctwo_match(device_t, cfdata_t, void *); +void ie_pcctwo_attach(device_t, device_t, void *); struct ie_pcctwo_softc { struct ie_softc ps_ie; @@ -220,7 +220,7 @@ ie_write_24(struct ie_softc *sc, int offset, int addr) /* ARGSUSED */ int -ie_pcctwo_match(struct device *parent, cfdata_t cf, void *args) +ie_pcctwo_match(device_t parent, cfdata_t cf, void *args) { struct pcctwo_attach_args *pa; @@ -236,7 +236,7 @@ ie_pcctwo_match(struct device *parent, cfdata_t cf, void *args) /* ARGSUSED */ void -ie_pcctwo_attach(struct device *parent, struct device *self, void *args) +ie_pcctwo_attach(device_t parent, device_t self, void *args) { struct pcctwo_attach_args *pa; struct ie_pcctwo_softc *ps; diff --git a/sys/dev/ofisa/ess_ofisa.c b/sys/dev/ofisa/ess_ofisa.c index 0c673476c09..5769a72c5e3 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.23 2009/05/12 13:17:15 cegger Exp $ */ +/* $NetBSD: ess_ofisa.c,v 1.24 2009/05/12 14:38:56 cegger Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ess_ofisa.c,v 1.23 2009/05/12 13:17:15 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ess_ofisa.c,v 1.24 2009/05/12 14:38:56 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -51,14 +51,14 @@ __KERNEL_RCSID(0, "$NetBSD: ess_ofisa.c,v 1.23 2009/05/12 13:17:15 cegger Exp $" #include <dev/isa/essreg.h> #include <dev/isa/essvar.h> -int ess_ofisa_match(struct device *, cfdata_t, void *); -void ess_ofisa_attach(struct device *, struct device *, void *); +int ess_ofisa_match(device_t, cfdata_t, void *); +void ess_ofisa_attach(device_t, device_t, void *); CFATTACH_DECL(ess_ofisa, sizeof(struct ess_softc), ess_ofisa_match, ess_ofisa_attach, NULL, NULL); int -ess_ofisa_match(struct device *parent, cfdata_t cf, void *aux) +ess_ofisa_match(device_t parent, cfdata_t cf, void *aux) { struct ofisa_attach_args *aa = aux; static const char *const compatible_strings[] = { @@ -78,7 +78,7 @@ ess_ofisa_match(struct device *parent, cfdata_t cf, void *aux) } void -ess_ofisa_attach(struct device *parent, struct device *self, void *aux) +ess_ofisa_attach(device_t parent, device_t self, void *aux) { struct ess_softc *sc = device_private(self); struct ofisa_attach_args *aa = aux; diff --git a/sys/dev/ofisa/if_cs_ofisa.c b/sys/dev/ofisa/if_cs_ofisa.c index cfced64a17a..585ea2976bd 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.21 2009/05/12 13:17:15 cegger Exp $ */ +/* $NetBSD: if_cs_ofisa.c,v 1.22 2009/05/12 14:38:56 cegger Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa.c,v 1.21 2009/05/12 13:17:15 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa.c,v 1.22 2009/05/12 14:38:56 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -63,14 +63,14 @@ __KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa.c,v 1.21 2009/05/12 13:17:15 cegger Exp #include <dev/ic/cs89x0var.h> #include <dev/isa/cs89x0isavar.h> -int cs_ofisa_match(struct device *, cfdata_t, void *); -void cs_ofisa_attach(struct device *, struct device *, void *); +int cs_ofisa_match(device_t, cfdata_t, void *); +void cs_ofisa_attach(device_t, device_t, void *); CFATTACH_DECL(cs_ofisa, sizeof(struct cs_softc_isa), cs_ofisa_match, cs_ofisa_attach, NULL, NULL); int -cs_ofisa_match(struct device *parent, cfdata_t cf, void *aux) +cs_ofisa_match(device_t parent, cfdata_t cf, void *aux) { struct ofisa_attach_args *aa = aux; static const char *const compatible_strings[] = { @@ -91,7 +91,7 @@ cs_ofisa_match(struct device *parent, cfdata_t cf, void *aux) } void -cs_ofisa_attach(struct device *parent, struct device *self, void *aux) +cs_ofisa_attach(device_t parent, device_t self, void *aux) { struct cs_softc *sc = device_private(self); struct cs_softc_isa *isc = (void *)sc; diff --git a/sys/dev/ofisa/ofisa.c b/sys/dev/ofisa/ofisa.c index 7c56947c8b7..716c4ee0e78 100644 --- a/sys/dev/ofisa/ofisa.c +++ b/sys/dev/ofisa/ofisa.c @@ -1,4 +1,4 @@ -/* $NetBSD: ofisa.c,v 1.22 2009/05/12 13:17:15 cegger Exp $ */ +/* $NetBSD: ofisa.c,v 1.23 2009/05/12 14:38:56 cegger Exp $ */ /* * Copyright 1997, 1998 @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ofisa.c,v 1.22 2009/05/12 13:17:15 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofisa.c,v 1.23 2009/05/12 14:38:56 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -51,8 +51,8 @@ __KERNEL_RCSID(0, "$NetBSD: ofisa.c,v 1.22 2009/05/12 13:17:15 cegger Exp $"); #define OFW_MAX_STACK_BUF_SIZE 256 -static int ofisamatch(struct device *, cfdata_t, void *); -static void ofisaattach(struct device *, struct device *, void *); +static int ofisamatch(device_t, cfdata_t, void *); +static void ofisaattach(device_t, device_t, void *); CFATTACH_DECL(ofisa, sizeof(struct device), ofisamatch, ofisaattach, NULL, NULL); @@ -76,7 +76,7 @@ ofisaprint(void *aux, const char *pnp) } int -ofisamatch(struct device *parent, cfdata_t cf, void *aux) +ofisamatch(device_t parent, cfdata_t cf, void *aux) { struct ofbus_attach_args *oba = aux; static const char *const compatible_strings[] = { "pnpPNP,a00", NULL }; @@ -94,7 +94,7 @@ ofisamatch(struct device *parent, cfdata_t cf, void *aux) } void -ofisaattach(struct device *parent, struct device *self, void *aux) +ofisaattach(device_t parent, device_t self, void *aux) { struct ofbus_attach_args *oba = aux; struct isabus_attach_args iba; diff --git a/sys/dev/ofw/ofbus.c b/sys/dev/ofw/ofbus.c index a8992783930..c197b43e708 100644 --- a/sys/dev/ofw/ofbus.c +++ b/sys/dev/ofw/ofbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: ofbus.c,v 1.23 2009/05/12 13:17:37 cegger Exp $ */ +/* $NetBSD: ofbus.c,v 1.24 2009/05/12 14:39:22 cegger Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ofbus.c,v 1.23 2009/05/12 13:17:37 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofbus.c,v 1.24 2009/05/12 14:39:22 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -40,8 +40,8 @@ __KERNEL_RCSID(0, "$NetBSD: ofbus.c,v 1.23 2009/05/12 13:17:37 cegger Exp $"); #include <dev/ofw/openfirm.h> -int ofbus_match(struct device *, cfdata_t, void *); -void ofbus_attach(struct device *, struct device *, void *); +int ofbus_match(device_t, cfdata_t, void *); +void ofbus_attach(device_t, device_t, void *); static int ofbus_print(void *, const char *); CFATTACH_DECL(ofbus, sizeof(struct device), @@ -60,7 +60,7 @@ ofbus_print(void *aux, const char *pnp) } int -ofbus_match(struct device *parent, cfdata_t cf, void *aux) +ofbus_match(device_t parent, cfdata_t cf, void *aux) { struct ofbus_attach_args *oba = aux; @@ -72,7 +72,7 @@ ofbus_match(struct device *parent, cfdata_t cf, void *aux) } void -ofbus_attach(struct device *parent, struct device *dev, void *aux) +ofbus_attach(device_t parent, device_t dev, void *aux) { struct ofbus_attach_args *oba = aux; struct ofbus_attach_args oba2; diff --git a/sys/dev/ofw/ofcons.c b/sys/dev/ofw/ofcons.c index 282db1abc77..e6e8472e57f 100644 --- a/sys/dev/ofw/ofcons.c +++ b/sys/dev/ofw/ofcons.c @@ -1,4 +1,4 @@ -/* $NetBSD: ofcons.c,v 1.39 2009/05/12 13:17:37 cegger Exp $ */ +/* $NetBSD: ofcons.c,v 1.40 2009/05/12 14:39:22 cegger Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ofcons.c,v 1.39 2009/05/12 13:17:37 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofcons.c,v 1.40 2009/05/12 14:39:22 cegger Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -62,8 +62,8 @@ cons_decl(ofcons_); static int stdin, stdout; -static int ofcons_match(struct device *, cfdata_t, void *); -static void ofcons_attach(struct device *, struct device *, void *); +static int ofcons_match(device_t, cfdata_t, void *); +static void ofcons_attach(device_t, device_t, void *); CFATTACH_DECL(ofcons, sizeof(struct ofcons_softc), ofcons_match, ofcons_attach, NULL, NULL); @@ -86,7 +86,7 @@ const struct cdevsw ofcons_cdevsw = { static int ofcons_probe(void); static int -ofcons_match(struct device *parent, cfdata_t match, void *aux) +ofcons_match(device_t parent, cfdata_t match, void *aux) { struct ofbus_attach_args *oba = aux; @@ -99,7 +99,7 @@ ofcons_match(struct device *parent, cfdata_t match, void *aux) } static void -ofcons_attach(struct device *parent, struct device *self, void *aux) +ofcons_attach(device_t parent, device_t self, void *aux) { struct ofcons_softc *sc = device_private(self); diff --git a/sys/dev/ofw/ofdisk.c b/sys/dev/ofw/ofdisk.c index 4e2de8b00f4..bd8d18b0cae 100644 --- a/sys/dev/ofw/ofdisk.c +++ b/sys/dev/ofw/ofdisk.c @@ -1,4 +1,4 @@ -/* $NetBSD: ofdisk.c,v 1.42 2009/05/12 13:17:37 cegger Exp $ */ +/* $NetBSD: ofdisk.c,v 1.43 2009/05/12 14:39:22 cegger Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ofdisk.c,v 1.42 2009/05/12 13:17:37 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofdisk.c,v 1.43 2009/05/12 14:39:22 cegger Exp $"); #include <sys/param.h> #include <sys/buf.h> @@ -63,8 +63,8 @@ struct ofdisk_softc { #define OFDISK_FLOPPY_P(of) ((of)->sc_flags & OFDF_ISFLOPPY) -static int ofdisk_match (struct device *, cfdata_t, void *); -static void ofdisk_attach (struct device *, struct device *, void *); +static int ofdisk_match (device_t, cfdata_t, void *); +static void ofdisk_attach (device_t, device_t, void *); CFATTACH_DECL(ofdisk, sizeof(struct ofdisk_softc), ofdisk_match, ofdisk_attach, NULL, NULL); @@ -98,7 +98,7 @@ void ofdisk_getdefaultlabel (struct ofdisk_softc *, struct disklabel *); void ofdisk_getdisklabel (dev_t); static int -ofdisk_match(struct device *parent, cfdata_t match, void *aux) +ofdisk_match(device_t parent, cfdata_t match, void *aux) { struct ofbus_attach_args *oba = aux; char type[8]; @@ -116,7 +116,7 @@ ofdisk_match(struct device *parent, cfdata_t match, void *aux) } static void -ofdisk_attach(struct device *parent, struct device *self, void *aux) +ofdisk_attach(device_t parent, device_t self, void *aux) { struct ofdisk_softc *of = device_private(self); struct ofbus_attach_args *oba = aux; diff --git a/sys/dev/ofw/ofnet.c b/sys/dev/ofw/ofnet.c index 5e8c71b079d..c95c3e743cd 100644 --- a/sys/dev/ofw/ofnet.c +++ b/sys/dev/ofw/ofnet.c @@ -1,4 +1,4 @@ -/* $NetBSD: ofnet.c,v 1.47 2009/05/12 13:17:37 cegger Exp $ */ +/* $NetBSD: ofnet.c,v 1.48 2009/05/12 14:39:22 cegger Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ofnet.c,v 1.47 2009/05/12 13:17:37 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofnet.c,v 1.48 2009/05/12 14:39:22 cegger Exp $"); #include "ofnet.h" #include "opt_inet.h" @@ -84,8 +84,8 @@ struct ofnet_softc { struct callout sc_callout; }; -static int ofnet_match (struct device *, cfdata_t, void *); -static void ofnet_attach (struct device *, struct device *, void *); +static int ofnet_match (device_t, cfdata_t, void *); +static void ofnet_attach (device_t, device_t, void *); CFATTACH_DECL(ofnet, sizeof(struct ofnet_softc), ofnet_match, ofnet_attach, NULL, NULL); @@ -100,7 +100,7 @@ static int ofnet_ioctl (struct ifnet *, u_long, void *); static void ofnet_watchdog (struct ifnet *); static int -ofnet_match(struct device *parent, cfdata_t match, void *aux) +ofnet_match(device_t parent, cfdata_t match, void *aux) { struct ofbus_attach_args *oba = aux; char type[32]; @@ -124,7 +124,7 @@ ofnet_match(struct device *parent, cfdata_t match, void *aux) } static void -ofnet_attach(struct device *parent, struct device *self, void *aux) +ofnet_attach(device_t parent, device_t self, void *aux) { struct ofnet_softc *of = device_private(self); struct ifnet *ifp = &of->sc_ethercom.ec_if; diff --git a/sys/dev/ofw/ofrtc.c b/sys/dev/ofw/ofrtc.c index 46ae1087216..d49a834d944 100644 --- a/sys/dev/ofw/ofrtc.c +++ b/sys/dev/ofw/ofrtc.c @@ -1,4 +1,4 @@ -/* $NetBSD: ofrtc.c,v 1.21 2009/05/12 13:17:37 cegger Exp $ */ +/* $NetBSD: ofrtc.c,v 1.22 2009/05/12 14:39:22 cegger Exp $ */ /* * Copyright (C) 1996 Wolfgang Solfrank. @@ -64,7 +64,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ofrtc.c,v 1.21 2009/05/12 13:17:37 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofrtc.c,v 1.22 2009/05/12 14:39:22 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -89,8 +89,8 @@ struct ofrtc_softc { struct todr_chip_handle sc_todr; }; -static int ofrtc_match(struct device *, cfdata_t, void *); -static void ofrtc_attach(struct device *, struct device *, void *); +static int ofrtc_match(device_t, cfdata_t, void *); +static void ofrtc_attach(device_t, device_t, void *); static int ofrtc_gettod(todr_chip_handle_t, struct clock_ymdhms *); static int ofrtc_settod(todr_chip_handle_t, struct clock_ymdhms *); @@ -98,7 +98,7 @@ CFATTACH_DECL(ofrtc, sizeof(struct ofrtc_softc), ofrtc_match, ofrtc_attach, NULL, NULL); static int -ofrtc_match(struct device *parent, cfdata_t match, void *aux) +ofrtc_match(device_t parent, cfdata_t match, void *aux) { struct ofbus_attach_args *oba = aux; char type[8]; @@ -117,7 +117,7 @@ ofrtc_match(struct device *parent, cfdata_t match, void *aux) } static void -ofrtc_attach(struct device *parent, struct device *self, void *aux) +ofrtc_attach(device_t parent, device_t self, void *aux) { struct ofrtc_softc *of = device_private(self); struct ofbus_attach_args *oba = aux; diff --git a/sys/dev/onewire/onewire.c b/sys/dev/onewire/onewire.c index afa97ec0f35..001cfc168e0 100644 --- a/sys/dev/onewire/onewire.c +++ b/sys/dev/onewire/onewire.c @@ -1,4 +1,4 @@ -/* $NetBSD: onewire.c,v 1.11 2009/03/18 16:00:19 cegger Exp $ */ +/* $NetBSD: onewire.c,v 1.12 2009/05/12 14:39:51 cegger Exp $ */ /* $OpenBSD: onewire.c,v 1.1 2006/03/04 16:27:03 grange Exp $ */ /* @@ -18,7 +18,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: onewire.c,v 1.11 2009/03/18 16:00:19 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: onewire.c,v 1.12 2009/05/12 14:39:51 cegger Exp $"); /* * 1-Wire bus driver. @@ -323,7 +323,7 @@ onewire_scan(struct onewire_softc *sc) { struct onewire_device *d, *next, *nd; struct onewire_attach_args oa; - struct device *dev; + device_t dev; int search = 1, count = 0, present; int dir, rv; uint64_t mask, rom = 0, lastrom; diff --git a/sys/dev/pcmcia/aic_pcmcia.c b/sys/dev/pcmcia/aic_pcmcia.c index 191da216653..1ab705e6f1c 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.39 2009/05/12 13:18:04 cegger Exp $ */ +/* $NetBSD: aic_pcmcia.c,v 1.40 2009/05/12 14:42:18 cegger 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.39 2009/05/12 13:18:04 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aic_pcmcia.c,v 1.40 2009/05/12 14:42:18 cegger 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(struct device *, cfdata_t, void *); +int aic_pcmcia_match(device_t, cfdata_t, 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); +void aic_pcmcia_attach(device_t, device_t, void *); +int aic_pcmcia_detach(device_t, int); +int aic_pcmcia_enable(device_t, int); CFATTACH_DECL(aic_pcmcia, sizeof(struct aic_pcmcia_softc), aic_pcmcia_match, aic_pcmcia_attach, aic_pcmcia_detach, aic_activate); @@ -85,7 +85,7 @@ const size_t aic_pcmcia_nproducts = sizeof(aic_pcmcia_products) / sizeof(aic_pcmcia_products[0]); int -aic_pcmcia_match(struct device *parent, cfdata_t match, +aic_pcmcia_match(device_t parent, cfdata_t match, void *aux) { struct pcmcia_attach_args *pa = aux; @@ -107,7 +107,7 @@ aic_pcmcia_validate_config(struct pcmcia_config_entry *cfe) } void -aic_pcmcia_attach(struct device *parent, struct device *self, +aic_pcmcia_attach(device_t parent, device_t self, void *aux) { struct aic_pcmcia_softc *psc = (void *)self; @@ -155,7 +155,7 @@ fail: } int -aic_pcmcia_detach(struct device *self, int flags) +aic_pcmcia_detach(device_t self, int flags) { struct aic_pcmcia_softc *sc = (void *)self; int error; @@ -173,7 +173,7 @@ aic_pcmcia_detach(struct device *self, int flags) } int -aic_pcmcia_enable(struct device *self, int onoff) +aic_pcmcia_enable(device_t self, int onoff) { struct aic_pcmcia_softc *sc = (void *)self; int error; diff --git a/sys/dev/pcmcia/esp_pcmcia.c b/sys/dev/pcmcia/esp_pcmcia.c index ab6a3576ce0..5d71f2c58f8 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.37 2009/03/14 15:36:20 dsl Exp $ */ +/* $NetBSD: esp_pcmcia.c,v 1.38 2009/05/12 14:42:18 cegger Exp $ */ /*- * Copyright (c) 2000, 2004 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: esp_pcmcia.c,v 1.37 2009/03/14 15:36:20 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: esp_pcmcia.c,v 1.38 2009/05/12 14:42:18 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -213,7 +213,7 @@ esp_pcmcia_init(struct esp_pcmcia_softc *esc) } int -esp_pcmcia_detach(struct device *self, int flags) +esp_pcmcia_detach(device_t self, int flags) { struct esp_pcmcia_softc *sc = device_private(self); int error; @@ -231,7 +231,7 @@ esp_pcmcia_detach(struct device *self, int flags) } int -esp_pcmcia_enable(struct device *self, int onoff) +esp_pcmcia_enable(device_t self, int onoff) { struct esp_pcmcia_softc *sc = device_private(self); int error; diff --git a/sys/dev/pcmcia/if_an_pcmcia.c b/sys/dev/pcmcia/if_an_pcmcia.c index f97a21f6b4e..fa731627d3e 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.38 2009/05/12 13:18:04 cegger Exp $ */ +/* $NetBSD: if_an_pcmcia.c,v 1.39 2009/05/12 14:42:18 cegger Exp $ */ /*- * Copyright (c) 2000, 2004 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_an_pcmcia.c,v 1.38 2009/05/12 13:18:04 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_an_pcmcia.c,v 1.39 2009/05/12 14:42:18 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -62,10 +62,10 @@ __KERNEL_RCSID(0, "$NetBSD: if_an_pcmcia.c,v 1.38 2009/05/12 13:18:04 cegger Exp #include <dev/pcmcia/pcmciavar.h> #include <dev/pcmcia/pcmciadevs.h> -static int an_pcmcia_match(struct device *, cfdata_t, void *); +static int an_pcmcia_match(device_t, cfdata_t, 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 void an_pcmcia_attach(device_t, device_t, void *); +static int an_pcmcia_detach(device_t, int); static int an_pcmcia_enable(struct an_softc *); static void an_pcmcia_disable(struct an_softc *); @@ -97,7 +97,7 @@ static const size_t an_pcmcia_nproducts = sizeof(an_pcmcia_products) / sizeof(an_pcmcia_products[0]); static int -an_pcmcia_match(struct device *parent, cfdata_t match, +an_pcmcia_match(device_t parent, cfdata_t match, void *aux) { struct pcmcia_attach_args *pa = aux; @@ -118,7 +118,7 @@ an_pcmcia_validate_config(struct pcmcia_config_entry *cfe) } static void -an_pcmcia_attach(struct device *parent, struct device *self, +an_pcmcia_attach(struct device *parent, device_t self, void *aux) { struct an_pcmcia_softc *psc = device_private(self); @@ -174,7 +174,7 @@ fail: static int -an_pcmcia_detach(struct device *self, int flags) +an_pcmcia_detach(device_t self, int flags) { struct an_pcmcia_softc *psc = device_private(self); int error; diff --git a/sys/dev/pcmcia/if_awi_pcmcia.c b/sys/dev/pcmcia/if_awi_pcmcia.c index ea4ecde9edc..7ac78695fcc 100644 --- a/sys/dev/pcmcia/if_awi_pcmcia.c +++ b/sys/dev/pcmcia/if_awi_pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_awi_pcmcia.c,v 1.42 2009/05/12 13:18:04 cegger Exp $ */ +/* $NetBSD: if_awi_pcmcia.c,v 1.43 2009/05/12 14:42:18 cegger Exp $ */ /*- * Copyright (c) 1999, 2004 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_awi_pcmcia.c,v 1.42 2009/05/12 13:18:04 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_awi_pcmcia.c,v 1.43 2009/05/12 14:42:18 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -71,10 +71,10 @@ __KERNEL_RCSID(0, "$NetBSD: if_awi_pcmcia.c,v 1.42 2009/05/12 13:18:04 cegger Ex #include <dev/pcmcia/pcmciavar.h> #include <dev/pcmcia/pcmciadevs.h> -static int awi_pcmcia_match(struct device *, cfdata_t, void *); +static int awi_pcmcia_match(device_t, cfdata_t, void *); static int awi_pcmcia_validate_config(struct pcmcia_config_entry *); -static void awi_pcmcia_attach(struct device *, struct device *, void *); -static int awi_pcmcia_detach(struct device *, int); +static void awi_pcmcia_attach(device_t, device_t, void *); +static int awi_pcmcia_detach(device_t, int); static int awi_pcmcia_enable(struct awi_softc *); static void awi_pcmcia_disable(struct awi_softc *); @@ -150,7 +150,7 @@ awi_pcmcia_disable(struct awi_softc *sc) } static int -awi_pcmcia_match(struct device *parent, cfdata_t match, +awi_pcmcia_match(device_t parent, cfdata_t match, void *aux) { struct pcmcia_attach_args *pa = aux; @@ -178,7 +178,7 @@ awi_pcmcia_validate_config(struct pcmcia_config_entry *cfe) } static void -awi_pcmcia_attach(struct device *parent, struct device *self, +awi_pcmcia_attach(device_t parent, device_t self, void *aux) { struct awi_pcmcia_softc *psc = (void *)self; @@ -239,7 +239,7 @@ fail: } static int -awi_pcmcia_detach(struct device *self, int flags) +awi_pcmcia_detach(device_t self, int flags) { struct awi_pcmcia_softc *psc = (struct awi_pcmcia_softc *)self; int error; diff --git a/sys/dev/pcmcia/if_cnw.c b/sys/dev/pcmcia/if_cnw.c index e0253938954..2da904219b3 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.50 2009/05/12 13:18:04 cegger Exp $ */ +/* $NetBSD: if_cnw.c,v 1.51 2009/05/12 14:42:18 cegger Exp $ */ /*- * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc. @@ -105,7 +105,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.50 2009/05/12 13:18:04 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.51 2009/05/12 14:42:18 cegger Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -178,11 +178,11 @@ int cnw_skey = CNW_SCRAMBLEKEY; /* Scramble key */ */ #define MEMORY_MAPPED -int cnw_match(struct device *, cfdata_t, void *); -void cnw_attach(struct device *, struct device *, void *); -int cnw_detach(struct device *, int); +int cnw_match(device_t, cfdata_t, void *); +void cnw_attach(device_t, device_t, void *); +int cnw_detach(device_t, int); -int cnw_activate(struct device *, enum devact); +int cnw_activate(device_t, enum devact); struct cnw_softc { struct device sc_dev; /* Device glue (must be first) */ @@ -461,7 +461,7 @@ cnw_disable(struct cnw_softc *sc) * Match the hardware we handle. */ int -cnw_match(struct device *parent, cfdata_t match, +cnw_match(device_t parent, cfdata_t match, void *aux) { struct pcmcia_attach_args *pa = aux; @@ -480,7 +480,7 @@ cnw_match(struct device *parent, cfdata_t match, * Attach the card. */ void -cnw_attach(struct device *parent, struct device *self, void *aux) +cnw_attach(struct device *parent, device_t self, void *aux) { struct cnw_softc *sc = (void *) self; struct pcmcia_attach_args *pa = aux; @@ -1176,7 +1176,7 @@ cnw_setkey(struct cnw_softc *sc, int key) } int -cnw_activate(struct device *self, enum devact act) +cnw_activate(device_t self, enum devact act) { struct cnw_softc *sc = (struct cnw_softc *)self; int rv = 0, s; @@ -1196,7 +1196,7 @@ cnw_activate(struct device *self, enum devact act) } int -cnw_detach(struct device *self, int flags) +cnw_detach(device_t self, int flags) { struct cnw_softc *sc = (struct cnw_softc *)self; struct ifnet *ifp = &sc->sc_ethercom.ec_if; diff --git a/sys/dev/pcmcia/if_cs_pcmcia.c b/sys/dev/pcmcia/if_cs_pcmcia.c index c13410bde39..9ab0993a486 100644 --- a/sys/dev/pcmcia/if_cs_pcmcia.c +++ b/sys/dev/pcmcia/if_cs_pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_cs_pcmcia.c,v 1.17 2009/05/12 13:18:04 cegger Exp $ */ +/* $NetBSD: if_cs_pcmcia.c,v 1.18 2009/05/12 14:42:18 cegger Exp $ */ /*- * Copyright (c)2001 YAMAMOTO Takashi, @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cs_pcmcia.c,v 1.17 2009/05/12 13:18:04 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cs_pcmcia.c,v 1.18 2009/05/12 14:42:18 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -56,10 +56,10 @@ __KERNEL_RCSID(0, "$NetBSD: if_cs_pcmcia.c,v 1.17 2009/05/12 13:18:04 cegger Exp struct cs_pcmcia_softc; -static int cs_pcmcia_match(struct device *, cfdata_t, void *); +static int cs_pcmcia_match(device_t, cfdata_t, void *); static int cs_pcmcia_validate_config(struct pcmcia_config_entry *); -static void cs_pcmcia_attach(struct device *, struct device *, void *); -static int cs_pcmcia_detach(struct device *, int); +static void cs_pcmcia_attach(device_t, device_t, void *); +static int cs_pcmcia_detach(device_t, int); static int cs_pcmcia_enable(struct cs_softc *); static void cs_pcmcia_disable(struct cs_softc *); @@ -76,7 +76,7 @@ CFATTACH_DECL(cs_pcmcia, sizeof(struct cs_pcmcia_softc), cs_pcmcia_match, cs_pcmcia_attach, cs_pcmcia_detach, cs_activate); static int -cs_pcmcia_match(struct device *parent, cfdata_t match, +cs_pcmcia_match(device_t parent, cfdata_t match, void *aux) { struct pcmcia_attach_args *pa = aux; @@ -99,7 +99,7 @@ cs_pcmcia_validate_config(struct pcmcia_config_entry *cfe) } static void -cs_pcmcia_attach(struct device *parent, struct device *self, void *aux) +cs_pcmcia_attach(device_t parent, device_t self, void *aux) { struct cs_pcmcia_softc *psc = (void *)self; struct cs_softc *sc = (void *)&psc->sc_cs; @@ -152,7 +152,7 @@ fail: } static int -cs_pcmcia_detach(struct device *self, int flags) +cs_pcmcia_detach(device_t self, int flags) { struct cs_pcmcia_softc *psc = (void *)self; struct cs_softc *sc = &psc->sc_cs; diff --git a/sys/dev/pcmcia/if_mbe_pcmcia.c b/sys/dev/pcmcia/if_mbe_pcmcia.c index 154cb919a7b..4a7675db3d5 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.45 2008/04/28 20:23:56 martin Exp $ */ +/* $NetBSD: if_mbe_pcmcia.c,v 1.46 2009/05/12 14:42:18 cegger Exp $ */ /*- * Copyright (c) 1998, 2000, 2004 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_mbe_pcmcia.c,v 1.45 2008/04/28 20:23:56 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_mbe_pcmcia.c,v 1.46 2009/05/12 14:42:18 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -235,7 +235,7 @@ fail: } int -mbe_pcmcia_detach(struct device *self, int flags) +mbe_pcmcia_detach(device_t self, int flags) { struct mbe_pcmcia_softc *psc = device_private(self); int error; diff --git a/sys/dev/pcmcia/if_ray.c b/sys/dev/pcmcia/if_ray.c index 0d696a3d960..ecb6fb97181 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.74 2009/05/12 13:18:04 cegger Exp $ */ +/* $NetBSD: if_ray.c,v 1.75 2009/05/12 14:42:18 cegger Exp $ */ /* * Copyright (c) 2000 Christian E. Hopps @@ -57,7 +57,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.74 2009/05/12 13:18:04 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.75 2009/05/12 14:42:18 cegger Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -278,7 +278,7 @@ 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 void ray_attach(device_t, device_t, 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 *); @@ -288,8 +288,8 @@ 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 int ray_detach(device_t, int); +static int ray_activate(device_t, enum devact); static void ray_disable(struct ray_softc *); static void ray_download_params(struct ray_softc *); static int ray_enable(struct ray_softc *); @@ -303,7 +303,7 @@ static int ray_intr(void *); static void ray_intr_start(struct ray_softc *); static int ray_ioctl(struct ifnet *, u_long, void *); static int ray_issue_cmd(struct ray_softc *, bus_size_t, u_int); -static int ray_match(struct device *, cfdata_t, void *); +static int ray_match(device_t, cfdata_t, void *); static int ray_media_change(struct ifnet *); static void ray_media_status(struct ifnet *, struct ifmediareq *); static ray_cmd_func_t ray_rccs_intr(struct ray_softc *, bus_size_t); @@ -469,7 +469,7 @@ CFATTACH_DECL(ray, sizeof(struct ray_softc), */ static int -ray_match(struct device *parent, cfdata_t match, +ray_match(device_t parent, cfdata_t match, void *aux) { struct pcmcia_attach_args *pa = aux; @@ -498,7 +498,7 @@ ray_validate_config(struct pcmcia_config_entry *cfe) } static void -ray_attach(struct device *parent, struct device *self, void *aux) +ray_attach(device_t parent, device_t self, void *aux) { struct ray_softc *sc = (void *)self; struct pcmcia_attach_args *pa = aux; @@ -619,7 +619,7 @@ fail: } static int -ray_activate(struct device *dev, enum devact act) +ray_activate(device_t dev, enum devact act) { struct ray_softc *sc = (struct ray_softc *)dev; struct ifnet *ifp = &sc->sc_if; @@ -643,7 +643,7 @@ ray_activate(struct device *dev, enum devact act) } static int -ray_detach(struct device *self, int flags) +ray_detach(device_t self, int flags) { struct ray_softc *sc; struct ifnet *ifp; diff --git a/sys/dev/pcmcia/if_sm_pcmcia.c b/sys/dev/pcmcia/if_sm_pcmcia.c index 15d4665a84b..e00bc4281f4 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.53 2009/05/12 13:18:04 cegger Exp $ */ +/* $NetBSD: if_sm_pcmcia.c,v 1.54 2009/05/12 14:42:18 cegger Exp $ */ /*- * Copyright (c) 1997, 1998, 2000, 2004 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_sm_pcmcia.c,v 1.53 2009/05/12 13:18:04 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_sm_pcmcia.c,v 1.54 2009/05/12 14:42:18 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -61,10 +61,10 @@ __KERNEL_RCSID(0, "$NetBSD: if_sm_pcmcia.c,v 1.53 2009/05/12 13:18:04 cegger Exp #include <dev/pcmcia/pcmciavar.h> #include <dev/pcmcia/pcmciadevs.h> -int sm_pcmcia_match(struct device *, cfdata_t, void *); +int sm_pcmcia_match(device_t, cfdata_t, 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); +void sm_pcmcia_attach(device_t, device_t, void *); +int sm_pcmcia_detach(device_t, int); struct sm_pcmcia_softc { struct smc91cxx_softc sc_smc; /* real "smc" softc */ @@ -105,7 +105,7 @@ const size_t sm_pcmcia_nproducts = sizeof(sm_pcmcia_products) / sizeof(sm_pcmcia_products[0]); int -sm_pcmcia_match(struct device *parent, cfdata_t match, +sm_pcmcia_match(device_t parent, cfdata_t match, void *aux) { struct pcmcia_attach_args *pa = aux; @@ -132,7 +132,7 @@ sm_pcmcia_validate_config(struct pcmcia_config_entry *cfe) } void -sm_pcmcia_attach(struct device *parent, struct device *self, void *aux) +sm_pcmcia_attach(device_t parent, device_t self, void *aux) { struct sm_pcmcia_softc *psc = (struct sm_pcmcia_softc *)self; struct smc91cxx_softc *sc = &psc->sc_smc; @@ -185,7 +185,7 @@ fail: } int -sm_pcmcia_detach(struct device *self, int flags) +sm_pcmcia_detach(device_t self, int flags) { struct sm_pcmcia_softc *psc = (struct sm_pcmcia_softc *)self; int error; @@ -193,7 +193,7 @@ sm_pcmcia_detach(struct device *self, int flags) if (psc->sc_state != SM_PCMCIA_ATTACHED) return (0); - error = smc91cxx_detach((struct device *)&psc->sc_smc, flags); + error = smc91cxx_detach((device_t)&psc->sc_smc, flags); if (error) return (error); diff --git a/sys/dev/pcmcia/if_tr_pcmcia.c b/sys/dev/pcmcia/if_tr_pcmcia.c index 94194ed67b1..8bb2b1ae2c0 100644 --- a/sys/dev/pcmcia/if_tr_pcmcia.c +++ b/sys/dev/pcmcia/if_tr_pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_tr_pcmcia.c,v 1.22 2009/05/12 13:18:04 cegger Exp $ */ +/* $NetBSD: if_tr_pcmcia.c,v 1.23 2009/05/12 14:42:18 cegger Exp $ */ /* * Copyright (c) 2000 Soren S. Jorvang. All rights reserved. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_tr_pcmcia.c,v 1.22 2009/05/12 13:18:04 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_tr_pcmcia.c,v 1.23 2009/05/12 14:42:18 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -93,9 +93,9 @@ struct tr_pcmcia_softc { struct pcmcia_function *sc_pf; }; -static int tr_pcmcia_match(struct device *, cfdata_t, void *); -static void tr_pcmcia_attach(struct device *, struct device *, void *); -static int tr_pcmcia_detach(struct device *, int); +static int tr_pcmcia_match(device_t, cfdata_t, void *); +static void tr_pcmcia_attach(device_t, device_t, void *); +static int tr_pcmcia_detach(device_t, int); static int tr_pcmcia_enable(struct tr_softc *); static int tr_pcmcia_mediachange(struct tr_softc *); static void tr_pcmcia_mediastatus(struct tr_softc *, struct ifmediareq *); @@ -106,7 +106,7 @@ CFATTACH_DECL(tr_pcmcia, sizeof(struct tr_pcmcia_softc), tr_pcmcia_match, tr_pcmcia_attach, tr_pcmcia_detach, tr_activate); static int -tr_pcmcia_match(struct device *parent, cfdata_t match, +tr_pcmcia_match(device_t parent, cfdata_t match, void *aux) { struct pcmcia_attach_args *pa = aux; @@ -121,7 +121,7 @@ tr_pcmcia_match(struct device *parent, cfdata_t match, } static void -tr_pcmcia_attach(struct device *parent, struct device *self, void *aux) +tr_pcmcia_attach(device_t parent, device_t self, void *aux) { struct tr_pcmcia_softc *psc = (void *)self; struct tr_softc *sc = &psc->sc_tr; @@ -292,7 +292,7 @@ tr_pcmcia_mediastatus(struct tr_softc *sc, struct ifmediareq *ifmr) } int -tr_pcmcia_detach(struct device *self, int flags) +tr_pcmcia_detach(device_t self, int flags) { struct tr_pcmcia_softc *psc = (struct tr_pcmcia_softc *)self; int rv; diff --git a/sys/dev/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c index 4b4176affa0..6ceac7d506f 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.83 2009/05/12 13:18:04 cegger Exp $ */ +/* $NetBSD: if_wi_pcmcia.c,v 1.84 2009/05/12 14:42:18 cegger Exp $ */ /*- * Copyright (c) 2001, 2004 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.83 2009/05/12 13:18:04 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.84 2009/05/12 14:42:18 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -74,10 +74,10 @@ __KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.83 2009/05/12 13:18:04 cegger Exp #include <dev/microcode/wi/spectrum24t_cf.h> #endif -static int wi_pcmcia_match(struct device *, cfdata_t, void *); +static int wi_pcmcia_match(device_t, cfdata_t, 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 void wi_pcmcia_attach(device_t, device_t, void *); +static int wi_pcmcia_detach(device_t, int); static int wi_pcmcia_enable(struct wi_softc *); static void wi_pcmcia_disable(struct wi_softc *); @@ -251,7 +251,7 @@ static const size_t wi_pcmcia_nproducts = sizeof(wi_pcmcia_products) / sizeof(wi_pcmcia_products[0]); static int -wi_pcmcia_match(struct device *parent, cfdata_t match, +wi_pcmcia_match(device_t parent, cfdata_t match, void *aux) { struct pcmcia_attach_args *pa = aux; @@ -322,7 +322,7 @@ wi_pcmcia_validate_config(struct pcmcia_config_entry *cfe) } static void -wi_pcmcia_attach(struct device *parent, struct device *self, +wi_pcmcia_attach(struct device *parent, device_t self, void *aux) { struct wi_pcmcia_softc *psc = (void *)self; @@ -392,7 +392,7 @@ fail: } static int -wi_pcmcia_detach(struct device *self, int flags) +wi_pcmcia_detach(device_t self, int flags) { struct wi_pcmcia_softc *psc = (struct wi_pcmcia_softc *)self; int error; diff --git a/sys/dev/pcmcia/if_xi.c b/sys/dev/pcmcia/if_xi.c index a5450ed99d8..785b3081a5d 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.66 2009/03/14 15:36:20 dsl Exp $ */ +/* $NetBSD: if_xi.c,v 1.67 2009/05/12 14:42:18 cegger 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.66 2009/03/14 15:36:20 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.67 2009/05/12 14:42:18 cegger Exp $"); #include "opt_inet.h" #include "opt_ipx.h" @@ -149,14 +149,14 @@ STATIC int xi_ether_ioctl(struct ifnet *, u_long cmd, void *); STATIC void xi_full_reset(struct xi_softc *); STATIC void xi_init(struct xi_softc *); STATIC int xi_ioctl(struct ifnet *, u_long, void *); -STATIC int xi_mdi_read(struct device *, int, int); -STATIC void xi_mdi_write(struct device *, int, int, int); +STATIC int xi_mdi_read(device_t, int, int); +STATIC void xi_mdi_write(device_t, int, int, int); STATIC int xi_mediachange(struct ifnet *); 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_statchg(device_t); STATIC void xi_stop(struct xi_softc *); STATIC void xi_watchdog(struct ifnet *); @@ -257,7 +257,7 @@ xi_attach(struct xi_softc *sc, u_int8_t *myea) } int -xi_detach(struct device *self, int flags) +xi_detach(device_t self, int flags) { struct xi_softc *sc = (void *)self; struct ifnet *ifp = &sc->sc_ethercom.ec_if; @@ -279,7 +279,7 @@ xi_detach(struct device *self, int flags) } int -xi_activate(struct device *self, enum devact act) +xi_activate(device_t self, enum devact act) { struct xi_softc *sc = (void *)self; int s, rv = 0; @@ -595,7 +595,7 @@ xi_mdi_pulse_bits(struct xi_softc *sc, u_int32_t data, int len) /* Read a PHY register. */ STATIC int -xi_mdi_read(struct device *self, int phy, int reg) +xi_mdi_read(device_t self, int phy, int reg) { struct xi_softc *sc = (struct xi_softc *)self; int i; @@ -625,7 +625,7 @@ xi_mdi_read(struct device *self, int phy, int reg) /* Write a PHY register. */ STATIC void -xi_mdi_write(struct device *self, int phy, int reg, int value) +xi_mdi_write(device_t self, int phy, int reg, int value) { struct xi_softc *sc = (struct xi_softc *)self; int i; @@ -645,7 +645,7 @@ xi_mdi_write(struct device *self, int phy, int reg, int value) } STATIC void -xi_statchg(struct device *self) +xi_statchg(device_t self) { /* XXX Update ifp->if_baudrate */ } diff --git a/sys/dev/pcmcia/if_xivar.h b/sys/dev/pcmcia/if_xivar.h index 46a5724afec..3e32d524a73 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.4 2005/12/11 12:23:23 christos Exp $ */ +/* $NetBSD: if_xivar.h,v 1.5 2009/05/12 14:42:18 cegger Exp $ */ /* * Copyright (c) 2004 Charles M. Hannum. All rights reserved. @@ -50,6 +50,6 @@ struct xi_softc { }; void xi_attach(struct xi_softc *, u_int8_t *); -int xi_detach(struct device *, int); -int xi_activate(struct device *, enum devact); +int xi_detach(device_t, int); +int xi_activate(device_t, enum devact); int xi_intr(void *); diff --git a/sys/dev/pcmcia/isic_pcmcia.c b/sys/dev/pcmcia/isic_pcmcia.c index 55fc14d76f6..535274faeac 100644 --- a/sys/dev/pcmcia/isic_pcmcia.c +++ b/sys/dev/pcmcia/isic_pcmcia.c @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia.c,v 1.38 2009/05/12 13:18:04 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia.c,v 1.39 2009/05/12 14:42:18 cegger Exp $"); #include <sys/param.h> #include <sys/errno.h> @@ -76,12 +76,12 @@ __KERNEL_RCSID(0, "$NetBSD: isic_pcmcia.c,v 1.38 2009/05/12 13:18:04 cegger Exp extern const struct isdn_layer1_isdnif_driver isic_std_driver; -static int isic_pcmcia_match(struct device *, cfdata_t, void *); -static void isic_pcmcia_attach(struct device *, struct device *, void *); +static int isic_pcmcia_match(device_t, cfdata_t, void *); +static void isic_pcmcia_attach(device_t, device_t, 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); +static int isic_pcmcia_detach(device_t self, int flags); +static int isic_pcmcia_activate(device_t self, enum devact act); CFATTACH_DECL(isic_pcmcia, sizeof(struct pcmcia_isic_softc), isic_pcmcia_match, isic_pcmcia_attach, @@ -171,7 +171,7 @@ find_matching_card(struct pcmcia_attach_args *pa) * Match card */ static int -isic_pcmcia_match(struct device *parent, +isic_pcmcia_match(device_t parent, cfdata_t match, void *aux) { struct pcmcia_attach_args *pa = aux; @@ -186,8 +186,8 @@ isic_pcmcia_match(struct device *parent, * Attach the card */ static void -isic_pcmcia_attach(struct device *parent, - struct device *self, void *aux) +isic_pcmcia_attach(device_t parent, + device_t self, void *aux) { struct pcmcia_isic_softc *psc = (void*) self; struct isic_softc *sc = &psc->sc_isic; @@ -232,7 +232,7 @@ fail: } static int -isic_pcmcia_detach(struct device *self, int flags) +isic_pcmcia_detach(device_t self, int flags) { struct pcmcia_isic_softc *psc = (struct pcmcia_isic_softc *)self; @@ -246,7 +246,7 @@ isic_pcmcia_detach(struct device *self, int flags) } int -isic_pcmcia_activate(struct device *self, enum devact act) +isic_pcmcia_activate(device_t self, enum devact act) { struct pcmcia_isic_softc *psc = (struct pcmcia_isic_softc *)self; int error = 0, s; diff --git a/sys/dev/pcmcia/mhzc.c b/sys/dev/pcmcia/mhzc.c index 761761eacba..21de7170a20 100644 --- a/sys/dev/pcmcia/mhzc.c +++ b/sys/dev/pcmcia/mhzc.c @@ -1,4 +1,4 @@ -/* $NetBSD: mhzc.c,v 1.45 2009/05/12 13:18:04 cegger Exp $ */ +/* $NetBSD: mhzc.c,v 1.46 2009/05/12 14:42:19 cegger Exp $ */ /*- * Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc. @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.45 2009/05/12 13:18:04 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.46 2009/05/12 14:42:19 cegger Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -105,14 +105,14 @@ struct mhzc_softc { /* * Data for the Modem portion. */ - struct device *sc_modem; + device_t sc_modem; struct pcmcia_io_handle sc_modem_pcioh; int sc_modem_io_window; /* * Data for the Ethernet portion. */ - struct device *sc_ethernet; + device_t sc_ethernet; struct pcmcia_io_handle sc_ethernet_pcioh; int sc_ethernet_io_window; @@ -127,10 +127,10 @@ struct mhzc_softc { #define MHZC_MODEM_ALLOCED 0x10 #define MHZC_ETHERNET_ALLOCED 0x20 -int mhzc_match(struct device *, cfdata_t, void *); -void mhzc_attach(struct device *, struct device *, void *); -int mhzc_detach(struct device *, int); -int mhzc_activate(struct device *, enum devact); +int mhzc_match(device_t, cfdata_t, void *); +void mhzc_attach(device_t, device_t, void *); +int mhzc_detach(device_t, int); +int mhzc_activate(device_t, enum devact); CFATTACH_DECL(mhzc, sizeof(struct mhzc_softc), mhzc_match, mhzc_attach, mhzc_detach, mhzc_activate); @@ -165,7 +165,7 @@ void mhzc_disable(struct mhzc_softc *, int); int mhzc_intr(void *); int -mhzc_match(struct device *parent, cfdata_t match, +mhzc_match(device_t parent, cfdata_t match, void *aux) { struct pcmcia_attach_args *pa = aux; @@ -177,7 +177,7 @@ mhzc_match(struct device *parent, cfdata_t match, } void -mhzc_attach(struct device *parent, struct device *self, void *aux) +mhzc_attach(device_t parent, device_t self, void *aux) { struct mhzc_softc *sc = (void *)self; struct pcmcia_attach_args *pa = aux; @@ -324,7 +324,7 @@ mhzc_print(void *aux, const char *pnp) } int -mhzc_detach(struct device *self, int flags) +mhzc_detach(device_t self, int flags) { struct mhzc_softc *sc = (void *)self; int rv; @@ -361,7 +361,7 @@ mhzc_detach(struct device *self, int flags) } int -mhzc_activate(struct device *self, enum devact act) +mhzc_activate(device_t self, enum devact act) { struct mhzc_softc *sc = (void *)self; int s, rv = 0; @@ -689,8 +689,8 @@ com_mhzc_disable(struct com_softc *sc) /****** Here begins the sm attachment code. ******/ #if NSM_MHZC > 0 -int sm_mhzc_match(struct device *, cfdata_t, void *); -void sm_mhzc_attach(struct device *, struct device *, void *); +int sm_mhzc_match(device_t, cfdata_t, void *); +void sm_mhzc_attach(device_t, device_t, void *); /* No mhzc-specific goo in the softc; it's all in the parent. */ CFATTACH_DECL(sm_mhzc, sizeof(struct smc91cxx_softc), @@ -700,7 +700,7 @@ int sm_mhzc_enable(struct smc91cxx_softc *); void sm_mhzc_disable(struct smc91cxx_softc *); int -sm_mhzc_match(struct device *parent, cfdata_t match, +sm_mhzc_match(device_t parent, cfdata_t match, void *aux) { extern struct cfdriver sm_cd; @@ -714,7 +714,7 @@ sm_mhzc_match(struct device *parent, cfdata_t match, } void -sm_mhzc_attach(struct device *parent, struct device *self, void *aux) +sm_mhzc_attach(device_t parent, device_t self, void *aux) { struct smc91cxx_softc *sc = (void *)self; struct mhzc_softc *msc = (void *)parent; diff --git a/sys/dev/pcmcia/pcmcia.c b/sys/dev/pcmcia/pcmcia.c index 5ea23f4a8d7..6bb3f92cf3a 100644 --- a/sys/dev/pcmcia/pcmcia.c +++ b/sys/dev/pcmcia/pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: pcmcia.c,v 1.92 2009/05/12 13:18:04 cegger Exp $ */ +/* $NetBSD: pcmcia.c,v 1.93 2009/05/12 14:42:19 cegger 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.92 2009/05/12 13:18:04 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.93 2009/05/12 14:42:19 cegger Exp $"); #include "opt_pcmciaverbose.h" @@ -80,11 +80,11 @@ int pcmcia_verbose = 1; int pcmcia_verbose = 0; #endif -int pcmcia_match(struct device *, cfdata_t, void *); -void pcmcia_attach(struct device *, struct device *, void *); +int pcmcia_match(device_t, cfdata_t, void *); +void pcmcia_attach(device_t, device_t, void *); int pcmcia_detach(device_t, int); -int pcmcia_rescan(struct device *, const char *, const int *); -void pcmcia_childdetached(struct device *, struct device *); +int pcmcia_rescan(device_t, const char *, const int *); +void pcmcia_childdetached(device_t, device_t); int pcmcia_print(void *, const char *); CFATTACH_DECL3_NEW(pcmcia, sizeof(struct pcmcia_softc), @@ -110,7 +110,7 @@ pcmcia_ccr_write(struct pcmcia_function *pf, int ccr, int val) } int -pcmcia_match(struct device *parent, cfdata_t match, void *aux) +pcmcia_match(device_t parent, cfdata_t match, void *aux) { struct pcmciabus_attach_args *paa = aux; @@ -122,7 +122,7 @@ pcmcia_match(struct device *parent, cfdata_t match, void *aux) } void -pcmcia_attach(struct device *parent, struct device *self, void *aux) +pcmcia_attach(device_t parent, device_t self, void *aux) { struct pcmciabus_attach_args *paa = aux; struct pcmcia_softc *sc = device_private(self); @@ -155,7 +155,7 @@ pcmcia_detach(device_t self, int flags) } int -pcmcia_card_attach(struct device *dev) +pcmcia_card_attach(device_t dev) { struct pcmcia_softc *sc = device_private(dev); struct pcmcia_function *pf; @@ -216,7 +216,7 @@ done: } int -pcmcia_rescan(struct device *self, const char *ifattr, +pcmcia_rescan(device_t self, const char *ifattr, const int *locators) { struct pcmcia_softc *sc = device_private(self); @@ -257,7 +257,7 @@ pcmcia_rescan(struct device *self, const char *ifattr, } void -pcmcia_card_detach(struct device *dev, int flags) +pcmcia_card_detach(device_t dev, int flags) /* flags: DETACH_* flags */ { struct pcmcia_softc *sc = device_private(dev); @@ -293,7 +293,7 @@ pcmcia_card_detach(struct device *dev, int flags) } void -pcmcia_childdetached(struct device *self, struct device *child) +pcmcia_childdetached(device_t self, device_t child) { struct pcmcia_softc *sc = device_private(self); struct pcmcia_function *pf; @@ -314,7 +314,7 @@ pcmcia_childdetached(struct device *self, struct device *child) } void -pcmcia_card_deactivate(struct device *dev) +pcmcia_card_deactivate(device_t dev) { struct pcmcia_softc *sc = device_private(dev); struct pcmcia_function *pf; @@ -427,7 +427,7 @@ pcmcia_product_lookup(struct pcmcia_attach_args *pa, const void *tab, size_t nen } void -pcmcia_socket_settype(struct device *dev, int type) +pcmcia_socket_settype(device_t dev, int type) { struct pcmcia_softc *sc = device_private(dev); @@ -449,7 +449,7 @@ pcmcia_function_init(struct pcmcia_function *pf, struct pcmcia_config_entry *cfe } void -pcmcia_socket_enable(struct device *dev) +pcmcia_socket_enable(device_t dev) { struct pcmcia_softc *sc = device_private(dev); @@ -460,7 +460,7 @@ pcmcia_socket_enable(struct device *dev) } void -pcmcia_socket_disable(struct device *dev) +pcmcia_socket_disable(device_t dev) { struct pcmcia_softc *sc = device_private(dev); diff --git a/sys/dev/pcmcia/pcmcia_cis.c b/sys/dev/pcmcia/pcmcia_cis.c index 93bba06e42e..03b1254d33e 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.54 2009/03/15 20:30:57 cegger Exp $ */ +/* $NetBSD: pcmcia_cis.c,v 1.55 2009/05/12 14:42:19 cegger 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.54 2009/03/15 20:30:57 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pcmcia_cis.c,v 1.55 2009/05/12 14:42:19 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -130,7 +130,7 @@ pcmcia_read_cis(struct pcmcia_softc *sc) } int -pcmcia_scan_cis(struct device *dev, +pcmcia_scan_cis(device_t dev, int (*fct)(struct pcmcia_tuple *, void *), void *arg) { diff --git a/sys/dev/pcmcia/pcmciachip.h b/sys/dev/pcmcia/pcmciachip.h index 059dca56338..6f49f64031d 100644 --- a/sys/dev/pcmcia/pcmciachip.h +++ b/sys/dev/pcmcia/pcmciachip.h @@ -1,4 +1,4 @@ -/* $NetBSD: pcmciachip.h,v 1.15 2008/06/26 12:33:18 drochner Exp $ */ +/* $NetBSD: pcmciachip.h,v 1.16 2009/05/12 14:42:19 cegger Exp $ */ /* * Copyright (c) 1997 Marc Horowitz. All rights reserved. @@ -149,8 +149,8 @@ struct pcmciabus_attach_args { /* interfaces for the chipset to call pcmcia */ -int pcmcia_card_attach(struct device *); -void pcmcia_card_detach(struct device *, int); -void pcmcia_card_deactivate(struct device *); +int pcmcia_card_attach(device_t); +void pcmcia_card_detach(device_t, int); +void pcmcia_card_deactivate(device_t); #endif /* _PCMCIA_PCMCIACHIP_H_ */ diff --git a/sys/dev/pcmcia/pcmciavar.h b/sys/dev/pcmcia/pcmciavar.h index 2ba31c1ee96..015bdd2efce 100644 --- a/sys/dev/pcmcia/pcmciavar.h +++ b/sys/dev/pcmcia/pcmciavar.h @@ -1,4 +1,4 @@ -/* $NetBSD: pcmciavar.h,v 1.33 2008/07/03 19:07:43 drochner Exp $ */ +/* $NetBSD: pcmciavar.h,v 1.34 2009/05/12 14:42:19 cegger Exp $ */ /* * Copyright (c) 1997 Marc Horowitz. All rights reserved. @@ -139,7 +139,7 @@ struct pcmcia_function { SIMPLEQ_ENTRY(pcmcia_function) pf_list; /* run-time state */ struct pcmcia_softc *sc; - struct device *child; + device_t child; struct pcmcia_config_entry *cfe; struct pcmcia_mem_handle pf_pcmh; #define pf_ccrt pf_pcmh.memt @@ -248,7 +248,7 @@ void pcmcia_devinfo(struct pcmcia_card *, int, char *, size_t); 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 pcmcia_scan_cis(device_t, int (*) (struct pcmcia_tuple *, void *), void *); #define pcmcia_cis_read_1(tuple, idx0) \ @@ -287,9 +287,9 @@ 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(struct device *); -void pcmcia_socket_disable(struct device *); -void pcmcia_socket_settype(struct device *, int); +void pcmcia_socket_enable(device_t); +void pcmcia_socket_disable(device_t); +void pcmcia_socket_settype(device_t, int); int pcmcia_config_alloc(struct pcmcia_function *, struct pcmcia_config_entry *); diff --git a/sys/dev/pcmcia/pcmcom.c b/sys/dev/pcmcia/pcmcom.c index f04de2ca40a..8e44404e184 100644 --- a/sys/dev/pcmcia/pcmcom.c +++ b/sys/dev/pcmcia/pcmcom.c @@ -1,4 +1,4 @@ -/* $NetBSD: pcmcom.c,v 1.36 2009/05/12 13:18:04 cegger Exp $ */ +/* $NetBSD: pcmcom.c,v 1.37 2009/05/12 14:42:19 cegger Exp $ */ /*- * Copyright (c) 1998, 2000, 2004 The NetBSD Foundation, Inc. @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pcmcom.c,v 1.36 2009/05/12 13:18:04 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pcmcom.c,v 1.37 2009/05/12 14:42:19 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -75,7 +75,7 @@ struct pcmcom_softc { int sc_enabled_count; /* enabled count */ #define NSLAVES 8 - struct device *sc_slaves[NSLAVES]; /* slave info */ + device_t sc_slaves[NSLAVES]; /* slave info */ int sc_nslaves; /* slave count */ int sc_state; @@ -88,11 +88,11 @@ struct pcmcom_attach_args { int pca_slave; /* slave # */ }; -int pcmcom_match(struct device *, cfdata_t, void *); +int pcmcom_match(device_t, cfdata_t, 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); +void pcmcom_attach(device_t, device_t, void *); +int pcmcom_detach(device_t, int); +int pcmcom_activate(device_t, enum devact); CFATTACH_DECL(pcmcom, sizeof(struct pcmcom_softc), pcmcom_match, pcmcom_attach, pcmcom_detach, pcmcom_activate); @@ -116,7 +116,7 @@ void pcmcom_disable(struct pcmcom_softc *); int pcmcom_intr(void *); int -pcmcom_match(struct device *parent, cfdata_t cf, +pcmcom_match(device_t parent, cfdata_t cf, void *aux) { struct pcmcia_attach_args *pa = aux; @@ -137,7 +137,7 @@ pcmcom_validate_config(struct pcmcia_config_entry *cfe) } void -pcmcom_attach(struct device *parent, struct device *self, void *aux) +pcmcom_attach(device_t parent, device_t self, void *aux) { struct pcmcom_softc *sc = (void *)self; struct pcmcia_attach_args *pa = aux; @@ -188,7 +188,7 @@ fail: } int -pcmcom_detach(struct device *self, int flags) +pcmcom_detach(device_t self, int flags) { struct pcmcom_softc *sc = (void *)self; int slave, error; @@ -212,7 +212,7 @@ pcmcom_detach(struct device *self, int flags) } int -pcmcom_activate(struct device *self, enum devact act) +pcmcom_activate(device_t self, enum devact act) { struct pcmcom_softc *sc = (void *)self; int slave, error = 0, s; diff --git a/sys/dev/pcmcia/slhci_pcmcia.c b/sys/dev/pcmcia/slhci_pcmcia.c index dd67e503e0a..2daf45dbc4b 100644 --- a/sys/dev/pcmcia/slhci_pcmcia.c +++ b/sys/dev/pcmcia/slhci_pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: slhci_pcmcia.c,v 1.5 2009/05/12 13:18:04 cegger Exp $ */ +/* $NetBSD: slhci_pcmcia.c,v 1.6 2009/05/12 14:42:19 cegger Exp $ */ /* * Not (c) 2007 Matthew Orgass * This file is public domain, meaning anyone can make any use of part or all @@ -11,7 +11,7 @@ /* Glue for RATOC USB HOST CF+ Card (SL811HS chip) */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: slhci_pcmcia.c,v 1.5 2009/05/12 13:18:04 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: slhci_pcmcia.c,v 1.6 2009/05/12 14:42:19 cegger Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -42,9 +42,9 @@ struct slhci_pcmcia_softc { }; -int slhci_pcmcia_probe(struct device *, cfdata_t, void *); -void slhci_pcmcia_attach(struct device *, struct device *, void *); -int slhci_pcmcia_detach(struct device *, int); +int slhci_pcmcia_probe(device_t, cfdata_t, void *); +void slhci_pcmcia_attach(device_t, device_t, void *); +int slhci_pcmcia_detach(device_t, int); int slhci_pcmcia_validate_config(struct pcmcia_config_entry *); int slhci_pcmcia_enable(struct slhci_pcmcia_softc *, int); @@ -63,7 +63,7 @@ static const size_t slhci_pcmcia_nproducts = sizeof(slhci_pcmcia_products) / sizeof(slhci_pcmcia_products[0]); int -slhci_pcmcia_probe(struct device *parent, cfdata_t match, void *aux) +slhci_pcmcia_probe(device_t parent, cfdata_t match, void *aux) { struct pcmcia_attach_args *pa = aux; @@ -83,7 +83,7 @@ slhci_pcmcia_validate_config(struct pcmcia_config_entry *cfe) } void -slhci_pcmcia_attach(struct device *parent, struct device *self, void *aux) +slhci_pcmcia_attach(device_t parent, device_t self, void *aux) { struct slhci_pcmcia_softc *psc = device_private(self); struct pcmcia_attach_args *pa = aux; @@ -100,7 +100,7 @@ slhci_pcmcia_attach(struct device *parent, struct device *self, void *aux) } int -slhci_pcmcia_detach(struct device *self, int flags) +slhci_pcmcia_detach(device_t self, int flags) { struct slhci_pcmcia_softc *psc = device_private(self); diff --git a/sys/dev/pcmcia/wdc_pcmcia.c b/sys/dev/pcmcia/wdc_pcmcia.c index b4a4d9609a8..8d63a57ae86 100644 --- a/sys/dev/pcmcia/wdc_pcmcia.c +++ b/sys/dev/pcmcia/wdc_pcmcia.c @@ -1,4 +1,4 @@ -/* $NetBSD: wdc_pcmcia.c,v 1.115 2009/04/05 02:35:03 uwe Exp $ */ +/* $NetBSD: wdc_pcmcia.c,v 1.116 2009/05/12 14:42:19 cegger Exp $ */ /*- * Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: wdc_pcmcia.c,v 1.115 2009/04/05 02:35:03 uwe Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wdc_pcmcia.c,v 1.116 2009/05/12 14:42:19 cegger Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -353,7 +353,7 @@ wdc_pcmcia_detach(device_t self, int flags) } static int -wdc_pcmcia_enable(struct device *self, int onoff) +wdc_pcmcia_enable(device_t self, int onoff) { struct wdc_pcmcia_softc *sc = device_private(self); int error; diff --git a/sys/dev/pcmcia/xirc.c b/sys/dev/pcmcia/xirc.c index ea9efa789d2..8e7ac64c85a 100644 --- a/sys/dev/pcmcia/xirc.c +++ b/sys/dev/pcmcia/xirc.c @@ -1,4 +1,4 @@ -/* $NetBSD: xirc.c,v 1.28 2009/05/12 13:18:04 cegger Exp $ */ +/* $NetBSD: xirc.c,v 1.29 2009/05/12 14:42:19 cegger Exp $ */ /*- * Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.28 2009/05/12 13:18:04 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.29 2009/05/12 14:42:19 cegger Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -101,14 +101,14 @@ struct xirc_softc { /* * Data for the Modem portion. */ - struct device *sc_modem; + device_t sc_modem; struct pcmcia_io_handle sc_modem_pcioh; int sc_modem_io_window; /* * Data for the Ethernet portion. */ - struct device *sc_ethernet; + device_t sc_ethernet; struct pcmcia_io_handle sc_ethernet_pcioh; int sc_ethernet_io_window; @@ -121,10 +121,10 @@ struct xirc_softc { #define XIRC_ETHERNET_ALLOCED 0x20 }; -int xirc_match(struct device *, cfdata_t, void *); -void xirc_attach(struct device *, struct device *, void *); -int xirc_detach(struct device *, int); -int xirc_activate(struct device *, enum devact); +int xirc_match(device_t, cfdata_t, void *); +void xirc_attach(device_t, device_t, void *); +int xirc_detach(device_t, int); +int xirc_activate(device_t, enum devact); CFATTACH_DECL(xirc, sizeof(struct xirc_softc), xirc_match, xirc_attach, xirc_detach, xirc_activate); @@ -145,7 +145,7 @@ void xirc_disable(struct xirc_softc *, int, int); int xirc_intr(void *); int -xirc_match(struct device *parent, cfdata_t match, +xirc_match(device_t parent, cfdata_t match, void *aux) { struct pcmcia_attach_args *pa = aux; @@ -168,7 +168,7 @@ xirc_match(struct device *parent, cfdata_t match, } void -xirc_attach(struct device *parent, struct device *self, void *aux) +xirc_attach(device_t parent, device_t self, void *aux) { struct xirc_softc *sc = (void *)self; struct pcmcia_attach_args *pa = aux; @@ -384,7 +384,7 @@ xirc_print(void *aux, const char *pnp) } int -xirc_detach(struct device *self, int flags) +xirc_detach(device_t self, int flags) { struct xirc_softc *sc = (void *)self; int rv; @@ -420,7 +420,7 @@ xirc_detach(struct device *self, int flags) } int -xirc_activate(struct device *self, enum devact act) +xirc_activate(device_t self, enum devact act) { struct xirc_softc *sc = (void *)self; int s, rv = 0; @@ -622,8 +622,8 @@ com_xirc_disable(struct com_softc *sc) /****** Here begins the xi attachment code. ******/ #if NXI_XIRC > 0 -int xi_xirc_match(struct device *, cfdata_t, void *); -void xi_xirc_attach(struct device *, struct device *, void *); +int xi_xirc_match(device_t, cfdata_t, void *); +void xi_xirc_attach(device_t, device_t, void *); /* No xirc-specific goo in the softc; it's all in the parent. */ CFATTACH_DECL(xi_xirc, sizeof(struct xi_softc), @@ -634,7 +634,7 @@ void xi_xirc_disable(struct xi_softc *); int xi_xirc_lan_nid_ciscallback(struct pcmcia_tuple *, void *); int -xi_xirc_match(struct device *parent, cfdata_t match, +xi_xirc_match(device_t parent, cfdata_t match, void *aux) { extern struct cfdriver xi_cd; @@ -647,7 +647,7 @@ xi_xirc_match(struct device *parent, cfdata_t match, } void -xi_xirc_attach(struct device *parent, struct device *self, void *aux) +xi_xirc_attach(device_t parent, device_t self, void *aux) { struct xi_softc *sc = (void *)self; struct xirc_softc *msc = (void *)parent; diff --git a/sys/dev/podulebus/if_ea.c b/sys/dev/podulebus/if_ea.c index ccb0fb0dbe0..da750226f2f 100644 --- a/sys/dev/podulebus/if_ea.c +++ b/sys/dev/podulebus/if_ea.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ea.c,v 1.15 2009/05/12 13:18:40 cegger Exp $ */ +/* $NetBSD: if_ea.c,v 1.16 2009/05/12 14:42:58 cegger Exp $ */ /* * Copyright (c) 2000, 2001 Ben Harris @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ea.c,v 1.15 2009/05/12 13:18:40 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ea.c,v 1.16 2009/05/12 14:42:58 cegger Exp $"); #include <sys/param.h> @@ -71,8 +71,8 @@ struct ea_softc { * prototypes */ -int eaprobe(struct device *, cfdata_t, void *); -void eaattach(struct device *, struct device *, void *); +int eaprobe(device_t, cfdata_t, void *); +void eaattach(device_t, device_t, void *); /* driver structure for autoconf */ @@ -88,7 +88,7 @@ CFATTACH_DECL(ea, sizeof(struct ea_softc), */ int -eaprobe(struct device *parent, cfdata_t cf, void *aux) +eaprobe(device_t parent, cfdata_t cf, void *aux) { struct podulebus_attach_args *pa = aux; @@ -101,7 +101,7 @@ eaprobe(struct device *parent, cfdata_t cf, void *aux) */ void -eaattach(struct device *parent, struct device *self, void *aux) +eaattach(device_t parent, device_t self, void *aux) { struct ea_softc *sc = device_private(self); struct podulebus_attach_args *pa = aux; diff --git a/sys/dev/podulebus/if_eb.c b/sys/dev/podulebus/if_eb.c index af7a92dd62e..cff77a3b3fa 100644 --- a/sys/dev/podulebus/if_eb.c +++ b/sys/dev/podulebus/if_eb.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_eb.c,v 1.13 2009/05/12 13:18:40 cegger Exp $ */ +/* $NetBSD: if_eb.c,v 1.14 2009/05/12 14:42:58 cegger Exp $ */ /* * Copyright (c) 2000, 2001 Ben Harris @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_eb.c,v 1.13 2009/05/12 13:18:40 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_eb.c,v 1.14 2009/05/12 14:42:58 cegger Exp $"); #include <sys/param.h> @@ -71,8 +71,8 @@ struct eb_softc { * prototypes */ -int ebprobe(struct device *, cfdata_t, void *); -void ebattach(struct device *, struct device *, void *); +int ebprobe(device_t, cfdata_t, void *); +void ebattach(device_t, device_t, void *); /* driver structure for autoconf */ @@ -88,7 +88,7 @@ CFATTACH_DECL(eb, sizeof(struct eb_softc), */ int -ebprobe(struct device *parent, cfdata_t cf, void *aux) +ebprobe(device_t parent, cfdata_t cf, void *aux) { struct podulebus_attach_args *pa = aux; @@ -101,7 +101,7 @@ ebprobe(struct device *parent, cfdata_t cf, void *aux) */ void -ebattach(struct device *parent, struct device *self, void *aux) +ebattach(device_t parent, device_t self, void *aux) { struct eb_softc *sc = device_private(self); struct podulebus_attach_args *pa = aux; diff --git a/sys/dev/podulebus/if_ei.c b/sys/dev/podulebus/if_ei.c index 6330b67abb7..3e80aeffb0b 100644 --- a/sys/dev/podulebus/if_ei.c +++ b/sys/dev/podulebus/if_ei.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ei.c,v 1.15 2009/05/12 13:18:40 cegger Exp $ */ +/* $NetBSD: if_ei.c,v 1.16 2009/05/12 14:42:58 cegger Exp $ */ /*- * Copyright (c) 2000, 2001 Ben Harris @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ei.c,v 1.15 2009/05/12 13:18:40 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ei.c,v 1.16 2009/05/12 14:42:58 cegger Exp $"); #include <sys/param.h> @@ -69,8 +69,8 @@ static void ei_write16(struct ie_softc *, int, u_int16_t); static void ei_write24(struct ie_softc *, int, int); /* autoconfiguration glue */ -static int ei_match(struct device *, cfdata_t, void *); -static void ei_attach(struct device *, struct device *, void *); +static int ei_match(device_t, cfdata_t, void *); +static void ei_attach(device_t, device_t, void *); struct ei_softc { struct ie_softc sc_ie; @@ -103,7 +103,7 @@ ei_cli(struct ei_softc *sc) } static int -ei_match(struct device *parent, cfdata_t cf, void *aux) +ei_match(device_t parent, cfdata_t cf, void *aux) { struct podulebus_attach_args *pa = aux; @@ -111,7 +111,7 @@ ei_match(struct device *parent, cfdata_t cf, void *aux) } static void -ei_attach(struct device *parent, struct device *self, void *aux) +ei_attach(device_t parent, device_t self, void *aux) { struct podulebus_attach_args *pa = aux; struct ei_softc *sc = device_private(self); diff --git a/sys/dev/qbus/dl.c b/sys/dev/qbus/dl.c index c4100aca1dd..1961a9e46e8 100644 --- a/sys/dev/qbus/dl.c +++ b/sys/dev/qbus/dl.c @@ -1,4 +1,4 @@ -/* $NetBSD: dl.c,v 1.44 2009/05/12 13:19:12 cegger Exp $ */ +/* $NetBSD: dl.c,v 1.45 2009/05/12 14:43:33 cegger Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -104,7 +104,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dl.c,v 1.44 2009/05/12 13:19:12 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dl.c,v 1.45 2009/05/12 14:43:33 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -137,8 +137,8 @@ struct dl_softc { struct tty *sc_tty; }; -static int dl_match (struct device *, cfdata_t, void *); -static void dl_attach (struct device *, struct device *, void *); +static int dl_match (device_t, cfdata_t, void *); +static void dl_attach (device_t, device_t, void *); static void dlrint (void *); static void dlxint (void *); static void dlstart (struct tty *); @@ -173,7 +173,7 @@ const struct cdevsw dl_cdevsw = { /* then complete the housecleaning for full operation */ static int -dl_match (struct device *parent, cfdata_t cf, void *aux) +dl_match (device_t parent, cfdata_t cf, void *aux) { struct uba_attach_args *ua = aux; @@ -229,7 +229,7 @@ dl_match (struct device *parent, cfdata_t cf, void *aux) } static void -dl_attach (struct device *parent, struct device *self, void *aux) +dl_attach (device_t parent, device_t self, void *aux) { struct dl_softc *sc = device_private(self); struct uba_attach_args *ua = aux; diff --git a/sys/dev/qbus/if_dmc.c b/sys/dev/qbus/if_dmc.c index d61ee9be136..4cf330ec34b 100644 --- a/sys/dev/qbus/if_dmc.c +++ b/sys/dev/qbus/if_dmc.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_dmc.c,v 1.19 2009/05/12 13:19:12 cegger Exp $ */ +/* $NetBSD: if_dmc.c,v 1.20 2009/05/12 14:43:33 cegger Exp $ */ /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_dmc.c,v 1.19 2009/05/12 13:19:12 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_dmc.c,v 1.20 2009/05/12 14:43:33 cegger Exp $"); #undef DMCDEBUG /* for base table dump on fatal error */ @@ -168,8 +168,8 @@ struct dmc_softc { } dmc_base; }; -static int dmcmatch(struct device *, cfdata_t, void *); -static void dmcattach(struct device *, struct device *, void *); +static int dmcmatch(device_t, cfdata_t, void *); +static void dmcattach(device_t, device_t, void *); static int dmcinit(struct ifnet *); static void dmcrint(void *); static void dmcxint(void *); @@ -181,7 +181,7 @@ static void dmctimeout(struct ifnet *); static int dmcioctl(struct ifnet *, u_long, void *); static int dmcoutput(struct ifnet *, struct mbuf *, struct sockaddr *, struct rtentry *); -static void dmcreset(struct device *); +static void dmcreset(device_t); CFATTACH_DECL(dmc, sizeof(struct dmc_softc), dmcmatch, dmcattach, NULL, NULL); @@ -214,7 +214,7 @@ CFATTACH_DECL(dmc, sizeof(struct dmc_softc), (tail) = (head) int -dmcmatch(struct device *parent, cfdata_t cf, void *aux) +dmcmatch(device_t parent, cfdata_t cf, void *aux) { struct uba_attach_args *ua = aux; struct dmc_softc ssc; @@ -247,7 +247,7 @@ dmcmatch(struct device *parent, cfdata_t cf, void *aux) * to accept packets. */ void -dmcattach(struct device *parent, struct device *self, void *aux) +dmcattach(device_t parent, device_t self, void *aux) { struct uba_attach_args *ua = aux; struct dmc_softc *sc = device_private(self); @@ -284,7 +284,7 @@ dmcattach(struct device *parent, struct device *self, void *aux) * If interface is on specified UBA, reset its state. */ void -dmcreset(struct device *dev) +dmcreset(device_t dev) { struct dmc_softc *sc = (struct dmc_softc *)dev; diff --git a/sys/dev/qbus/if_il.c b/sys/dev/qbus/if_il.c index 7e832acb8b6..1d80772e450 100644 --- a/sys/dev/qbus/if_il.c +++ b/sys/dev/qbus/if_il.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_il.c,v 1.23 2009/05/12 13:19:12 cegger Exp $ */ +/* $NetBSD: if_il.c,v 1.24 2009/05/12 14:43:33 cegger Exp $ */ /* * Copyright (c) 1982, 1986 Regents of the University of California. * All rights reserved. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_il.c,v 1.23 2009/05/12 13:19:12 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_il.c,v 1.24 2009/05/12 14:43:33 cegger Exp $"); #include "opt_inet.h" @@ -111,11 +111,11 @@ struct il_softc { int sc_ubaddr; /* mapping registers of is_stats */ }; -static int ilmatch(struct device *, cfdata_t, void *); -static void ilattach(struct device *, struct device *, void *); +static int ilmatch(device_t, cfdata_t, void *); +static void ilattach(device_t, device_t, void *); static void ilcint(void *); static void ilrint(void *); -static void ilreset(struct device *); +static void ilreset(device_t); static int ilwait(struct il_softc *, char *); static int ilinit(struct ifnet *); static void ilstart(struct ifnet *); @@ -134,7 +134,7 @@ CFATTACH_DECL(il, sizeof(struct il_softc), #define HIWORD(x) (((int)(x) >> 16) & 0x3) int -ilmatch(struct device *parent, cfdata_t cf, void *aux) +ilmatch(device_t parent, cfdata_t cf, void *aux) { struct uba_attach_args *ua = aux; volatile int i; @@ -153,7 +153,7 @@ ilmatch(struct device *parent, cfdata_t cf, void *aux) * address and other interesting data. */ void -ilattach(struct device *parent, struct device *self, void *aux) +ilattach(device_t parent, device_t self, void *aux) { struct uba_attach_args *ua = aux; struct il_softc *sc = device_private(self); @@ -242,7 +242,7 @@ ilwait(struct il_softc *sc, char *op) * If interface is on specified uba, reset its state. */ void -ilreset(struct device *dev) +ilreset(device_t dev) { struct il_softc *sc = (void *)dev; diff --git a/sys/dev/sbus/be.c b/sys/dev/sbus/be.c index 4e571666d4d..d245aa9de1a 100644 --- a/sys/dev/sbus/be.c +++ b/sys/dev/sbus/be.c @@ -1,4 +1,4 @@ -/* $NetBSD: be.c,v 1.64 2009/05/12 13:20:05 cegger Exp $ */ +/* $NetBSD: be.c,v 1.65 2009/05/12 14:43:59 cegger Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -57,7 +57,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.64 2009/05/12 13:20:05 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.65 2009/05/12 14:43:59 cegger Exp $"); #include "opt_ddb.h" #include "opt_inet.h" @@ -159,8 +159,8 @@ struct be_softc { #endif }; -int bematch(struct device *, cfdata_t, void *); -void beattach(struct device *, struct device *, void *); +int bematch(device_t, cfdata_t, void *); +void beattach(device_t, device_t, void *); void beinit(struct be_softc *); void bestart(struct ifnet *); @@ -188,9 +188,9 @@ int be_ifmedia_upd(struct ifnet *); void be_mcreset(struct be_softc *); /* MII methods & callbacks */ -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 *); +static int be_mii_readreg(device_t, int, int); +static void be_mii_writereg(device_t, int, int, int); +static void be_mii_statchg(device_t); /* MII helpers */ static void be_mii_sync(struct be_softc *); @@ -209,7 +209,7 @@ CFATTACH_DECL(be, sizeof(struct be_softc), bematch, beattach, NULL, NULL); int -bematch(struct device *parent, cfdata_t cf, void *aux) +bematch(device_t parent, cfdata_t cf, void *aux) { struct sbus_attach_args *sa = aux; @@ -217,7 +217,7 @@ bematch(struct device *parent, cfdata_t cf, void *aux) } void -beattach(struct device *parent, struct device *self, void *aux) +beattach(device_t parent, device_t self, void *aux) { struct sbus_attach_args *sa = aux; struct qec_softc *qec = (struct qec_softc *)parent; @@ -1319,7 +1319,7 @@ be_mii_sendbits(struct be_softc *sc, int phy, u_int32_t data, int nbits) } static int -be_mii_readreg(struct device *self, int phy, int reg) +be_mii_readreg(device_t self, int phy, int reg) { struct be_softc *sc = (struct be_softc *)self; int val = 0, i; @@ -1347,7 +1347,7 @@ be_mii_readreg(struct device *self, int phy, int reg) } void -be_mii_writereg(struct device *self, int phy, int reg, int val) +be_mii_writereg(device_t self, int phy, int reg, int val) { struct be_softc *sc = (struct be_softc *)self; int i; @@ -1373,12 +1373,12 @@ be_mii_reset(struct be_softc *sc, int phy) { int n; - be_mii_writereg((struct device *)sc, phy, MII_BMCR, + be_mii_writereg((device_t)sc, phy, MII_BMCR, BMCR_LOOP | BMCR_PDOWN | BMCR_ISO); - be_mii_writereg((struct device *)sc, phy, MII_BMCR, BMCR_RESET); + be_mii_writereg((device_t)sc, phy, MII_BMCR, BMCR_RESET); for (n = 16; n >= 0; n--) { - int bmcr = be_mii_readreg((struct device *)sc, phy, MII_BMCR); + int bmcr = be_mii_readreg((device_t)sc, phy, MII_BMCR); if ((bmcr & BMCR_RESET) == 0) break; DELAY(20); @@ -1405,7 +1405,7 @@ be_tick(void *arg) } void -be_mii_statchg(struct device *self) +be_mii_statchg(device_t self) { struct be_softc *sc = (struct be_softc *)self; bus_space_tag_t t = sc->sc_bustag; @@ -1613,7 +1613,7 @@ be_intphy_service(struct be_softc *sc, struct mii_data *mii, int cmd) /* Callback if something changed. */ if (sc->sc_mii_active != mii->mii_media_active || cmd == MII_MEDIACHG) { - (*mii->mii_statchg)((struct device *)sc); + (*mii->mii_statchg)((device_t)sc); sc->sc_mii_active = mii->mii_media_active; } return (0); @@ -1635,7 +1635,7 @@ be_intphy_status(struct be_softc *sc) /* * Internal transceiver; do the work here. */ - bmcr = be_mii_readreg((struct device *)sc, BE_PHY_INTERNAL, MII_BMCR); + bmcr = be_mii_readreg((device_t)sc, BE_PHY_INTERNAL, MII_BMCR); switch (bmcr & (BMCR_S100 | BMCR_FDX)) { case (BMCR_S100 | BMCR_FDX): @@ -1653,8 +1653,8 @@ be_intphy_status(struct be_softc *sc) } /* Read twice in case the register is latched */ - bmsr = be_mii_readreg((struct device *)sc, BE_PHY_INTERNAL, MII_BMSR)| - be_mii_readreg((struct device *)sc, BE_PHY_INTERNAL, MII_BMSR); + bmsr = be_mii_readreg((device_t)sc, BE_PHY_INTERNAL, MII_BMSR)| + be_mii_readreg((device_t)sc, BE_PHY_INTERNAL, MII_BMSR); if (bmsr & BMSR_LINK) media_status |= IFM_ACTIVE; diff --git a/sys/dev/sbus/bwtwo_sbus.c b/sys/dev/sbus/bwtwo_sbus.c index 8cfe8dfedc4..6884b684041 100644 --- a/sys/dev/sbus/bwtwo_sbus.c +++ b/sys/dev/sbus/bwtwo_sbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: bwtwo_sbus.c,v 1.24 2009/05/12 13:20:05 cegger Exp $ */ +/* $NetBSD: bwtwo_sbus.c,v 1.25 2009/05/12 14:43:59 cegger Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -79,7 +79,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bwtwo_sbus.c,v 1.24 2009/05/12 13:20:05 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bwtwo_sbus.c,v 1.25 2009/05/12 14:43:59 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -103,8 +103,8 @@ __KERNEL_RCSID(0, "$NetBSD: bwtwo_sbus.c,v 1.24 2009/05/12 13:20:05 cegger Exp $ #include <dev/sun/pfourreg.h> /* autoconfiguration driver */ -static void bwtwoattach_sbus (struct device *, struct device *, void *); -static int bwtwomatch_sbus (struct device *, cfdata_t, void *); +static void bwtwoattach_sbus (device_t, device_t, void *); +static int bwtwomatch_sbus (device_t, cfdata_t, void *); /* Allocate an `sbusdev' in addition to the bwtwo softc */ struct bwtwo_sbus_softc { @@ -122,7 +122,7 @@ static void bwtwo_set_video (struct bwtwo_softc *, int); * Match a bwtwo. */ static int -bwtwomatch_sbus(struct device *parent, cfdata_t cf, void *aux) +bwtwomatch_sbus(device_t parent, cfdata_t cf, void *aux) { struct sbus_attach_args *sa = aux; @@ -134,7 +134,7 @@ bwtwomatch_sbus(struct device *parent, cfdata_t cf, void *aux) * Attach a display. We need to notice if it is the console, too. */ void -bwtwoattach_sbus(struct device *parent, struct device *self, void *args) +bwtwoattach_sbus(device_t parent, device_t self, void *args) { struct bwtwo_softc *sc = (struct bwtwo_softc *)self; struct sbusdev *sd = &((struct bwtwo_sbus_softc *)self)->bss_sd; diff --git a/sys/dev/sbus/cgthree_sbus.c b/sys/dev/sbus/cgthree_sbus.c index 4528dc303b2..4692965c8eb 100644 --- a/sys/dev/sbus/cgthree_sbus.c +++ b/sys/dev/sbus/cgthree_sbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: cgthree_sbus.c,v 1.24 2009/05/12 13:20:05 cegger Exp $ */ +/* $NetBSD: cgthree_sbus.c,v 1.25 2009/05/12 14:43:59 cegger Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -78,7 +78,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cgthree_sbus.c,v 1.24 2009/05/12 13:20:05 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cgthree_sbus.c,v 1.25 2009/05/12 14:43:59 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -111,8 +111,8 @@ struct cgthree_sbus_softc { /* autoconfiguration driver */ -static int cgthreematch_sbus(struct device *, cfdata_t, void *); -static void cgthreeattach_sbus(struct device *, struct device *, void *); +static int cgthreematch_sbus(device_t, cfdata_t, void *); +static void cgthreeattach_sbus(device_t, device_t, void *); CFATTACH_DECL(cgthree_sbus, sizeof(struct cgthree_softc), cgthreematch_sbus, cgthreeattach_sbus, NULL, NULL); @@ -121,7 +121,7 @@ CFATTACH_DECL(cgthree_sbus, sizeof(struct cgthree_softc), * Match a cgthree. */ int -cgthreematch_sbus(struct device *parent, cfdata_t cf, void *aux) +cgthreematch_sbus(device_t parent, cfdata_t cf, void *aux) { struct sbus_attach_args *sa = aux; @@ -132,7 +132,7 @@ cgthreematch_sbus(struct device *parent, cfdata_t cf, void *aux) * Attach a display. We need to notice if it is the console, too. */ void -cgthreeattach_sbus(struct device *parent, struct device *self, void *args) +cgthreeattach_sbus(device_t parent, device_t self, void *args) { struct cgthree_softc *sc = (struct cgthree_softc *)self; struct sbusdev *sd = &((struct cgthree_sbus_softc *)self)->bss_sd; diff --git a/sys/dev/sbus/cs4231_sbus.c b/sys/dev/sbus/cs4231_sbus.c index 33a13caaa77..7bdf23b37b0 100644 --- a/sys/dev/sbus/cs4231_sbus.c +++ b/sys/dev/sbus/cs4231_sbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: cs4231_sbus.c,v 1.44 2009/05/12 13:20:05 cegger Exp $ */ +/* $NetBSD: cs4231_sbus.c,v 1.45 2009/05/12 14:43:59 cegger Exp $ */ /*- * Copyright (c) 1998, 1999, 2002, 2007 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cs4231_sbus.c,v 1.44 2009/05/12 13:20:05 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cs4231_sbus.c,v 1.45 2009/05/12 14:43:59 cegger Exp $"); #include "audio.h" #if NAUDIO > 0 @@ -79,8 +79,8 @@ struct cs4231_sbus_softc { }; -static int cs4231_sbus_match(struct device *, cfdata_t, void *); -static void cs4231_sbus_attach(struct device *, struct device *, void *); +static int cs4231_sbus_match(device_t, cfdata_t, void *); +static void cs4231_sbus_attach(device_t, device_t, void *); static int cs4231_sbus_pint(void *); static int cs4231_sbus_rint(void *); @@ -138,7 +138,7 @@ static int cs4231_sbus_intr(void *); static int -cs4231_sbus_match(struct device *parent, cfdata_t cf, void *aux) +cs4231_sbus_match(device_t parent, cfdata_t cf, void *aux) { struct sbus_attach_args *sa; @@ -148,7 +148,7 @@ cs4231_sbus_match(struct device *parent, cfdata_t cf, void *aux) static void -cs4231_sbus_attach(struct device *parent, struct device *self, void *aux) +cs4231_sbus_attach(device_t parent, device_t self, void *aux) { struct cs4231_sbus_softc *sbsc; struct cs4231_softc *sc; diff --git a/sys/dev/sbus/esp_sbus.c b/sys/dev/sbus/esp_sbus.c index 5257dd05df1..0a61c44c414 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.47 2009/05/12 13:20:05 cegger Exp $ */ +/* $NetBSD: esp_sbus.c,v 1.48 2009/05/12 14:43:59 cegger Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: esp_sbus.c,v 1.47 2009/05/12 13:20:05 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: esp_sbus.c,v 1.48 2009/05/12 14:43:59 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -132,7 +132,7 @@ static struct ncr53c9x_glue esp_sbus_glue1 = { }; int -espmatch_sbus(struct device *parent, cfdata_t cf, void *aux) +espmatch_sbus(device_t parent, cfdata_t cf, void *aux) { int rv; struct sbus_attach_args *sa = aux; diff --git a/sys/dev/sbus/genfb_sbus.c b/sys/dev/sbus/genfb_sbus.c index bc1e520e64a..8ec84492100 100644 --- a/sys/dev/sbus/genfb_sbus.c +++ b/sys/dev/sbus/genfb_sbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: genfb_sbus.c,v 1.6 2009/05/12 13:20:05 cegger Exp $ */ +/* $NetBSD: genfb_sbus.c,v 1.7 2009/05/12 14:43:59 cegger Exp $ */ /*- * Copyright (c) 2007 Michael Lorenz @@ -29,7 +29,7 @@ /* an SBus frontend for the generic fb console driver */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: genfb_sbus.c,v 1.6 2009/05/12 13:20:05 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: genfb_sbus.c,v 1.7 2009/05/12 14:43:59 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -57,8 +57,8 @@ struct genfb_sbus_softc { paddr_t sc_paddr; }; -static int genfb_match_sbus(struct device *, cfdata_t, void *); -static void genfb_attach_sbus(struct device *, struct device *, void *); +static int genfb_match_sbus(device_t, cfdata_t, void *); +static void genfb_attach_sbus(device_t, device_t, void *); static int genfb_ioctl_sbus(void *, void *, u_long, void *, int, struct lwp*); static paddr_t genfb_mmap_sbus(void *, void *, off_t, int); @@ -70,7 +70,7 @@ CFATTACH_DECL(genfb_sbus, sizeof(struct genfb_sbus_softc), * Match a graphics device. */ static int -genfb_match_sbus(struct device *parent, cfdata_t cf, void *aux) +genfb_match_sbus(device_t parent, cfdata_t cf, void *aux) { struct sbus_attach_args *sa = aux; @@ -88,7 +88,7 @@ genfb_match_sbus(struct device *parent, cfdata_t cf, void *aux) * Attach a display. We need to notice if it is the console, too. */ static void -genfb_attach_sbus(struct device *parent, struct device *self, void *args) +genfb_attach_sbus(device_t parent, device_t self, void *args) { struct genfb_sbus_softc *sc = (struct genfb_sbus_softc *)self; struct sbusdev *sd = &sc->sc_sd; diff --git a/sys/dev/sbus/if_en.c b/sys/dev/sbus/if_en.c index d4d4f5f6797..5fc99fb305e 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.24 2009/05/12 13:20:05 cegger Exp $ */ +/* $NetBSD: if_en.c,v 1.25 2009/05/12 14:43:59 cegger Exp $ */ /* * @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_en.c,v 1.24 2009/05/12 13:20:05 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_en.c,v 1.25 2009/05/12 14:43:59 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -79,8 +79,8 @@ struct en_sbus_softc { /* * prototypes */ -static int en_sbus_match(struct device *, cfdata_t, void *); -static void en_sbus_attach(struct device *, struct device *, void *); +static int en_sbus_match(device_t, cfdata_t, void *); +static void en_sbus_attach(device_t, device_t, void *); /* * SBus autoconfig attachments @@ -96,11 +96,7 @@ CFATTACH_DECL(en_sbus, sizeof(struct en_sbus_softc), */ static int -en_sbus_match(parent, cf, aux) - struct device *parent; - cfdata_t cf; - void *aux; - +en_sbus_match(device_t parent, cfdata_t cf, void *aux) { struct sbus_attach_args *sa = aux; @@ -120,10 +116,7 @@ en_sbus_match(parent, cf, aux) static void -en_sbus_attach(parent, self, aux) - struct device *parent, *self; - void *aux; - +en_sbus_attach(device_t parent, device_t self, void *aux) { struct sbus_attach_args *sa = aux; struct en_softc *sc = (void *)self; diff --git a/sys/dev/sbus/if_gem_sbus.c b/sys/dev/sbus/if_gem_sbus.c index 66c27099f97..f984fb2a4f3 100644 --- a/sys/dev/sbus/if_gem_sbus.c +++ b/sys/dev/sbus/if_gem_sbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_gem_sbus.c,v 1.9 2009/05/12 13:20:05 cegger Exp $ */ +/* $NetBSD: if_gem_sbus.c,v 1.10 2009/05/12 14:43:59 cegger Exp $ */ /*- * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_gem_sbus.c,v 1.9 2009/05/12 13:20:05 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_gem_sbus.c,v 1.10 2009/05/12 14:43:59 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -67,14 +67,14 @@ struct gem_sbus_softc { bus_space_handle_t gsc_sbus_regs_h; }; -int gemmatch_sbus(struct device *, cfdata_t, void *); -void gemattach_sbus(struct device *, struct device *, void *); +int gemmatch_sbus(device_t, cfdata_t, void *); +void gemattach_sbus(device_t, device_t, void *); CFATTACH_DECL(gem_sbus, sizeof(struct gem_sbus_softc), gemmatch_sbus, gemattach_sbus, NULL, NULL); int -gemmatch_sbus(struct device *parent, cfdata_t cf, void *aux) +gemmatch_sbus(device_t parent, cfdata_t cf, void *aux) { struct sbus_attach_args *sa = aux; @@ -82,7 +82,7 @@ gemmatch_sbus(struct device *parent, cfdata_t cf, void *aux) } void -gemattach_sbus(struct device *parent, struct device *self, void *aux) +gemattach_sbus(device_t parent, device_t self, void *aux) { struct sbus_attach_args *sa = aux; struct gem_sbus_softc *gsc = (void *)self; diff --git a/sys/dev/sbus/if_hme_sbus.c b/sys/dev/sbus/if_hme_sbus.c index d195e2a6d39..11f0a7e4680 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.27 2009/05/12 13:20:05 cegger Exp $ */ +/* $NetBSD: if_hme_sbus.c,v 1.28 2009/05/12 14:43:59 cegger Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_hme_sbus.c,v 1.27 2009/05/12 13:20:05 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_hme_sbus.c,v 1.28 2009/05/12 14:43:59 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -63,14 +63,14 @@ struct hmesbus_softc { struct sbusdev hsc_sbus; /* SBus device */ }; -int hmematch_sbus(struct device *, cfdata_t, void *); -void hmeattach_sbus(struct device *, struct device *, void *); +int hmematch_sbus(device_t, cfdata_t, void *); +void hmeattach_sbus(device_t, device_t, void *); CFATTACH_DECL(hme_sbus, sizeof(struct hmesbus_softc), hmematch_sbus, hmeattach_sbus, NULL, NULL); int -hmematch_sbus(struct device *parent, cfdata_t cf, void *aux) +hmematch_sbus(device_t parent, cfdata_t cf, void *aux) { struct sbus_attach_args *sa = aux; @@ -80,7 +80,7 @@ hmematch_sbus(struct device *parent, cfdata_t cf, void *aux) } void -hmeattach_sbus(struct device *parent, struct device *self, void *aux) +hmeattach_sbus(device_t parent, device_t self, void *aux) { struct sbus_attach_args *sa = aux; struct hmesbus_softc *hsc = (void *)self; diff --git a/sys/dev/sbus/isp_sbus.c b/sys/dev/sbus/isp_sbus.c index c72babe6bad..2b52a2a33d1 100644 --- a/sys/dev/sbus/isp_sbus.c +++ b/sys/dev/sbus/isp_sbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: isp_sbus.c,v 1.74 2009/05/12 13:20:05 cegger Exp $ */ +/* $NetBSD: isp_sbus.c,v 1.75 2009/05/12 14:43:59 cegger Exp $ */ /* * SBus specific probe and attach routines for Qlogic ISP SCSI adapters. * @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isp_sbus.c,v 1.74 2009/05/12 13:20:05 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isp_sbus.c,v 1.75 2009/05/12 14:43:59 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -95,13 +95,13 @@ struct isp_sbussoftc { }; -static int isp_match(struct device *, cfdata_t, void *); -static void isp_sbus_attach(struct device *, struct device *, void *); +static int isp_match(device_t, cfdata_t, void *); +static void isp_sbus_attach(device_t, device_t, void *); CFATTACH_DECL(isp_sbus, sizeof (struct isp_sbussoftc), isp_match, isp_sbus_attach, NULL, NULL); static int -isp_match(struct device *parent, cfdata_t cf, void *aux) +isp_match(device_t parent, cfdata_t cf, void *aux) { int rv; struct sbus_attach_args *sa = aux; @@ -117,7 +117,7 @@ isp_match(struct device *parent, cfdata_t cf, void *aux) static void -isp_sbus_attach(struct device *parent, struct device *self, void *aux) +isp_sbus_attach(device_t parent, device_t self, void *aux) { int freq, ispburst, sbusburst; struct sbus_attach_args *sa = aux; diff --git a/sys/dev/sbus/lebuffer.c b/sys/dev/sbus/lebuffer.c index e9c2a6ad737..6eeac55fa5e 100644 --- a/sys/dev/sbus/lebuffer.c +++ b/sys/dev/sbus/lebuffer.c @@ -1,4 +1,4 @@ -/* $NetBSD: lebuffer.c,v 1.31 2009/05/12 13:20:05 cegger Exp $ */ +/* $NetBSD: lebuffer.c,v 1.32 2009/05/12 14:43:59 cegger Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lebuffer.c,v 1.31 2009/05/12 13:20:05 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lebuffer.c,v 1.32 2009/05/12 14:43:59 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -47,8 +47,8 @@ __KERNEL_RCSID(0, "$NetBSD: lebuffer.c,v 1.31 2009/05/12 13:20:05 cegger Exp $") #include <dev/sbus/lebuffervar.h> int lebufprint(void *, const char *); -int lebufmatch(struct device *, cfdata_t, void *); -void lebufattach(struct device *, struct device *, void *); +int lebufmatch(device_t, cfdata_t, void *); +void lebufattach(device_t, device_t, void *); CFATTACH_DECL(lebuffer, sizeof(struct lebuf_softc), lebufmatch, lebufattach, NULL, NULL); @@ -62,7 +62,7 @@ lebufprint(void *aux, const char *busname) } int -lebufmatch(struct device *parent, cfdata_t cf, void *aux) +lebufmatch(device_t parent, cfdata_t cf, void *aux) { struct sbus_attach_args *sa = aux; @@ -73,7 +73,7 @@ lebufmatch(struct device *parent, cfdata_t cf, void *aux) * Attach all the sub-devices we can find */ void -lebufattach(struct device *parent, struct device *self, void *aux) +lebufattach(device_t parent, device_t self, void *aux) { struct sbus_attach_args *sa = aux; struct lebuf_softc *sc = (void *)self; diff --git a/sys/dev/sbus/magma.c b/sys/dev/sbus/magma.c index 29fd8b95c66..065bafccb71 100644 --- a/sys/dev/sbus/magma.c +++ b/sys/dev/sbus/magma.c @@ -1,4 +1,4 @@ -/* $NetBSD: magma.c,v 1.51 2009/05/12 13:20:06 cegger Exp $ */ +/* $NetBSD: magma.c,v 1.52 2009/05/12 14:43:59 cegger Exp $ */ /*- * Copyright (c) 1998 Iain Hibbert @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.51 2009/05/12 13:20:06 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.52 2009/05/12 14:43:59 cegger Exp $"); #if 0 #define MAGMA_DEBUG @@ -302,7 +302,7 @@ cd1400_enable_transmitter(struct cd1400 *cd, int channel) */ int -magma_match(struct device *parent, cfdata_t cf, void *aux) +magma_match(device_t parent, cfdata_t cf, void *aux) { struct sbus_attach_args *sa = aux; struct magma_board_info *card; @@ -330,7 +330,7 @@ magma_match(struct device *parent, cfdata_t cf, void *aux) } void -magma_attach(struct device *parent, struct device *self, void *aux) +magma_attach(device_t parent, device_t self, void *aux) { struct sbus_attach_args *sa = aux; struct magma_softc *sc = device_private(self); @@ -819,7 +819,7 @@ chkbpp: */ int -mtty_match(struct device *parent, cfdata_t cf, void *args) +mtty_match(device_t parent, cfdata_t cf, void *args) { struct magma_softc *sc = device_private(parent); @@ -827,7 +827,7 @@ mtty_match(struct device *parent, cfdata_t cf, void *args) } void -mtty_attach(struct device *parent, struct device *dev, void *args) +mtty_attach(device_t parent, device_t dev, void *args) { struct magma_softc *sc = device_private(parent); struct mtty_softc *ms = device_private(dev); @@ -1388,7 +1388,7 @@ mtty_param(struct tty *tp, struct termios *t) */ int -mbpp_match(struct device *parent, cfdata_t cf, void *args) +mbpp_match(device_t parent, cfdata_t cf, void *args) { struct magma_softc *sc = device_private(parent); @@ -1396,7 +1396,7 @@ mbpp_match(struct device *parent, cfdata_t cf, void *args) } void -mbpp_attach(struct device *parent, struct device *dev, void *args) +mbpp_attach(device_t parent, device_t dev, void *args) { struct magma_softc *sc = device_private(parent); struct mbpp_softc *ms = device_private(dev); diff --git a/sys/dev/sbus/magmareg.h b/sys/dev/sbus/magmareg.h index 393443a241c..7214223bb54 100644 --- a/sys/dev/sbus/magmareg.h +++ b/sys/dev/sbus/magmareg.h @@ -1,4 +1,4 @@ -/* $NetBSD: magmareg.h,v 1.14 2009/05/12 13:20:06 cegger Exp $ */ +/* $NetBSD: magmareg.h,v 1.15 2009/05/12 14:43:59 cegger Exp $ */ /*- * Copyright (c) 1998 Iain Hibbert @@ -203,19 +203,19 @@ __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 *, cfdata_t, void *); -void magma_attach(struct device *, struct device *, void *); +int magma_match(device_t, cfdata_t, void *); +void magma_attach(device_t, device_t, void *); int magma_hard(void *); void magma_soft(void *); -int mtty_match(struct device *, cfdata_t, void *); -void mtty_attach(struct device *, struct device *, void *); +int mtty_match(device_t, cfdata_t, void *); +void mtty_attach(device_t, device_t, 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 *, cfdata_t, void *); -void mbpp_attach(struct device *, struct device *, void *); +int mbpp_match(device_t, cfdata_t, void *); +void mbpp_attach(device_t, device_t, void *); void mbpp_timeout(void *); void mbpp_start(void *); int mbpp_send(struct mbpp_port *, void *, int); diff --git a/sys/dev/sbus/p9100.c b/sys/dev/sbus/p9100.c index ed68e9ec819..324c247f1d4 100644 --- a/sys/dev/sbus/p9100.c +++ b/sys/dev/sbus/p9100.c @@ -1,4 +1,4 @@ -/* $NetBSD: p9100.c,v 1.42 2009/05/12 13:20:06 cegger Exp $ */ +/* $NetBSD: p9100.c,v 1.43 2009/05/12 14:43:59 cegger Exp $ */ /*- * Copyright (c) 1998, 2005, 2006 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.42 2009/05/12 13:20:06 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.43 2009/05/12 14:43:59 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -149,10 +149,10 @@ struct wsscreen_list p9100_screenlist = { }; /* autoconfiguration driver */ -static int p9100_sbus_match(struct device *, cfdata_t, void *); -static void p9100_sbus_attach(struct device *, struct device *, void *); +static int p9100_sbus_match(device_t, cfdata_t, void *); +static void p9100_sbus_attach(device_t, device_t, void *); -static void p9100unblank(struct device *); +static void p9100unblank(device_t); static void p9100_shutdown(void *); CFATTACH_DECL(pnozz, sizeof(struct p9100_softc), @@ -260,7 +260,7 @@ struct wsdisplay_accessops p9100_accessops = { * Match a p9100. */ static int -p9100_sbus_match(struct device *parent, cfdata_t cf, void *aux) +p9100_sbus_match(device_t parent, cfdata_t cf, void *aux) { struct sbus_attach_args *sa = aux; @@ -272,7 +272,7 @@ p9100_sbus_match(struct device *parent, cfdata_t cf, void *aux) * Attach a display. We need to notice if it is the console, too. */ static void -p9100_sbus_attach(struct device *parent, struct device *self, void *args) +p9100_sbus_attach(device_t parent, device_t self, void *args) { struct p9100_softc *sc = device_private(self); struct sbus_attach_args *sa = args; @@ -893,7 +893,7 @@ p9100_ramdac_write_ctl(struct p9100_softc *sc, int off, uint8_t val) * Undo the effect of an FBIOSVIDEO that turns the video off. */ static void -p9100unblank(struct device *dev) +p9100unblank(device_t dev) { struct p9100_softc *sc = device_private(dev); diff --git a/sys/dev/sbus/qe.c b/sys/dev/sbus/qe.c index 69c0b512127..f15fbe90bf9 100644 --- a/sys/dev/sbus/qe.c +++ b/sys/dev/sbus/qe.c @@ -1,4 +1,4 @@ -/* $NetBSD: qe.c,v 1.50 2009/05/12 13:20:06 cegger Exp $ */ +/* $NetBSD: qe.c,v 1.51 2009/05/12 14:43:59 cegger Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.50 2009/05/12 13:20:06 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.51 2009/05/12 14:43:59 cegger Exp $"); #define QEDEBUG @@ -149,8 +149,8 @@ struct qe_softc { #endif }; -int qematch(struct device *, cfdata_t, void *); -void qeattach(struct device *, struct device *, void *); +int qematch(device_t, cfdata_t, void *); +void qeattach(device_t, device_t, void *); void qeinit(struct qe_softc *); void qestart(struct ifnet *); @@ -177,7 +177,7 @@ CFATTACH_DECL(qe, sizeof(struct qe_softc), qematch, qeattach, NULL, NULL); int -qematch(struct device *parent, cfdata_t cf, void *aux) +qematch(device_t parent, cfdata_t cf, void *aux) { struct sbus_attach_args *sa = aux; @@ -185,7 +185,7 @@ qematch(struct device *parent, cfdata_t cf, void *aux) } void -qeattach(struct device *parent, struct device *self, void *aux) +qeattach(device_t parent, device_t self, void *aux) { struct sbus_attach_args *sa = aux; struct qec_softc *qec = (struct qec_softc *)parent; diff --git a/sys/dev/sbus/qec.c b/sys/dev/sbus/qec.c index 02facbec017..11d1b1dfcd9 100644 --- a/sys/dev/sbus/qec.c +++ b/sys/dev/sbus/qec.c @@ -1,4 +1,4 @@ -/* $NetBSD: qec.c,v 1.42 2009/05/12 13:20:06 cegger Exp $ */ +/* $NetBSD: qec.c,v 1.43 2009/05/12 14:43:59 cegger Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.42 2009/05/12 13:20:06 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.43 2009/05/12 14:43:59 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -48,8 +48,8 @@ __KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.42 2009/05/12 13:20:06 cegger Exp $"); #include <dev/sbus/qecvar.h> static int qecprint(void *, const char *); -static int qecmatch(struct device *, cfdata_t, void *); -static void qecattach(struct device *, struct device *, void *); +static int qecmatch(device_t, cfdata_t, void *); +static void qecattach(device_t, device_t, void *); void qec_init(struct qec_softc *); static int qec_bus_map( @@ -84,7 +84,7 @@ qecprint(void *aux, const char *busname) } int -qecmatch(struct device *parent, cfdata_t cf, void *aux) +qecmatch(device_t parent, cfdata_t cf, void *aux) { struct sbus_attach_args *sa = aux; @@ -95,7 +95,7 @@ qecmatch(struct device *parent, cfdata_t cf, void *aux) * Attach all the sub-devices we can find */ void -qecattach(struct device *parent, struct device *self, void *aux) +qecattach(device_t parent, device_t self, void *aux) { struct sbus_attach_args *sa = aux; struct qec_softc *sc = (void *)self; diff --git a/sys/dev/sbus/sio16.c b/sys/dev/sbus/sio16.c index 856cc45e842..41eb7c53e3a 100644 --- a/sys/dev/sbus/sio16.c +++ b/sys/dev/sbus/sio16.c @@ -1,4 +1,4 @@ -/* $NetBSD: sio16.c,v 1.20 2009/05/12 13:20:06 cegger Exp $ */ +/* $NetBSD: sio16.c,v 1.21 2009/05/12 14:43:59 cegger Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sio16.c,v 1.20 2009/05/12 13:20:06 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sio16.c,v 1.21 2009/05/12 14:43:59 cegger Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -64,8 +64,8 @@ __KERNEL_RCSID(0, "$NetBSD: sio16.c,v 1.20 2009/05/12 13:20:06 cegger Exp $"); * device cfattach and cfdriver definitions, plus the routine we pass * to the cd18xx code or interrupt acknowledgement. */ -static int sio16_match(struct device *, cfdata_t, void *); -static void sio16_attach(struct device *, struct device *, void *); +static int sio16_match(device_t, cfdata_t, void *); +static void sio16_attach(device_t, device_t, void *); static u_char sio16_ackfunc(void *, int who); /* @@ -108,7 +108,7 @@ struct sio16_attach_args { */ #define SIO16_ROM_NAME "sio16" int -sio16_match(struct device *parent, cfdata_t cf, void *aux) +sio16_match(device_t parent, cfdata_t cf, void *aux) { struct sbus_attach_args *sa = aux; @@ -123,7 +123,7 @@ sio16_match(struct device *parent, cfdata_t cf, void *aux) * device attach routine: go attach all sub devices. */ void -sio16_attach(struct device *parent, struct device *self, void *aux) +sio16_attach(device_t parent, device_t self, void *aux) { struct sbus_attach_args *sa = aux; struct sio16_softc *sc = (struct sio16_softc *)self; @@ -268,14 +268,14 @@ sio16_ackfunc(void *v, int who) * we attach two `clcd' instances per 1600se, that each call the * backend cd18xx driver for help. */ -static int clcd_match(struct device *, cfdata_t, void *); -static void clcd_attach(struct device *, struct device *, void *); +static int clcd_match(device_t, cfdata_t, void *); +static void clcd_attach(device_t, device_t, void *); CFATTACH_DECL(clcd, sizeof(struct cd18xx_softc), clcd_match, clcd_attach, NULL, NULL); static int -clcd_match(struct device *parent, cfdata_t cf, void *aux) +clcd_match(device_t parent, cfdata_t cf, void *aux) { /* XXX */ @@ -283,7 +283,7 @@ clcd_match(struct device *parent, cfdata_t cf, void *aux) } static void -clcd_attach(struct device *parent, struct device *self, void *aux) +clcd_attach(device_t parent, device_t self, void *aux) { struct cd18xx_softc *sc = (struct cd18xx_softc *)self; struct sio16_attach_args *args = aux; diff --git a/sys/dev/sbus/spif.c b/sys/dev/sbus/spif.c index 386303c93ed..611deb049cf 100644 --- a/sys/dev/sbus/spif.c +++ b/sys/dev/sbus/spif.c @@ -1,4 +1,4 @@ -/* $NetBSD: spif.c,v 1.22 2009/05/12 13:20:06 cegger Exp $ */ +/* $NetBSD: spif.c,v 1.23 2009/05/12 14:43:59 cegger Exp $ */ /* $OpenBSD: spif.c,v 1.12 2003/10/03 16:44:51 miod Exp $ */ /* @@ -41,7 +41,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: spif.c,v 1.22 2009/05/12 13:20:06 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: spif.c,v 1.23 2009/05/12 14:43:59 cegger Exp $"); #include "spif.h" #if NSPIF > 0 @@ -143,7 +143,7 @@ const struct cdevsw sbpp_cdevsw = { int -spif_match(struct device *parent, cfdata_t vcf, void *aux) +spif_match(device_t parent, cfdata_t vcf, void *aux) { struct sbus_attach_args *sa = aux; @@ -154,7 +154,7 @@ spif_match(struct device *parent, cfdata_t vcf, void *aux) } void -spif_attach(struct device *parent, struct device *self, void *aux) +spif_attach(device_t parent, device_t self, void *aux) { struct spif_softc *sc = device_private(self); struct sbus_attach_args *sa = aux; @@ -269,7 +269,7 @@ fail_unmapregs: } int -stty_match(struct device *parent, cfdata_t vcf, void *aux) +stty_match(device_t parent, cfdata_t vcf, void *aux) { struct spif_softc *sc = device_private(parent); @@ -277,7 +277,7 @@ stty_match(struct device *parent, cfdata_t vcf, void *aux) } void -stty_attach(struct device *parent, struct device *dev, void *aux) +stty_attach(device_t parent, device_t dev, void *aux) { struct spif_softc *sc = device_private(parent); struct stty_softc *ssc = device_private(dev); @@ -974,7 +974,7 @@ stty_compute_baud(speed_t speed, int clock, u_int8_t *bprlp, u_int8_t *bprhp) } int -sbpp_match(struct device *parent, cfdata_t vcf, void *aux) +sbpp_match(device_t parent, cfdata_t vcf, void *aux) { struct spif_softc *sc = device_private(parent); @@ -982,7 +982,7 @@ sbpp_match(struct device *parent, cfdata_t vcf, void *aux) } void -sbpp_attach(struct device *parent, struct device *dev, void *aux) +sbpp_attach(device_t parent, device_t dev, void *aux) { struct spif_softc *sc = device_private(parent); struct sbpp_softc *psc = device_private(dev); diff --git a/sys/dev/sbus/spifreg.h b/sys/dev/sbus/spifreg.h index 2329ce598c4..2ce2c3d66c2 100644 --- a/sys/dev/sbus/spifreg.h +++ b/sys/dev/sbus/spifreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: spifreg.h,v 1.3 2009/05/12 13:20:06 cegger Exp $ */ +/* $NetBSD: spifreg.h,v 1.4 2009/05/12 14:43:59 cegger Exp $ */ /* $OpenBSD: spifreg.h,v 1.5 2003/06/02 18:32:41 jason Exp $ */ /* @@ -390,11 +390,11 @@ /* * internal function prototypes */ -int spif_match(struct device *, cfdata_t, void *); -void spif_attach(struct device *, struct device *, void *); +int spif_match(device_t, cfdata_t, void *); +void spif_attach(device_t, device_t, void *); -int stty_match(struct device *, cfdata_t, void *); -void stty_attach(struct device *, struct device *, void *); +int stty_match(device_t, cfdata_t, void *); +void stty_attach(device_t, device_t, void *); int spif_stcintr(void *); int spif_stcintr_mx(struct spif_softc *, int *); @@ -409,8 +409,8 @@ void stty_write_ccr(struct spif_softc *, u_int8_t); int stty_compute_baud(speed_t, int, u_int8_t *, u_int8_t *); void stty_start(struct tty *); -int sbpp_match(struct device *, cfdata_t, void *); -void sbpp_attach(struct device *, struct device *, void *); +int sbpp_match(device_t, cfdata_t, void *); +void sbpp_attach(device_t, device_t, void *); int sbpp_rw(dev_t, struct uio *); int spif_ppcintr(void *); diff --git a/sys/dev/sbus/stp4020.c b/sys/dev/sbus/stp4020.c index 169a96f2aa6..235b666493d 100644 --- a/sys/dev/sbus/stp4020.c +++ b/sys/dev/sbus/stp4020.c @@ -1,4 +1,4 @@ -/* $NetBSD: stp4020.c,v 1.60 2009/05/12 13:20:06 cegger Exp $ */ +/* $NetBSD: stp4020.c,v 1.61 2009/05/12 14:43:59 cegger Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.60 2009/05/12 13:20:06 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.61 2009/05/12 14:43:59 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -135,8 +135,8 @@ struct stp4020_softc { static int stp4020print(void *, const char *); -static int stp4020match(struct device *, cfdata_t, void *); -static void stp4020attach(struct device *, struct device *, void *); +static int stp4020match(device_t, cfdata_t, void *); +static void stp4020attach(device_t, device_t, 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 *cmd_delay); @@ -312,7 +312,7 @@ stp4020print(void *aux, const char *busname) } int -stp4020match(struct device *parent, cfdata_t cf, void *aux) +stp4020match(device_t parent, cfdata_t cf, void *aux) { struct sbus_attach_args *sa = aux; @@ -323,7 +323,7 @@ stp4020match(struct device *parent, cfdata_t cf, void *aux) * Attach all the sub-devices we can find */ void -stp4020attach(struct device *parent, struct device *self, void *aux) +stp4020attach(device_t parent, device_t self, void *aux) { struct sbus_attach_args *sa = aux; struct stp4020_softc *sc = (void *)self; diff --git a/sys/dev/sbus/tcx.c b/sys/dev/sbus/tcx.c index 40756b3f1f2..a191df2a45b 100644 --- a/sys/dev/sbus/tcx.c +++ b/sys/dev/sbus/tcx.c @@ -1,4 +1,4 @@ -/* $NetBSD: tcx.c,v 1.30 2009/05/12 13:20:06 cegger Exp $ */ +/* $NetBSD: tcx.c,v 1.31 2009/05/12 14:43:59 cegger Exp $ */ /* * Copyright (c) 1996,1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.30 2009/05/12 13:20:06 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.31 2009/05/12 14:43:59 cegger Exp $"); /* * define for cg8 emulation on S24 (24-bit version of tcx) for the SS5; @@ -106,9 +106,9 @@ struct tcx_softc { #define TCX_CTL_PIXELMASK 0x00FFFFFF /* mask for index/level */ /* autoconfiguration driver */ -static void tcxattach(struct device *, struct device *, void *); -static int tcxmatch(struct device *, cfdata_t, void *); -static void tcx_unblank(struct device *); +static void tcxattach(device_t, device_t, void *); +static int tcxmatch(device_t, cfdata_t, void *); +static void tcx_unblank(device_t); CFATTACH_DECL(tcx, sizeof(struct tcx_softc), tcxmatch, tcxattach, NULL, NULL); @@ -153,7 +153,7 @@ static void tcx_loadcmap(struct tcx_softc *, int, int); * Match a tcx. */ int -tcxmatch(struct device *parent, cfdata_t cf, void *aux) +tcxmatch(device_t parent, cfdata_t cf, void *aux) { struct sbus_attach_args *sa = aux; @@ -164,7 +164,7 @@ tcxmatch(struct device *parent, cfdata_t cf, void *aux) * Attach a display. */ void -tcxattach(struct device *parent, struct device *self, void *args) +tcxattach(device_t parent, device_t self, void *args) { struct tcx_softc *sc = device_private(self); struct sbus_attach_args *sa = args; @@ -518,7 +518,7 @@ tcx_loadcmap(struct tcx_softc *sc, int start, int ncolors) } static void -tcx_unblank(struct device *dev) +tcx_unblank(device_t dev) { struct tcx_softc *sc = device_private(dev); diff --git a/sys/dev/sbus/xbox.c b/sys/dev/sbus/xbox.c index 6e3500d33b6..070e2f85481 100644 --- a/sys/dev/sbus/xbox.c +++ b/sys/dev/sbus/xbox.c @@ -1,4 +1,4 @@ -/* $NetBSD: xbox.c,v 1.18 2009/05/12 13:20:06 cegger Exp $ */ +/* $NetBSD: xbox.c,v 1.19 2009/05/12 14:43:59 cegger Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: xbox.c,v 1.18 2009/05/12 13:20:06 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xbox.c,v 1.19 2009/05/12 14:43:59 cegger Exp $"); #include <sys/param.h> #include <sys/malloc.h> @@ -91,8 +91,8 @@ struct xbox_softc { }; /* autoconfiguration driver */ -int xbox_match(struct device *, cfdata_t, void *); -void xbox_attach(struct device *, struct device *, void *); +int xbox_match(device_t, cfdata_t, void *); +void xbox_attach(device_t, device_t, void *); int xbox_print( void *, const char *); CFATTACH_DECL(xbox, sizeof(struct xbox_softc), @@ -109,7 +109,7 @@ xbox_print(void *args, const char *busname) } int -xbox_match(struct device *parent, cfdata_t cf, void *aux) +xbox_match(device_t parent, cfdata_t cf, void *aux) { struct sbus_attach_args *sa = aux; @@ -120,7 +120,7 @@ xbox_match(struct device *parent, cfdata_t cf, void *aux) * Attach an Xbox. */ void -xbox_attach(struct device *parent, struct device *self, void *aux) +xbox_attach(device_t parent, device_t self, void *aux) { struct xbox_softc *sc = (struct xbox_softc *)self; struct sbus_attach_args *sa = aux; diff --git a/sys/dev/scsipi/ch.c b/sys/dev/scsipi/ch.c index a227d359c4a..630ce8aff1e 100644 --- a/sys/dev/scsipi/ch.c +++ b/sys/dev/scsipi/ch.c @@ -1,4 +1,4 @@ -/* $NetBSD: ch.c,v 1.83 2009/05/12 13:20:33 cegger Exp $ */ +/* $NetBSD: ch.c,v 1.84 2009/05/12 14:44:31 cegger Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 1999, 2004 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ch.c,v 1.83 2009/05/12 13:20:33 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ch.c,v 1.84 2009/05/12 14:44:31 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -99,8 +99,8 @@ struct ch_softc { #define CHF_ROTATE 0x01 /* picker can rotate */ /* Autoconfiguration glue */ -static int chmatch(struct device *, cfdata_t, void *); -static void chattach(struct device *, struct device *, void *); +static int chmatch(device_t, cfdata_t, void *); +static void chattach(device_t, device_t, void *); CFATTACH_DECL(ch, sizeof(struct ch_softc), chmatch, chattach, NULL, NULL); @@ -173,7 +173,7 @@ static const struct chquirk chquirks[] = { }; static int -chmatch(struct device *parent, cfdata_t match, +chmatch(device_t parent, cfdata_t match, void *aux) { struct scsipibus_attach_args *sa = aux; @@ -187,7 +187,7 @@ chmatch(struct device *parent, cfdata_t match, } static void -chattach(struct device *parent, struct device *self, void *aux) +chattach(device_t parent, device_t self, void *aux) { struct ch_softc *sc = device_private(self); struct scsipibus_attach_args *sa = aux; diff --git a/sys/dev/scsipi/if_se.c b/sys/dev/scsipi/if_se.c index 2ac3c958d7f..fb871fa6ed8 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.77 2009/05/12 13:20:33 cegger Exp $ */ +/* $NetBSD: if_se.c,v 1.78 2009/05/12 14:44:31 cegger 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.77 2009/05/12 13:20:33 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.78 2009/05/12 14:44:31 cegger Exp $"); #include "opt_inet.h" #include "opt_atalk.h" @@ -194,8 +194,8 @@ struct se_softc { int sc_enabled; }; -static int sematch(struct device *, cfdata_t, void *); -static void seattach(struct device *, struct device *, void *); +static int sematch(device_t, cfdata_t, void *); +static void seattach(device_t, device_t, void *); static void se_ifstart(struct ifnet *); static void sestart(struct scsipi_periph *); @@ -278,7 +278,7 @@ ether_cmp(void *one, void *two) #define ETHER_CMP ether_cmp static int -sematch(struct device *parent, cfdata_t match, void *aux) +sematch(device_t parent, cfdata_t match, void *aux) { struct scsipibus_attach_args *sa = aux; int priority; @@ -294,7 +294,7 @@ sematch(struct device *parent, cfdata_t match, void *aux) * a device suitable for this driver. */ static void -seattach(struct device *parent, struct device *self, void *aux) +seattach(device_t parent, device_t self, void *aux) { struct se_softc *sc = device_private(self); struct scsipibus_attach_args *sa = aux; diff --git a/sys/dev/scsipi/scsiconf.c b/sys/dev/scsipi/scsiconf.c index 4e31ae03dfd..bb47d68ce64 100644 --- a/sys/dev/scsipi/scsiconf.c +++ b/sys/dev/scsipi/scsiconf.c @@ -1,4 +1,4 @@ -/* $NetBSD: scsiconf.c,v 1.252 2009/05/12 13:20:33 cegger Exp $ */ +/* $NetBSD: scsiconf.c,v 1.253 2009/05/12 14:44:31 cegger Exp $ */ /*- * Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc. @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.252 2009/05/12 13:20:33 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.253 2009/05/12 14:44:31 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -87,12 +87,12 @@ static struct simplelock scsibus_interlock = SIMPLELOCK_INITIALIZER; static int scsi_probe_device(struct scsibus_softc *, int, int); -static int scsibusmatch(struct device *, cfdata_t, void *); -static void scsibusattach(struct device *, struct device *, void *); -static int scsibusactivate(struct device *, enum devact); -static int scsibusdetach(struct device *, int flags); -static int scsibusrescan(struct device *, const char *, const int *); -static void scsidevdetached(struct device *, struct device *); +static int scsibusmatch(device_t, cfdata_t, void *); +static void scsibusattach(device_t, device_t, void *); +static int scsibusactivate(device_t, enum devact); +static int scsibusdetach(device_t, int flags); +static int scsibusrescan(device_t, const char *, const int *); +static void scsidevdetached(device_t, device_t); CFATTACH_DECL3_NEW(scsibus, sizeof(struct scsibus_softc), scsibusmatch, scsibusattach, scsibusdetach, scsibusactivate, @@ -138,7 +138,7 @@ scsiprint(void *aux, const char *pnp) } static int -scsibusmatch(struct device *parent, cfdata_t cf, void *aux) +scsibusmatch(device_t parent, cfdata_t cf, void *aux) { struct scsipi_channel *chan = aux; @@ -153,7 +153,7 @@ scsibusmatch(struct device *parent, cfdata_t cf, void *aux) } static void -scsibusattach(struct device *parent, struct device *self, void *aux) +scsibusattach(device_t parent, device_t self, void *aux) { struct scsibus_softc *sc = device_private(self); struct scsipi_channel *chan = aux; @@ -236,7 +236,7 @@ scsibus_config(struct scsipi_channel *chan, void *arg) } static int -scsibusactivate(struct device *self, enum devact act) +scsibusactivate(device_t self, enum devact act) { struct scsibus_softc *sc = device_private(self); struct scsipi_channel *chan = sc->sc_channel; @@ -272,7 +272,7 @@ scsibusactivate(struct device *self, enum devact act) } static int -scsibusdetach(struct device *self, int flags) +scsibusdetach(device_t self, int flags) { struct scsibus_softc *sc = device_private(self); struct scsipi_channel *chan = sc->sc_channel; @@ -378,7 +378,7 @@ scsi_probe_bus(struct scsibus_softc *sc, int target, int lun) } static int -scsibusrescan(struct device *sc, const char *ifattr, +scsibusrescan(device_t sc, const char *ifattr, const int *locators) { @@ -390,7 +390,7 @@ scsibusrescan(struct device *sc, const char *ifattr, } static void -scsidevdetached(struct device *sc, struct device *dev) +scsidevdetached(device_t sc, device_t dev) { struct scsibus_softc *ssc = device_private(sc); struct scsipi_channel *chan = ssc->sc_channel; @@ -729,7 +729,7 @@ scsi_probe_device(struct scsibus_softc *sc, int target, int lun) struct scsipibus_attach_args sa; cfdata_t cf; int locs[SCSIBUSCF_NLOCS]; - struct device *chld; + device_t chld; /* * Assume no more luns to search after this one. diff --git a/sys/dev/scsipi/scsipiconf.h b/sys/dev/scsipi/scsipiconf.h index 1a5fbc1469d..a88a9431abd 100644 --- a/sys/dev/scsipi/scsipiconf.h +++ b/sys/dev/scsipi/scsipiconf.h @@ -1,4 +1,4 @@ -/* $NetBSD: scsipiconf.h,v 1.113 2008/09/08 23:36:54 gmcgarry Exp $ */ +/* $NetBSD: scsipiconf.h,v 1.114 2009/05/12 14:44:31 cegger Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2004 The NetBSD Foundation, Inc. @@ -186,7 +186,7 @@ struct scsipi_inquiry_pattern; * structure contains the channel number. */ struct scsipi_adapter { - struct device *adapt_dev; /* pointer to adapter's device */ + device_t adapt_dev; /* pointer to adapter's device */ int adapt_nchannels; /* number of adapter channels */ int adapt_refcnt; /* adapter's reference count */ int adapt_openings; /* total # of command openings */ @@ -198,7 +198,7 @@ struct scsipi_adapter { void (*adapt_minphys)(struct buf *); int (*adapt_ioctl)(struct scsipi_channel *, u_long, void *, int, struct proc *); - int (*adapt_enable)(struct device *, int); + int (*adapt_enable)(device_t, int); int (*adapt_getgeom)(struct scsipi_periph *, struct disk_parms *, u_long); int (*adapt_accesschk)(struct scsipi_periph *, @@ -342,7 +342,7 @@ struct scsipi_channel { * still be an improvement. */ struct scsipi_periph { - struct device *periph_dev; /* pointer to peripherial's device */ + device_t periph_dev; /* pointer to peripherial's device */ struct scsipi_channel *periph_channel; /* channel we're connected to */ /* link in channel's table of periphs */ diff --git a/sys/dev/scsipi/sd.c b/sys/dev/scsipi/sd.c index 850ba3d5333..737823a8590 100644 --- a/sys/dev/scsipi/sd.c +++ b/sys/dev/scsipi/sd.c @@ -1,4 +1,4 @@ -/* $NetBSD: sd.c,v 1.280 2009/05/12 13:20:33 cegger Exp $ */ +/* $NetBSD: sd.c,v 1.281 2009/05/12 14:44:31 cegger Exp $ */ /*- * Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc. @@ -47,7 +47,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.280 2009/05/12 13:20:33 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.281 2009/05/12 14:44:31 cegger Exp $"); #include "opt_scsi.h" #include "rnd.h" @@ -123,10 +123,10 @@ static int sd_flush(struct sd_softc *, int); static int sd_getcache(struct sd_softc *, int *); static int sd_setcache(struct sd_softc *, int); -static int sdmatch(struct device *, cfdata_t, void *); -static void sdattach(struct device *, struct device *, void *); -static int sdactivate(struct device *, enum devact); -static int sddetach(struct device *, int); +static int sdmatch(device_t, cfdata_t, void *); +static void sdattach(device_t, device_t, void *); +static int sdactivate(device_t, enum devact); +static int sddetach(device_t, int); static void sd_set_properties(struct sd_softc *); CFATTACH_DECL3_NEW(sd, sizeof(struct sd_softc), sdmatch, sdattach, sddetach, @@ -195,7 +195,7 @@ struct sd_mode_sense_data { * A device suitable for this driver */ static int -sdmatch(struct device *parent, cfdata_t match, +sdmatch(device_t parent, cfdata_t match, void *aux) { struct scsipibus_attach_args *sa = aux; @@ -212,7 +212,7 @@ sdmatch(struct device *parent, cfdata_t match, * Attach routine common to atapi & scsi. */ static void -sdattach(struct device *parent, struct device *self, void *aux) +sdattach(device_t parent, device_t self, void *aux) { struct sd_softc *sd = device_private(self); struct scsipibus_attach_args *sa = aux; @@ -327,7 +327,7 @@ sdattach(struct device *parent, struct device *self, void *aux) } static int -sdactivate(struct device *self, enum devact act) +sdactivate(device_t self, enum devact act) { int rv = 0; @@ -346,7 +346,7 @@ sdactivate(struct device *self, enum devact act) } static int -sddetach(struct device *self, int flags) +sddetach(device_t self, int flags) { struct sd_softc *sd = device_private(self); int s, bmaj, cmaj, i, mn; diff --git a/sys/dev/scsipi/ses.c b/sys/dev/scsipi/ses.c index ceee7627343..4f51338cc67 100644 --- a/sys/dev/scsipi/ses.c +++ b/sys/dev/scsipi/ses.c @@ -1,4 +1,4 @@ -/* $NetBSD: ses.c,v 1.41 2009/05/12 13:20:33 cegger Exp $ */ +/* $NetBSD: ses.c,v 1.42 2009/05/12 14:44:31 cegger Exp $ */ /* * Copyright (C) 2000 National Aeronautics & Space Administration * All rights reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ses.c,v 1.41 2009/05/12 13:20:33 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ses.c,v 1.42 2009/05/12 14:44:31 cegger Exp $"); #include "opt_scsi.h" @@ -167,8 +167,8 @@ struct ses_softc { #define SESUNIT(x) (minor((x))) -static int ses_match(struct device *, cfdata_t, void *); -static void ses_attach(struct device *, struct device *, void *); +static int ses_match(device_t, cfdata_t, void *); +static void ses_attach(device_t, device_t, void *); static enctyp ses_device_type(struct scsipibus_attach_args *); CFATTACH_DECL(ses, sizeof (struct ses_softc), @@ -184,7 +184,7 @@ static const struct scsipi_periphsw ses_switch = { }; static int -ses_match(struct device *parent, cfdata_t match, +ses_match(device_t parent, cfdata_t match, void *aux) { struct scsipibus_attach_args *sa = aux; @@ -213,7 +213,7 @@ ses_match(struct device *parent, cfdata_t match, * the softc available to set stuff in. */ static void -ses_attach(struct device *parent, struct device *self, void *aux) +ses_attach(device_t parent, device_t self, void *aux) { const char *tname; struct ses_softc *softc = device_private(self); diff --git a/sys/dev/scsipi/ss.c b/sys/dev/scsipi/ss.c index 72bc2604ffe..e91167175ed 100644 --- a/sys/dev/scsipi/ss.c +++ b/sys/dev/scsipi/ss.c @@ -1,4 +1,4 @@ -/* $NetBSD: ss.c,v 1.77 2009/05/12 13:20:33 cegger Exp $ */ +/* $NetBSD: ss.c,v 1.78 2009/05/12 14:44:31 cegger Exp $ */ /* * Copyright (c) 1995 Kenneth Stailey. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.77 2009/05/12 13:20:33 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.78 2009/05/12 14:44:31 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -69,10 +69,10 @@ __KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.77 2009/05/12 13:20:33 cegger Exp $"); #define MODE_NONREWIND 1 #define MODE_CONTROL 3 -static int ssmatch(struct device *, cfdata_t, void *); -static void ssattach(struct device *, struct device *, void *); -static int ssdetach(struct device *self, int flags); -static int ssactivate(struct device *self, enum devact act); +static int ssmatch(device_t, cfdata_t, void *); +static void ssattach(device_t, device_t, void *); +static int ssdetach(device_t self, int flags); +static int ssactivate(device_t self, enum devact act); CFATTACH_DECL(ss, sizeof(struct ss_softc), ssmatch, ssattach, ssdetach, ssactivate); @@ -123,7 +123,7 @@ static const struct scsipi_inquiry_pattern ss_patterns[] = { }; static int -ssmatch(struct device *parent, cfdata_t match, +ssmatch(device_t parent, cfdata_t match, void *aux) { struct scsipibus_attach_args *sa = aux; @@ -142,7 +142,7 @@ ssmatch(struct device *parent, cfdata_t match, * special handlers into the ss_softc structure */ static void -ssattach(struct device *parent, struct device *self, void *aux) +ssattach(device_t parent, device_t self, void *aux) { struct ss_softc *ss = device_private(self); struct scsipibus_attach_args *sa = aux; @@ -186,7 +186,7 @@ ssattach(struct device *parent, struct device *self, void *aux) } static int -ssdetach(struct device *self, int flags) +ssdetach(device_t self, int flags) { struct ss_softc *ss = device_private(self); int s, cmaj, mn; @@ -217,7 +217,7 @@ ssdetach(struct device *self, int flags) } static int -ssactivate(struct device *self, enum devact act) +ssactivate(device_t self, enum devact act) { int rv = 0; diff --git a/sys/dev/scsipi/st.c b/sys/dev/scsipi/st.c index c6a39ff74bb..ff2ccc5c68c 100644 --- a/sys/dev/scsipi/st.c +++ b/sys/dev/scsipi/st.c @@ -1,4 +1,4 @@ -/* $NetBSD: st.c,v 1.210 2009/01/13 13:35:54 yamt Exp $ */ +/* $NetBSD: st.c,v 1.211 2009/05/12 14:44:31 cegger Exp $ */ /*- * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc. @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.210 2009/01/13 13:35:54 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.211 2009/05/12 14:44:31 cegger Exp $"); #include "opt_scsi.h" @@ -350,7 +350,7 @@ static const struct scsipi_periphsw st_switch = { * A device suitable for this driver */ void -stattach(struct device *parent, struct st_softc *st, void *aux) +stattach(device_t parent, struct st_softc *st, void *aux) { struct scsipibus_attach_args *sa = aux; struct scsipi_periph *periph = sa->sa_periph; @@ -411,7 +411,7 @@ stattach(struct device *parent, struct st_softc *st, void *aux) } int -stactivate(struct device *self, enum devact act) +stactivate(device_t self, enum devact act) { int rv = 0; @@ -430,7 +430,7 @@ stactivate(struct device *self, enum devact act) } int -stdetach(struct device *self, int flags) +stdetach(device_t self, int flags) { struct st_softc *st = device_private(self); int s, bmaj, cmaj, mn; diff --git a/sys/dev/scsipi/st_atapi.c b/sys/dev/scsipi/st_atapi.c index 8447553041a..7737e19fc8c 100644 --- a/sys/dev/scsipi/st_atapi.c +++ b/sys/dev/scsipi/st_atapi.c @@ -1,4 +1,4 @@ -/* $NetBSD: st_atapi.c,v 1.21 2009/05/12 13:20:33 cegger Exp $ */ +/* $NetBSD: st_atapi.c,v 1.22 2009/05/12 14:44:31 cegger Exp $ */ /* * Copyright (c) 2001 Manuel Bouyer. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: st_atapi.c,v 1.21 2009/05/12 13:20:33 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: st_atapi.c,v 1.22 2009/05/12 14:44:31 cegger Exp $"); #include "opt_scsi.h" #include "rnd.h" @@ -47,8 +47,8 @@ __KERNEL_RCSID(0, "$NetBSD: st_atapi.c,v 1.21 2009/05/12 13:20:33 cegger Exp $") #include <dev/scsipi/stvar.h> #include <dev/scsipi/atapi_tape.h> -static int st_atapibus_match(struct device *, cfdata_t, void *); -static void st_atapibus_attach(struct device *, struct device *, void *); +static int st_atapibus_match(device_t, cfdata_t, void *); +static void st_atapibus_attach(device_t, device_t, void *); static int st_atapibus_ops(struct st_softc *, int, int); static int st_atapibus_mode_sense(struct st_softc *, int); static int st_atapibus_mode_select(struct st_softc *, int); @@ -62,7 +62,7 @@ static const struct scsipi_inquiry_pattern st_atapibus_patterns[] = { }; static int -st_atapibus_match(struct device *parent, cfdata_t match, +st_atapibus_match(device_t parent, cfdata_t match, void *aux) { struct scsipibus_attach_args *sa = aux; @@ -79,7 +79,7 @@ st_atapibus_match(struct device *parent, cfdata_t match, } static void -st_atapibus_attach(struct device *parent, struct device *self, void *aux) +st_atapibus_attach(device_t parent, device_t self, void *aux) { struct st_softc *st = device_private(self); struct scsipibus_attach_args *sa = aux; diff --git a/sys/dev/scsipi/st_scsi.c b/sys/dev/scsipi/st_scsi.c index 3aaae7de5c5..6bb6d6dbb85 100644 --- a/sys/dev/scsipi/st_scsi.c +++ b/sys/dev/scsipi/st_scsi.c @@ -1,4 +1,4 @@ -/* $NetBSD: st_scsi.c,v 1.28 2009/05/12 13:20:33 cegger Exp $ */ +/* $NetBSD: st_scsi.c,v 1.29 2009/05/12 14:44:31 cegger Exp $ */ /*- * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc. @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: st_scsi.c,v 1.28 2009/05/12 13:20:33 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: st_scsi.c,v 1.29 2009/05/12 14:44:31 cegger Exp $"); #include "opt_scsi.h" #include "rnd.h" @@ -67,8 +67,8 @@ __KERNEL_RCSID(0, "$NetBSD: st_scsi.c,v 1.28 2009/05/12 13:20:33 cegger Exp $"); #include <dev/scsipi/scsi_tape.h> #include <dev/scsipi/stvar.h> -static int st_scsibus_match(struct device *, cfdata_t, void *); -static void st_scsibus_attach(struct device *, struct device *, void *); +static int st_scsibus_match(device_t, cfdata_t, void *); +static void st_scsibus_attach(device_t, device_t, void *); static int st_scsibus_ops(struct st_softc *, int, int); static int st_scsibus_read_block_limits(struct st_softc *, int); static int st_scsibus_mode_sense(struct st_softc *, int); @@ -84,7 +84,7 @@ static const struct scsipi_inquiry_pattern st_scsibus_patterns[] = { }; static int -st_scsibus_match(struct device *parent, cfdata_t match, +st_scsibus_match(device_t parent, cfdata_t match, void *aux) { struct scsipibus_attach_args *sa = aux; @@ -101,7 +101,7 @@ st_scsibus_match(struct device *parent, cfdata_t match, } static void -st_scsibus_attach(struct device *parent, struct device *self, void *aux) +st_scsibus_attach(device_t parent, device_t self, void *aux) { struct st_softc *st = device_private(self); diff --git a/sys/dev/scsipi/stvar.h b/sys/dev/scsipi/stvar.h index 0d73921c9d5..3e55dd935f5 100644 --- a/sys/dev/scsipi/stvar.h +++ b/sys/dev/scsipi/stvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: stvar.h,v 1.18 2008/04/28 20:23:58 martin Exp $ */ +/* $NetBSD: stvar.h,v 1.19 2009/05/12 14:44:31 cegger Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -178,8 +178,8 @@ struct st_softc { ST_FIXEDBLOCKS | ST_READONLY | ST_FM_WRITTEN | \ ST_2FM_AT_EOD | ST_PER_ACTION | ST_POSUPDATED) -void stattach(struct device *, struct st_softc *, void *); -int stactivate(struct device *, enum devact); -int stdetach(struct device *, int); +void stattach(device_t, struct st_softc *, void *); +int stactivate(device_t, enum devact); +int stdetach(device_t, int); extern struct cfdriver st_cd; diff --git a/sys/dev/scsipi/uk.c b/sys/dev/scsipi/uk.c index 2b0fe0c30aa..b5b916fcea0 100644 --- a/sys/dev/scsipi/uk.c +++ b/sys/dev/scsipi/uk.c @@ -1,4 +1,4 @@ -/* $NetBSD: uk.c,v 1.57 2009/05/12 13:20:34 cegger Exp $ */ +/* $NetBSD: uk.c,v 1.58 2009/05/12 14:44:31 cegger Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uk.c,v 1.57 2009/05/12 13:20:34 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uk.c,v 1.58 2009/05/12 14:44:31 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -58,10 +58,10 @@ struct uk_softc { struct scsipi_periph *sc_periph; /* all the inter level info */ }; -static int ukmatch(struct device *, cfdata_t, void *); -static void ukattach(struct device *, struct device *, void *); -static int ukactivate(struct device *, enum devact); -static int ukdetach(struct device *, int); +static int ukmatch(device_t, cfdata_t, void *); +static void ukattach(device_t, device_t, void *); +static int ukactivate(device_t, enum devact); +static int ukdetach(device_t, int); CFATTACH_DECL(uk, sizeof(struct uk_softc), ukmatch, ukattach, ukdetach, @@ -79,7 +79,7 @@ const struct cdevsw uk_cdevsw = { }; static int -ukmatch(struct device *parent, cfdata_t match, +ukmatch(device_t parent, cfdata_t match, void *aux) { @@ -91,7 +91,7 @@ ukmatch(struct device *parent, cfdata_t match, * a device suitable for this driver. */ static void -ukattach(struct device *parent, struct device *self, void *aux) +ukattach(device_t parent, device_t self, void *aux) { struct uk_softc *uk = device_private(self); struct scsipibus_attach_args *sa = aux; @@ -109,7 +109,7 @@ ukattach(struct device *parent, struct device *self, void *aux) } static int -ukactivate(struct device *self, enum devact act) +ukactivate(device_t self, enum devact act) { int rv = 0; @@ -128,7 +128,7 @@ ukactivate(struct device *self, enum devact act) } static int -ukdetach(struct device *self, int flags) +ukdetach(device_t self, int flags) { /*struct uk_softc *uk = device_private(self);*/ int cmaj, mn; diff --git a/sys/dev/spi/spiflash.h b/sys/dev/spi/spiflash.h index dde7e786207..ade373a3dd0 100644 --- a/sys/dev/spi/spiflash.h +++ b/sys/dev/spi/spiflash.h @@ -1,4 +1,4 @@ -/* $NetBSD: spiflash.h,v 1.3 2006/12/25 18:39:48 wiz Exp $ */ +/* $NetBSD: spiflash.h,v 1.4 2009/05/12 14:45:08 cegger Exp $ */ /*- * Copyright (c) 2006 Urbana-Champaign Independent Media Center. @@ -139,7 +139,7 @@ struct spiflash_hw_if { #define SPIFLASH_FLAG_FAST_READ 0x0004 /* use fast read sequence */ spiflash_handle_t spiflash_attach_mi(const struct spiflash_hw_if *, void *, - struct device *); + device_t); void spiflash_set_private(spiflash_handle_t, void *); void *spiflash_get_private(spiflash_handle_t); int spiflash_read_status(spiflash_handle_t, uint8_t *); diff --git a/sys/dev/splash/splash.c b/sys/dev/splash/splash.c index 7e6a699894f..7fa7269264f 100644 --- a/sys/dev/splash/splash.c +++ b/sys/dev/splash/splash.c @@ -1,4 +1,4 @@ -/* $NetBSD: splash.c,v 1.6 2008/05/10 15:31:05 martin Exp $ */ +/* $NetBSD: splash.c,v 1.7 2009/05/12 14:45:43 cegger Exp $ */ /*- * Copyright (c) 2006 Jared D. McNeill <jmcneill@invisible.ca> @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: splash.c,v 1.6 2008/05/10 15:31:05 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: splash.c,v 1.7 2009/05/12 14:45:43 cegger Exp $"); #include "opt_splash.h" @@ -373,7 +373,7 @@ splash_progress_render(struct splash_progress *sp) } static int -splash_progress_stop(struct device *dev) +splash_progress_stop(device_t dev) { struct splash_progress *sp; @@ -397,7 +397,7 @@ splash_progress_init(struct splash_progress *sp) sp->sp_force = 0; splash_progress_state = sp; splash_progress_render(sp); - config_finalize_register((struct device *)sp, splash_progress_stop); + config_finalize_register((device_t)sp, splash_progress_stop); return; } diff --git a/sys/dev/splash/splash.h b/sys/dev/splash/splash.h index aee80fd672a..3598a21d1d2 100644 --- a/sys/dev/splash/splash.h +++ b/sys/dev/splash/splash.h @@ -1,4 +1,4 @@ -/* $NetBSD: splash.h,v 1.3 2008/05/10 15:31:05 martin Exp $ */ +/* $NetBSD: splash.h,v 1.4 2009/05/12 14:45:43 cegger Exp $ */ /*- * Copyright (c) 2006 Jared D. McNeill <jmcneill@invisible.ca> @@ -54,7 +54,7 @@ struct splash_info { #ifdef SPLASHSCREEN_PROGRESS struct splash_progress { - struct device *sp_dev; /* XXX needed for config_finalize */ + device_t sp_dev; /* XXX needed for config_finalize */ int sp_top; int sp_left; int sp_width; diff --git a/sys/dev/std/ieee1212.c b/sys/dev/std/ieee1212.c index 026ae1399d8..e8e58d1884d 100644 --- a/sys/dev/std/ieee1212.c +++ b/sys/dev/std/ieee1212.c @@ -1,4 +1,4 @@ -/* $NetBSD: ieee1212.c,v 1.11 2008/04/28 20:23:58 martin Exp $ */ +/* $NetBSD: ieee1212.c,v 1.12 2009/05/12 14:46:01 cegger Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ieee1212.c,v 1.11 2008/04/28 20:23:58 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ieee1212.c,v 1.12 2009/05/12 14:46:01 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1207,12 +1207,12 @@ p1212_calc_crc(u_int32_t crc, u_int32_t *data, int len, int broke) * can match and attach multiple children in one pass. */ -struct device ** -p1212_match_units(struct device *sc, struct p1212_dir *dir, +device_t * +p1212_match_units(device_t sc, struct p1212_dir *dir, int (*print)(void *, const char *)) { struct p1212_dir **udirs; - struct device **devret, *dev; + device_t *devret, *dev; int numdev; /* @@ -1221,7 +1221,7 @@ p1212_match_units(struct device *sc, struct p1212_dir *dir, */ numdev = 0; - devret = malloc(sizeof(struct device *) * 2, M_DEVBUF, M_WAITOK); + devret = malloc(sizeof(device_t) * 2, M_DEVBUF, M_WAITOK); devret[1] = NULL; udirs = (struct p1212_dir **)p1212_find(dir, P1212_KEYTYPE_Directory, @@ -1233,7 +1233,7 @@ p1212_match_units(struct device *sc, struct p1212_dir *dir, dev = config_found_ia(sc, "fwnode", udirs, print); if (dev && numdev) { devret = realloc(devret, - sizeof(struct device *) * + sizeof(device_t) * (numdev + 2), M_DEVBUF, M_WAITOK); devret[numdev++] = dev; devret[numdev] = NULL; diff --git a/sys/dev/std/ieee1212var.h b/sys/dev/std/ieee1212var.h index 3a47c3fa72d..6abb81bbc9e 100644 --- a/sys/dev/std/ieee1212var.h +++ b/sys/dev/std/ieee1212var.h @@ -1,4 +1,4 @@ -/* $NetBSD: ieee1212var.h,v 1.4 2008/04/28 20:23:58 martin Exp $ */ +/* $NetBSD: ieee1212var.h,v 1.5 2009/05/12 14:46:01 cegger Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -94,7 +94,7 @@ void p1212_walk(struct p1212_dir *, void *, struct p1212_key **p1212_find(struct p1212_dir *, int, int, int); void p1212_print(struct p1212_dir *); void p1212_free(struct p1212_rom *); -struct device **p1212_match_units(struct device *, struct p1212_dir *, +device_t *p1212_match_units(device_t, struct p1212_dir *, int (*)(void *, const char *)); #endif /* _DEV_STD_IEEE1212VAR_H */ diff --git a/sys/dev/sun/bwtwo.c b/sys/dev/sun/bwtwo.c index b96da9fd947..8af76f2f64d 100644 --- a/sys/dev/sun/bwtwo.c +++ b/sys/dev/sun/bwtwo.c @@ -1,4 +1,4 @@ -/* $NetBSD: bwtwo.c,v 1.25 2009/05/12 13:21:06 cegger Exp $ */ +/* $NetBSD: bwtwo.c,v 1.26 2009/05/12 14:46:39 cegger Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -79,7 +79,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bwtwo.c,v 1.25 2009/05/12 13:21:06 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bwtwo.c,v 1.26 2009/05/12 14:46:39 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -121,7 +121,7 @@ const struct cdevsw bwtwo_cdevsw = { }; /* XXX we do not handle frame buffer interrupts (do not know how) */ -static void bwtwounblank(struct device *); +static void bwtwounblank(device_t); /* frame buffer generic driver */ static struct fbdriver bwtwofbdriver = { @@ -356,7 +356,7 @@ bwtwoioctl(dev_t dev, u_long cmd, void *data, int flags, struct lwp *l) } static void -bwtwounblank(struct device *dev) +bwtwounblank(device_t dev) { struct bwtwo_softc *sc = device_private(dev); diff --git a/sys/dev/sun/cgthree.c b/sys/dev/sun/cgthree.c index 532c973ceaa..ceee9f42455 100644 --- a/sys/dev/sun/cgthree.c +++ b/sys/dev/sun/cgthree.c @@ -1,4 +1,4 @@ -/* $NetBSD: cgthree.c,v 1.22 2009/03/14 21:04:23 dsl Exp $ */ +/* $NetBSD: cgthree.c,v 1.23 2009/05/12 14:46:39 cegger Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cgthree.c,v 1.22 2009/03/14 21:04:23 dsl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cgthree.c,v 1.23 2009/05/12 14:46:39 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -69,7 +69,7 @@ __KERNEL_RCSID(0, "$NetBSD: cgthree.c,v 1.22 2009/03/14 21:04:23 dsl Exp $"); #include "opt_wsemul.h" #endif -static void cgthreeunblank(struct device *); +static void cgthreeunblank(device_t); static void cgthreeloadcmap(struct cgthree_softc *, int, int); static void cgthree_set_video(struct cgthree_softc *, int); static int cgthree_get_video(struct cgthree_softc *); @@ -336,7 +336,7 @@ cgthreeioctl(dev_t dev, u_long cmd, void *data, int flags, struct lwp *l) * Undo the effect of an FBIOSVIDEO that turns the video off. */ static void -cgthreeunblank(struct device *dev) +cgthreeunblank(device_t dev) { cgthree_set_video(device_private(dev), 1); diff --git a/sys/dev/sun/kbd.c b/sys/dev/sun/kbd.c index 67ab165fee5..f08ff33523e 100644 --- a/sys/dev/sun/kbd.c +++ b/sys/dev/sun/kbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: kbd.c,v 1.62 2009/01/11 23:36:39 christos Exp $ */ +/* $NetBSD: kbd.c,v 1.63 2009/05/12 14:46:39 cegger Exp $ */ /* * Copyright (c) 1992, 1993 @@ -47,7 +47,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.62 2009/01/11 23:36:39 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.63 2009/05/12 14:46:39 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -97,7 +97,7 @@ static void sunkbd_wskbd_cngetc(void *, u_int *, int *); static void sunkbd_wskbd_cnpollc(void *, int); static void sunkbd_wskbd_cnbell(void *, u_int, u_int, u_int); static void sunkbd_bell_off(void *v); -static void kbd_enable(struct device *); /* deferred keyboard init */ +static void kbd_enable(device_t); /* deferred keyboard init */ const struct wskbd_accessops sunkbd_wskbd_accessops = { wssunkbd_enable, @@ -1015,7 +1015,7 @@ sunkbd_wskbd_cnbell(void *v, u_int pitch, u_int period, u_int volume) } void -kbd_enable(struct device *dev) +kbd_enable(device_t dev) { struct kbd_softc *k = device_private(dev); struct wskbddev_attach_args a; diff --git a/sys/dev/sun/kbdsunvar.h b/sys/dev/sun/kbdsunvar.h index 10569e472e8..9248b699faf 100644 --- a/sys/dev/sun/kbdsunvar.h +++ b/sys/dev/sun/kbdsunvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: kbdsunvar.h,v 1.6 2008/03/29 19:15:36 tsutsui Exp $ */ +/* $NetBSD: kbdsunvar.h,v 1.7 2009/05/12 14:46:39 cegger Exp $ */ /* * Copyright (c) 1992, 1993 @@ -84,8 +84,8 @@ struct kbd_sun_softc { * underlying lower level driver and used as a back door when * opening and closing the internal device. */ - int (*k_deviopen)(struct device *, int); - int (*k_deviclose)(struct device *, int); + int (*k_deviopen)(device_t, int); + int (*k_deviclose)(device_t, int); /* * Callback provided by the lower layer (actual device driver). diff --git a/sys/dev/sun/kbdvar.h b/sys/dev/sun/kbdvar.h index 57e991b6895..85f1398a648 100644 --- a/sys/dev/sun/kbdvar.h +++ b/sys/dev/sun/kbdvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: kbdvar.h,v 1.19 2008/03/29 19:15:36 tsutsui Exp $ */ +/* $NetBSD: kbdvar.h,v 1.20 2009/05/12 14:46:39 cegger Exp $ */ /* * Copyright (c) 1992, 1993 @@ -59,7 +59,7 @@ struct kbd_softc { struct evvar k_events; /* event queue state */ #if NWSKBD > 0 - struct device * k_wskbd;/* handle for wskbd, if it is attached */ + device_t k_wskbd;/* handle for wskbd, if it is attached */ int k_wsenabled; /* set if we are using wskbd */ #ifdef WSDISPLAY_COMPAT_RAWKBD int k_wsraw; /* send raw events to wscons */ diff --git a/sys/dev/sun/msvar.h b/sys/dev/sun/msvar.h index 32138b7290b..60254920e96 100644 --- a/sys/dev/sun/msvar.h +++ b/sys/dev/sun/msvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: msvar.h,v 1.8 2008/03/29 19:15:36 tsutsui Exp $ */ +/* $NetBSD: msvar.h,v 1.9 2009/05/12 14:46:39 cegger Exp $ */ /* * Copyright (c) 1992, 1993 @@ -82,8 +82,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) (struct device *, int); - int (*ms_deviclose) (struct device *, int); + int (*ms_deviopen) (device_t, int); + int (*ms_deviclose) (device_t, int); /* Flags to communicate with ms_softintr() */ volatile int ms_intr_flags; @@ -113,7 +113,7 @@ struct ms_softc { volatile int ms_ready; /* event queue is ready */ struct evvar ms_events; /* event queue state */ - struct device *ms_wsmousedev; + device_t ms_wsmousedev; }; /* front-end call back for mouse input */ diff --git a/sys/dev/sun/sunms.c b/sys/dev/sun/sunms.c index 46dd824fb2a..1a781f13947 100644 --- a/sys/dev/sun/sunms.c +++ b/sys/dev/sun/sunms.c @@ -1,4 +1,4 @@ -/* $NetBSD: sunms.c,v 1.30 2009/05/12 13:21:06 cegger Exp $ */ +/* $NetBSD: sunms.c,v 1.31 2009/05/12 14:46:39 cegger Exp $ */ /* * Copyright (c) 1992, 1993 @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sunms.c,v 1.30 2009/05/12 13:21:06 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunms.c,v 1.31 2009/05/12 14:46:39 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -90,7 +90,7 @@ int sunms_bps = MS_DEFAULT_BPS; static int sunms_match(device_t, cfdata_t, void *); static void sunms_attach(device_t, device_t, void *); -static int sunmsiopen(struct device *, int mode); +static int sunmsiopen(device_t, int mode); int sunmsinput(int, struct tty *); CFATTACH_DECL_NEW(ms_tty, sizeof(struct ms_softc), diff --git a/sys/dev/tc/bba.c b/sys/dev/tc/bba.c index a180957b1f9..83a8765113c 100644 --- a/sys/dev/tc/bba.c +++ b/sys/dev/tc/bba.c @@ -1,4 +1,4 @@ -/* $NetBSD: bba.c,v 1.35 2009/05/12 13:21:22 cegger Exp $ */ +/* $NetBSD: bba.c,v 1.36 2009/05/12 14:47:04 cegger Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ /* maxine/alpha baseboard audio (bba) */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bba.c,v 1.35 2009/05/12 13:21:22 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bba.c,v 1.36 2009/05/12 14:47:04 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -92,8 +92,8 @@ struct bba_softc { struct bba_dma_state sc_rx_dma_state; }; -static int bba_match(struct device *, cfdata_t, void *); -static void bba_attach(struct device *, struct device *, void *); +static int bba_match(device_t, cfdata_t, void *); +static void bba_attach(device_t, device_t, void *); CFATTACH_DECL(bba, sizeof(struct bba_softc), bba_match, bba_attach, NULL, NULL); @@ -190,7 +190,7 @@ static void bba_codec_dwrite(struct am7930_softc *, int, u_int8_t); static uint8_t bba_codec_dread(struct am7930_softc *, int); static int -bba_match(struct device *parent, cfdata_t cf, void *aux) +bba_match(device_t parent, cfdata_t cf, void *aux) { struct ioasicdev_attach_args *ia; @@ -204,7 +204,7 @@ bba_match(struct device *parent, cfdata_t cf, void *aux) static void -bba_attach(struct device *parent, struct device *self, void *aux) +bba_attach(device_t parent, device_t self, void *aux) { struct ioasicdev_attach_args *ia; struct bba_softc *sc; diff --git a/sys/dev/tc/if_fta.c b/sys/dev/tc/if_fta.c index f0c12fae980..f5dde4c6a36 100644 --- a/sys/dev/tc/if_fta.c +++ b/sys/dev/tc/if_fta.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_fta.c,v 1.26 2009/05/12 13:21:22 cegger Exp $ */ +/* $NetBSD: if_fta.c,v 1.27 2009/05/12 14:47:04 cegger Exp $ */ /*- * Copyright (c) 1996 Matt Thomas <matt@3am-software.com> @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_fta.c,v 1.26 2009/05/12 13:21:22 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_fta.c,v 1.27 2009/05/12 14:47:04 cegger Exp $"); #include "opt_inet.h" @@ -65,7 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_fta.c,v 1.26 2009/05/12 13:21:22 cegger Exp $"); static int pdq_tc_match( - struct device *parent, + device_t parent, cfdata_t match, void *aux) { @@ -79,8 +79,8 @@ pdq_tc_match( static void pdq_tc_attach( - struct device * const parent, - struct device * const self, + device_t const parent, + device_t const self, void *const aux) { pdq_softc_t * const sc = device_private(self); diff --git a/sys/dev/tc/ioasicvar.h b/sys/dev/tc/ioasicvar.h index 56c0e92e699..7facb016170 100644 --- a/sys/dev/tc/ioasicvar.h +++ b/sys/dev/tc/ioasicvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: ioasicvar.h,v 1.19 2005/12/11 12:24:00 christos Exp $ */ +/* $NetBSD: ioasicvar.h,v 1.20 2009/05/12 14:47:04 cegger Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. @@ -60,10 +60,10 @@ extern struct cfdriver ioasic_cd; */ extern tc_addr_t ioasic_base; -const struct evcnt *ioasic_intr_evcnt(struct device *, void *); -void ioasic_intr_establish(struct device *, void *, +const struct evcnt *ioasic_intr_evcnt(device_t, void *); +void ioasic_intr_establish(device_t, void *, int, int (*)(void *), void *); -void ioasic_intr_disestablish(struct device *, void *); +void ioasic_intr_disestablish(device_t, void *); void ioasic_attach_devs(struct ioasic_softc *, struct ioasic_dev *, int); diff --git a/sys/dev/tc/px.c b/sys/dev/tc/px.c index 99fab97de31..ffcdf1fc794 100644 --- a/sys/dev/tc/px.c +++ b/sys/dev/tc/px.c @@ -1,4 +1,4 @@ -/* $NetBSD: px.c,v 1.35 2009/05/12 13:21:22 cegger Exp $ */ +/* $NetBSD: px.c,v 1.36 2009/05/12 14:47:04 cegger Exp $ */ /*- * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: px.c,v 1.35 2009/05/12 13:21:22 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: px.c,v 1.36 2009/05/12 14:47:04 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -90,11 +90,11 @@ __KERNEL_RCSID(0, "$NetBSD: px.c,v 1.35 2009/05/12 13:21:22 cegger Exp $"); #define PXF_QUEUE 0x01 -static void px_attach(struct device *, struct device *, void *); +static void px_attach(device_t, device_t, void *); static void px_init(struct stic_info *, int); static int px_ioctl(struct stic_info *, u_long, void *, int, struct lwp *); -static int px_match(struct device *, cfdata_t, void *); +static int px_match(device_t, cfdata_t, void *); static int px_intr(void *); static uint32_t *px_pbuf_get(struct stic_info *); diff --git a/sys/dev/tc/pxg.c b/sys/dev/tc/pxg.c index 4f21fdf7696..239316ea005 100644 --- a/sys/dev/tc/pxg.c +++ b/sys/dev/tc/pxg.c @@ -1,4 +1,4 @@ -/* $NetBSD: pxg.c,v 1.31 2009/05/12 13:21:22 cegger Exp $ */ +/* $NetBSD: pxg.c,v 1.32 2009/05/12 14:47:04 cegger Exp $ */ /*- * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pxg.c,v 1.31 2009/05/12 13:21:22 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pxg.c,v 1.32 2009/05/12 14:47:04 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -80,9 +80,9 @@ __KERNEL_RCSID(0, "$NetBSD: pxg.c,v 1.31 2009/05/12 13:21:22 cegger Exp $"); #define PXG_I860_START_OFFSET 0x380000 /* i860 start register */ #define PXG_I860_RESET_OFFSET 0x3c0000 /* i860 stop register */ -static void pxg_attach(struct device *, struct device *, void *); +static void pxg_attach(device_t, device_t, void *); static int pxg_intr(void *); -static int pxg_match(struct device *, cfdata_t, void *); +static int pxg_match(device_t, cfdata_t, void *); static void pxg_init(struct stic_info *); static int pxg_ioctl(struct stic_info *, u_long, void *, int, struct lwp *); diff --git a/sys/dev/tc/tc.c b/sys/dev/tc/tc.c index 79997d68f20..4ea8fa9ad42 100644 --- a/sys/dev/tc/tc.c +++ b/sys/dev/tc/tc.c @@ -1,4 +1,4 @@ -/* $NetBSD: tc.c,v 1.49 2009/05/12 13:21:22 cegger Exp $ */ +/* $NetBSD: tc.c,v 1.50 2009/05/12 14:47:04 cegger Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.49 2009/05/12 13:21:22 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.50 2009/05/12 14:47:04 cegger Exp $"); #include "opt_tcverbose.h" @@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.49 2009/05/12 13:21:22 cegger Exp $"); #include "locators.h" /* Definition of the driver for autoconfig. */ -static int tcmatch(struct device *, cfdata_t, void *); +static int tcmatch(device_t, cfdata_t, void *); CFATTACH_DECL(tc, sizeof(struct tc_softc), tcmatch, tcattach, NULL, NULL); @@ -56,7 +56,7 @@ static int tcprint(void *, const char *); static void tc_devinfo(const char *, char *, size_t); static int -tcmatch(struct device *parent, cfdata_t cf, void *aux) +tcmatch(device_t parent, cfdata_t cf, void *aux) { struct tcbus_attach_args *tba = aux; @@ -67,7 +67,7 @@ tcmatch(struct device *parent, cfdata_t cf, void *aux) } void -tcattach(struct device *parent, struct device *self, void *aux) +tcattach(device_t parent, device_t self, void *aux) { struct tc_softc *sc = device_private(self); struct tcbus_attach_args *tba = aux; @@ -243,7 +243,7 @@ tc_checkslot(tc_addr_t slotbase, char *namep) } const struct evcnt * -tc_intr_evcnt(struct device *dev, void *cookie) +tc_intr_evcnt(device_t dev, void *cookie) { struct tc_softc *sc = device_lookup_private(&tc_cd, 0); @@ -251,7 +251,7 @@ tc_intr_evcnt(struct device *dev, void *cookie) } void -tc_intr_establish(struct device *dev, void *cookie, int level, +tc_intr_establish(device_t dev, void *cookie, int level, int (*handler)(void *), void *arg) { struct tc_softc *sc = device_lookup_private(&tc_cd, 0); @@ -260,7 +260,7 @@ tc_intr_establish(struct device *dev, void *cookie, int level, } void -tc_intr_disestablish(struct device *dev, void *cookie) +tc_intr_disestablish(device_t dev, void *cookie) { struct tc_softc *sc = device_lookup_private(&tc_cd, 0); diff --git a/sys/dev/tc/tcdsvar.h b/sys/dev/tc/tcdsvar.h index 2baa8cd8926..b7079dbfe5c 100644 --- a/sys/dev/tc/tcdsvar.h +++ b/sys/dev/tc/tcdsvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: tcdsvar.h,v 1.5 2005/12/11 12:24:00 christos Exp $ */ +/* $NetBSD: tcdsvar.h,v 1.6 2009/05/12 14:47:04 cegger Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -76,8 +76,8 @@ struct tcdsdev_attach_args { /* * TCDS functions. */ -void tcds_intr_establish(struct device *, int, int (*)(void *), void *); -void tcds_intr_disestablish(struct device *, int); +void tcds_intr_establish(device_t, int, int (*)(void *), void *); +void tcds_intr_disestablish(device_t, int); void tcds_dma_enable(struct tcds_slotconfig *, int); void tcds_scsi_enable(struct tcds_slotconfig *, int); int tcds_scsi_iserr(struct tcds_slotconfig *); diff --git a/sys/dev/tc/tcvar.h b/sys/dev/tc/tcvar.h index 88eb202f13c..c563fd2cc90 100644 --- a/sys/dev/tc/tcvar.h +++ b/sys/dev/tc/tcvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: tcvar.h,v 1.23 2007/10/19 12:01:20 ad Exp $ */ +/* $NetBSD: tcvar.h,v 1.24 2009/05/12 14:47:04 cegger Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. @@ -69,10 +69,10 @@ struct tc_softc { int sc_nslots; struct tc_slotdesc *sc_slots; - const struct evcnt *(*sc_intr_evcnt)(struct device *, void *); - void (*sc_intr_establish)(struct device *, void *, + const struct evcnt *(*sc_intr_evcnt)(device_t, void *); + void (*sc_intr_establish)(device_t, void *, int, int (*)(void *), void *); - void (*sc_intr_disestablish)(struct device *, void *); + void (*sc_intr_disestablish)(device_t, void *); bus_dma_tag_t (*sc_get_dma_tag)(int); }; @@ -92,10 +92,10 @@ struct tcbus_attach_args { /* TC bus resource management; XXX will move elsewhere eventually. */ - const struct evcnt *(*tba_intr_evcnt)(struct device *, void *); - void (*tba_intr_establish)(struct device *, void *, + const struct evcnt *(*tba_intr_evcnt)(device_t, void *); + void (*tba_intr_establish)(device_t, void *, int, int (*)(void *), void *); - void (*tba_intr_disestablish)(struct device *, void *); + void (*tba_intr_disestablish)(device_t, void *); bus_dma_tag_t (*tba_get_dma_tag)(int); }; @@ -139,11 +139,11 @@ struct tc_builtin { * Interrupt establishment functions. */ int tc_checkslot(tc_addr_t, char *); -void tcattach(struct device *, struct device *, void *); -const struct evcnt *tc_intr_evcnt(struct device *, void *); -void tc_intr_establish(struct device *, void *, int, int (*)(void *), +void tcattach(device_t, device_t, void *); +const struct evcnt *tc_intr_evcnt(device_t, void *); +void tc_intr_establish(device_t, void *, int, int (*)(void *), void *); -void tc_intr_disestablish(struct device *, void *); +void tc_intr_disestablish(device_t, void *); /* * Miscellaneous definitions. diff --git a/sys/dev/tc/xcfb.c b/sys/dev/tc/xcfb.c index 4cea11f49d5..1e86e50944e 100644 --- a/sys/dev/tc/xcfb.c +++ b/sys/dev/tc/xcfb.c @@ -1,4 +1,4 @@ -/* $NetBSD: xcfb.c,v 1.49 2009/05/12 13:21:22 cegger Exp $ */ +/* $NetBSD: xcfb.c,v 1.50 2009/05/12 14:47:04 cegger Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.49 2009/05/12 13:21:22 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.50 2009/05/12 14:47:04 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -94,8 +94,8 @@ struct xcfb_softc { int sc_csr; /* software copy of IMS332 CSR A */ }; -static int xcfbmatch(struct device *, cfdata_t, void *); -static void xcfbattach(struct device *, struct device *, void *); +static int xcfbmatch(device_t, cfdata_t, void *); +static void xcfbattach(device_t, device_t, void *); CFATTACH_DECL_NEW(xcfb, sizeof(struct xcfb_softc), xcfbmatch, xcfbattach, NULL, NULL); diff --git a/sys/dev/tc/zskbd.c b/sys/dev/tc/zskbd.c index 63e5801110d..daead89069a 100644 --- a/sys/dev/tc/zskbd.c +++ b/sys/dev/tc/zskbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: zskbd.c,v 1.16 2008/03/29 19:15:36 tsutsui Exp $ */ +/* $NetBSD: zskbd.c,v 1.17 2009/05/12 14:47:05 cegger Exp $ */ /* * Copyright (c) 1992, 1993 @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zskbd.c,v 1.16 2008/03/29 19:15:36 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zskbd.c,v 1.17 2009/05/12 14:47:05 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -113,7 +113,7 @@ struct zskbd_softc { int sc_enabled; int kbd_type; - struct device *sc_wskbddev; + device_t sc_wskbddev; }; static struct zsops zsops_zskbd; diff --git a/sys/dev/tc/zsms.c b/sys/dev/tc/zsms.c index 1861ff41390..88e54ed010e 100644 --- a/sys/dev/tc/zsms.c +++ b/sys/dev/tc/zsms.c @@ -1,4 +1,4 @@ -/* $NetBSD: zsms.c,v 1.17 2008/03/29 19:15:36 tsutsui Exp $ */ +/* $NetBSD: zsms.c,v 1.18 2009/05/12 14:47:05 cegger Exp $ */ /* * Copyright (c) 1992, 1993 @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zsms.c,v 1.17 2008/03/29 19:15:36 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zsms.c,v 1.18 2009/05/12 14:47:05 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -105,7 +105,7 @@ struct zsms_softc { /* driver status information */ u_int buttons; int dx, dy; - struct device *sc_wsmousedev; + device_t sc_wsmousedev; }; static struct zsops zsops_zsms; diff --git a/sys/dev/vme/if_ie_vme.c b/sys/dev/vme/if_ie_vme.c index 00486db95df..a4456781000 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.26 2009/05/12 13:22:28 cegger Exp $ */ +/* $NetBSD: if_ie_vme.c,v 1.27 2009/05/12 14:47:27 cegger 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.26 2009/05/12 13:22:28 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ie_vme.c,v 1.27 2009/05/12 14:47:27 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -238,8 +238,8 @@ 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(struct device *, cfdata_t, void *); -void ie_vme_attach(struct device *, struct device *, void *); +int ie_vme_match(device_t, cfdata_t, void *); +void ie_vme_attach(device_t, device_t, void *); struct ie_vme_softc { struct ie_softc ie; @@ -414,7 +414,7 @@ ie_vme_write24(struct ie_softc *sc, int offset, int addr) } int -ie_vme_match(struct device *parent, cfdata_t cf, void *aux) +ie_vme_match(device_t parent, cfdata_t cf, void *aux) { struct vme_attach_args *va = aux; vme_chipset_tag_t ct = va->va_vct; @@ -464,7 +464,7 @@ ie_vme_match(struct device *parent, cfdata_t cf, void *aux) } void -ie_vme_attach(struct device *parent, struct device *self, void *aux) +ie_vme_attach(device_t parent, device_t self, void *aux) { u_int8_t myaddr[ETHER_ADDR_LEN]; struct ie_vme_softc *vsc = (void *) self; diff --git a/sys/dev/vme/vme.c b/sys/dev/vme/vme.c index fa733627087..bf6cb826c76 100644 --- a/sys/dev/vme/vme.c +++ b/sys/dev/vme/vme.c @@ -1,4 +1,4 @@ -/* $NetBSD: vme.c,v 1.22 2009/05/12 13:22:28 cegger Exp $ */ +/* $NetBSD: vme.c,v 1.23 2009/05/12 14:47:27 cegger Exp $ */ /* * Copyright (c) 1999 @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.22 2009/05/12 13:22:28 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.23 2009/05/12 14:47:27 cegger Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -47,7 +47,7 @@ static int vmesubmatch1(struct device*, struct cfdata*, const int *, void*); static int vmesubmatch(struct device*, struct cfdata*, const int *, void*); -int vmematch(struct device *, cfdata_t, void *); +int vmematch(device_t, cfdata_t, void *); void vmeattach(struct device*, struct device*,void*); static struct extent *vme_select_map(struct vmebus_softc*, vme_am_t); @@ -123,7 +123,7 @@ vmeprint(struct vme_attach_args *v, char *dummy) * devices are attached. */ static int -vmesubmatch1(struct device *bus, cfdata_t dev, const int *ldesc, void *aux) +vmesubmatch1(device_t bus, cfdata_t dev, const int *ldesc, void *aux) { struct vmebus_softc *sc = (struct vmebus_softc*)bus; struct vme_attach_args v; @@ -140,7 +140,7 @@ vmesubmatch1(struct device *bus, cfdata_t dev, const int *ldesc, void *aux) } static int -vmesubmatch(struct device *bus, cfdata_t dev, const int *ldesc, void *aux) +vmesubmatch(device_t bus, cfdata_t dev, const int *ldesc, void *aux) { struct vmebus_softc *sc = (struct vmebus_softc*)bus; struct vme_attach_args v; @@ -161,13 +161,13 @@ vmesubmatch(struct device *bus, cfdata_t dev, const int *ldesc, void *aux) } int -vmematch(struct device *parent, cfdata_t match, void *aux) +vmematch(device_t parent, cfdata_t match, void *aux) { return (1); } void -vmeattach(struct device *parent, struct device *self, void *aux) +vmeattach(device_t parent, device_t self, void *aux) { struct vmebus_softc *sc = (struct vmebus_softc *)self; @@ -227,7 +227,7 @@ vmeattach(struct device *parent, struct device *self, void *aux) #ifdef notyet int -vmedetach(struct device *dev) +vmedetach(device_t dev) { struct vmebus_softc *sc = (struct vmebus_softc*)dev; diff --git a/sys/dev/vme/vmevar.h b/sys/dev/vme/vmevar.h index 80af616ff26..b8c88f53e0d 100644 --- a/sys/dev/vme/vmevar.h +++ b/sys/dev/vme/vmevar.h @@ -1,4 +1,4 @@ -/* $NetBSD: vmevar.h,v 1.12 2005/12/11 12:24:07 christos Exp $ */ +/* $NetBSD: vmevar.h,v 1.13 2009/05/12 14:47:27 cegger Exp $ */ /* * Copyright (c) 1999 @@ -154,7 +154,7 @@ typedef struct vme_chipset_tag { */ struct vme_attach_args; -typedef void (*vme_slaveconf_callback)(struct device *, +typedef void (*vme_slaveconf_callback)(device_t, struct vme_attach_args *); struct vmebus_attach_args { diff --git a/sys/dev/vme/xd.c b/sys/dev/vme/xd.c index 2ce90279c7e..7abea6918c2 100644 --- a/sys/dev/vme/xd.c +++ b/sys/dev/vme/xd.c @@ -1,4 +1,4 @@ -/* $NetBSD: xd.c,v 1.85 2009/05/12 13:22:28 cegger Exp $ */ +/* $NetBSD: xd.c,v 1.86 2009/05/12 14:47:27 cegger Exp $ */ /* * @@ -51,7 +51,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.85 2009/05/12 13:22:28 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.86 2009/05/12 14:47:27 cegger Exp $"); #undef XDC_DEBUG /* full debug */ #define XDC_DIAG /* extra sanity checks */ @@ -241,10 +241,10 @@ void xd_dmamem_free(bus_dma_tag_t, bus_dmamap_t, bus_dma_segment_t *, int xdcintr(void *); /* autoconf */ -int xdcmatch(struct device *, cfdata_t, void *); -void xdcattach(struct device *, struct device *, void *); -int xdmatch(struct device *, cfdata_t, void *); -void xdattach(struct device *, struct device *, void *); +int xdcmatch(device_t, cfdata_t, void *); +void xdcattach(device_t, device_t, void *); +int xdmatch(device_t, cfdata_t, void *); +void xdattach(device_t, device_t, void *); static int xdc_probe(void *, bus_space_tag_t, bus_space_handle_t); static void xddummystrat(struct buf *); @@ -451,7 +451,7 @@ xdc_probe(void *arg, bus_space_tag_t tag, bus_space_handle_t handle) } int xdcmatch(parent, cf, aux) - struct device *parent; + device_t parent; cfdata_t cf; void *aux; { @@ -475,10 +475,7 @@ int xdcmatch(parent, cf, aux) * xdcattach: attach controller */ void -xdcattach(parent, self, aux) - struct device *parent, *self; - void *aux; - +xdcattach(device_t parent, device_t self, void *aux) { struct vme_attach_args *va = aux; vme_chipset_tag_t ct = va->va_vct; @@ -681,7 +678,7 @@ xdcattach(parent, self, aux) * call xdattach!). */ int -xdmatch(struct device *parent, cfdata_t cf, void *aux) +xdmatch(device_t parent, cfdata_t cf, void *aux) { struct xdc_attach_args *xa = aux; @@ -700,10 +697,7 @@ xdmatch(struct device *parent, cfdata_t cf, void *aux) * from xdopen/xdstrategy. */ void -xdattach(parent, self, aux) - struct device *parent, *self; - void *aux; - +xdattach(device_t parent, device_t self, void *aux) { struct xd_softc *xd = device_private(self); struct xdc_softc *xdc = device_private(parent); @@ -1163,7 +1157,7 @@ xdopen(dev_t dev, int flag, int fmt, struct lwp *l) xa.driveno = xd->xd_drive; xa.fullmode = XD_SUB_WAIT; xa.booting = 0; - xdattach((struct device *) xd->parent, (struct device *) xd, &xa); + xdattach((device_t) xd->parent, (device_t) xd, &xa); if (xd->state == XD_DRIVE_UNKNOWN) { return (EIO); } @@ -1268,7 +1262,7 @@ xdstrategy(bp) xa.driveno = xd->xd_drive; xa.fullmode = XD_SUB_WAIT; xa.booting = 0; - xdattach((struct device *)xd->parent, (struct device *)xd, &xa); + xdattach((device_t)xd->parent, (device_t)xd, &xa); if (xd->state == XD_DRIVE_UNKNOWN) { bp->b_error = EIO; goto done; diff --git a/sys/dev/vme/xy.c b/sys/dev/vme/xy.c index 865e735e801..5ab80eb011f 100644 --- a/sys/dev/vme/xy.c +++ b/sys/dev/vme/xy.c @@ -1,4 +1,4 @@ -/* $NetBSD: xy.c,v 1.89 2009/05/12 13:22:28 cegger Exp $ */ +/* $NetBSD: xy.c,v 1.90 2009/05/12 14:47:27 cegger Exp $ */ /* * @@ -51,7 +51,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.89 2009/05/12 13:22:28 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.90 2009/05/12 14:47:27 cegger Exp $"); #undef XYC_DEBUG /* full debug */ #undef XYC_DIAG /* extra sanity checks */ @@ -183,10 +183,10 @@ void xy_dmamem_free(bus_dma_tag_t, bus_dmamap_t, bus_dma_segment_t *, int xycintr(void *); /* autoconf */ -int xycmatch(struct device *, cfdata_t, void *); -void xycattach(struct device *, struct device *, void *); -int xymatch(struct device *, cfdata_t, void *); -void xyattach(struct device *, struct device *, void *); +int xycmatch(device_t, cfdata_t, void *); +void xycattach(device_t, device_t, void *); +int xymatch(device_t, cfdata_t, void *); +void xyattach(device_t, device_t, void *); static int xyc_probe(void *, bus_space_tag_t, bus_space_handle_t); static void xydummystrat(struct buf *); @@ -362,7 +362,7 @@ xyc_probe(void *arg, bus_space_tag_t tag, bus_space_handle_t handle) } int xycmatch(parent, cf, aux) - struct device *parent; + device_t parent; cfdata_t cf; void *aux; { @@ -386,10 +386,7 @@ int xycmatch(parent, cf, aux) * xycattach: attach controller */ void -xycattach(parent, self, aux) - struct device *parent, *self; - void *aux; - +xycattach(device_t parent, device_t self, void *aux) { struct xyc_softc *xyc = device_private(self); struct vme_attach_args *va = aux; @@ -579,7 +576,7 @@ xycattach(parent, self, aux) * call xyattach!). */ int -xymatch(struct device *parent, cfdata_t cf, void *aux) +xymatch(device_t parent, cfdata_t cf, void *aux) { struct xyc_attach_args *xa = aux; @@ -598,10 +595,7 @@ xymatch(struct device *parent, cfdata_t cf, void *aux) * from xyopen/xystrategy. */ void -xyattach(parent, self, aux) - struct device *parent, *self; - void *aux; - +xyattach(device_t parent, device_t self, void *aux) { struct xy_softc *xy = device_private(self), *oxy; struct xyc_softc *xyc = device_private(parent); @@ -1086,8 +1080,8 @@ xyopen(dev_t dev, int flag, int fmt, struct lwp *l) xa.driveno = xy->xy_drive; xa.fullmode = XY_SUB_WAIT; xa.booting = 0; - xyattach((struct device *) xy->parent, - (struct device *) xy, &xa); + xyattach((device_t) xy->parent, + (device_t) xy, &xa); if (xy->state == XY_DRIVE_UNKNOWN) { return (EIO); } @@ -1194,7 +1188,7 @@ xystrategy(bp) xa.driveno = xy->xy_drive; xa.fullmode = XY_SUB_WAIT; xa.booting = 0; - xyattach((struct device *)xy->parent, (struct device *)xy, &xa); + xyattach((device_t)xy->parent, (device_t)xy, &xa); if (xy->state == XY_DRIVE_UNKNOWN) { bp->b_error = EIO; goto done; diff --git a/sys/dev/wscons/wsmousevar.h b/sys/dev/wscons/wsmousevar.h index 4cb3a9a24cc..53194af40e5 100644 --- a/sys/dev/wscons/wsmousevar.h +++ b/sys/dev/wscons/wsmousevar.h @@ -1,4 +1,4 @@ -/* $NetBSD: wsmousevar.h,v 1.10 2007/03/04 06:02:52 christos Exp $ */ +/* $NetBSD: wsmousevar.h,v 1.11 2009/05/12 14:47:55 cegger Exp $ */ /* * Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved. @@ -72,4 +72,4 @@ int wsmousedevprint(void *, const char *); #define WSMOUSE_INPUT_ABSOLUTE_Y (1<<1) #define WSMOUSE_INPUT_ABSOLUTE_Z (1<<2) #define WSMOUSE_INPUT_ABSOLUTE_W (1<<3) -void wsmouse_input(struct device *, u_int, int, int, int, int, u_int); +void wsmouse_input(device_t, u_int, int, int, int, int, u_int); diff --git a/sys/dev/xmi/bi_xmi.c b/sys/dev/xmi/bi_xmi.c index fd794ea3d31..3ad6668f558 100644 --- a/sys/dev/xmi/bi_xmi.c +++ b/sys/dev/xmi/bi_xmi.c @@ -1,4 +1,4 @@ -/* $NetBSD: bi_xmi.c,v 1.8 2009/05/12 13:22:58 cegger Exp $ */ +/* $NetBSD: bi_xmi.c,v 1.9 2009/05/12 14:48:08 cegger Exp $ */ /* * Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bi_xmi.c,v 1.8 2009/05/12 13:22:58 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bi_xmi.c,v 1.9 2009/05/12 14:48:08 cegger Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: bi_xmi.c,v 1.8 2009/05/12 13:22:58 cegger Exp $"); #include "locators.h" static int -bi_xmi_match(struct device *parent, cfdata_t cf, void *aux) +bi_xmi_match(device_t parent, cfdata_t cf, void *aux) { struct xmi_attach_args *xa = aux; @@ -67,7 +67,7 @@ bi_xmi_match(struct device *parent, cfdata_t cf, void *aux) } static void -bi_xmi_attach(struct device *parent, struct device *self, void *aux) +bi_xmi_attach(device_t parent, device_t self, void *aux) { struct bi_softc *sc = device_private(self); struct xmi_attach_args *xa = aux; diff --git a/sys/dev/xmi/xmivar.h b/sys/dev/xmi/xmivar.h index 817359c4388..68b389f898d 100644 --- a/sys/dev/xmi/xmivar.h +++ b/sys/dev/xmi/xmivar.h @@ -1,4 +1,4 @@ -/* $NetBSD: xmivar.h,v 1.2 2008/03/11 05:34:02 matt Exp $ */ +/* $NetBSD: xmivar.h,v 1.3 2009/05/12 14:48:08 cegger Exp $ */ /* * Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved. @@ -34,7 +34,7 @@ * per-XMI-adapter state. */ struct xmi_softc { - struct device *sc_dev; + device_t sc_dev; bus_space_tag_t sc_iot; /* Space tag for the XMI bus */ bus_dma_tag_t sc_dmat; bus_addr_t sc_addr; /* Address base address for this bus */ |
