Module Name: src
Committed By: cegger
Date: Tue May 12 13:17:37 UTC 2009
Modified Files:
src/sys/dev/ofw: ofbus.c ofcons.c ofdisk.c ofnet.c ofrtc.c
Log Message:
struct cfdata * -> cfdata_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/ofw/ofbus.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/ofw/ofcons.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/ofw/ofdisk.c
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/ofw/ofnet.c
cvs rdiff -u -r1.20 -r1.21 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.22 src/sys/dev/ofw/ofbus.c:1.23
--- src/sys/dev/ofw/ofbus.c:1.22 Sat Mar 14 21:04:21 2009
+++ src/sys/dev/ofw/ofbus.c Tue May 12 13:17:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ofbus.c,v 1.22 2009/03/14 21:04:21 dsl Exp $ */
+/* $NetBSD: ofbus.c,v 1.23 2009/05/12 13:17:37 cegger Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofbus.c,v 1.22 2009/03/14 21:04:21 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofbus.c,v 1.23 2009/05/12 13:17:37 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,7 +40,7 @@
#include <dev/ofw/openfirm.h>
-int ofbus_match(struct device *, struct cfdata *, void *);
+int ofbus_match(struct device *, cfdata_t, void *);
void ofbus_attach(struct device *, struct device *, void *);
static int ofbus_print(void *, const char *);
@@ -60,7 +60,7 @@
}
int
-ofbus_match(struct device *parent, struct cfdata *cf, void *aux)
+ofbus_match(struct device *parent, cfdata_t cf, void *aux)
{
struct ofbus_attach_args *oba = aux;
Index: src/sys/dev/ofw/ofcons.c
diff -u src/sys/dev/ofw/ofcons.c:1.38 src/sys/dev/ofw/ofcons.c:1.39
--- src/sys/dev/ofw/ofcons.c:1.38 Wed Mar 18 10:22:41 2009
+++ src/sys/dev/ofw/ofcons.c Tue May 12 13:17:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ofcons.c,v 1.38 2009/03/18 10:22:41 cegger Exp $ */
+/* $NetBSD: ofcons.c,v 1.39 2009/05/12 13:17:37 cegger Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofcons.c,v 1.38 2009/03/18 10:22:41 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofcons.c,v 1.39 2009/05/12 13:17:37 cegger Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -62,7 +62,7 @@
static int stdin, stdout;
-static int ofcons_match(struct device *, struct cfdata *, void *);
+static int ofcons_match(struct device *, cfdata_t, void *);
static void ofcons_attach(struct device *, struct device *, void *);
CFATTACH_DECL(ofcons, sizeof(struct ofcons_softc),
@@ -86,7 +86,7 @@
static int ofcons_probe(void);
static int
-ofcons_match(struct device *parent, struct cfdata *match, void *aux)
+ofcons_match(struct device *parent, cfdata_t match, void *aux)
{
struct ofbus_attach_args *oba = aux;
Index: src/sys/dev/ofw/ofdisk.c
diff -u src/sys/dev/ofw/ofdisk.c:1.41 src/sys/dev/ofw/ofdisk.c:1.42
--- src/sys/dev/ofw/ofdisk.c:1.41 Thu Jun 12 22:28:26 2008
+++ src/sys/dev/ofw/ofdisk.c Tue May 12 13:17:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ofdisk.c,v 1.41 2008/06/12 22:28:26 cegger Exp $ */
+/* $NetBSD: ofdisk.c,v 1.42 2009/05/12 13:17:37 cegger Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofdisk.c,v 1.41 2008/06/12 22:28:26 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofdisk.c,v 1.42 2009/05/12 13:17:37 cegger Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -63,7 +63,7 @@
#define OFDISK_FLOPPY_P(of) ((of)->sc_flags & OFDF_ISFLOPPY)
-static int ofdisk_match (struct device *, struct cfdata *, void *);
+static int ofdisk_match (struct device *, cfdata_t, void *);
static void ofdisk_attach (struct device *, struct device *, void *);
CFATTACH_DECL(ofdisk, sizeof(struct ofdisk_softc),
@@ -98,7 +98,7 @@
void ofdisk_getdisklabel (dev_t);
static int
-ofdisk_match(struct device *parent, struct cfdata *match, void *aux)
+ofdisk_match(struct device *parent, cfdata_t match, void *aux)
{
struct ofbus_attach_args *oba = aux;
char type[8];
Index: src/sys/dev/ofw/ofnet.c
diff -u src/sys/dev/ofw/ofnet.c:1.46 src/sys/dev/ofw/ofnet.c:1.47
--- src/sys/dev/ofw/ofnet.c:1.46 Sat Apr 18 14:58:03 2009
+++ src/sys/dev/ofw/ofnet.c Tue May 12 13:17:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ofnet.c,v 1.46 2009/04/18 14:58:03 tsutsui Exp $ */
+/* $NetBSD: ofnet.c,v 1.47 2009/05/12 13:17:37 cegger Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofnet.c,v 1.46 2009/04/18 14:58:03 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofnet.c,v 1.47 2009/05/12 13:17:37 cegger Exp $");
#include "ofnet.h"
#include "opt_inet.h"
@@ -73,7 +73,7 @@
static struct ipkdb_if *kifp;
static struct ofnet_softc *ipkdb_of;
-static int ipkdbprobe (struct cfdata *, void *);
+static int ipkdbprobe (cfdata_t, void *);
#endif
struct ofnet_softc {
@@ -84,7 +84,7 @@
struct callout sc_callout;
};
-static int ofnet_match (struct device *, struct cfdata *, void *);
+static int ofnet_match (struct device *, cfdata_t, void *);
static void ofnet_attach (struct device *, struct device *, void *);
CFATTACH_DECL(ofnet, sizeof(struct ofnet_softc),
@@ -100,7 +100,7 @@
static void ofnet_watchdog (struct ifnet *);
static int
-ofnet_match(struct device *parent, struct cfdata *match, void *aux)
+ofnet_match(struct device *parent, cfdata_t match, void *aux)
{
struct ofbus_attach_args *oba = aux;
char type[32];
@@ -458,7 +458,7 @@
}
static int
-ipkdbprobe(struct cfdata *match, void *aux)
+ipkdbprobe(cfdata_t match, void *aux)
{
struct ipkdb_if *kip = aux;
static char name[256];
Index: src/sys/dev/ofw/ofrtc.c
diff -u src/sys/dev/ofw/ofrtc.c:1.20 src/sys/dev/ofw/ofrtc.c:1.21
--- src/sys/dev/ofw/ofrtc.c:1.20 Wed Sep 13 07:14:36 2006
+++ src/sys/dev/ofw/ofrtc.c Tue May 12 13:17:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ofrtc.c,v 1.20 2006/09/13 07:14:36 gdamore Exp $ */
+/* $NetBSD: ofrtc.c,v 1.21 2009/05/12 13:17:37 cegger Exp $ */
/*
* Copyright (C) 1996 Wolfgang Solfrank.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofrtc.c,v 1.20 2006/09/13 07:14:36 gdamore Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofrtc.c,v 1.21 2009/05/12 13:17:37 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -89,7 +89,7 @@
struct todr_chip_handle sc_todr;
};
-static int ofrtc_match(struct device *, struct cfdata *, void *);
+static int ofrtc_match(struct device *, cfdata_t, void *);
static void ofrtc_attach(struct device *, struct device *, 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, struct cfdata *match, void *aux)
+ofrtc_match(struct device *parent, cfdata_t match, void *aux)
{
struct ofbus_attach_args *oba = aux;
char type[8];
