Module Name: src
Committed By: cegger
Date: Tue May 12 14:46:39 UTC 2009
Modified Files:
src/sys/dev/sun: bwtwo.c cgthree.c kbd.c kbdsunvar.h kbdvar.h msvar.h
sunms.c
Log Message:
struct device * -> device_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/sun/bwtwo.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/sun/cgthree.c
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/sun/kbd.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/sun/kbdsunvar.h
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/sun/kbdvar.h
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/sun/msvar.h
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/sun/sunms.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/sun/bwtwo.c
diff -u src/sys/dev/sun/bwtwo.c:1.25 src/sys/dev/sun/bwtwo.c:1.26
--- src/sys/dev/sun/bwtwo.c:1.25 Tue May 12 13:21:06 2009
+++ src/sys/dev/sun/bwtwo.c Tue May 12 14:46:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bwtwo.c,v 1.25 2009/05/12 13:21:06 cegger Exp $ */
+/* $NetBSD: bwtwo.c,v 1.26 2009/05/12 14:46:39 cegger Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bwtwo.c,v 1.25 2009/05/12 13:21:06 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bwtwo.c,v 1.26 2009/05/12 14:46:39 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -121,7 +121,7 @@
};
/* XXX we do not handle frame buffer interrupts (do not know how) */
-static void bwtwounblank(struct device *);
+static void bwtwounblank(device_t);
/* frame buffer generic driver */
static struct fbdriver bwtwofbdriver = {
@@ -356,7 +356,7 @@
}
static void
-bwtwounblank(struct device *dev)
+bwtwounblank(device_t dev)
{
struct bwtwo_softc *sc = device_private(dev);
Index: src/sys/dev/sun/cgthree.c
diff -u src/sys/dev/sun/cgthree.c:1.22 src/sys/dev/sun/cgthree.c:1.23
--- src/sys/dev/sun/cgthree.c:1.22 Sat Mar 14 21:04:23 2009
+++ src/sys/dev/sun/cgthree.c Tue May 12 14:46:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cgthree.c,v 1.22 2009/03/14 21:04:23 dsl Exp $ */
+/* $NetBSD: cgthree.c,v 1.23 2009/05/12 14:46:39 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgthree.c,v 1.22 2009/03/14 21:04:23 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgthree.c,v 1.23 2009/05/12 14:46:39 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -69,7 +69,7 @@
#include "opt_wsemul.h"
#endif
-static void cgthreeunblank(struct device *);
+static void cgthreeunblank(device_t);
static void cgthreeloadcmap(struct cgthree_softc *, int, int);
static void cgthree_set_video(struct cgthree_softc *, int);
static int cgthree_get_video(struct cgthree_softc *);
@@ -336,7 +336,7 @@
* Undo the effect of an FBIOSVIDEO that turns the video off.
*/
static void
-cgthreeunblank(struct device *dev)
+cgthreeunblank(device_t dev)
{
cgthree_set_video(device_private(dev), 1);
Index: src/sys/dev/sun/kbd.c
diff -u src/sys/dev/sun/kbd.c:1.62 src/sys/dev/sun/kbd.c:1.63
--- src/sys/dev/sun/kbd.c:1.62 Sun Jan 11 23:36:39 2009
+++ src/sys/dev/sun/kbd.c Tue May 12 14:46:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd.c,v 1.62 2009/01/11 23:36:39 christos Exp $ */
+/* $NetBSD: kbd.c,v 1.63 2009/05/12 14:46:39 cegger Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.62 2009/01/11 23:36:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.63 2009/05/12 14:46:39 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -97,7 +97,7 @@
static void sunkbd_wskbd_cnpollc(void *, int);
static void sunkbd_wskbd_cnbell(void *, u_int, u_int, u_int);
static void sunkbd_bell_off(void *v);
-static void kbd_enable(struct device *); /* deferred keyboard init */
+static void kbd_enable(device_t); /* deferred keyboard init */
const struct wskbd_accessops sunkbd_wskbd_accessops = {
wssunkbd_enable,
@@ -1015,7 +1015,7 @@
}
void
-kbd_enable(struct device *dev)
+kbd_enable(device_t dev)
{
struct kbd_softc *k = device_private(dev);
struct wskbddev_attach_args a;
Index: src/sys/dev/sun/kbdsunvar.h
diff -u src/sys/dev/sun/kbdsunvar.h:1.6 src/sys/dev/sun/kbdsunvar.h:1.7
--- src/sys/dev/sun/kbdsunvar.h:1.6 Sat Mar 29 19:15:36 2008
+++ src/sys/dev/sun/kbdsunvar.h Tue May 12 14:46:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: kbdsunvar.h,v 1.6 2008/03/29 19:15:36 tsutsui Exp $ */
+/* $NetBSD: kbdsunvar.h,v 1.7 2009/05/12 14:46:39 cegger Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -84,8 +84,8 @@
* underlying lower level driver and used as a back door when
* opening and closing the internal device.
*/
- int (*k_deviopen)(struct device *, int);
- int (*k_deviclose)(struct device *, int);
+ int (*k_deviopen)(device_t, int);
+ int (*k_deviclose)(device_t, int);
/*
* Callback provided by the lower layer (actual device driver).
Index: src/sys/dev/sun/kbdvar.h
diff -u src/sys/dev/sun/kbdvar.h:1.19 src/sys/dev/sun/kbdvar.h:1.20
--- src/sys/dev/sun/kbdvar.h:1.19 Sat Mar 29 19:15:36 2008
+++ src/sys/dev/sun/kbdvar.h Tue May 12 14:46:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: kbdvar.h,v 1.19 2008/03/29 19:15:36 tsutsui Exp $ */
+/* $NetBSD: kbdvar.h,v 1.20 2009/05/12 14:46:39 cegger Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -59,7 +59,7 @@
struct evvar k_events; /* event queue state */
#if NWSKBD > 0
- struct device * k_wskbd;/* handle for wskbd, if it is attached */
+ device_t k_wskbd;/* handle for wskbd, if it is attached */
int k_wsenabled; /* set if we are using wskbd */
#ifdef WSDISPLAY_COMPAT_RAWKBD
int k_wsraw; /* send raw events to wscons */
Index: src/sys/dev/sun/msvar.h
diff -u src/sys/dev/sun/msvar.h:1.8 src/sys/dev/sun/msvar.h:1.9
--- src/sys/dev/sun/msvar.h:1.8 Sat Mar 29 19:15:36 2008
+++ src/sys/dev/sun/msvar.h Tue May 12 14:46:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: msvar.h,v 1.8 2008/03/29 19:15:36 tsutsui Exp $ */
+/* $NetBSD: msvar.h,v 1.9 2009/05/12 14:46:39 cegger Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -82,8 +82,8 @@
* by the lower level driver and used as a back door
* when opening and closing the internal device.
*/
- int (*ms_deviopen) (struct device *, int);
- int (*ms_deviclose) (struct device *, int);
+ int (*ms_deviopen) (device_t, int);
+ int (*ms_deviclose) (device_t, int);
/* Flags to communicate with ms_softintr() */
volatile int ms_intr_flags;
@@ -113,7 +113,7 @@
volatile int ms_ready; /* event queue is ready */
struct evvar ms_events; /* event queue state */
- struct device *ms_wsmousedev;
+ device_t ms_wsmousedev;
};
/* front-end call back for mouse input */
Index: src/sys/dev/sun/sunms.c
diff -u src/sys/dev/sun/sunms.c:1.30 src/sys/dev/sun/sunms.c:1.31
--- src/sys/dev/sun/sunms.c:1.30 Tue May 12 13:21:06 2009
+++ src/sys/dev/sun/sunms.c Tue May 12 14:46:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sunms.c,v 1.30 2009/05/12 13:21:06 cegger Exp $ */
+/* $NetBSD: sunms.c,v 1.31 2009/05/12 14:46:39 cegger Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunms.c,v 1.30 2009/05/12 13:21:06 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunms.c,v 1.31 2009/05/12 14:46:39 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,7 +90,7 @@
static int sunms_match(device_t, cfdata_t, void *);
static void sunms_attach(device_t, device_t, void *);
-static int sunmsiopen(struct device *, int mode);
+static int sunmsiopen(device_t, int mode);
int sunmsinput(int, struct tty *);
CFATTACH_DECL_NEW(ms_tty, sizeof(struct ms_softc),
