Module Name: src
Committed By: cegger
Date: Tue May 12 14:39:22 UTC 2009
Modified Files:
src/sys/dev/ofw: ofbus.c ofcons.c ofdisk.c ofnet.c ofrtc.c
Log Message:
struct device * -> device_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/ofw/ofbus.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/ofw/ofcons.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/ofw/ofdisk.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/ofw/ofnet.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/ofw/ofrtc.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/ofw/ofbus.c
diff -u src/sys/dev/ofw/ofbus.c:1.23 src/sys/dev/ofw/ofbus.c:1.24
--- src/sys/dev/ofw/ofbus.c:1.23 Tue May 12 13:17:37 2009
+++ src/sys/dev/ofw/ofbus.c Tue May 12 14:39:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ofbus.c,v 1.23 2009/05/12 13:17:37 cegger Exp $ */
+/* $NetBSD: ofbus.c,v 1.24 2009/05/12 14:39:22 cegger Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofbus.c,v 1.23 2009/05/12 13:17:37 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofbus.c,v 1.24 2009/05/12 14:39:22 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,8 +40,8 @@
#include <dev/ofw/openfirm.h>
-int ofbus_match(struct device *, cfdata_t, void *);
-void ofbus_attach(struct device *, struct device *, void *);
+int ofbus_match(device_t, cfdata_t, void *);
+void ofbus_attach(device_t, device_t, void *);
static int ofbus_print(void *, const char *);
CFATTACH_DECL(ofbus, sizeof(struct device),
@@ -60,7 +60,7 @@
}
int
-ofbus_match(struct device *parent, cfdata_t cf, void *aux)
+ofbus_match(device_t parent, cfdata_t cf, void *aux)
{
struct ofbus_attach_args *oba = aux;
@@ -72,7 +72,7 @@
}
void
-ofbus_attach(struct device *parent, struct device *dev, void *aux)
+ofbus_attach(device_t parent, device_t dev, void *aux)
{
struct ofbus_attach_args *oba = aux;
struct ofbus_attach_args oba2;
Index: src/sys/dev/ofw/ofcons.c
diff -u src/sys/dev/ofw/ofcons.c:1.39 src/sys/dev/ofw/ofcons.c:1.40
--- src/sys/dev/ofw/ofcons.c:1.39 Tue May 12 13:17:37 2009
+++ src/sys/dev/ofw/ofcons.c Tue May 12 14:39:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ofcons.c,v 1.39 2009/05/12 13:17:37 cegger Exp $ */
+/* $NetBSD: ofcons.c,v 1.40 2009/05/12 14:39:22 cegger Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofcons.c,v 1.39 2009/05/12 13:17:37 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofcons.c,v 1.40 2009/05/12 14:39:22 cegger Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -62,8 +62,8 @@
static int stdin, stdout;
-static int ofcons_match(struct device *, cfdata_t, void *);
-static void ofcons_attach(struct device *, struct device *, void *);
+static int ofcons_match(device_t, cfdata_t, void *);
+static void ofcons_attach(device_t, device_t, void *);
CFATTACH_DECL(ofcons, sizeof(struct ofcons_softc),
ofcons_match, ofcons_attach, NULL, NULL);
@@ -86,7 +86,7 @@
static int ofcons_probe(void);
static int
-ofcons_match(struct device *parent, cfdata_t match, void *aux)
+ofcons_match(device_t parent, cfdata_t match, void *aux)
{
struct ofbus_attach_args *oba = aux;
@@ -99,7 +99,7 @@
}
static void
-ofcons_attach(struct device *parent, struct device *self, void *aux)
+ofcons_attach(device_t parent, device_t self, void *aux)
{
struct ofcons_softc *sc = device_private(self);
Index: src/sys/dev/ofw/ofdisk.c
diff -u src/sys/dev/ofw/ofdisk.c:1.42 src/sys/dev/ofw/ofdisk.c:1.43
--- src/sys/dev/ofw/ofdisk.c:1.42 Tue May 12 13:17:37 2009
+++ src/sys/dev/ofw/ofdisk.c Tue May 12 14:39:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ofdisk.c,v 1.42 2009/05/12 13:17:37 cegger Exp $ */
+/* $NetBSD: ofdisk.c,v 1.43 2009/05/12 14:39:22 cegger Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofdisk.c,v 1.42 2009/05/12 13:17:37 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofdisk.c,v 1.43 2009/05/12 14:39:22 cegger Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -63,8 +63,8 @@
#define OFDISK_FLOPPY_P(of) ((of)->sc_flags & OFDF_ISFLOPPY)
-static int ofdisk_match (struct device *, cfdata_t, void *);
-static void ofdisk_attach (struct device *, struct device *, void *);
+static int ofdisk_match (device_t, cfdata_t, void *);
+static void ofdisk_attach (device_t, device_t, void *);
CFATTACH_DECL(ofdisk, sizeof(struct ofdisk_softc),
ofdisk_match, ofdisk_attach, NULL, NULL);
@@ -98,7 +98,7 @@
void ofdisk_getdisklabel (dev_t);
static int
-ofdisk_match(struct device *parent, cfdata_t match, void *aux)
+ofdisk_match(device_t parent, cfdata_t match, void *aux)
{
struct ofbus_attach_args *oba = aux;
char type[8];
@@ -116,7 +116,7 @@
}
static void
-ofdisk_attach(struct device *parent, struct device *self, void *aux)
+ofdisk_attach(device_t parent, device_t self, void *aux)
{
struct ofdisk_softc *of = device_private(self);
struct ofbus_attach_args *oba = aux;
Index: src/sys/dev/ofw/ofnet.c
diff -u src/sys/dev/ofw/ofnet.c:1.47 src/sys/dev/ofw/ofnet.c:1.48
--- src/sys/dev/ofw/ofnet.c:1.47 Tue May 12 13:17:37 2009
+++ src/sys/dev/ofw/ofnet.c Tue May 12 14:39:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ofnet.c,v 1.47 2009/05/12 13:17:37 cegger Exp $ */
+/* $NetBSD: ofnet.c,v 1.48 2009/05/12 14:39:22 cegger Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofnet.c,v 1.47 2009/05/12 13:17:37 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofnet.c,v 1.48 2009/05/12 14:39:22 cegger Exp $");
#include "ofnet.h"
#include "opt_inet.h"
@@ -84,8 +84,8 @@
struct callout sc_callout;
};
-static int ofnet_match (struct device *, cfdata_t, void *);
-static void ofnet_attach (struct device *, struct device *, void *);
+static int ofnet_match (device_t, cfdata_t, void *);
+static void ofnet_attach (device_t, device_t, void *);
CFATTACH_DECL(ofnet, sizeof(struct ofnet_softc),
ofnet_match, ofnet_attach, NULL, NULL);
@@ -100,7 +100,7 @@
static void ofnet_watchdog (struct ifnet *);
static int
-ofnet_match(struct device *parent, cfdata_t match, void *aux)
+ofnet_match(device_t parent, cfdata_t match, void *aux)
{
struct ofbus_attach_args *oba = aux;
char type[32];
@@ -124,7 +124,7 @@
}
static void
-ofnet_attach(struct device *parent, struct device *self, void *aux)
+ofnet_attach(device_t parent, device_t self, void *aux)
{
struct ofnet_softc *of = device_private(self);
struct ifnet *ifp = &of->sc_ethercom.ec_if;
Index: src/sys/dev/ofw/ofrtc.c
diff -u src/sys/dev/ofw/ofrtc.c:1.21 src/sys/dev/ofw/ofrtc.c:1.22
--- src/sys/dev/ofw/ofrtc.c:1.21 Tue May 12 13:17:37 2009
+++ src/sys/dev/ofw/ofrtc.c Tue May 12 14:39:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ofrtc.c,v 1.21 2009/05/12 13:17:37 cegger Exp $ */
+/* $NetBSD: ofrtc.c,v 1.22 2009/05/12 14:39:22 cegger Exp $ */
/*
* Copyright (C) 1996 Wolfgang Solfrank.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofrtc.c,v 1.21 2009/05/12 13:17:37 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofrtc.c,v 1.22 2009/05/12 14:39:22 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -89,8 +89,8 @@
struct todr_chip_handle sc_todr;
};
-static int ofrtc_match(struct device *, cfdata_t, void *);
-static void ofrtc_attach(struct device *, struct device *, void *);
+static int ofrtc_match(device_t, cfdata_t, void *);
+static void ofrtc_attach(device_t, device_t, void *);
static int ofrtc_gettod(todr_chip_handle_t, struct clock_ymdhms *);
static int ofrtc_settod(todr_chip_handle_t, struct clock_ymdhms *);
@@ -98,7 +98,7 @@
ofrtc_match, ofrtc_attach, NULL, NULL);
static int
-ofrtc_match(struct device *parent, cfdata_t match, void *aux)
+ofrtc_match(device_t parent, cfdata_t match, void *aux)
{
struct ofbus_attach_args *oba = aux;
char type[8];
@@ -117,7 +117,7 @@
}
static void
-ofrtc_attach(struct device *parent, struct device *self, void *aux)
+ofrtc_attach(device_t parent, device_t self, void *aux)
{
struct ofrtc_softc *of = device_private(self);
struct ofbus_attach_args *oba = aux;
