Module Name: src
Committed By: cegger
Date: Tue May 12 14:47:27 UTC 2009
Modified Files:
src/sys/dev/vme: if_ie_vme.c vme.c vmevar.h xd.c xy.c
Log Message:
struct device * -> device_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/vme/if_ie_vme.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/vme/vme.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/vme/vmevar.h
cvs rdiff -u -r1.85 -r1.86 src/sys/dev/vme/xd.c
cvs rdiff -u -r1.89 -r1.90 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.26 src/sys/dev/vme/if_ie_vme.c:1.27
--- src/sys/dev/vme/if_ie_vme.c:1.26 Tue May 12 13:22:28 2009
+++ src/sys/dev/vme/if_ie_vme.c Tue May 12 14:47:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie_vme.c,v 1.26 2009/05/12 13:22:28 cegger Exp $ */
+/* $NetBSD: if_ie_vme.c,v 1.27 2009/05/12 14:47:27 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.26 2009/05/12 13:22:28 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie_vme.c,v 1.27 2009/05/12 14:47:27 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -238,8 +238,8 @@
static void ie_vmerun(struct ie_softc *);
static int ie_vmeintr(struct ie_softc *, int);
-int ie_vme_match(struct device *, cfdata_t, void *);
-void ie_vme_attach(struct device *, struct device *, void *);
+int ie_vme_match(device_t, cfdata_t, void *);
+void ie_vme_attach(device_t, device_t, void *);
struct ie_vme_softc {
struct ie_softc ie;
@@ -414,7 +414,7 @@
}
int
-ie_vme_match(struct device *parent, cfdata_t cf, void *aux)
+ie_vme_match(device_t parent, cfdata_t cf, void *aux)
{
struct vme_attach_args *va = aux;
vme_chipset_tag_t ct = va->va_vct;
@@ -464,7 +464,7 @@
}
void
-ie_vme_attach(struct device *parent, struct device *self, void *aux)
+ie_vme_attach(device_t parent, device_t self, void *aux)
{
u_int8_t myaddr[ETHER_ADDR_LEN];
struct ie_vme_softc *vsc = (void *) self;
Index: src/sys/dev/vme/vme.c
diff -u src/sys/dev/vme/vme.c:1.22 src/sys/dev/vme/vme.c:1.23
--- src/sys/dev/vme/vme.c:1.22 Tue May 12 13:22:28 2009
+++ src/sys/dev/vme/vme.c Tue May 12 14:47:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vme.c,v 1.22 2009/05/12 13:22:28 cegger Exp $ */
+/* $NetBSD: vme.c,v 1.23 2009/05/12 14:47:27 cegger Exp $ */
/*
* Copyright (c) 1999
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.22 2009/05/12 13:22:28 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.23 2009/05/12 14:47:27 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 *, cfdata_t, void *);
+int vmematch(device_t, 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, cfdata_t dev, const int *ldesc, void *aux)
+vmesubmatch1(device_t 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, cfdata_t dev, const int *ldesc, void *aux)
+vmesubmatch(device_t bus, cfdata_t dev, const int *ldesc, void *aux)
{
struct vmebus_softc *sc = (struct vmebus_softc*)bus;
struct vme_attach_args v;
@@ -161,13 +161,13 @@
}
int
-vmematch(struct device *parent, cfdata_t match, void *aux)
+vmematch(device_t parent, cfdata_t match, void *aux)
{
return (1);
}
void
-vmeattach(struct device *parent, struct device *self, void *aux)
+vmeattach(device_t parent, device_t self, void *aux)
{
struct vmebus_softc *sc = (struct vmebus_softc *)self;
@@ -227,7 +227,7 @@
#ifdef notyet
int
-vmedetach(struct device *dev)
+vmedetach(device_t dev)
{
struct vmebus_softc *sc = (struct vmebus_softc*)dev;
Index: src/sys/dev/vme/vmevar.h
diff -u src/sys/dev/vme/vmevar.h:1.12 src/sys/dev/vme/vmevar.h:1.13
--- src/sys/dev/vme/vmevar.h:1.12 Sun Dec 11 12:24:07 2005
+++ src/sys/dev/vme/vmevar.h Tue May 12 14:47:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vmevar.h,v 1.12 2005/12/11 12:24:07 christos Exp $ */
+/* $NetBSD: vmevar.h,v 1.13 2009/05/12 14:47:27 cegger Exp $ */
/*
* Copyright (c) 1999
@@ -154,7 +154,7 @@
*/
struct vme_attach_args;
-typedef void (*vme_slaveconf_callback)(struct device *,
+typedef void (*vme_slaveconf_callback)(device_t,
struct vme_attach_args *);
struct vmebus_attach_args {
Index: src/sys/dev/vme/xd.c
diff -u src/sys/dev/vme/xd.c:1.85 src/sys/dev/vme/xd.c:1.86
--- src/sys/dev/vme/xd.c:1.85 Tue May 12 13:22:28 2009
+++ src/sys/dev/vme/xd.c Tue May 12 14:47:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: xd.c,v 1.85 2009/05/12 13:22:28 cegger Exp $ */
+/* $NetBSD: xd.c,v 1.86 2009/05/12 14:47:27 cegger Exp $ */
/*
*
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.85 2009/05/12 13:22:28 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.86 2009/05/12 14:47:27 cegger Exp $");
#undef XDC_DEBUG /* full debug */
#define XDC_DIAG /* extra sanity checks */
@@ -241,10 +241,10 @@
int xdcintr(void *);
/* autoconf */
-int xdcmatch(struct device *, cfdata_t, void *);
-void xdcattach(struct device *, struct device *, void *);
-int xdmatch(struct device *, cfdata_t, void *);
-void xdattach(struct device *, struct device *, void *);
+int xdcmatch(device_t, cfdata_t, void *);
+void xdcattach(device_t, device_t, void *);
+int xdmatch(device_t, cfdata_t, void *);
+void xdattach(device_t, device_t, void *);
static int xdc_probe(void *, bus_space_tag_t, bus_space_handle_t);
static void xddummystrat(struct buf *);
@@ -451,7 +451,7 @@
}
int xdcmatch(parent, cf, aux)
- struct device *parent;
+ device_t parent;
cfdata_t cf;
void *aux;
{
@@ -475,10 +475,7 @@
* xdcattach: attach controller
*/
void
-xdcattach(parent, self, aux)
- struct device *parent, *self;
- void *aux;
-
+xdcattach(device_t parent, device_t self, void *aux)
{
struct vme_attach_args *va = aux;
vme_chipset_tag_t ct = va->va_vct;
@@ -681,7 +678,7 @@
* call xdattach!).
*/
int
-xdmatch(struct device *parent, cfdata_t cf, void *aux)
+xdmatch(device_t parent, cfdata_t cf, void *aux)
{
struct xdc_attach_args *xa = aux;
@@ -700,10 +697,7 @@
* from xdopen/xdstrategy.
*/
void
-xdattach(parent, self, aux)
- struct device *parent, *self;
- void *aux;
-
+xdattach(device_t parent, device_t self, void *aux)
{
struct xd_softc *xd = device_private(self);
struct xdc_softc *xdc = device_private(parent);
@@ -1163,7 +1157,7 @@
xa.driveno = xd->xd_drive;
xa.fullmode = XD_SUB_WAIT;
xa.booting = 0;
- xdattach((struct device *) xd->parent, (struct device *) xd, &xa);
+ xdattach((device_t) xd->parent, (device_t) xd, &xa);
if (xd->state == XD_DRIVE_UNKNOWN) {
return (EIO);
}
@@ -1268,7 +1262,7 @@
xa.driveno = xd->xd_drive;
xa.fullmode = XD_SUB_WAIT;
xa.booting = 0;
- xdattach((struct device *)xd->parent, (struct device *)xd, &xa);
+ xdattach((device_t)xd->parent, (device_t)xd, &xa);
if (xd->state == XD_DRIVE_UNKNOWN) {
bp->b_error = EIO;
goto done;
Index: src/sys/dev/vme/xy.c
diff -u src/sys/dev/vme/xy.c:1.89 src/sys/dev/vme/xy.c:1.90
--- src/sys/dev/vme/xy.c:1.89 Tue May 12 13:22:28 2009
+++ src/sys/dev/vme/xy.c Tue May 12 14:47:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: xy.c,v 1.89 2009/05/12 13:22:28 cegger Exp $ */
+/* $NetBSD: xy.c,v 1.90 2009/05/12 14:47:27 cegger Exp $ */
/*
*
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.89 2009/05/12 13:22:28 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.90 2009/05/12 14:47:27 cegger Exp $");
#undef XYC_DEBUG /* full debug */
#undef XYC_DIAG /* extra sanity checks */
@@ -183,10 +183,10 @@
int xycintr(void *);
/* autoconf */
-int xycmatch(struct device *, cfdata_t, void *);
-void xycattach(struct device *, struct device *, void *);
-int xymatch(struct device *, cfdata_t, void *);
-void xyattach(struct device *, struct device *, void *);
+int xycmatch(device_t, cfdata_t, void *);
+void xycattach(device_t, device_t, void *);
+int xymatch(device_t, cfdata_t, void *);
+void xyattach(device_t, device_t, void *);
static int xyc_probe(void *, bus_space_tag_t, bus_space_handle_t);
static void xydummystrat(struct buf *);
@@ -362,7 +362,7 @@
}
int xycmatch(parent, cf, aux)
- struct device *parent;
+ device_t parent;
cfdata_t cf;
void *aux;
{
@@ -386,10 +386,7 @@
* xycattach: attach controller
*/
void
-xycattach(parent, self, aux)
- struct device *parent, *self;
- void *aux;
-
+xycattach(device_t parent, device_t self, void *aux)
{
struct xyc_softc *xyc = device_private(self);
struct vme_attach_args *va = aux;
@@ -579,7 +576,7 @@
* call xyattach!).
*/
int
-xymatch(struct device *parent, cfdata_t cf, void *aux)
+xymatch(device_t parent, cfdata_t cf, void *aux)
{
struct xyc_attach_args *xa = aux;
@@ -598,10 +595,7 @@
* from xyopen/xystrategy.
*/
void
-xyattach(parent, self, aux)
- struct device *parent, *self;
- void *aux;
-
+xyattach(device_t parent, device_t self, void *aux)
{
struct xy_softc *xy = device_private(self), *oxy;
struct xyc_softc *xyc = device_private(parent);
@@ -1086,8 +1080,8 @@
xa.driveno = xy->xy_drive;
xa.fullmode = XY_SUB_WAIT;
xa.booting = 0;
- xyattach((struct device *) xy->parent,
- (struct device *) xy, &xa);
+ xyattach((device_t) xy->parent,
+ (device_t) xy, &xa);
if (xy->state == XY_DRIVE_UNKNOWN) {
return (EIO);
}
@@ -1194,7 +1188,7 @@
xa.driveno = xy->xy_drive;
xa.fullmode = XY_SUB_WAIT;
xa.booting = 0;
- xyattach((struct device *)xy->parent, (struct device *)xy, &xa);
+ xyattach((device_t)xy->parent, (device_t)xy, &xa);
if (xy->state == XY_DRIVE_UNKNOWN) {
bp->b_error = EIO;
goto done;
