Module Name: src
Committed By: cegger
Date: Tue May 12 14:17:31 UTC 2009
Modified Files:
src/sys/dev/cardbus: adv_cardbus.c cardslot.c if_fxp_cardbus.c
if_ral_cardbus.c njata_cardbus.c njs_cardbus.c rbus_ppb.c
Log Message:
struct device * -> device_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/cardbus/adv_cardbus.c
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/cardbus/cardslot.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/cardbus/if_fxp_cardbus.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/cardbus/if_ral_cardbus.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/cardbus/njata_cardbus.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/cardbus/njs_cardbus.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/cardbus/rbus_ppb.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/cardbus/adv_cardbus.c
diff -u src/sys/dev/cardbus/adv_cardbus.c:1.21 src/sys/dev/cardbus/adv_cardbus.c:1.22
--- src/sys/dev/cardbus/adv_cardbus.c:1.21 Tue May 12 12:11:17 2009
+++ src/sys/dev/cardbus/adv_cardbus.c Tue May 12 14:17:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: adv_cardbus.c,v 1.21 2009/05/12 12:11:17 cegger Exp $ */
+/* $NetBSD: adv_cardbus.c,v 1.22 2009/05/12 14:17:31 cegger Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adv_cardbus.c,v 1.21 2009/05/12 12:11:17 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adv_cardbus.c,v 1.22 2009/05/12 14:17:31 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -82,15 +82,15 @@
bus_size_t sc_size;
};
-int adv_cardbus_match(struct device *, cfdata_t, void *);
-void adv_cardbus_attach(struct device *, struct device *, void *);
-int adv_cardbus_detach(struct device *, int);
+int adv_cardbus_match(device_t, cfdata_t, void *);
+void adv_cardbus_attach(device_t, device_t, void *);
+int adv_cardbus_detach(device_t, int);
CFATTACH_DECL(adv_cardbus, sizeof(struct adv_cardbus_softc),
adv_cardbus_match, adv_cardbus_attach, adv_cardbus_detach, NULL);
int
-adv_cardbus_match(struct device *parent, cfdata_t match,
+adv_cardbus_match(device_t parent, cfdata_t match,
void *aux)
{
struct cardbus_attach_args *ca = aux;
@@ -103,7 +103,7 @@
}
void
-adv_cardbus_attach(struct device *parent, struct device *self,
+adv_cardbus_attach(device_t parent, device_t self,
void *aux)
{
struct cardbus_attach_args *ca = aux;
@@ -239,7 +239,7 @@
}
int
-adv_cardbus_detach(struct device *self, int flags)
+adv_cardbus_detach(device_t self, int flags)
{
struct adv_cardbus_softc *csc = device_private(self);
struct asc_softc *sc = &csc->sc_adv;
Index: src/sys/dev/cardbus/cardslot.c
diff -u src/sys/dev/cardbus/cardslot.c:1.48 src/sys/dev/cardbus/cardslot.c:1.49
--- src/sys/dev/cardbus/cardslot.c:1.48 Tue May 12 12:11:17 2009
+++ src/sys/dev/cardbus/cardslot.c Tue May 12 14:17:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cardslot.c,v 1.48 2009/05/12 12:11:17 cegger Exp $ */
+/* $NetBSD: cardslot.c,v 1.49 2009/05/12 14:17:31 cegger Exp $ */
/*
* Copyright (c) 1999 and 2000
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.48 2009/05/12 12:11:17 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.49 2009/05/12 14:17:31 cegger Exp $");
#include "opt_cardslot.h"
@@ -64,15 +64,15 @@
-STATIC void cardslotattach(struct device *, struct device *, void *);
+STATIC void cardslotattach(device_t, device_t, void *);
STATIC int cardslotdetach(device_t, int);
-STATIC int cardslotmatch(struct device *, cfdata_t, void *);
+STATIC int cardslotmatch(device_t, cfdata_t, void *);
static void cardslot_event_thread(void *arg);
STATIC int cardslot_cb_print(void *aux, const char *pcic);
static int cardslot_16_print(void *, const char *);
-static int cardslot_16_submatch(struct device *, cfdata_t,
+static int cardslot_16_submatch(device_t, cfdata_t,
const int *, void *);
CFATTACH_DECL3_NEW(cardslot, sizeof(struct cardslot_softc),
@@ -80,7 +80,7 @@
DVF_DETACH_SHUTDOWN);
STATIC int
-cardslotmatch(struct device *parent, cfdata_t cf,
+cardslotmatch(device_t parent, cfdata_t cf,
void *aux)
{
struct cardslot_attach_args *caa = aux;
@@ -96,7 +96,7 @@
STATIC void
-cardslotattach(struct device *parent, struct device *self,
+cardslotattach(device_t parent, device_t self,
void *aux)
{
struct cardslot_softc *sc = device_private(self);
@@ -204,7 +204,7 @@
static int
-cardslot_16_submatch(struct device *parent, cfdata_t cf,
+cardslot_16_submatch(device_t parent, cfdata_t cf,
const int *ldesc, void *aux)
{
@@ -375,7 +375,7 @@
}
if (sc->sc_16_softc) {
CARDSLOT_SET_CARDTYPE(sc->sc_status, CARDSLOT_STATUS_CARD_16);
- if (pcmcia_card_attach((struct device *)sc->sc_16_softc)) {
+ if (pcmcia_card_attach((device_t)sc->sc_16_softc)) {
/* Do not attach */
CARDSLOT_SET_WORK(sc->sc_status,
CARDSLOT_STATUS_NOTWORK);
Index: src/sys/dev/cardbus/if_fxp_cardbus.c
diff -u src/sys/dev/cardbus/if_fxp_cardbus.c:1.38 src/sys/dev/cardbus/if_fxp_cardbus.c:1.39
--- src/sys/dev/cardbus/if_fxp_cardbus.c:1.38 Tue May 12 12:11:17 2009
+++ src/sys/dev/cardbus/if_fxp_cardbus.c Tue May 12 14:17:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fxp_cardbus.c,v 1.38 2009/05/12 12:11:17 cegger Exp $ */
+/* $NetBSD: if_fxp_cardbus.c,v 1.39 2009/05/12 14:17:31 cegger Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.38 2009/05/12 12:11:17 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.39 2009/05/12 14:17:31 cegger Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -111,7 +111,7 @@
#endif
static int
-fxp_cardbus_match(struct device *parent, cfdata_t match,
+fxp_cardbus_match(device_t parent, cfdata_t match,
void *aux)
{
struct cardbus_attach_args *ca = aux;
@@ -124,7 +124,7 @@
}
static void
-fxp_cardbus_attach(struct device *parent, struct device *self,
+fxp_cardbus_attach(device_t parent, device_t self,
void *aux)
{
struct fxp_cardbus_softc *csc = device_private(self);
Index: src/sys/dev/cardbus/if_ral_cardbus.c
diff -u src/sys/dev/cardbus/if_ral_cardbus.c:1.15 src/sys/dev/cardbus/if_ral_cardbus.c:1.16
--- src/sys/dev/cardbus/if_ral_cardbus.c:1.15 Tue May 12 12:11:17 2009
+++ src/sys/dev/cardbus/if_ral_cardbus.c Tue May 12 14:17:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ral_cardbus.c,v 1.15 2009/05/12 12:11:17 cegger Exp $ */
+/* $NetBSD: if_ral_cardbus.c,v 1.16 2009/05/12 14:17:31 cegger Exp $ */
/* $OpenBSD: if_ral_cardbus.c,v 1.6 2006/01/09 20:03:31 damien Exp $ */
/*-
@@ -22,7 +22,7 @@
* CardBus front-end for the Ralink RT2560/RT2561/RT2561S/RT2661 driver.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ral_cardbus.c,v 1.15 2009/05/12 12:11:17 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ral_cardbus.c,v 1.16 2009/05/12 14:17:31 cegger Exp $");
#include "bpfilter.h"
@@ -93,9 +93,9 @@
cardbus_intr_line_t sc_intrline;
};
-int ral_cardbus_match(struct device *, cfdata_t, void *);
-void ral_cardbus_attach(struct device *, struct device *, void *);
-int ral_cardbus_detach(struct device *, int);
+int ral_cardbus_match(device_t, cfdata_t, void *);
+void ral_cardbus_attach(device_t, device_t, void *);
+int ral_cardbus_detach(device_t, int);
CFATTACH_DECL(ral_cardbus, sizeof (struct ral_cardbus_softc),
ral_cardbus_match, ral_cardbus_attach, ral_cardbus_detach, NULL);
@@ -106,7 +106,7 @@
void ral_cardbus_setup(struct ral_cardbus_softc *);
int
-ral_cardbus_match(struct device *parent,
+ral_cardbus_match(device_t parent,
cfdata_t cfdata, void *aux)
{
struct cardbus_attach_args *ca = aux;
@@ -127,7 +127,7 @@
}
void
-ral_cardbus_attach(struct device *parent, struct device *self,
+ral_cardbus_attach(device_t parent, device_t self,
void *aux)
{
struct ral_cardbus_softc *csc = (struct ral_cardbus_softc *)self;
@@ -180,7 +180,7 @@
}
int
-ral_cardbus_detach(struct device *self, int flags)
+ral_cardbus_detach(device_t self, int flags)
{
struct ral_cardbus_softc *csc = (struct ral_cardbus_softc *)self;
struct rt2560_softc *sc = &csc->sc_sc;
Index: src/sys/dev/cardbus/njata_cardbus.c
diff -u src/sys/dev/cardbus/njata_cardbus.c:1.7 src/sys/dev/cardbus/njata_cardbus.c:1.8
--- src/sys/dev/cardbus/njata_cardbus.c:1.7 Tue Jun 24 19:44:52 2008
+++ src/sys/dev/cardbus/njata_cardbus.c Tue May 12 14:17:31 2009
@@ -1,4 +1,4 @@
-/* $Id: njata_cardbus.c,v 1.7 2008/06/24 19:44:52 drochner Exp $ */
+/* $Id: njata_cardbus.c,v 1.8 2009/05/12 14:17:31 cegger Exp $ */
/*
* Copyright (c) 2006 ITOH Yasufumi <it...@netbsd.org>.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: njata_cardbus.c,v 1.7 2008/06/24 19:44:52 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: njata_cardbus.c,v 1.8 2009/05/12 14:17:31 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -66,7 +66,7 @@
(const struct cardbus_attach_args *);
static int njata_cardbus_match(device_t, cfdata_t, void *);
static void njata_cardbus_attach(device_t, device_t, void *);
-static int njata_cardbus_detach(struct device *, int);
+static int njata_cardbus_detach(device_t, int);
CFATTACH_DECL_NEW(njata_cardbus, sizeof(struct njata32_cardbus_softc),
njata_cardbus_match, njata_cardbus_attach, njata_cardbus_detach, NULL);
Index: src/sys/dev/cardbus/njs_cardbus.c
diff -u src/sys/dev/cardbus/njs_cardbus.c:1.10 src/sys/dev/cardbus/njs_cardbus.c:1.11
--- src/sys/dev/cardbus/njs_cardbus.c:1.10 Wed Jul 9 19:08:44 2008
+++ src/sys/dev/cardbus/njs_cardbus.c Tue May 12 14:17:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: njs_cardbus.c,v 1.10 2008/07/09 19:08:44 joerg Exp $ */
+/* $NetBSD: njs_cardbus.c,v 1.11 2009/05/12 14:17:31 cegger Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: njs_cardbus.c,v 1.10 2008/07/09 19:08:44 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: njs_cardbus.c,v 1.11 2009/05/12 14:17:31 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -227,7 +227,7 @@
}
static int
-njs_cardbus_detach(struct device *self, int flags)
+njs_cardbus_detach(device_t self, int flags)
{
struct njsc32_cardbus_softc *csc = device_private(self);
struct njsc32_softc *sc = &csc->sc_njsc32;
Index: src/sys/dev/cardbus/rbus_ppb.c
diff -u src/sys/dev/cardbus/rbus_ppb.c:1.30 src/sys/dev/cardbus/rbus_ppb.c:1.31
--- src/sys/dev/cardbus/rbus_ppb.c:1.30 Tue May 12 12:11:17 2009
+++ src/sys/dev/cardbus/rbus_ppb.c Tue May 12 14:17:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rbus_ppb.c,v 1.30 2009/05/12 12:11:17 cegger Exp $ */
+/* $NetBSD: rbus_ppb.c,v 1.31 2009/05/12 14:17:31 cegger Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.30 2009/05/12 12:11:17 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.31 2009/05/12 14:17:31 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -75,13 +75,13 @@
struct ppb_softc;
-static int ppb_cardbus_match(struct device *, cfdata_t, void *);
-static void ppb_cardbus_attach(struct device *, struct device *, void *);
-static int ppb_cardbus_detach(struct device * self, int flags);
+static int ppb_cardbus_match(device_t, cfdata_t, void *);
+static void ppb_cardbus_attach(device_t, device_t, void *);
+static int ppb_cardbus_detach(device_t self, int flags);
/*static*/ void ppb_cardbus_setup(struct ppb_softc * sc);
/*static*/ int ppb_cardbus_enable(struct ppb_softc * sc);
/*static*/ void ppb_cardbus_disable(struct ppb_softc * sc);
-static int ppb_activate(struct device *, enum devact);
+static int ppb_activate(device_t, enum devact);
int rppbprint(void *, const char *);
int rbus_intr_fixup(pci_chipset_tag_t, int, int, int);
void rbus_do_header_fixup(pci_chipset_tag_t, pcitag_t, void *);
@@ -116,7 +116,7 @@
#endif
static int
-ppb_cardbus_match(struct device *parent, cfdata_t match, void *aux)
+ppb_cardbus_match(device_t parent, cfdata_t match, void *aux)
{
struct cardbus_attach_args *ca = aux;
@@ -814,7 +814,7 @@
}
static int
-ppb_cardbus_detach(struct device *self, int flags)
+ppb_cardbus_detach(device_t self, int flags)
{
/* struct ppb_softc *sc = device_private(self);*/
struct ppb_cardbus_softc *csc = device_private(self);
@@ -853,7 +853,7 @@
}
int
-ppb_activate(struct device *self, enum devact act)
+ppb_activate(device_t self, enum devact act)
{
printf("ppb_activate called\n");
return 0;
