Module Name: src
Committed By: cegger
Date: Tue May 12 14:38:26 UTC 2009
Modified Files:
src/sys/dev/mvme: clmpcc_pcctwo.c clock_pcctwo.c clockvar.h
if_ie_mvme.c
Log Message:
struct device * -> device_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/mvme/clmpcc_pcctwo.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/mvme/clock_pcctwo.c \
src/sys/dev/mvme/if_ie_mvme.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/mvme/clockvar.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/mvme/clmpcc_pcctwo.c
diff -u src/sys/dev/mvme/clmpcc_pcctwo.c:1.17 src/sys/dev/mvme/clmpcc_pcctwo.c:1.18
--- src/sys/dev/mvme/clmpcc_pcctwo.c:1.17 Tue May 12 13:16:45 2009
+++ src/sys/dev/mvme/clmpcc_pcctwo.c Tue May 12 14:38:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: clmpcc_pcctwo.c,v 1.17 2009/05/12 13:16:45 cegger Exp $ */
+/* $NetBSD: clmpcc_pcctwo.c,v 1.18 2009/05/12 14:38:26 cegger Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clmpcc_pcctwo.c,v 1.17 2009/05/12 13:16:45 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clmpcc_pcctwo.c,v 1.18 2009/05/12 14:38:26 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -68,8 +68,8 @@
/* Definition of the driver for autoconfig. */
-int clmpcc_pcctwo_match(struct device *, cfdata_t, void *);
-void clmpcc_pcctwo_attach(struct device *, struct device *, void *);
+int clmpcc_pcctwo_match(device_t, cfdata_t, void *);
+void clmpcc_pcctwo_attach(device_t, device_t, void *);
void clmpcc_pcctwo_iackhook(struct clmpcc_softc *, int);
void clmpcc_pcctwo_consiackhook(struct clmpcc_softc *, int);
@@ -90,7 +90,7 @@
* Is the CD2401 chip present?
*/
int
-clmpcc_pcctwo_match(struct device *parent, cfdata_t cf, void *aux)
+clmpcc_pcctwo_match(device_t parent, cfdata_t cf, void *aux)
{
struct pcctwo_attach_args *pa;
@@ -108,7 +108,7 @@
* Attach a found CD2401.
*/
void
-clmpcc_pcctwo_attach(struct device *parent, struct device *self, void *aux)
+clmpcc_pcctwo_attach(device_t parent, device_t self, void *aux)
{
struct clmpcc_softc *sc;
struct pcctwo_attach_args *pa = aux;
Index: src/sys/dev/mvme/clock_pcctwo.c
diff -u src/sys/dev/mvme/clock_pcctwo.c:1.15 src/sys/dev/mvme/clock_pcctwo.c:1.16
--- src/sys/dev/mvme/clock_pcctwo.c:1.15 Tue May 12 13:16:45 2009
+++ src/sys/dev/mvme/clock_pcctwo.c Tue May 12 14:38:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: clock_pcctwo.c,v 1.15 2009/05/12 13:16:45 cegger Exp $ */
+/* $NetBSD: clock_pcctwo.c,v 1.16 2009/05/12 14:38:26 cegger Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock_pcctwo.c,v 1.15 2009/05/12 13:16:45 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock_pcctwo.c,v 1.16 2009/05/12 14:38:26 cegger Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -52,8 +52,8 @@
#include <dev/mvme/pcctworeg.h>
-int clock_pcctwo_match(struct device *, cfdata_t, void *);
-void clock_pcctwo_attach(struct device *, struct device *, void *);
+int clock_pcctwo_match(device_t, cfdata_t, void *);
+void clock_pcctwo_attach(device_t, device_t, void *);
struct clock_pcctwo_softc {
struct device sc_dev;
@@ -78,7 +78,7 @@
/* ARGSUSED */
int
-clock_pcctwo_match(struct device *parent, cfdata_t cf, void *aux)
+clock_pcctwo_match(device_t parent, cfdata_t cf, void *aux)
{
struct pcctwo_attach_args *pa = aux;
@@ -96,7 +96,7 @@
/* ARGSUSED */
void
-clock_pcctwo_attach(struct device *parent, struct device *self, void *aux)
+clock_pcctwo_attach(device_t parent, device_t self, void *aux)
{
struct clock_pcctwo_softc *sc;
struct pcctwo_attach_args *pa;
Index: src/sys/dev/mvme/if_ie_mvme.c
diff -u src/sys/dev/mvme/if_ie_mvme.c:1.15 src/sys/dev/mvme/if_ie_mvme.c:1.16
--- src/sys/dev/mvme/if_ie_mvme.c:1.15 Tue May 12 13:16:45 2009
+++ src/sys/dev/mvme/if_ie_mvme.c Tue May 12 14:38:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie_mvme.c,v 1.15 2009/05/12 13:16:45 cegger Exp $ */
+/* $NetBSD: if_ie_mvme.c,v 1.16 2009/05/12 14:38:26 cegger Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie_mvme.c,v 1.15 2009/05/12 13:16:45 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie_mvme.c,v 1.16 2009/05/12 14:38:26 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -60,8 +60,8 @@
#include <dev/mvme/pcctworeg.h>
-int ie_pcctwo_match(struct device *, cfdata_t, void *);
-void ie_pcctwo_attach(struct device *, struct device *, void *);
+int ie_pcctwo_match(device_t, cfdata_t, void *);
+void ie_pcctwo_attach(device_t, device_t, void *);
struct ie_pcctwo_softc {
struct ie_softc ps_ie;
@@ -220,7 +220,7 @@
/* ARGSUSED */
int
-ie_pcctwo_match(struct device *parent, cfdata_t cf, void *args)
+ie_pcctwo_match(device_t parent, cfdata_t cf, void *args)
{
struct pcctwo_attach_args *pa;
@@ -236,7 +236,7 @@
/* ARGSUSED */
void
-ie_pcctwo_attach(struct device *parent, struct device *self, void *args)
+ie_pcctwo_attach(device_t parent, device_t self, void *args)
{
struct pcctwo_attach_args *pa;
struct ie_pcctwo_softc *ps;
Index: src/sys/dev/mvme/clockvar.h
diff -u src/sys/dev/mvme/clockvar.h:1.8 src/sys/dev/mvme/clockvar.h:1.9
--- src/sys/dev/mvme/clockvar.h:1.8 Mon Apr 28 20:23:54 2008
+++ src/sys/dev/mvme/clockvar.h Tue May 12 14:38:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: clockvar.h,v 1.8 2008/04/28 20:23:54 martin Exp $ */
+/* $NetBSD: clockvar.h,v 1.9 2009/05/12 14:38:26 cegger Exp $ */
/*-
* Copyright (c) 1996, 2002 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
void *ca_arg;
};
-void clock_config(struct device *, struct clock_attach_args *,
+void clock_config(device_t, struct clock_attach_args *,
struct evcnt *);
/*
