Module Name: src
Committed By: cegger
Date: Tue May 12 14:30:25 UTC 2009
Modified Files:
src/sys/dev/marvell: gt.c gti2c.c gtidma.c gtmpsc.c gtpci.c gtvar.h
if_gfe.c obio.c
Log Message:
struct device * -> device_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/marvell/gt.c \
src/sys/dev/marvell/gtpci.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/marvell/gti2c.c \
src/sys/dev/marvell/obio.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/marvell/gtidma.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/marvell/gtmpsc.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/marvell/gtvar.h
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/marvell/if_gfe.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/marvell/gt.c
diff -u src/sys/dev/marvell/gt.c:1.20 src/sys/dev/marvell/gt.c:1.21
--- src/sys/dev/marvell/gt.c:1.20 Tue May 12 12:18:45 2009
+++ src/sys/dev/marvell/gt.c Tue May 12 14:30:25 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gt.c,v 1.20 2009/05/12 12:18:45 cegger Exp $ */
+/* $NetBSD: gt.c,v 1.21 2009/05/12 14:30:25 cegger Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.20 2009/05/12 12:18:45 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.21 2009/05/12 14:30:25 cegger Exp $");
#include "opt_marvell.h"
#include "locators.h"
@@ -115,7 +115,7 @@
static int
-gt_cfsearch(struct device *parent, cfdata_t cf,
+gt_cfsearch(device_t parent, cfdata_t cf,
const int *ldesc, void *aux)
{
struct gt_softc *gt = (struct gt_softc *) parent;
@@ -932,8 +932,8 @@
int
gt_mii_read(
- struct device *child,
- struct device *parent,
+ device_t child,
+ device_t parent,
int phy,
int reg)
{
@@ -973,8 +973,8 @@
void
gt_mii_write (
- struct device *child,
- struct device *parent,
+ device_t child,
+ device_t parent,
int phy, int reg,
int value)
{
Index: src/sys/dev/marvell/gtpci.c
diff -u src/sys/dev/marvell/gtpci.c:1.20 src/sys/dev/marvell/gtpci.c:1.21
--- src/sys/dev/marvell/gtpci.c:1.20 Tue May 12 12:18:45 2009
+++ src/sys/dev/marvell/gtpci.c Tue May 12 14:30:25 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gtpci.c,v 1.20 2009/05/12 12:18:45 cegger Exp $ */
+/* $NetBSD: gtpci.c,v 1.21 2009/05/12 14:30:25 cegger Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtpci.c,v 1.20 2009/05/12 12:18:45 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtpci.c,v 1.21 2009/05/12 14:30:25 cegger Exp $");
#include "opt_marvell.h"
#include <sys/param.h>
@@ -65,7 +65,7 @@
static void gtpci_bus_init(struct gtpci_chipset *);
-static void gtpci_bus_attach_hook(struct device *, struct device *,
+static void gtpci_bus_attach_hook(device_t, device_t,
struct pcibus_attach_args *);
static int gtpci_bus_maxdevs(pci_chipset_tag_t, int);
@@ -87,8 +87,8 @@
};
static int gtpci_cfprint(void *, const char *);
-static int gtpci_match(struct device *, cfdata_t, void *);
-static void gtpci_attach(struct device *, struct device *, void *);
+static int gtpci_match(device_t, cfdata_t, void *);
+static void gtpci_attach(device_t, device_t, void *);
CFATTACH_DECL(gtpci, sizeof(struct gtpci_softc),
gtpci_match, gtpci_attach, NULL, NULL);
@@ -194,7 +194,7 @@
};
int
-gtpci_match(struct device *parent, cfdata_t self, void *aux)
+gtpci_match(device_t parent, cfdata_t self, void *aux)
{
struct gt_softc * const gt = device_private(parent);
struct gt_attach_args * const ga = aux;
@@ -216,7 +216,7 @@
}
void
-gtpci_attach(struct device *parent, struct device *self, void *aux)
+gtpci_attach(device_t parent, device_t self, void *aux)
{
struct pcibus_attach_args pba;
struct gt_attach_args * const ga = aux;
@@ -452,7 +452,7 @@
}
void
-gtpci_bus_attach_hook(struct device *parent, struct device *self,
+gtpci_bus_attach_hook(device_t parent, device_t self,
struct pcibus_attach_args *pba)
{
struct gtpci_chipset *gtpc = (struct gtpci_chipset *) pba->pba_pc;
Index: src/sys/dev/marvell/gti2c.c
diff -u src/sys/dev/marvell/gti2c.c:1.11 src/sys/dev/marvell/gti2c.c:1.12
--- src/sys/dev/marvell/gti2c.c:1.11 Tue May 12 12:18:45 2009
+++ src/sys/dev/marvell/gti2c.c Tue May 12 14:30:25 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gti2c.c,v 1.11 2009/05/12 12:18:45 cegger Exp $ */
+/* $NetBSD: gti2c.c,v 1.12 2009/05/12 14:30:25 cegger Exp $ */
/*
* Copyright (c) 2005 Brocade Communcations, inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gti2c.c,v 1.11 2009/05/12 12:18:45 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gti2c.c,v 1.12 2009/05/12 14:30:25 cegger Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -57,8 +57,8 @@
kmutex_t sc_lock;
};
-static int gt_i2c_match(struct device *, cfdata_t, void *);
-static void gt_i2c_attach(struct device *, struct device *, void *);
+static int gt_i2c_match(device_t, cfdata_t, void *);
+static void gt_i2c_attach(device_t, device_t, void *);
CFATTACH_DECL(gtiic, sizeof(struct gti2c_softc),
gt_i2c_match, gt_i2c_attach, NULL, NULL);
@@ -231,7 +231,7 @@
}
int
-gt_i2c_match(struct device *parent, cfdata_t cfdata, void *aux)
+gt_i2c_match(device_t parent, cfdata_t cfdata, void *aux)
{
struct gt_softc * const gt = device_private(parent);
struct gt_attach_args * const ga = aux;
@@ -240,7 +240,7 @@
}
void
-gt_i2c_attach(struct device *parent, struct device *self, void *aux)
+gt_i2c_attach(device_t parent, device_t self, void *aux)
{
struct gt_softc * const gt = device_private(parent);
struct gti2c_softc * const sc = device_private(self);
Index: src/sys/dev/marvell/obio.c
diff -u src/sys/dev/marvell/obio.c:1.11 src/sys/dev/marvell/obio.c:1.12
--- src/sys/dev/marvell/obio.c:1.11 Tue May 12 12:18:45 2009
+++ src/sys/dev/marvell/obio.c Tue May 12 14:30:25 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.11 2009/05/12 12:18:45 cegger Exp $ */
+/* $NetBSD: obio.c,v 1.12 2009/05/12 14:30:25 cegger Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.11 2009/05/12 12:18:45 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.12 2009/05/12 14:30:25 cegger Exp $");
#include "opt_marvell.h"
@@ -71,10 +71,10 @@
#include "locators.h"
static int obio_cfprint(void *, const char *);
-static int obio_cfmatch(struct device *, cfdata_t, void *);
-static int obio_cfsearch(struct device *, cfdata_t,
+static int obio_cfmatch(device_t, cfdata_t, void *);
+static int obio_cfsearch(device_t, cfdata_t,
const int *, void *);
-static void obio_cfattach(struct device *, struct device *, void *);
+static void obio_cfattach(device_t, device_t, void *);
struct obio_softc {
struct device sc_dev;
@@ -118,7 +118,7 @@
int
-obio_cfsearch(struct device *parent, cfdata_t cf,
+obio_cfsearch(device_t parent, cfdata_t cf,
const int *ldesc, void *aux)
{
struct obio_softc *sc = (struct obio_softc *) parent;
@@ -137,7 +137,7 @@
}
int
-obio_cfmatch(struct device *parent, cfdata_t cf, void *aux)
+obio_cfmatch(device_t parent, cfdata_t cf, void *aux)
{
struct gt_softc * const gt = (struct gt_softc *)parent;
struct gt_attach_args * const ga = aux;
@@ -146,7 +146,7 @@
}
void
-obio_cfattach(struct device *parent, struct device *self, void *aux)
+obio_cfattach(device_t parent, device_t self, void *aux)
{
struct gt_softc * const gt = device_private(parent);
struct obio_softc *sc = device_private(self);
Index: src/sys/dev/marvell/gtidma.c
diff -u src/sys/dev/marvell/gtidma.c:1.17 src/sys/dev/marvell/gtidma.c:1.18
--- src/sys/dev/marvell/gtidma.c:1.17 Tue May 12 12:18:45 2009
+++ src/sys/dev/marvell/gtidma.c Tue May 12 14:30:25 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gtidma.c,v 1.17 2009/05/12 12:18:45 cegger Exp $ */
+/* $NetBSD: gtidma.c,v 1.18 2009/05/12 14:30:25 cegger Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtidma.c,v 1.17 2009/05/12 12:18:45 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtidma.c,v 1.18 2009/05/12 14:30:25 cegger Exp $");
#include "opt_idma.h"
#include "opt_ddb.h"
@@ -228,8 +228,8 @@
#endif /* IDMA_COHERENT */
-STATIC void idma_attach (struct device *, struct device *, void *);
-STATIC int idma_match (struct device *, cfdata_t, void *);
+STATIC void idma_attach (device_t, device_t, void *);
+STATIC int idma_match (device_t, cfdata_t, void *);
STATIC void idma_chan_init
(idma_softc_t *, idma_chan_t *, unsigned int);
STATIC void idma_arb_init(idma_softc_t *);
@@ -265,7 +265,7 @@
STATIC int
idma_match(
- struct device * const parent,
+ device_t const parent,
cfdata_t const self,
void *const aux)
{
@@ -279,8 +279,8 @@
STATIC void
idma_attach(
- struct device * const parent,
- struct device * const self,
+ device_t const parent,
+ device_t const self,
void *const aux)
{
struct gt_softc * const gtsc = device_private(parent);
Index: src/sys/dev/marvell/gtmpsc.c
diff -u src/sys/dev/marvell/gtmpsc.c:1.36 src/sys/dev/marvell/gtmpsc.c:1.37
--- src/sys/dev/marvell/gtmpsc.c:1.36 Tue May 12 12:18:45 2009
+++ src/sys/dev/marvell/gtmpsc.c Tue May 12 14:30:25 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gtmpsc.c,v 1.36 2009/05/12 12:18:45 cegger Exp $ */
+/* $NetBSD: gtmpsc.c,v 1.37 2009/05/12 14:30:25 cegger Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtmpsc.c,v 1.36 2009/05/12 12:18:45 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtmpsc.c,v 1.37 2009/05/12 14:30:25 cegger Exp $");
#include "opt_kgdb.h"
@@ -118,8 +118,8 @@
#define GTMPSCDIALOUT(x) (minor(x) & GTMPSCDIALOUT_MASK)
STATIC void gtmpscinit(struct gtmpsc_softc *);
-STATIC int gtmpscmatch(struct device *, cfdata_t, void *);
-STATIC void gtmpscattach(struct device *, struct device *, void *);
+STATIC int gtmpscmatch(device_t, cfdata_t, void *);
+STATIC void gtmpscattach(device_t, device_t, void *);
STATIC int compute_cdv(unsigned int);
STATIC void gtmpsc_loadchannelregs(struct gtmpsc_softc *);
STATIC void gtmpscshutdown(struct gtmpsc_softc *);
@@ -419,7 +419,7 @@
}
STATIC int
-gtmpscmatch(struct device *parent, cfdata_t self, void *aux)
+gtmpscmatch(device_t parent, cfdata_t self, void *aux)
{
struct gt_softc *gt = device_private(parent);
struct gt_attach_args *ga = aux;
@@ -428,7 +428,7 @@
}
STATIC void
-gtmpscattach(struct device *parent, struct device *self, void *aux)
+gtmpscattach(device_t parent, device_t self, void *aux)
{
struct gt_attach_args *ga = aux;
struct gt_softc *gt = device_private(parent);
Index: src/sys/dev/marvell/gtvar.h
diff -u src/sys/dev/marvell/gtvar.h:1.13 src/sys/dev/marvell/gtvar.h:1.14
--- src/sys/dev/marvell/gtvar.h:1.13 Wed Feb 21 23:00:00 2007
+++ src/sys/dev/marvell/gtvar.h Tue May 12 14:30:25 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gtvar.h,v 1.13 2007/02/21 23:00:00 thorpej Exp $ */
+/* $NetBSD: gtvar.h,v 1.14 2009/05/12 14:30:25 cegger Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -119,8 +119,8 @@
int gt_cfprint(void *, const char *);
/* int gt_bs_extent_init(struct discovery_bus_space *, char *); AKB */
-int gt_mii_read(struct device *, struct device *, int, int);
-void gt_mii_write(struct device *, struct device *, int, int, int);
+int gt_mii_read(device_t, device_t, int, int);
+void gt_mii_write(device_t, device_t, int, int, int);
int gtget_macaddr(struct gt_softc *,int, char *);
void gt_watchdog_service(void);
bus_addr_t gt_dma_phys_to_bus_mem(bus_dma_tag_t, bus_addr_t);
Index: src/sys/dev/marvell/if_gfe.c
diff -u src/sys/dev/marvell/if_gfe.c:1.32 src/sys/dev/marvell/if_gfe.c:1.33
--- src/sys/dev/marvell/if_gfe.c:1.32 Tue May 12 12:18:45 2009
+++ src/sys/dev/marvell/if_gfe.c Tue May 12 14:30:25 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gfe.c,v 1.32 2009/05/12 12:18:45 cegger Exp $ */
+/* $NetBSD: if_gfe.c,v 1.33 2009/05/12 14:30:25 cegger Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.32 2009/05/12 12:18:45 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.33 2009/05/12 14:30:25 cegger Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -144,8 +144,8 @@
#define STATIC
-STATIC int gfe_match (struct device *, cfdata_t, void *);
-STATIC void gfe_attach (struct device *, struct device *, void *);
+STATIC int gfe_match (device_t, cfdata_t, void *);
+STATIC void gfe_attach (device_t, device_t, void *);
STATIC int gfe_dmamem_alloc(struct gfe_softc *, struct gfe_dmamem *, int,
size_t, int);
@@ -155,9 +155,9 @@
STATIC void gfe_ifstart (struct ifnet *);
STATIC void gfe_ifwatchdog (struct ifnet *);
-STATIC int gfe_mii_read (struct device *, int, int);
-STATIC void gfe_mii_write (struct device *, int, int, int);
-STATIC void gfe_mii_statchg (struct device *);
+STATIC int gfe_mii_read (device_t, int, int);
+STATIC void gfe_mii_write (device_t, int, int, int);
+STATIC void gfe_mii_statchg (device_t);
STATIC void gfe_tick(void *arg);
@@ -196,7 +196,7 @@
extern struct cfdriver gfe_cd;
int
-gfe_match(struct device *parent, cfdata_t cf, void *aux)
+gfe_match(device_t parent, cfdata_t cf, void *aux)
{
struct gt_softc *gt = (struct gt_softc *) parent;
struct gt_attach_args *ga = aux;
@@ -219,7 +219,7 @@
* Attach this instance, and then all the sub-devices
*/
void
-gfe_attach(struct device *parent, struct device *self, void *aux)
+gfe_attach(device_t parent, device_t self, void *aux)
{
struct gt_attach_args * const ga = aux;
struct gt_softc * const gt = device_private(parent);
@@ -1480,19 +1480,19 @@
}
int
-gfe_mii_read (struct device *self, int phy, int reg)
+gfe_mii_read (device_t self, int phy, int reg)
{
return gt_mii_read(self, device_parent(self), phy, reg);
}
void
-gfe_mii_write (struct device *self, int phy, int reg, int value)
+gfe_mii_write (device_t self, int phy, int reg, int value)
{
gt_mii_write(self, device_parent(self), phy, reg, value);
}
void
-gfe_mii_statchg (struct device *self)
+gfe_mii_statchg (device_t self)
{
/* struct gfe_softc *sc = device_private(self); */
/* do nothing? */
