Module Name: src
Committed By: cegger
Date: Tue May 12 13:22:28 UTC 2009
Modified Files:
src/sys/dev/vme: if_ie_vme.c vme.c xd.c xy.c
Log Message:
struct cfdata * -> cfdata_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/vme/if_ie_vme.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/vme/vme.c
cvs rdiff -u -r1.84 -r1.85 src/sys/dev/vme/xd.c
cvs rdiff -u -r1.88 -r1.89 src/sys/dev/vme/xy.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/vme/if_ie_vme.c
diff -u src/sys/dev/vme/if_ie_vme.c:1.25 src/sys/dev/vme/if_ie_vme.c:1.26
--- src/sys/dev/vme/if_ie_vme.c:1.25 Sat Mar 14 15:36:21 2009
+++ src/sys/dev/vme/if_ie_vme.c Tue May 12 13:22:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie_vme.c,v 1.25 2009/03/14 15:36:21 dsl Exp $ */
+/* $NetBSD: if_ie_vme.c,v 1.26 2009/05/12 13:22:28 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.25 2009/03/14 15:36:21 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie_vme.c,v 1.26 2009/05/12 13:22:28 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -238,7 +238,7 @@
static void ie_vmerun(struct ie_softc *);
static int ie_vmeintr(struct ie_softc *, int);
-int ie_vme_match(struct device *, struct cfdata *, void *);
+int ie_vme_match(struct device *, cfdata_t, void *);
void ie_vme_attach(struct device *, struct device *, void *);
struct ie_vme_softc {
@@ -414,7 +414,7 @@
}
int
-ie_vme_match(struct device *parent, struct cfdata *cf, void *aux)
+ie_vme_match(struct device *parent, cfdata_t cf, void *aux)
{
struct vme_attach_args *va = aux;
vme_chipset_tag_t ct = va->va_vct;
Index: src/sys/dev/vme/vme.c
diff -u src/sys/dev/vme/vme.c:1.21 src/sys/dev/vme/vme.c:1.22
--- src/sys/dev/vme/vme.c:1.21 Sat Mar 14 21:04:23 2009
+++ src/sys/dev/vme/vme.c Tue May 12 13:22:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vme.c,v 1.21 2009/03/14 21:04:23 dsl Exp $ */
+/* $NetBSD: vme.c,v 1.22 2009/05/12 13:22:28 cegger Exp $ */
/*
* Copyright (c) 1999
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.21 2009/03/14 21:04:23 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.22 2009/05/12 13:22:28 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,7 +47,7 @@
const int *, void*);
static int vmesubmatch(struct device*, struct cfdata*,
const int *, void*);
-int vmematch(struct device *, struct cfdata *, void *);
+int vmematch(struct device *, 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 @@
* devices are attached.
*/
static int
-vmesubmatch1(struct device *bus, struct cfdata *dev, const int *ldesc, void *aux)
+vmesubmatch1(struct device *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 @@
}
static int
-vmesubmatch(struct device *bus, struct cfdata *dev, const int *ldesc, void *aux)
+vmesubmatch(struct device *bus, cfdata_t dev, const int *ldesc, void *aux)
{
struct vmebus_softc *sc = (struct vmebus_softc*)bus;
struct vme_attach_args v;
@@ -161,7 +161,7 @@
}
int
-vmematch(struct device *parent, struct cfdata *match, void *aux)
+vmematch(struct device *parent, cfdata_t match, void *aux)
{
return (1);
}
Index: src/sys/dev/vme/xd.c
diff -u src/sys/dev/vme/xd.c:1.84 src/sys/dev/vme/xd.c:1.85
--- src/sys/dev/vme/xd.c:1.84 Sat Apr 18 14:58:04 2009
+++ src/sys/dev/vme/xd.c Tue May 12 13:22:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: xd.c,v 1.84 2009/04/18 14:58:04 tsutsui Exp $ */
+/* $NetBSD: xd.c,v 1.85 2009/05/12 13:22:28 cegger Exp $ */
/*
*
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.84 2009/04/18 14:58:04 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.85 2009/05/12 13:22:28 cegger Exp $");
#undef XDC_DEBUG /* full debug */
#define XDC_DIAG /* extra sanity checks */
@@ -241,9 +241,9 @@
int xdcintr(void *);
/* autoconf */
-int xdcmatch(struct device *, struct cfdata *, void *);
+int xdcmatch(struct device *, cfdata_t, void *);
void xdcattach(struct device *, struct device *, void *);
-int xdmatch(struct device *, struct cfdata *, void *);
+int xdmatch(struct device *, cfdata_t, void *);
void xdattach(struct device *, struct device *, void *);
static int xdc_probe(void *, bus_space_tag_t, bus_space_handle_t);
@@ -452,7 +452,7 @@
int xdcmatch(parent, cf, aux)
struct device *parent;
- struct cfdata *cf;
+ cfdata_t cf;
void *aux;
{
struct vme_attach_args *va = aux;
@@ -681,7 +681,7 @@
* call xdattach!).
*/
int
-xdmatch(struct device *parent, struct cfdata *cf, void *aux)
+xdmatch(struct device *parent, cfdata_t cf, void *aux)
{
struct xdc_attach_args *xa = aux;
Index: src/sys/dev/vme/xy.c
diff -u src/sys/dev/vme/xy.c:1.88 src/sys/dev/vme/xy.c:1.89
--- src/sys/dev/vme/xy.c:1.88 Sat Apr 18 14:58:04 2009
+++ src/sys/dev/vme/xy.c Tue May 12 13:22:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: xy.c,v 1.88 2009/04/18 14:58:04 tsutsui Exp $ */
+/* $NetBSD: xy.c,v 1.89 2009/05/12 13:22:28 cegger Exp $ */
/*
*
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.88 2009/04/18 14:58:04 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.89 2009/05/12 13:22:28 cegger Exp $");
#undef XYC_DEBUG /* full debug */
#undef XYC_DIAG /* extra sanity checks */
@@ -183,9 +183,9 @@
int xycintr(void *);
/* autoconf */
-int xycmatch(struct device *, struct cfdata *, void *);
+int xycmatch(struct device *, cfdata_t, void *);
void xycattach(struct device *, struct device *, void *);
-int xymatch(struct device *, struct cfdata *, void *);
+int xymatch(struct device *, cfdata_t, void *);
void xyattach(struct device *, struct device *, void *);
static int xyc_probe(void *, bus_space_tag_t, bus_space_handle_t);
@@ -363,7 +363,7 @@
int xycmatch(parent, cf, aux)
struct device *parent;
- struct cfdata *cf;
+ cfdata_t cf;
void *aux;
{
struct vme_attach_args *va = aux;
@@ -579,7 +579,7 @@
* call xyattach!).
*/
int
-xymatch(struct device *parent, struct cfdata *cf, void *aux)
+xymatch(struct device *parent, cfdata_t cf, void *aux)
{
struct xyc_attach_args *xa = aux;
