Module Name: src
Committed By: cegger
Date: Tue May 12 14:43:33 UTC 2009
Modified Files:
src/sys/dev/qbus: dl.c if_dmc.c if_il.c
Log Message:
struct device * -> device_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/qbus/dl.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/qbus/if_dmc.c
cvs rdiff -u -r1.23 -r1.24 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.44 src/sys/dev/qbus/dl.c:1.45
--- src/sys/dev/qbus/dl.c:1.44 Tue May 12 13:19:12 2009
+++ src/sys/dev/qbus/dl.c Tue May 12 14:43:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dl.c,v 1.44 2009/05/12 13:19:12 cegger Exp $ */
+/* $NetBSD: dl.c,v 1.45 2009/05/12 14:43:33 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.44 2009/05/12 13:19:12 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dl.c,v 1.45 2009/05/12 14:43:33 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -137,8 +137,8 @@
struct tty *sc_tty;
};
-static int dl_match (struct device *, cfdata_t, void *);
-static void dl_attach (struct device *, struct device *, void *);
+static int dl_match (device_t, cfdata_t, void *);
+static void dl_attach (device_t, device_t, void *);
static void dlrint (void *);
static void dlxint (void *);
static void dlstart (struct tty *);
@@ -173,7 +173,7 @@
/* then complete the housecleaning for full operation */
static int
-dl_match (struct device *parent, cfdata_t cf, void *aux)
+dl_match (device_t parent, cfdata_t cf, void *aux)
{
struct uba_attach_args *ua = aux;
@@ -229,7 +229,7 @@
}
static void
-dl_attach (struct device *parent, struct device *self, void *aux)
+dl_attach (device_t parent, device_t self, void *aux)
{
struct dl_softc *sc = device_private(self);
struct uba_attach_args *ua = aux;
Index: src/sys/dev/qbus/if_dmc.c
diff -u src/sys/dev/qbus/if_dmc.c:1.19 src/sys/dev/qbus/if_dmc.c:1.20
--- src/sys/dev/qbus/if_dmc.c:1.19 Tue May 12 13:19:12 2009
+++ src/sys/dev/qbus/if_dmc.c Tue May 12 14:43:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_dmc.c,v 1.19 2009/05/12 13:19:12 cegger Exp $ */
+/* $NetBSD: if_dmc.c,v 1.20 2009/05/12 14:43:33 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.19 2009/05/12 13:19:12 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_dmc.c,v 1.20 2009/05/12 14:43:33 cegger Exp $");
#undef DMCDEBUG /* for base table dump on fatal error */
@@ -168,8 +168,8 @@
} dmc_base;
};
-static int dmcmatch(struct device *, cfdata_t, void *);
-static void dmcattach(struct device *, struct device *, void *);
+static int dmcmatch(device_t, cfdata_t, void *);
+static void dmcattach(device_t, device_t, void *);
static int dmcinit(struct ifnet *);
static void dmcrint(void *);
static void dmcxint(void *);
@@ -181,7 +181,7 @@
static int dmcioctl(struct ifnet *, u_long, void *);
static int dmcoutput(struct ifnet *, struct mbuf *, struct sockaddr *,
struct rtentry *);
-static void dmcreset(struct device *);
+static void dmcreset(device_t);
CFATTACH_DECL(dmc, sizeof(struct dmc_softc),
dmcmatch, dmcattach, NULL, NULL);
@@ -214,7 +214,7 @@
(tail) = (head)
int
-dmcmatch(struct device *parent, cfdata_t cf, void *aux)
+dmcmatch(device_t parent, cfdata_t cf, void *aux)
{
struct uba_attach_args *ua = aux;
struct dmc_softc ssc;
@@ -247,7 +247,7 @@
* to accept packets.
*/
void
-dmcattach(struct device *parent, struct device *self, void *aux)
+dmcattach(device_t parent, device_t self, void *aux)
{
struct uba_attach_args *ua = aux;
struct dmc_softc *sc = device_private(self);
@@ -284,7 +284,7 @@
* If interface is on specified UBA, reset its state.
*/
void
-dmcreset(struct device *dev)
+dmcreset(device_t dev)
{
struct dmc_softc *sc = (struct dmc_softc *)dev;
Index: src/sys/dev/qbus/if_il.c
diff -u src/sys/dev/qbus/if_il.c:1.23 src/sys/dev/qbus/if_il.c:1.24
--- src/sys/dev/qbus/if_il.c:1.23 Tue May 12 13:19:12 2009
+++ src/sys/dev/qbus/if_il.c Tue May 12 14:43:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_il.c,v 1.23 2009/05/12 13:19:12 cegger Exp $ */
+/* $NetBSD: if_il.c,v 1.24 2009/05/12 14:43:33 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.23 2009/05/12 13:19:12 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_il.c,v 1.24 2009/05/12 14:43:33 cegger Exp $");
#include "opt_inet.h"
@@ -111,11 +111,11 @@
int sc_ubaddr; /* mapping registers of is_stats */
};
-static int ilmatch(struct device *, cfdata_t, void *);
-static void ilattach(struct device *, struct device *, void *);
+static int ilmatch(device_t, cfdata_t, void *);
+static void ilattach(device_t, device_t, void *);
static void ilcint(void *);
static void ilrint(void *);
-static void ilreset(struct device *);
+static void ilreset(device_t);
static int ilwait(struct il_softc *, char *);
static int ilinit(struct ifnet *);
static void ilstart(struct ifnet *);
@@ -134,7 +134,7 @@
#define HIWORD(x) (((int)(x) >> 16) & 0x3)
int
-ilmatch(struct device *parent, cfdata_t cf, void *aux)
+ilmatch(device_t parent, cfdata_t cf, void *aux)
{
struct uba_attach_args *ua = aux;
volatile int i;
@@ -153,7 +153,7 @@
* address and other interesting data.
*/
void
-ilattach(struct device *parent, struct device *self, void *aux)
+ilattach(device_t parent, device_t self, void *aux)
{
struct uba_attach_args *ua = aux;
struct il_softc *sc = device_private(self);
@@ -242,7 +242,7 @@
* If interface is on specified uba, reset its state.
*/
void
-ilreset(struct device *dev)
+ilreset(device_t dev)
{
struct il_softc *sc = (void *)dev;
