Module Name: src
Committed By: cegger
Date: Tue May 12 14:22:39 UTC 2009
Modified Files:
src/sys/dev/hpc: bivideo.c btnmgr.c button.c hpcapm.c hpcin.c
hpcioman.c hpckbd.c hpcout.c hpf1275a_tty.c pwctl.c
Log Message:
struct device * -> device_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/hpc/bivideo.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/hpc/btnmgr.c \
src/sys/dev/hpc/hpf1275a_tty.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/hpc/button.c src/sys/dev/hpc/hpcout.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/hpc/hpcapm.c \
src/sys/dev/hpc/hpcioman.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/hpc/hpcin.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/hpc/hpckbd.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/hpc/pwctl.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/hpc/bivideo.c
diff -u src/sys/dev/hpc/bivideo.c:1.29 src/sys/dev/hpc/bivideo.c:1.30
--- src/sys/dev/hpc/bivideo.c:1.29 Tue May 12 12:13:49 2009
+++ src/sys/dev/hpc/bivideo.c Tue May 12 14:22:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bivideo.c,v 1.29 2009/05/12 12:13:49 cegger Exp $ */
+/* $NetBSD: bivideo.c,v 1.30 2009/05/12 14:22:39 cegger Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bivideo.c,v 1.29 2009/05/12 12:13:49 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bivideo.c,v 1.30 2009/05/12 14:22:39 cegger Exp $");
#ifdef _KERNEL_OPT
#include "opt_hpcfb.h"
@@ -79,8 +79,8 @@
/*
* function prototypes
*/
-int bivideomatch(struct device *, cfdata_t, void *);
-void bivideoattach(struct device *, struct device *, void *);
+int bivideomatch(device_t, cfdata_t, void *);
+void bivideoattach(device_t, device_t, void *);
int bivideo_ioctl(void *, u_long, void *, int, struct lwp *);
paddr_t bivideo_mmap(void *, off_t, int);
@@ -140,7 +140,7 @@
* function bodies
*/
int
-bivideomatch(struct device *parent, cfdata_t match, void *aux)
+bivideomatch(device_t parent, cfdata_t match, void *aux)
{
struct mainbus_attach_args *ma = aux;
@@ -152,7 +152,7 @@
}
void
-bivideoattach(struct device *parent, struct device *self, void *aux)
+bivideoattach(device_t parent, device_t self, void *aux)
{
struct bivideo_softc *sc = device_private(self);
struct hpcfb_attach_args ha;
Index: src/sys/dev/hpc/btnmgr.c
diff -u src/sys/dev/hpc/btnmgr.c:1.24 src/sys/dev/hpc/btnmgr.c:1.25
--- src/sys/dev/hpc/btnmgr.c:1.24 Tue May 12 12:13:49 2009
+++ src/sys/dev/hpc/btnmgr.c Tue May 12 14:22:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: btnmgr.c,v 1.24 2009/05/12 12:13:49 cegger Exp $ */
+/* $NetBSD: btnmgr.c,v 1.25 2009/05/12 14:22:39 cegger Exp $ */
/*-
* Copyright (c) 1999
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btnmgr.c,v 1.24 2009/05/12 12:13:49 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btnmgr.c,v 1.25 2009/05/12 14:22:39 cegger Exp $");
#ifdef _KERNEL_OPT
#include "opt_btnmgr.h"
@@ -77,14 +77,14 @@
struct device sc_dev;
config_hook_tag sc_hook_tag;
int sc_enabled;
- struct device *sc_wskbddev;
+ device_t sc_wskbddev;
#ifdef WSDISPLAY_COMPAT_RAWKBD
int sc_rawkbd;
#endif
};
-int btnmgrmatch(struct device *, cfdata_t, void *);
-void btnmgrattach(struct device *, struct device *, void *);
+int btnmgrmatch(device_t, cfdata_t, void *);
+void btnmgrattach(device_t, device_t, void *);
const char *btnmgr_name(long);
static int btnmgr_hook(void *, int, long, void *);
@@ -173,7 +173,7 @@
* function bodies
*/
int
-btnmgrmatch(struct device *parent, cfdata_t match, void *aux)
+btnmgrmatch(device_t parent, cfdata_t match, void *aux)
{
struct mainbus_attach_args *ma = aux;
@@ -184,8 +184,8 @@
}
void
-btnmgrattach(struct device *parent,
- struct device *self, void *aux)
+btnmgrattach(device_t parent,
+ device_t self, void *aux)
{
int id;
struct btnmgr_softc *sc = device_private(self);
Index: src/sys/dev/hpc/hpf1275a_tty.c
diff -u src/sys/dev/hpc/hpf1275a_tty.c:1.24 src/sys/dev/hpc/hpf1275a_tty.c:1.25
--- src/sys/dev/hpc/hpf1275a_tty.c:1.24 Tue May 12 12:13:49 2009
+++ src/sys/dev/hpc/hpf1275a_tty.c Tue May 12 14:22:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: hpf1275a_tty.c,v 1.24 2009/05/12 12:13:49 cegger Exp $ */
+/* $NetBSD: hpf1275a_tty.c,v 1.25 2009/05/12 14:22:39 cegger Exp $ */
/*
* Copyright (c) 2004 Valeriy E. Ushakov
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpf1275a_tty.c,v 1.24 2009/05/12 12:13:49 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpf1275a_tty.c,v 1.25 2009/05/12 14:22:39 cegger Exp $");
#include "opt_wsdisplay_compat.h"
@@ -59,7 +59,7 @@
struct device sc_dev;
struct tty *sc_tp; /* back reference to the tty */
- struct device *sc_wskbd; /* wskbd child */
+ device_t sc_wskbd; /* wskbd child */
int sc_enabled;
#ifdef WSDISPLAY_COMPAT_RAWKBD
int sc_rawkbd;
@@ -76,9 +76,9 @@
static int hpf1275a_input(int, struct tty *);
/* autoconf(9) methods */
-static int hpf1275a_match(struct device *, cfdata_t, void *);
-static void hpf1275a_attach(struct device *, struct device *, void *);
-static int hpf1275a_detach(struct device *, int);
+static int hpf1275a_match(device_t, cfdata_t, void *);
+static void hpf1275a_attach(device_t, device_t, void *);
+static int hpf1275a_detach(device_t, int);
/* wskbd(4) accessops */
static int hpf1275a_wskbd_enable(void *, int);
@@ -244,7 +244,7 @@
* XXX: unused: config_attach_pseudo(9) does not call ca_match.
*/
static int
-hpf1275a_match(struct device *self,
+hpf1275a_match(device_t self,
cfdata_t cfdata, void *arg)
{
@@ -258,8 +258,8 @@
* open the line discipline.
*/
static void
-hpf1275a_attach(struct device *parent,
- struct device *self, void *aux)
+hpf1275a_attach(device_t parent,
+ device_t self, void *aux)
{
struct hpf1275a_softc *sc = device_private(self);
struct wskbddev_attach_args wska;
@@ -281,7 +281,7 @@
* Autoconf detach routine. Called when we close the line discipline.
*/
static int
-hpf1275a_detach(struct device *self, int flags)
+hpf1275a_detach(device_t self, int flags)
{
struct hpf1275a_softc *sc = device_private(self);
int error;
Index: src/sys/dev/hpc/button.c
diff -u src/sys/dev/hpc/button.c:1.14 src/sys/dev/hpc/button.c:1.15
--- src/sys/dev/hpc/button.c:1.14 Tue May 12 12:13:49 2009
+++ src/sys/dev/hpc/button.c Tue May 12 14:22:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: button.c,v 1.14 2009/05/12 12:13:49 cegger Exp $ */
+/* $NetBSD: button.c,v 1.15 2009/05/12 14:22:39 cegger Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: button.c,v 1.14 2009/05/12 12:13:49 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: button.c,v 1.15 2009/05/12 14:22:39 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -62,8 +62,8 @@
config_hook_tag sc_ghook_tag;
};
-static int button_match(struct device *, cfdata_t, void *);
-static void button_attach(struct device *, struct device *, void *);
+static int button_match(device_t, cfdata_t, void *);
+static void button_attach(device_t, device_t, void *);
static int button_intr(void *);
static int button_state(void *, int, long, void *);
@@ -71,7 +71,7 @@
button_match, button_attach, NULL, NULL);
int
-button_match(struct device *parent, cfdata_t match, void *aux)
+button_match(device_t parent, cfdata_t match, void *aux)
{
struct hpcio_attach_args *haa = aux;
platid_mask_t mask;
@@ -85,7 +85,7 @@
}
void
-button_attach(struct device *parent, struct device *self, void *aux)
+button_attach(device_t parent, device_t self, void *aux)
{
struct hpcio_attach_args *haa = aux;
int *loc;
Index: src/sys/dev/hpc/hpcout.c
diff -u src/sys/dev/hpc/hpcout.c:1.14 src/sys/dev/hpc/hpcout.c:1.15
--- src/sys/dev/hpc/hpcout.c:1.14 Tue May 12 12:13:49 2009
+++ src/sys/dev/hpc/hpcout.c Tue May 12 14:22:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcout.c,v 1.14 2009/05/12 12:13:49 cegger Exp $ */
+/* $NetBSD: hpcout.c,v 1.15 2009/05/12 14:22:39 cegger Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcout.c,v 1.14 2009/05/12 12:13:49 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcout.c,v 1.15 2009/05/12 14:22:39 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,8 +44,8 @@
#include "locators.h"
-int hpcout_match(struct device *, cfdata_t, void *);
-void hpcout_attach(struct device *, struct device *, void *);
+int hpcout_match(device_t, cfdata_t, void *);
+void hpcout_attach(device_t, device_t, void *);
int hpcout_hook(void *, int, long, void *);
struct hpcout_softc {
@@ -66,13 +66,13 @@
hpcout_match, hpcout_attach, NULL, NULL);
int
-hpcout_match(struct device *parent, cfdata_t cf, void *aux)
+hpcout_match(device_t parent, cfdata_t cf, void *aux)
{
return (1);
}
void
-hpcout_attach(struct device *parent, struct device *self, void *aux)
+hpcout_attach(device_t parent, device_t self, void *aux)
{
struct hpcioman_attach_args *hma = aux;
struct hpcout_softc *sc = device_private(self);
Index: src/sys/dev/hpc/hpcapm.c
diff -u src/sys/dev/hpc/hpcapm.c:1.17 src/sys/dev/hpc/hpcapm.c:1.18
--- src/sys/dev/hpc/hpcapm.c:1.17 Tue May 12 12:13:49 2009
+++ src/sys/dev/hpc/hpcapm.c Tue May 12 14:22:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcapm.c,v 1.17 2009/05/12 12:13:49 cegger Exp $ */
+/* $NetBSD: hpcapm.c,v 1.18 2009/05/12 14:22:39 cegger Exp $ */
/*
* Copyright (c) 2000 Takemura Shin
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcapm.c,v 1.17 2009/05/12 12:13:49 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcapm.c,v 1.18 2009/05/12 14:22:39 cegger Exp $");
#ifdef _KERNEL_OPT
#include "opt_hpcapm.h"
@@ -61,8 +61,8 @@
#endif
/* Definition of the driver for autoconfig. */
-static int hpcapm_match(struct device *, cfdata_t, void *);
-static void hpcapm_attach(struct device *, struct device *, void *);
+static int hpcapm_match(device_t, cfdata_t, void *);
+static void hpcapm_attach(device_t, device_t, void *);
static int hpcapm_hook(void *, int, long, void *);
static void hpcapm_disconnect(void *);
@@ -106,7 +106,7 @@
extern struct cfdriver hpcapm_cd;
static int
-hpcapm_match(struct device *parent,
+hpcapm_match(device_t parent,
cfdata_t cf, void *aux)
{
@@ -114,8 +114,8 @@
}
static void
-hpcapm_attach(struct device *parent,
- struct device *self, void *aux)
+hpcapm_attach(device_t parent,
+ device_t self, void *aux)
{
struct apmhpc_softc *sc;
struct apmdev_attach_args aaa;
Index: src/sys/dev/hpc/hpcioman.c
diff -u src/sys/dev/hpc/hpcioman.c:1.17 src/sys/dev/hpc/hpcioman.c:1.18
--- src/sys/dev/hpc/hpcioman.c:1.17 Tue May 12 12:13:49 2009
+++ src/sys/dev/hpc/hpcioman.c Tue May 12 14:22:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcioman.c,v 1.17 2009/05/12 12:13:49 cegger Exp $ */
+/* $NetBSD: hpcioman.c,v 1.18 2009/05/12 14:22:39 cegger Exp $ */
/*-
* Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcioman.c,v 1.17 2009/05/12 12:13:49 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcioman.c,v 1.18 2009/05/12 14:22:39 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,10 +46,10 @@
#include "locators.h"
-int hpcioman_match(struct device *, cfdata_t, void *);
-void hpcioman_attach(struct device *, struct device *, void *);
+int hpcioman_match(device_t, cfdata_t, void *);
+void hpcioman_attach(device_t, device_t, void *);
int hpcioman_print(void *, const char *);
-int hpcioman_search(struct device *, cfdata_t,
+int hpcioman_search(device_t, cfdata_t,
const int *, void *);
struct hpcioman_softc {
@@ -60,7 +60,7 @@
hpcioman_match, hpcioman_attach, NULL, NULL);
int
-hpcioman_match(struct device *parent, cfdata_t cf, void *aux)
+hpcioman_match(device_t parent, cfdata_t cf, void *aux)
{
struct hpcio_attach_args *haa = aux;
platid_mask_t mask;
@@ -74,7 +74,7 @@
}
void
-hpcioman_attach(struct device *parent, struct device *self, void *aux)
+hpcioman_attach(device_t parent, device_t self, void *aux)
{
printf("\n");
@@ -82,7 +82,7 @@
}
int
-hpcioman_search(struct device *parent, cfdata_t cf,
+hpcioman_search(device_t parent, cfdata_t cf,
const int *ldesc, void *aux)
{
//struct hpcioman_softc *sc = (struct hpcioman_softc *)parent;
Index: src/sys/dev/hpc/hpcin.c
diff -u src/sys/dev/hpc/hpcin.c:1.13 src/sys/dev/hpc/hpcin.c:1.14
--- src/sys/dev/hpc/hpcin.c:1.13 Tue May 12 12:13:49 2009
+++ src/sys/dev/hpc/hpcin.c Tue May 12 14:22:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcin.c,v 1.13 2009/05/12 12:13:49 cegger Exp $ */
+/* $NetBSD: hpcin.c,v 1.14 2009/05/12 14:22:39 cegger Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcin.c,v 1.13 2009/05/12 12:13:49 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcin.c,v 1.14 2009/05/12 14:22:39 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,8 +44,8 @@
#include "locators.h"
-int hpcin_match(struct device *, cfdata_t, void *);
-void hpcin_attach(struct device *, struct device *, void *);
+int hpcin_match(device_t, cfdata_t, void *);
+void hpcin_attach(device_t, device_t, void *);
int hpcin_intr(void *);
struct hpcin_softc {
@@ -69,13 +69,13 @@
hpcin_match, hpcin_attach, NULL, NULL);
int
-hpcin_match(struct device *parent, cfdata_t cf, void *aux)
+hpcin_match(device_t parent, cfdata_t cf, void *aux)
{
return (1);
}
void
-hpcin_attach(struct device *parent, struct device *self, void *aux)
+hpcin_attach(device_t parent, device_t self, void *aux)
{
struct hpcioman_attach_args *hma = aux;
struct hpcin_softc *sc = device_private(self);
Index: src/sys/dev/hpc/hpckbd.c
diff -u src/sys/dev/hpc/hpckbd.c:1.27 src/sys/dev/hpc/hpckbd.c:1.28
--- src/sys/dev/hpc/hpckbd.c:1.27 Tue May 12 12:13:49 2009
+++ src/sys/dev/hpc/hpckbd.c Tue May 12 14:22:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: hpckbd.c,v 1.27 2009/05/12 12:13:49 cegger Exp $ */
+/* $NetBSD: hpckbd.c,v 1.28 2009/05/12 14:22:39 cegger Exp $ */
/*-
* Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpckbd.c,v 1.27 2009/05/12 12:13:49 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpckbd.c,v 1.28 2009/05/12 14:22:39 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -92,8 +92,8 @@
struct hpckbd_core sc_coredata;
};
-int hpckbd_match(struct device *, cfdata_t, void *);
-void hpckbd_attach(struct device *, struct device *, void *);
+int hpckbd_match(device_t, cfdata_t, void *);
+void hpckbd_attach(device_t, device_t, void *);
void hpckbd_initcore(struct hpckbd_core *, struct hpckbd_ic_if *, int);
void hpckbd_initif(struct hpckbd_core *);
@@ -139,14 +139,14 @@
};
int
-hpckbd_match(struct device *parent,
+hpckbd_match(device_t parent,
cfdata_t cf, void *aux)
{
return (1);
}
void
-hpckbd_attach(struct device *parent, struct device *self, void *aux)
+hpckbd_attach(device_t parent, device_t self, void *aux)
{
struct hpckbd_attach_args *haa = aux;
struct hpckbd_softc *sc = device_private(self);
Index: src/sys/dev/hpc/pwctl.c
diff -u src/sys/dev/hpc/pwctl.c:1.18 src/sys/dev/hpc/pwctl.c:1.19
--- src/sys/dev/hpc/pwctl.c:1.18 Tue May 12 12:13:49 2009
+++ src/sys/dev/hpc/pwctl.c Tue May 12 14:22:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pwctl.c,v 1.18 2009/05/12 12:13:49 cegger Exp $ */
+/* $NetBSD: pwctl.c,v 1.19 2009/05/12 14:22:39 cegger Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pwctl.c,v 1.18 2009/05/12 12:13:49 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pwctl.c,v 1.19 2009/05/12 14:22:39 cegger Exp $");
#ifdef _KERNEL_OPT
#include "opt_pwctl.h"
@@ -82,8 +82,8 @@
int sc_initvalue;
};
-static int pwctl_match(struct device *, cfdata_t, void *);
-static void pwctl_attach(struct device *, struct device *, void *);
+static int pwctl_match(device_t, cfdata_t, void *);
+static void pwctl_attach(device_t, device_t, void *);
static int pwctl_hook(void *, int, long, void *);
static int pwctl_ghook(void *, int, long, void *);
int pwctl_hardpower(void *, int, long, void *);
@@ -92,7 +92,7 @@
pwctl_match, pwctl_attach, NULL, NULL);
int
-pwctl_match(struct device *parent, cfdata_t match, void *aux)
+pwctl_match(device_t parent, cfdata_t match, void *aux)
{
struct hpcio_attach_args *haa = aux;
platid_mask_t mask;
@@ -108,7 +108,7 @@
}
void
-pwctl_attach(struct device *parent, struct device *self, void *aux)
+pwctl_attach(device_t parent, device_t self, void *aux)
{
struct hpcio_attach_args *haa = aux;
int *loc;
