Module Name: src
Committed By: cegger
Date: Tue May 12 13:19:12 UTC 2009
Modified Files:
src/sys/dev/qbus: dl.c if_dmc.c if_il.c
Log Message:
struct cfdata * -> cfdata_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/qbus/dl.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/qbus/if_dmc.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/qbus/if_il.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/qbus/dl.c
diff -u src/sys/dev/qbus/dl.c:1.43 src/sys/dev/qbus/dl.c:1.44
--- src/sys/dev/qbus/dl.c:1.43 Wed Jun 11 17:32:30 2008
+++ src/sys/dev/qbus/dl.c Tue May 12 13:19:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dl.c,v 1.43 2008/06/11 17:32:30 drochner Exp $ */
+/* $NetBSD: dl.c,v 1.44 2009/05/12 13:19:12 cegger Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -104,7 +104,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dl.c,v 1.43 2008/06/11 17:32:30 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dl.c,v 1.44 2009/05/12 13:19:12 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -137,7 +137,7 @@
struct tty *sc_tty;
};
-static int dl_match (struct device *, struct cfdata *, void *);
+static int dl_match (struct device *, cfdata_t, void *);
static void dl_attach (struct device *, struct device *, void *);
static void dlrint (void *);
static void dlxint (void *);
@@ -173,7 +173,7 @@
/* then complete the housecleaning for full operation */
static int
-dl_match (struct device *parent, struct cfdata *cf, void *aux)
+dl_match (struct device *parent, cfdata_t cf, void *aux)
{
struct uba_attach_args *ua = aux;
Index: src/sys/dev/qbus/if_dmc.c
diff -u src/sys/dev/qbus/if_dmc.c:1.18 src/sys/dev/qbus/if_dmc.c:1.19
--- src/sys/dev/qbus/if_dmc.c:1.18 Tue Dec 16 22:35:34 2008
+++ src/sys/dev/qbus/if_dmc.c Tue May 12 13:19:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_dmc.c,v 1.18 2008/12/16 22:35:34 christos Exp $ */
+/* $NetBSD: if_dmc.c,v 1.19 2009/05/12 13:19:12 cegger Exp $ */
/*
* Copyright (c) 1982, 1986 Regents of the University of California.
* All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_dmc.c,v 1.18 2008/12/16 22:35:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_dmc.c,v 1.19 2009/05/12 13:19:12 cegger Exp $");
#undef DMCDEBUG /* for base table dump on fatal error */
@@ -168,7 +168,7 @@
} dmc_base;
};
-static int dmcmatch(struct device *, struct cfdata *, void *);
+static int dmcmatch(struct device *, cfdata_t, void *);
static void dmcattach(struct device *, struct device *, void *);
static int dmcinit(struct ifnet *);
static void dmcrint(void *);
@@ -214,7 +214,7 @@
(tail) = (head)
int
-dmcmatch(struct device *parent, struct cfdata *cf, void *aux)
+dmcmatch(struct device *parent, cfdata_t cf, void *aux)
{
struct uba_attach_args *ua = aux;
struct dmc_softc ssc;
@@ -305,7 +305,7 @@
struct dmcbufs *rp;
struct dmc_command *qp;
struct ifaddr *ifa;
- struct cfdata *ui = device_cfdata(&sc->sc_dev);
+ cfdata_t ui = device_cfdata(&sc->sc_dev);
int base;
int s;
Index: src/sys/dev/qbus/if_il.c
diff -u src/sys/dev/qbus/if_il.c:1.22 src/sys/dev/qbus/if_il.c:1.23
--- src/sys/dev/qbus/if_il.c:1.22 Sat Apr 18 14:58:03 2009
+++ src/sys/dev/qbus/if_il.c Tue May 12 13:19:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_il.c,v 1.22 2009/04/18 14:58:03 tsutsui Exp $ */
+/* $NetBSD: if_il.c,v 1.23 2009/05/12 13:19:12 cegger Exp $ */
/*
* Copyright (c) 1982, 1986 Regents of the University of California.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_il.c,v 1.22 2009/04/18 14:58:03 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_il.c,v 1.23 2009/05/12 13:19:12 cegger Exp $");
#include "opt_inet.h"
@@ -111,7 +111,7 @@
int sc_ubaddr; /* mapping registers of is_stats */
};
-static int ilmatch(struct device *, struct cfdata *, void *);
+static int ilmatch(struct device *, cfdata_t, void *);
static void ilattach(struct device *, struct device *, void *);
static void ilcint(void *);
static void ilrint(void *);
@@ -134,7 +134,7 @@
#define HIWORD(x) (((int)(x) >> 16) & 0x3)
int
-ilmatch(struct device *parent, struct cfdata *cf, void *aux)
+ilmatch(struct device *parent, cfdata_t cf, void *aux)
{
struct uba_attach_args *ua = aux;
volatile int i;