diff options
| author | cegger <cegger@NetBSD.org> | 2009-05-12 14:38:26 +0000 |
|---|---|---|
| committer | cegger <cegger@NetBSD.org> | 2009-05-12 14:38:26 +0000 |
| commit | 7cf2991222ea44a8a722cf40f50f32f50785265e (patch) | |
| tree | 731d31e467e3cddc3965b328d7fa313614de7008 /sys/dev/sun | |
| parent | 99747a8099a6916ccfc458619170aec025801090 (diff) | |
struct device * -> device_t, no functional changes intended.
Diffstat (limited to 'sys/dev/sun')
| -rw-r--r-- | sys/dev/sun/bwtwo.c | 8 | ||||
| -rw-r--r-- | sys/dev/sun/cgthree.c | 8 | ||||
| -rw-r--r-- | sys/dev/sun/kbd.c | 8 | ||||
| -rw-r--r-- | sys/dev/sun/kbdsunvar.h | 6 | ||||
| -rw-r--r-- | sys/dev/sun/kbdvar.h | 4 | ||||
| -rw-r--r-- | sys/dev/sun/msvar.h | 8 | ||||
| -rw-r--r-- | sys/dev/sun/sunms.c | 6 |
7 files changed, 24 insertions, 24 deletions
diff --git a/sys/dev/sun/bwtwo.c b/sys/dev/sun/bwtwo.c index b96da9fd947..8af76f2f64d 100644 --- a/sys/dev/sun/bwtwo.c +++ b/sys/dev/sun/bwtwo.c @@ -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 @@ const struct cdevsw bwtwo_cdevsw = { }; /* 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 @@ bwtwoioctl(dev_t dev, u_long cmd, void *data, int flags, struct lwp *l) } static void -bwtwounblank(struct device *dev) +bwtwounblank(device_t dev) { struct bwtwo_softc *sc = device_private(dev); diff --git a/sys/dev/sun/cgthree.c b/sys/dev/sun/cgthree.c index 532c973ceaa..ceee9f42455 100644 --- a/sys/dev/sun/cgthree.c +++ b/sys/dev/sun/cgthree.c @@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: cgthree.c,v 1.22 2009/03/14 21:04:23 dsl Exp $"); #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 @@ cgthreeioctl(dev_t dev, u_long cmd, void *data, int flags, struct lwp *l) * 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); diff --git a/sys/dev/sun/kbd.c b/sys/dev/sun/kbd.c index 67ab165fee5..f08ff33523e 100644 --- a/sys/dev/sun/kbd.c +++ b/sys/dev/sun/kbd.c @@ -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_cngetc(void *, u_int *, int *); 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 @@ sunkbd_wskbd_cnbell(void *v, u_int pitch, u_int period, u_int volume) } void -kbd_enable(struct device *dev) +kbd_enable(device_t dev) { struct kbd_softc *k = device_private(dev); struct wskbddev_attach_args a; diff --git a/sys/dev/sun/kbdsunvar.h b/sys/dev/sun/kbdsunvar.h index 10569e472e8..9248b699faf 100644 --- a/sys/dev/sun/kbdsunvar.h +++ b/sys/dev/sun/kbdsunvar.h @@ -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 @@ struct kbd_sun_softc { * 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). diff --git a/sys/dev/sun/kbdvar.h b/sys/dev/sun/kbdvar.h index 57e991b6895..85f1398a648 100644 --- a/sys/dev/sun/kbdvar.h +++ b/sys/dev/sun/kbdvar.h @@ -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 kbd_softc { 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 */ diff --git a/sys/dev/sun/msvar.h b/sys/dev/sun/msvar.h index 32138b7290b..60254920e96 100644 --- a/sys/dev/sun/msvar.h +++ b/sys/dev/sun/msvar.h @@ -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 @@ struct ms_softc { * 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 @@ struct ms_softc { 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 */ diff --git a/sys/dev/sun/sunms.c b/sys/dev/sun/sunms.c index 46dd824fb2a..1a781f13947 100644 --- a/sys/dev/sun/sunms.c +++ b/sys/dev/sun/sunms.c @@ -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 @@ int sunms_bps = MS_DEFAULT_BPS; 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), |
