Module Name: src
Committed By: cegger
Date: Tue May 12 14:42:19 UTC 2009
Modified Files:
src/sys/dev/pcmcia: aic_pcmcia.c esp_pcmcia.c if_an_pcmcia.c
if_awi_pcmcia.c if_cnw.c if_cs_pcmcia.c if_mbe_pcmcia.c if_ray.c
if_sm_pcmcia.c if_tr_pcmcia.c if_wi_pcmcia.c if_xi.c if_xivar.h
isic_pcmcia.c mhzc.c pcmcia.c pcmcia_cis.c pcmciachip.h pcmciavar.h
pcmcom.c slhci_pcmcia.c wdc_pcmcia.c xirc.c
Log Message:
struct device * -> device_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/pcmcia/aic_pcmcia.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/pcmcia/esp_pcmcia.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/pcmcia/if_an_pcmcia.c \
src/sys/dev/pcmcia/isic_pcmcia.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/pcmcia/if_awi_pcmcia.c
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/pcmcia/if_cnw.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pcmcia/if_cs_pcmcia.c
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/pcmcia/if_mbe_pcmcia.c \
src/sys/dev/pcmcia/mhzc.c
cvs rdiff -u -r1.74 -r1.75 src/sys/dev/pcmcia/if_ray.c
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/pcmcia/if_sm_pcmcia.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/pcmcia/if_tr_pcmcia.c
cvs rdiff -u -r1.83 -r1.84 src/sys/dev/pcmcia/if_wi_pcmcia.c
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/pcmcia/if_xi.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pcmcia/if_xivar.h
cvs rdiff -u -r1.92 -r1.93 src/sys/dev/pcmcia/pcmcia.c
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/pcmcia/pcmcia_cis.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/pcmcia/pcmciachip.h
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/pcmcia/pcmciavar.h
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/pcmcia/pcmcom.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pcmcia/slhci_pcmcia.c
cvs rdiff -u -r1.115 -r1.116 src/sys/dev/pcmcia/wdc_pcmcia.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/pcmcia/xirc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pcmcia/aic_pcmcia.c
diff -u src/sys/dev/pcmcia/aic_pcmcia.c:1.39 src/sys/dev/pcmcia/aic_pcmcia.c:1.40
--- src/sys/dev/pcmcia/aic_pcmcia.c:1.39 Tue May 12 13:18:04 2009
+++ src/sys/dev/pcmcia/aic_pcmcia.c Tue May 12 14:42:18 2009
@@ -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 @@
#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 @@
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 @@
}
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 @@
}
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 @@
}
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;
Index: src/sys/dev/pcmcia/esp_pcmcia.c
diff -u src/sys/dev/pcmcia/esp_pcmcia.c:1.37 src/sys/dev/pcmcia/esp_pcmcia.c:1.38
--- src/sys/dev/pcmcia/esp_pcmcia.c:1.37 Sat Mar 14 15:36:20 2009
+++ src/sys/dev/pcmcia/esp_pcmcia.c Tue May 12 14:42:18 2009
@@ -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 @@
}
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 @@
}
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;
Index: src/sys/dev/pcmcia/if_an_pcmcia.c
diff -u src/sys/dev/pcmcia/if_an_pcmcia.c:1.38 src/sys/dev/pcmcia/if_an_pcmcia.c:1.39
--- src/sys/dev/pcmcia/if_an_pcmcia.c:1.38 Tue May 12 13:18:04 2009
+++ src/sys/dev/pcmcia/if_an_pcmcia.c Tue May 12 14:42:18 2009
@@ -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 @@
#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 @@
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 @@
}
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 @@
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;
Index: src/sys/dev/pcmcia/isic_pcmcia.c
diff -u src/sys/dev/pcmcia/isic_pcmcia.c:1.38 src/sys/dev/pcmcia/isic_pcmcia.c:1.39
--- src/sys/dev/pcmcia/isic_pcmcia.c:1.38 Tue May 12 13:18:04 2009
+++ src/sys/dev/pcmcia/isic_pcmcia.c Tue May 12 14:42:18 2009
@@ -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 @@
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 @@
* 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 @@
* 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 @@
}
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 @@
}
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;
Index: src/sys/dev/pcmcia/if_awi_pcmcia.c
diff -u src/sys/dev/pcmcia/if_awi_pcmcia.c:1.42 src/sys/dev/pcmcia/if_awi_pcmcia.c:1.43
--- src/sys/dev/pcmcia/if_awi_pcmcia.c:1.42 Tue May 12 13:18:04 2009
+++ src/sys/dev/pcmcia/if_awi_pcmcia.c Tue May 12 14:42:18 2009
@@ -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 @@
#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 @@
}
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 @@
}
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 @@
}
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;
Index: src/sys/dev/pcmcia/if_cnw.c
diff -u src/sys/dev/pcmcia/if_cnw.c:1.50 src/sys/dev/pcmcia/if_cnw.c:1.51
--- src/sys/dev/pcmcia/if_cnw.c:1.50 Tue May 12 13:18:04 2009
+++ src/sys/dev/pcmcia/if_cnw.c Tue May 12 14:42:18 2009
@@ -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 @@
*/
#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 @@
* 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 @@
* 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 @@
}
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 @@
}
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;
Index: src/sys/dev/pcmcia/if_cs_pcmcia.c
diff -u src/sys/dev/pcmcia/if_cs_pcmcia.c:1.17 src/sys/dev/pcmcia/if_cs_pcmcia.c:1.18
--- src/sys/dev/pcmcia/if_cs_pcmcia.c:1.17 Tue May 12 13:18:04 2009
+++ src/sys/dev/pcmcia/if_cs_pcmcia.c Tue May 12 14:42:18 2009
@@ -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 @@
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 @@
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 @@
}
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 @@
}
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;
Index: src/sys/dev/pcmcia/if_mbe_pcmcia.c
diff -u src/sys/dev/pcmcia/if_mbe_pcmcia.c:1.45 src/sys/dev/pcmcia/if_mbe_pcmcia.c:1.46
--- src/sys/dev/pcmcia/if_mbe_pcmcia.c:1.45 Mon Apr 28 20:23:56 2008
+++ src/sys/dev/pcmcia/if_mbe_pcmcia.c Tue May 12 14:42:18 2009
@@ -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 @@
}
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;
Index: src/sys/dev/pcmcia/mhzc.c
diff -u src/sys/dev/pcmcia/mhzc.c:1.45 src/sys/dev/pcmcia/mhzc.c:1.46
--- src/sys/dev/pcmcia/mhzc.c:1.45 Tue May 12 13:18:04 2009
+++ src/sys/dev/pcmcia/mhzc.c Tue May 12 14:42:19 2009
@@ -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 @@
/*
* 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 @@
#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 @@
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 @@
}
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 @@
}
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 @@
}
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 @@
/****** 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 @@
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 @@
}
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;
Index: src/sys/dev/pcmcia/if_ray.c
diff -u src/sys/dev/pcmcia/if_ray.c:1.74 src/sys/dev/pcmcia/if_ray.c:1.75
--- src/sys/dev/pcmcia/if_ray.c:1.74 Tue May 12 13:18:04 2009
+++ src/sys/dev/pcmcia/if_ray.c Tue May 12 14:42:18 2009
@@ -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 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 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 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 @@
*/
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 @@
}
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 @@
}
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 @@
}
static int
-ray_detach(struct device *self, int flags)
+ray_detach(device_t self, int flags)
{
struct ray_softc *sc;
struct ifnet *ifp;
Index: src/sys/dev/pcmcia/if_sm_pcmcia.c
diff -u src/sys/dev/pcmcia/if_sm_pcmcia.c:1.53 src/sys/dev/pcmcia/if_sm_pcmcia.c:1.54
--- src/sys/dev/pcmcia/if_sm_pcmcia.c:1.53 Tue May 12 13:18:04 2009
+++ src/sys/dev/pcmcia/if_sm_pcmcia.c Tue May 12 14:42:18 2009
@@ -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 @@
#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 @@
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 @@
}
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 @@
}
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 @@
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);
Index: src/sys/dev/pcmcia/if_tr_pcmcia.c
diff -u src/sys/dev/pcmcia/if_tr_pcmcia.c:1.22 src/sys/dev/pcmcia/if_tr_pcmcia.c:1.23
--- src/sys/dev/pcmcia/if_tr_pcmcia.c:1.22 Tue May 12 13:18:04 2009
+++ src/sys/dev/pcmcia/if_tr_pcmcia.c Tue May 12 14:42:18 2009
@@ -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 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 @@
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 @@
}
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 @@
}
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;
Index: src/sys/dev/pcmcia/if_wi_pcmcia.c
diff -u src/sys/dev/pcmcia/if_wi_pcmcia.c:1.83 src/sys/dev/pcmcia/if_wi_pcmcia.c:1.84
--- src/sys/dev/pcmcia/if_wi_pcmcia.c:1.83 Tue May 12 13:18:04 2009
+++ src/sys/dev/pcmcia/if_wi_pcmcia.c Tue May 12 14:42:18 2009
@@ -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 @@
#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 @@
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 @@
}
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 @@
}
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;
Index: src/sys/dev/pcmcia/if_xi.c
diff -u src/sys/dev/pcmcia/if_xi.c:1.66 src/sys/dev/pcmcia/if_xi.c:1.67
--- src/sys/dev/pcmcia/if_xi.c:1.66 Sat Mar 14 15:36:20 2009
+++ src/sys/dev/pcmcia/if_xi.c Tue May 12 14:42:18 2009
@@ -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 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 @@
}
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 @@
}
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 @@
/* 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 @@
/* 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 @@
}
STATIC void
-xi_statchg(struct device *self)
+xi_statchg(device_t self)
{
/* XXX Update ifp->if_baudrate */
}
Index: src/sys/dev/pcmcia/if_xivar.h
diff -u src/sys/dev/pcmcia/if_xivar.h:1.4 src/sys/dev/pcmcia/if_xivar.h:1.5
--- src/sys/dev/pcmcia/if_xivar.h:1.4 Sun Dec 11 12:23:23 2005
+++ src/sys/dev/pcmcia/if_xivar.h Tue May 12 14:42:18 2009
@@ -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 @@
};
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 *);
Index: src/sys/dev/pcmcia/pcmcia.c
diff -u src/sys/dev/pcmcia/pcmcia.c:1.92 src/sys/dev/pcmcia/pcmcia.c:1.93
--- src/sys/dev/pcmcia/pcmcia.c:1.92 Tue May 12 13:18:04 2009
+++ src/sys/dev/pcmcia/pcmcia.c Tue May 12 14:42:19 2009
@@ -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 = 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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
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 @@
}
void
-pcmcia_socket_enable(struct device *dev)
+pcmcia_socket_enable(device_t dev)
{
struct pcmcia_softc *sc = device_private(dev);
@@ -460,7 +460,7 @@
}
void
-pcmcia_socket_disable(struct device *dev)
+pcmcia_socket_disable(device_t dev)
{
struct pcmcia_softc *sc = device_private(dev);
Index: src/sys/dev/pcmcia/pcmcia_cis.c
diff -u src/sys/dev/pcmcia/pcmcia_cis.c:1.54 src/sys/dev/pcmcia/pcmcia_cis.c:1.55
--- src/sys/dev/pcmcia/pcmcia_cis.c:1.54 Sun Mar 15 20:30:57 2009
+++ src/sys/dev/pcmcia/pcmcia_cis.c Tue May 12 14:42:19 2009
@@ -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 @@
}
int
-pcmcia_scan_cis(struct device *dev,
+pcmcia_scan_cis(device_t dev,
int (*fct)(struct pcmcia_tuple *, void *),
void *arg)
{
Index: src/sys/dev/pcmcia/pcmciachip.h
diff -u src/sys/dev/pcmcia/pcmciachip.h:1.15 src/sys/dev/pcmcia/pcmciachip.h:1.16
--- src/sys/dev/pcmcia/pcmciachip.h:1.15 Thu Jun 26 12:33:18 2008
+++ src/sys/dev/pcmcia/pcmciachip.h Tue May 12 14:42:19 2009
@@ -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 @@
/* 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_ */
Index: src/sys/dev/pcmcia/pcmciavar.h
diff -u src/sys/dev/pcmcia/pcmciavar.h:1.33 src/sys/dev/pcmcia/pcmciavar.h:1.34
--- src/sys/dev/pcmcia/pcmciavar.h:1.33 Thu Jul 3 19:07:43 2008
+++ src/sys/dev/pcmcia/pcmciavar.h Tue May 12 14:42:19 2009
@@ -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 @@
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_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 @@
#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 *);
Index: src/sys/dev/pcmcia/pcmcom.c
diff -u src/sys/dev/pcmcia/pcmcom.c:1.36 src/sys/dev/pcmcia/pcmcom.c:1.37
--- src/sys/dev/pcmcia/pcmcom.c:1.36 Tue May 12 13:18:04 2009
+++ src/sys/dev/pcmcia/pcmcom.c Tue May 12 14:42:19 2009
@@ -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 @@
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 @@
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 @@
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 @@
}
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 @@
}
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 @@
}
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;
Index: src/sys/dev/pcmcia/slhci_pcmcia.c
diff -u src/sys/dev/pcmcia/slhci_pcmcia.c:1.5 src/sys/dev/pcmcia/slhci_pcmcia.c:1.6
--- src/sys/dev/pcmcia/slhci_pcmcia.c:1.5 Tue May 12 13:18:04 2009
+++ src/sys/dev/pcmcia/slhci_pcmcia.c Tue May 12 14:42:19 2009
@@ -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 @@
};
-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 @@
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 @@
}
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 @@
}
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);
Index: src/sys/dev/pcmcia/wdc_pcmcia.c
diff -u src/sys/dev/pcmcia/wdc_pcmcia.c:1.115 src/sys/dev/pcmcia/wdc_pcmcia.c:1.116
--- src/sys/dev/pcmcia/wdc_pcmcia.c:1.115 Sun Apr 5 02:35:03 2009
+++ src/sys/dev/pcmcia/wdc_pcmcia.c Tue May 12 14:42:19 2009
@@ -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 @@
}
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;
Index: src/sys/dev/pcmcia/xirc.c
diff -u src/sys/dev/pcmcia/xirc.c:1.28 src/sys/dev/pcmcia/xirc.c:1.29
--- src/sys/dev/pcmcia/xirc.c:1.28 Tue May 12 13:18:04 2009
+++ src/sys/dev/pcmcia/xirc.c Tue May 12 14:42:19 2009
@@ -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 @@
/*
* 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 @@
#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 @@
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 @@
}
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 @@
}
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 @@
}
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 @@
/****** 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 @@
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 @@
}
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;
