Module Name: src
Committed By: cegger
Date: Tue May 12 14:31:27 UTC 2009
Modified Files:
src/sys/dev/mii: brgphy.c ciphy.c mii_bitbang.h mii_physubr.c miivar.h
Log Message:
struct device * -> device_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/mii/brgphy.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/mii/ciphy.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/mii/mii_bitbang.h
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/mii/mii_physubr.c
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/mii/miivar.h
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/mii/brgphy.c
diff -u src/sys/dev/mii/brgphy.c:1.45 src/sys/dev/mii/brgphy.c:1.46
--- src/sys/dev/mii/brgphy.c:1.45 Tue May 12 13:16:02 2009
+++ src/sys/dev/mii/brgphy.c Tue May 12 14:31:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: brgphy.c,v 1.45 2009/05/12 13:16:02 cegger Exp $ */
+/* $NetBSD: brgphy.c,v 1.46 2009/05/12 14:31:27 cegger Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.45 2009/05/12 13:16:02 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.46 2009/05/12 14:31:27 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -187,7 +187,7 @@
};
static int
-brgphymatch(struct device *parent, cfdata_t match,
+brgphymatch(device_t parent, cfdata_t match,
void *aux)
{
struct mii_attach_args *ma = aux;
@@ -199,7 +199,7 @@
}
static void
-brgphyattach(struct device *parent, struct device *self, void *aux)
+brgphyattach(device_t parent, device_t self, void *aux)
{
struct brgphy_softc *bsc = device_private(self);
struct mii_softc *sc = &bsc->sc_mii;
Index: src/sys/dev/mii/ciphy.c
diff -u src/sys/dev/mii/ciphy.c:1.18 src/sys/dev/mii/ciphy.c:1.19
--- src/sys/dev/mii/ciphy.c:1.18 Tue May 12 13:16:02 2009
+++ src/sys/dev/mii/ciphy.c Tue May 12 14:31:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ciphy.c,v 1.18 2009/05/12 13:16:02 cegger Exp $ */
+/* $NetBSD: ciphy.c,v 1.19 2009/05/12 14:31:27 cegger Exp $ */
/*-
* Copyright (c) 2004
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ciphy.c,v 1.18 2009/05/12 13:16:02 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciphy.c,v 1.19 2009/05/12 14:31:27 cegger Exp $");
/*
* Driver for the Cicada CS8201 10/100/1000 copper PHY.
@@ -97,7 +97,7 @@
};
static int
-ciphymatch(struct device *parent, cfdata_t match,
+ciphymatch(device_t parent, cfdata_t match,
void *aux)
{
struct mii_attach_args *ma = aux;
@@ -109,7 +109,7 @@
}
static void
-ciphyattach(struct device *parent, struct device *self, void *aux)
+ciphyattach(device_t parent, device_t self, void *aux)
{
struct mii_softc *sc = device_private(self);
struct mii_attach_args *ma = aux;
Index: src/sys/dev/mii/mii_bitbang.h
diff -u src/sys/dev/mii/mii_bitbang.h:1.5 src/sys/dev/mii/mii_bitbang.h:1.6
--- src/sys/dev/mii/mii_bitbang.h:1.5 Tue Nov 25 22:18:17 2008
+++ src/sys/dev/mii/mii_bitbang.h Tue May 12 14:31:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mii_bitbang.h,v 1.5 2008/11/25 22:18:17 matt Exp $ */
+/* $NetBSD: mii_bitbang.h,v 1.6 2009/05/12 14:31:27 cegger Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -38,14 +38,14 @@
#define MII_NBITS 5
struct mii_bitbang_ops {
- uint32_t (*mbo_read)(struct device *);
- void (*mbo_write)(struct device *, uint32_t);
+ uint32_t (*mbo_read)(device_t);
+ void (*mbo_write)(device_t, uint32_t);
uint32_t mbo_bits[MII_NBITS];
};
typedef const struct mii_bitbang_ops *mii_bitbang_ops_t;
-int mii_bitbang_readreg(struct device *, mii_bitbang_ops_t,
+int mii_bitbang_readreg(device_t, mii_bitbang_ops_t,
int, int);
-void mii_bitbang_writereg(struct device *, mii_bitbang_ops_t,
+void mii_bitbang_writereg(device_t, mii_bitbang_ops_t,
int, int, int);
Index: src/sys/dev/mii/mii_physubr.c
diff -u src/sys/dev/mii/mii_physubr.c:1.63 src/sys/dev/mii/mii_physubr.c:1.64
--- src/sys/dev/mii/mii_physubr.c:1.63 Tue Apr 7 18:05:02 2009
+++ src/sys/dev/mii/mii_physubr.c Tue May 12 14:31:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mii_physubr.c,v 1.63 2009/04/07 18:05:02 dyoung Exp $ */
+/* $NetBSD: mii_physubr.c,v 1.64 2009/05/12 14:31:27 cegger Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.63 2009/04/07 18:05:02 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.64 2009/05/12 14:31:27 cegger Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -534,7 +534,7 @@
}
int
-mii_phy_activate(struct device *self, enum devact act)
+mii_phy_activate(device_t self, enum devact act)
{
int rv = 0;
@@ -553,7 +553,7 @@
/* ARGSUSED1 */
int
-mii_phy_detach(struct device *self, int flags)
+mii_phy_detach(device_t self, int flags)
{
struct mii_softc *sc = device_private(self);
Index: src/sys/dev/mii/miivar.h
diff -u src/sys/dev/mii/miivar.h:1.54 src/sys/dev/mii/miivar.h:1.55
--- src/sys/dev/mii/miivar.h:1.54 Sun Apr 19 10:47:48 2009
+++ src/sys/dev/mii/miivar.h Tue May 12 14:31:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: miivar.h,v 1.54 2009/04/19 10:47:48 msaitoh Exp $ */
+/* $NetBSD: miivar.h,v 1.55 2009/05/12 14:31:27 cegger Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -45,9 +45,9 @@
/*
* Callbacks from MII layer into network interface device driver.
*/
-typedef int (*mii_readreg_t)(struct device *, int, int);
-typedef void (*mii_writereg_t)(struct device *, int, int, int);
-typedef void (*mii_statchg_t)(struct device *);
+typedef int (*mii_readreg_t)(device_t, int, int);
+typedef void (*mii_writereg_t)(device_t, int, int, int);
+typedef void (*mii_statchg_t)(device_t);
/*
* A network interface driver has one of these structures in its softc.
