Module Name: src
Committed By: cegger
Date: Tue May 12 12:18:45 UTC 2009
Modified Files:
src/sys/dev/marvell: gt.c gti2c.c gtidma.c gtmpsc.c gtpci.c if_gfe.c
obio.c
Log Message:
struct cfdata * -> cfdata_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/marvell/gt.c \
src/sys/dev/marvell/gtpci.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/marvell/gti2c.c \
src/sys/dev/marvell/obio.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/marvell/gtidma.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/marvell/gtmpsc.c
cvs rdiff -u -r1.31 -r1.32 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.19 src/sys/dev/marvell/gt.c:1.20
--- src/sys/dev/marvell/gt.c:1.19 Wed Mar 18 10:22:40 2009
+++ src/sys/dev/marvell/gt.c Tue May 12 12:18:45 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gt.c,v 1.19 2009/03/18 10:22:40 cegger Exp $ */
+/* $NetBSD: gt.c,v 1.20 2009/05/12 12:18:45 cegger Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.19 2009/03/18 10:22:40 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.20 2009/05/12 12:18:45 cegger Exp $");
#include "opt_marvell.h"
#include "locators.h"
@@ -115,7 +115,7 @@
static int
-gt_cfsearch(struct device *parent, struct cfdata *cf,
+gt_cfsearch(struct device *parent, cfdata_t cf,
const int *ldesc, void *aux)
{
struct gt_softc *gt = (struct gt_softc *) parent;
Index: src/sys/dev/marvell/gtpci.c
diff -u src/sys/dev/marvell/gtpci.c:1.19 src/sys/dev/marvell/gtpci.c:1.20
--- src/sys/dev/marvell/gtpci.c:1.19 Fri Apr 11 06:25:25 2008
+++ src/sys/dev/marvell/gtpci.c Tue May 12 12:18:45 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gtpci.c,v 1.19 2008/04/11 06:25:25 he Exp $ */
+/* $NetBSD: gtpci.c,v 1.20 2009/05/12 12:18:45 cegger Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtpci.c,v 1.19 2008/04/11 06:25:25 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtpci.c,v 1.20 2009/05/12 12:18:45 cegger Exp $");
#include "opt_marvell.h"
#include <sys/param.h>
@@ -87,7 +87,7 @@
};
static int gtpci_cfprint(void *, const char *);
-static int gtpci_match(struct device *, struct cfdata *, void *);
+static int gtpci_match(struct device *, cfdata_t, void *);
static void gtpci_attach(struct device *, struct device *, void *);
CFATTACH_DECL(gtpci, sizeof(struct gtpci_softc),
@@ -194,7 +194,7 @@
};
int
-gtpci_match(struct device *parent, struct cfdata *self, void *aux)
+gtpci_match(struct device *parent, cfdata_t self, void *aux)
{
struct gt_softc * const gt = device_private(parent);
struct gt_attach_args * const ga = aux;
Index: src/sys/dev/marvell/gti2c.c
diff -u src/sys/dev/marvell/gti2c.c:1.10 src/sys/dev/marvell/gti2c.c:1.11
--- src/sys/dev/marvell/gti2c.c:1.10 Tue Apr 8 20:40:42 2008
+++ src/sys/dev/marvell/gti2c.c Tue May 12 12:18:45 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gti2c.c,v 1.10 2008/04/08 20:40:42 cegger Exp $ */
+/* $NetBSD: gti2c.c,v 1.11 2009/05/12 12:18:45 cegger Exp $ */
/*
* Copyright (c) 2005 Brocade Communcations, inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gti2c.c,v 1.10 2008/04/08 20:40:42 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gti2c.c,v 1.11 2009/05/12 12:18:45 cegger Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -57,7 +57,7 @@
kmutex_t sc_lock;
};
-static int gt_i2c_match(struct device *, struct cfdata *, void *);
+static int gt_i2c_match(struct device *, cfdata_t, void *);
static void gt_i2c_attach(struct device *, struct device *, void *);
CFATTACH_DECL(gtiic, sizeof(struct gti2c_softc),
@@ -231,7 +231,7 @@
}
int
-gt_i2c_match(struct device *parent, struct cfdata *cfdata, void *aux)
+gt_i2c_match(struct device *parent, cfdata_t cfdata, void *aux)
{
struct gt_softc * const gt = device_private(parent);
struct gt_attach_args * const ga = aux;
Index: src/sys/dev/marvell/obio.c
diff -u src/sys/dev/marvell/obio.c:1.10 src/sys/dev/marvell/obio.c:1.11
--- src/sys/dev/marvell/obio.c:1.10 Fri Oct 19 12:00:34 2007
+++ src/sys/dev/marvell/obio.c Tue May 12 12:18:45 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.10 2007/10/19 12:00:34 ad Exp $ */
+/* $NetBSD: obio.c,v 1.11 2009/05/12 12:18:45 cegger Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.10 2007/10/19 12:00:34 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.11 2009/05/12 12:18:45 cegger Exp $");
#include "opt_marvell.h"
@@ -71,8 +71,8 @@
#include "locators.h"
static int obio_cfprint(void *, const char *);
-static int obio_cfmatch(struct device *, struct cfdata *, void *);
-static int obio_cfsearch(struct device *, struct cfdata *,
+static int obio_cfmatch(struct device *, cfdata_t, void *);
+static int obio_cfsearch(struct device *, cfdata_t,
const int *, void *);
static void obio_cfattach(struct device *, struct device *, void *);
@@ -118,7 +118,7 @@
int
-obio_cfsearch(struct device *parent, struct cfdata *cf,
+obio_cfsearch(struct device *parent, cfdata_t cf,
const int *ldesc, void *aux)
{
struct obio_softc *sc = (struct obio_softc *) parent;
@@ -137,7 +137,7 @@
}
int
-obio_cfmatch(struct device *parent, struct cfdata *cf, void *aux)
+obio_cfmatch(struct device *parent, cfdata_t cf, void *aux)
{
struct gt_softc * const gt = (struct gt_softc *)parent;
struct gt_attach_args * const ga = aux;
Index: src/sys/dev/marvell/gtidma.c
diff -u src/sys/dev/marvell/gtidma.c:1.16 src/sys/dev/marvell/gtidma.c:1.17
--- src/sys/dev/marvell/gtidma.c:1.16 Wed Mar 18 10:22:40 2009
+++ src/sys/dev/marvell/gtidma.c Tue May 12 12:18:45 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gtidma.c,v 1.16 2009/03/18 10:22:40 cegger Exp $ */
+/* $NetBSD: gtidma.c,v 1.17 2009/05/12 12:18:45 cegger Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtidma.c,v 1.16 2009/03/18 10:22:40 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtidma.c,v 1.17 2009/05/12 12:18:45 cegger Exp $");
#include "opt_idma.h"
#include "opt_ddb.h"
@@ -229,7 +229,7 @@
STATIC void idma_attach (struct device *, struct device *, void *);
-STATIC int idma_match (struct device *, struct cfdata *, void *);
+STATIC int idma_match (struct device *, cfdata_t, void *);
STATIC void idma_chan_init
(idma_softc_t *, idma_chan_t *, unsigned int);
STATIC void idma_arb_init(idma_softc_t *);
@@ -266,7 +266,7 @@
STATIC int
idma_match(
struct device * const parent,
- struct cfdata * const self,
+ cfdata_t const self,
void *const aux)
{
struct gt_attach_args * const ga = (struct gt_attach_args *)aux;
Index: src/sys/dev/marvell/gtmpsc.c
diff -u src/sys/dev/marvell/gtmpsc.c:1.35 src/sys/dev/marvell/gtmpsc.c:1.36
--- src/sys/dev/marvell/gtmpsc.c:1.35 Sat Apr 18 14:58:03 2009
+++ src/sys/dev/marvell/gtmpsc.c Tue May 12 12:18:45 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gtmpsc.c,v 1.35 2009/04/18 14:58:03 tsutsui Exp $ */
+/* $NetBSD: gtmpsc.c,v 1.36 2009/05/12 12:18:45 cegger Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtmpsc.c,v 1.35 2009/04/18 14:58:03 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtmpsc.c,v 1.36 2009/05/12 12:18:45 cegger Exp $");
#include "opt_kgdb.h"
@@ -118,7 +118,7 @@
#define GTMPSCDIALOUT(x) (minor(x) & GTMPSCDIALOUT_MASK)
STATIC void gtmpscinit(struct gtmpsc_softc *);
-STATIC int gtmpscmatch(struct device *, struct cfdata *, void *);
+STATIC int gtmpscmatch(struct device *, cfdata_t, void *);
STATIC void gtmpscattach(struct device *, struct device *, void *);
STATIC int compute_cdv(unsigned int);
STATIC void gtmpsc_loadchannelregs(struct gtmpsc_softc *);
@@ -419,7 +419,7 @@
}
STATIC int
-gtmpscmatch(struct device *parent, struct cfdata *self, void *aux)
+gtmpscmatch(struct device *parent, cfdata_t self, void *aux)
{
struct gt_softc *gt = device_private(parent);
struct gt_attach_args *ga = aux;
Index: src/sys/dev/marvell/if_gfe.c
diff -u src/sys/dev/marvell/if_gfe.c:1.31 src/sys/dev/marvell/if_gfe.c:1.32
--- src/sys/dev/marvell/if_gfe.c:1.31 Fri Nov 7 00:20:07 2008
+++ src/sys/dev/marvell/if_gfe.c Tue May 12 12:18:45 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gfe.c,v 1.31 2008/11/07 00:20:07 dyoung Exp $ */
+/* $NetBSD: if_gfe.c,v 1.32 2009/05/12 12:18:45 cegger Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.31 2008/11/07 00:20:07 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.32 2009/05/12 12:18:45 cegger Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -144,7 +144,7 @@
#define STATIC
-STATIC int gfe_match (struct device *, struct cfdata *, void *);
+STATIC int gfe_match (struct device *, cfdata_t, void *);
STATIC void gfe_attach (struct device *, struct device *, void *);
STATIC int gfe_dmamem_alloc(struct gfe_softc *, struct gfe_dmamem *, int,
@@ -196,7 +196,7 @@
extern struct cfdriver gfe_cd;
int
-gfe_match(struct device *parent, struct cfdata *cf, void *aux)
+gfe_match(struct device *parent, cfdata_t cf, void *aux)
{
struct gt_softc *gt = (struct gt_softc *) parent;
struct gt_attach_args *ga = aux;
