summaryrefslogtreecommitdiff
path: root/sys/dev/sysmon
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2007-03-04 05:59:00 +0000
committerchristos <christos@NetBSD.org>2007-03-04 05:59:00 +0000
commit53524e44efd7c7176da8dc8190a698b2fe184db1 (patch)
tree68b6fb4aee85c3eb0a522cc199c3a3427938828e /sys/dev/sysmon
parent1b20cebad5f8d3582a41d5599641a95247721732 (diff)
Kill caddr_t; there will be some MI fallout, but it will be fixed shortly.
Diffstat (limited to 'sys/dev/sysmon')
-rw-r--r--sys/dev/sysmon/sysmon.c6
-rw-r--r--sys/dev/sysmon/sysmon_envsys.c6
-rw-r--r--sys/dev/sysmon/sysmon_power.c6
-rw-r--r--sys/dev/sysmon/sysmon_wdog.c6
-rw-r--r--sys/dev/sysmon/sysmonvar.h10
5 files changed, 17 insertions, 17 deletions
diff --git a/sys/dev/sysmon/sysmon.c b/sys/dev/sysmon/sysmon.c
index 84fd0166632..e78f9fcd7bb 100644
--- a/sys/dev/sysmon/sysmon.c
+++ b/sys/dev/sysmon/sysmon.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon.c,v 1.14 2006/11/16 01:33:26 christos Exp $ */
+/* $NetBSD: sysmon.c,v 1.15 2007/03/04 06:02:45 christos Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.14 2006/11/16 01:33:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.15 2007/03/04 06:02:45 christos Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -138,7 +138,7 @@ sysmonclose(dev_t dev, int flag, int mode, struct lwp *l)
* Perform a control request.
*/
int
-sysmonioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
+sysmonioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
{
int error;
diff --git a/sys/dev/sysmon/sysmon_envsys.c b/sys/dev/sysmon/sysmon_envsys.c
index e06765cbbcf..c15b3c75b04 100644
--- a/sys/dev/sysmon/sysmon_envsys.c
+++ b/sys/dev/sysmon/sysmon_envsys.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys.c,v 1.16 2007/02/19 06:08:37 ad Exp $ */
+/* $NetBSD: sysmon_envsys.c,v 1.17 2007/03/04 06:02:45 christos Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.16 2007/02/19 06:08:37 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.17 2007/03/04 06:02:45 christos Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -117,7 +117,7 @@ sysmonclose_envsys(dev_t dev, int flag, int mode,
* Perform an envsys control request.
*/
int
-sysmonioctl_envsys(dev_t dev, u_long cmd, caddr_t data,
+sysmonioctl_envsys(dev_t dev, u_long cmd, void *data,
int flag, struct lwp *l)
{
struct sysmon_envsys *sme;
diff --git a/sys/dev/sysmon/sysmon_power.c b/sys/dev/sysmon/sysmon_power.c
index 5fb85f59dca..bcd851cf656 100644
--- a/sys/dev/sysmon/sysmon_power.c
+++ b/sys/dev/sysmon/sysmon_power.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_power.c,v 1.16 2007/02/19 06:08:37 ad Exp $ */
+/* $NetBSD: sysmon_power.c,v 1.17 2007/03/04 06:02:45 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.16 2007/02/19 06:08:37 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.17 2007/03/04 06:02:45 christos Exp $");
#include <sys/param.h>
#include <sys/reboot.h>
@@ -315,7 +315,7 @@ sysmonkqfilter_power(dev_t dev, struct knote *kn)
* Perform a power managmenet control request.
*/
int
-sysmonioctl_power(dev_t dev, u_long cmd, caddr_t data,
+sysmonioctl_power(dev_t dev, u_long cmd, void *data,
int flag, struct lwp *l)
{
int error = 0;
diff --git a/sys/dev/sysmon/sysmon_wdog.c b/sys/dev/sysmon/sysmon_wdog.c
index 56a9f517c55..47faea1e3b6 100644
--- a/sys/dev/sysmon/sysmon_wdog.c
+++ b/sys/dev/sysmon/sysmon_wdog.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_wdog.c,v 1.17 2007/02/19 06:08:37 ad Exp $ */
+/* $NetBSD: sysmon_wdog.c,v 1.18 2007/03/04 06:02:45 christos Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_wdog.c,v 1.17 2007/02/19 06:08:37 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_wdog.c,v 1.18 2007/03/04 06:02:45 christos Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -151,7 +151,7 @@ sysmonclose_wdog(dev_t dev, int flag, int mode,
* Perform a watchdog control request.
*/
int
-sysmonioctl_wdog(dev_t dev, u_long cmd, caddr_t data, int flag,
+sysmonioctl_wdog(dev_t dev, u_long cmd, void *data, int flag,
struct lwp *l)
{
struct sysmon_wdog *smw;
diff --git a/sys/dev/sysmon/sysmonvar.h b/sys/dev/sysmon/sysmonvar.h
index 58470d2d485..9fa56f12d88 100644
--- a/sys/dev/sysmon/sysmonvar.h
+++ b/sys/dev/sysmon/sysmonvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmonvar.h,v 1.12 2006/07/08 20:26:06 christos Exp $ */
+/* $NetBSD: sysmonvar.h,v 1.13 2007/03/04 06:02:45 christos Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -80,7 +80,7 @@ struct sysmon_envsys {
int sysmonopen_envsys(dev_t, int, int, struct lwp *);
int sysmonclose_envsys(dev_t, int, int, struct lwp *);
-int sysmonioctl_envsys(dev_t, u_long, caddr_t, int, struct lwp *);
+int sysmonioctl_envsys(dev_t, u_long, void *, int, struct lwp *);
int sysmon_envsys_register(struct sysmon_envsys *);
void sysmon_envsys_unregister(struct sysmon_envsys *);
@@ -105,7 +105,7 @@ struct sysmon_wdog {
int sysmonopen_wdog(dev_t, int, int, struct lwp *);
int sysmonclose_wdog(dev_t, int, int, struct lwp *);
-int sysmonioctl_wdog(dev_t, u_long, caddr_t, int, struct lwp *);
+int sysmonioctl_wdog(dev_t, u_long, void *, int, struct lwp *);
int sysmon_wdog_register(struct sysmon_wdog *);
void sysmon_wdog_unregister(struct sysmon_wdog *);
@@ -126,7 +126,7 @@ int sysmonclose_power(dev_t, int, int, struct lwp *);
int sysmonread_power(dev_t, struct uio *, int);
int sysmonpoll_power(dev_t, int, struct lwp *);
int sysmonkqfilter_power(dev_t, struct knote *);
-int sysmonioctl_power(dev_t, u_long, caddr_t, int, struct lwp *);
+int sysmonioctl_power(dev_t, u_long, void *, int, struct lwp *);
void sysmon_power_settype(const char *);
@@ -135,6 +135,6 @@ void sysmon_pswitch_unregister(struct sysmon_pswitch *);
void sysmon_pswitch_event(struct sysmon_pswitch *, int);
-int sysmonioctl_envsys(dev_t, u_long, caddr_t, int, struct lwp *);
+int sysmonioctl_envsys(dev_t, u_long, void *, int, struct lwp *);
#endif /* _DEV_SYSMON_SYSMONVAR_H_ */