Module Name: src
Committed By: cegger
Date: Tue May 12 14:18:16 UTC 2009
Modified Files:
src/sys/dev/dec: clockvar.h dzkbd.c dzms.c dzvar.h mcclock.c vsxxxvar.h
Log Message:
struct device * -> device_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/dec/clockvar.h
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/dec/dzkbd.c src/sys/dev/dec/mcclock.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/dec/dzms.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/dec/dzvar.h
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/dec/vsxxxvar.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/dec/clockvar.h
diff -u src/sys/dev/dec/clockvar.h:1.9 src/sys/dev/dec/clockvar.h:1.10
--- src/sys/dev/dec/clockvar.h:1.9 Thu Jan 3 23:02:25 2008
+++ src/sys/dev/dec/clockvar.h Tue May 12 14:18:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: clockvar.h,v 1.9 2008/01/03 23:02:25 joerg Exp $ */
+/* $NetBSD: clockvar.h,v 1.10 2009/05/12 14:18:16 cegger Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -38,7 +38,7 @@
* chip-dependent routines.
*/
struct clockfns {
- void (*cf_init)(struct device *);
+ void (*cf_init)(device_t);
};
-void clockattach(struct device *, const struct clockfns *);
+void clockattach(device_t, const struct clockfns *);
Index: src/sys/dev/dec/dzkbd.c
diff -u src/sys/dev/dec/dzkbd.c:1.22 src/sys/dev/dec/dzkbd.c:1.23
--- src/sys/dev/dec/dzkbd.c:1.22 Tue May 12 12:11:54 2009
+++ src/sys/dev/dec/dzkbd.c Tue May 12 14:18:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dzkbd.c,v 1.22 2009/05/12 12:11:54 cegger Exp $ */
+/* $NetBSD: dzkbd.c,v 1.23 2009/05/12 14:18:16 cegger Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.22 2009/05/12 12:11:54 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.23 2009/05/12 14:18:16 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -86,13 +86,13 @@
int sc_enabled;
int kbd_type;
- struct device *sc_wskbddev;
+ device_t sc_wskbddev;
};
static int dzkbd_input(void *, int);
-static int dzkbd_match(struct device *, cfdata_t, void *);
-static void dzkbd_attach(struct device *, struct device *, void *);
+static int dzkbd_match(device_t, cfdata_t, void *);
+static void dzkbd_attach(device_t, device_t, void *);
CFATTACH_DECL(dzkbd, sizeof(struct dzkbd_softc),
dzkbd_match, dzkbd_attach, NULL, NULL);
@@ -130,7 +130,7 @@
* kbd_match: how is this dz line configured?
*/
static int
-dzkbd_match(struct device *parent, cfdata_t cf, void *aux)
+dzkbd_match(device_t parent, cfdata_t cf, void *aux)
{
struct dzkm_attach_args *daa = aux;
@@ -146,7 +146,7 @@
}
static void
-dzkbd_attach(struct device *parent, struct device *self, void *aux)
+dzkbd_attach(device_t parent, device_t self, void *aux)
{
struct dz_softc *dz = device_private(parent);
struct dzkbd_softc *dzkbd = device_private(self);
Index: src/sys/dev/dec/mcclock.c
diff -u src/sys/dev/dec/mcclock.c:1.22 src/sys/dev/dec/mcclock.c:1.23
--- src/sys/dev/dec/mcclock.c:1.22 Sat Mar 14 15:36:17 2009
+++ src/sys/dev/dec/mcclock.c Tue May 12 14:18:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock.c,v 1.22 2009/03/14 15:36:17 dsl Exp $ */
+/* $NetBSD: mcclock.c,v 1.23 2009/05/12 14:18:16 cegger Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcclock.c,v 1.22 2009/03/14 15:36:17 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock.c,v 1.23 2009/05/12 14:18:16 cegger Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -51,7 +51,7 @@
#endif
-void mcclock_init(struct device *);
+void mcclock_init(device_t);
int mcclock_get(todr_chip_handle_t, volatile struct timeval *);
int mcclock_set(todr_chip_handle_t, volatile struct timeval *);
@@ -84,7 +84,7 @@
}
void
-mcclock_init(struct device *dev)
+mcclock_init(device_t dev)
{
struct mcclock_softc *sc = (struct mcclock_softc *)dev;
int rate;
Index: src/sys/dev/dec/dzms.c
diff -u src/sys/dev/dec/dzms.c:1.20 src/sys/dev/dec/dzms.c:1.21
--- src/sys/dev/dec/dzms.c:1.20 Tue May 12 12:11:54 2009
+++ src/sys/dev/dec/dzms.c Tue May 12 14:18:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dzms.c,v 1.20 2009/05/12 12:11:54 cegger Exp $ */
+/* $NetBSD: dzms.c,v 1.21 2009/05/12 14:18:16 cegger Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dzms.c,v 1.20 2009/05/12 12:11:54 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dzms.c,v 1.21 2009/05/12 14:18:16 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -79,11 +79,11 @@
u_int buttons;
int dx, dy;
- struct device *sc_wsmousedev;
+ device_t sc_wsmousedev;
};
-static int dzms_match(struct device *, cfdata_t, void *);
-static void dzms_attach(struct device *, struct device *, void *);
+static int dzms_match(device_t, cfdata_t, void *);
+static void dzms_attach(device_t, device_t, void *);
static int dzms_input(void *, int);
CFATTACH_DECL(dzms, sizeof(struct dzms_softc),
@@ -100,7 +100,7 @@
};
static int
-dzms_match(struct device *parent, cfdata_t cf, void *aux)
+dzms_match(device_t parent, cfdata_t cf, void *aux)
{
struct dzkm_attach_args *daa = aux;
@@ -116,7 +116,7 @@
}
static void
-dzms_attach(struct device *parent, struct device *self, void *aux)
+dzms_attach(device_t parent, device_t self, void *aux)
{
struct dz_softc *dz = device_private(parent);
struct dzms_softc *dzms = device_private(self);
Index: src/sys/dev/dec/dzvar.h
diff -u src/sys/dev/dec/dzvar.h:1.10 src/sys/dev/dec/dzvar.h:1.11
--- src/sys/dev/dec/dzvar.h:1.10 Sat Mar 15 00:57:15 2008
+++ src/sys/dev/dec/dzvar.h Tue May 12 14:18:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dzvar.h,v 1.10 2008/03/15 00:57:15 matt Exp $ */
+/* $NetBSD: dzvar.h,v 1.11 2009/05/12 14:18:16 cegger Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -109,6 +109,6 @@
void dzattach(struct dz_softc *, struct evcnt *, int);
void dzrint(void *);
void dzxint(void *);
-void dzreset(struct device *);
+void dzreset(device_t);
#endif /* _DEV_DEC_DZVAR_H_ */
Index: src/sys/dev/dec/vsxxxvar.h
diff -u src/sys/dev/dec/vsxxxvar.h:1.4 src/sys/dev/dec/vsxxxvar.h:1.5
--- src/sys/dev/dec/vsxxxvar.h:1.4 Mon May 26 10:31:22 2008
+++ src/sys/dev/dec/vsxxxvar.h Tue May 12 14:18:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vsxxxvar.h,v 1.4 2008/05/26 10:31:22 nisimura Exp $ */
+/* $NetBSD: vsxxxvar.h,v 1.5 2009/05/12 14:18:16 cegger Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
struct vsxxx_softc {
struct device sc_dev;
- struct device *sc_wsmousedev;
+ device_t sc_wsmousedev;
unsigned sc_nbyte;
union {
u_int8_t raw[4];
