diff options
| -rw-r--r-- | sys/rump/dev/Makefile.rumpdev | 4 | ||||
| -rw-r--r-- | sys/rump/dev/lib/libsysmon/Makefile | 18 | ||||
| -rw-r--r-- | sys/rump/dev/lib/libsysmon/component.c | 73 | ||||
| -rw-r--r-- | sys/rump/dev/lib/libsysmon/opt/sysmon_envsys.h | 3 | ||||
| -rw-r--r-- | sys/rump/dev/lib/libsysmon/opt/sysmon_power.h | 3 | ||||
| -rw-r--r-- | sys/rump/dev/lib/libsysmon/opt/sysmon_wdog.h | 3 | ||||
| -rw-r--r-- | sys/rump/dev/lib/libsysmon/shlib_version | 4 | ||||
| -rw-r--r-- | sys/rump/librump/rumpdev/rump_dev.c | 7 | ||||
| -rw-r--r-- | sys/rump/librump/rumpdev/rump_dev_private.h | 3 |
9 files changed, 112 insertions, 6 deletions
diff --git a/sys/rump/dev/Makefile.rumpdev b/sys/rump/dev/Makefile.rumpdev index ad45bc84ccc..1869d45d761 100644 --- a/sys/rump/dev/Makefile.rumpdev +++ b/sys/rump/dev/Makefile.rumpdev @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.rumpdev,v 1.7 2010/01/19 22:38:21 pooka Exp $ +# $NetBSD: Makefile.rumpdev,v 1.8 2010/01/31 03:06:59 pooka Exp $ # -RUMPDEVLIST= bpf cgd disk netsmb raidframe rnd dm +RUMPDEVLIST= bpf cgd disk dm netsmb raidframe rnd sysmon .for var in ${RUMPDEVLIST} RUMPDEVLIBS+=lib${var} diff --git a/sys/rump/dev/lib/libsysmon/Makefile b/sys/rump/dev/lib/libsysmon/Makefile new file mode 100644 index 00000000000..8ed5fafca2c --- /dev/null +++ b/sys/rump/dev/lib/libsysmon/Makefile @@ -0,0 +1,18 @@ +# $NetBSD: Makefile,v 1.1 2010/01/31 03:06:59 pooka Exp $ +# + +.PATH: ${.CURDIR}/../../../../dev/sysmon + +LIB= rumpdev_sysmon + +SRCS= sysmon_taskq.c sysmon_power.c sysmon_envsys.c sysmon_envsys_events.c \ + sysmon_envsys_tables.c sysmon_envsys_util.c sysmon_wdog.c sysmon.c \ + swwdog.c + +SRCS+= component.c + +CFLAGS+= -Wno-pointer-sign +CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs -I${.CURDIR}/opt + +.include <bsd.lib.mk> +.include <bsd.klinks.mk> diff --git a/sys/rump/dev/lib/libsysmon/component.c b/sys/rump/dev/lib/libsysmon/component.c new file mode 100644 index 00000000000..0a3562b6e74 --- /dev/null +++ b/sys/rump/dev/lib/libsysmon/component.c @@ -0,0 +1,73 @@ +/* $NetBSD: component.c,v 1.1 2010/01/31 03:06:59 pooka Exp $ */ + +/* + * Copyright (c) 2010 Antti Kantee. All Rights Reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS + * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include <sys/cdefs.h> +__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.1 2010/01/31 03:06:59 pooka Exp $"); + +#include <sys/param.h> +#include <sys/conf.h> +#include <sys/device.h> +#include <sys/stat.h> + +#include <dev/sysmon/sysmon_taskq.h> +#include <dev/sysmon/sysmonvar.h> + +#include "rump_dev_private.h" +#include "rump_vfs_private.h" + +void swwdogattach(int); + +void +rump_dev_sysmon_init() +{ + extern const struct cdevsw sysmon_cdevsw; + devmajor_t bmaj, cmaj; + int error; + + bmaj = cmaj = -1; + if ((error = devsw_attach("sysmon", NULL, &bmaj, + &sysmon_cdevsw, &cmaj)) != 0) + panic("sysmon devsw attach failed: %d", error); + + if ((error = rump_vfs_makeonedevnode(S_IFCHR, "/dev/sysmon", + cmaj, SYSMON_MINOR_ENVSYS)) != 0) + panic("cannot create /dev/sysmon: %d", error); + if ((error = rump_vfs_makeonedevnode(S_IFCHR, "/dev/watchdog", + cmaj, SYSMON_MINOR_WDOG)) != 0) + panic("cannot create /dev/watchdog: %d", error); + if ((error = rump_vfs_makeonedevnode(S_IFCHR, "/dev/power", + cmaj, SYSMON_MINOR_POWER)) != 0) + panic("cannot create /dev/power: %d", error); + + sysmon_task_queue_preinit(); + sysmon_task_queue_init(); + sysmon_envsys_init(); + sysmon_power_init(); + sysmon_wdog_init(); + + rump_pdev_add(swwdogattach, 0); +} diff --git a/sys/rump/dev/lib/libsysmon/opt/sysmon_envsys.h b/sys/rump/dev/lib/libsysmon/opt/sysmon_envsys.h new file mode 100644 index 00000000000..311773a0059 --- /dev/null +++ b/sys/rump/dev/lib/libsysmon/opt/sysmon_envsys.h @@ -0,0 +1,3 @@ +/* $NetBSD: sysmon_envsys.h,v 1.1 2010/01/31 03:06:59 pooka Exp $ */ + +#define NSYSMON_ENVSYS 1 diff --git a/sys/rump/dev/lib/libsysmon/opt/sysmon_power.h b/sys/rump/dev/lib/libsysmon/opt/sysmon_power.h new file mode 100644 index 00000000000..364315fa1d2 --- /dev/null +++ b/sys/rump/dev/lib/libsysmon/opt/sysmon_power.h @@ -0,0 +1,3 @@ +/* $NetBSD: sysmon_power.h,v 1.1 2010/01/31 03:07:00 pooka Exp $ */ + +#define NSYSMON_POWER 1 diff --git a/sys/rump/dev/lib/libsysmon/opt/sysmon_wdog.h b/sys/rump/dev/lib/libsysmon/opt/sysmon_wdog.h new file mode 100644 index 00000000000..ec7539d02b3 --- /dev/null +++ b/sys/rump/dev/lib/libsysmon/opt/sysmon_wdog.h @@ -0,0 +1,3 @@ +/* $NetBSD: sysmon_wdog.h,v 1.1 2010/01/31 03:07:00 pooka Exp $ */ + +#define NSYSMON_WDOG 1 diff --git a/sys/rump/dev/lib/libsysmon/shlib_version b/sys/rump/dev/lib/libsysmon/shlib_version new file mode 100644 index 00000000000..6adea4c41b5 --- /dev/null +++ b/sys/rump/dev/lib/libsysmon/shlib_version @@ -0,0 +1,4 @@ +# $NetBSD: shlib_version,v 1.1 2010/01/31 03:06:59 pooka Exp $ +# +major=0 +minor=0 diff --git a/sys/rump/librump/rumpdev/rump_dev.c b/sys/rump/librump/rumpdev/rump_dev.c index eb68d52d7b5..b0223b2e698 100644 --- a/sys/rump/librump/rumpdev/rump_dev.c +++ b/sys/rump/librump/rumpdev/rump_dev.c @@ -1,4 +1,4 @@ -/* $NetBSD: rump_dev.c,v 1.12 2010/01/19 22:38:21 pooka Exp $ */ +/* $NetBSD: rump_dev.c,v 1.13 2010/01/31 03:07:00 pooka Exp $ */ /* * Copyright (c) 2009 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rump_dev.c,v 1.12 2010/01/19 22:38:21 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rump_dev.c,v 1.13 2010/01/31 03:07:00 pooka Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -42,6 +42,7 @@ __weak_alias(rump_dev_raidframe_init,nocomponent); __weak_alias(rump_dev_netsmb_init,nocomponent); __weak_alias(rump_dev_rnd_init,nocomponent); __weak_alias(rump_dev_rumpusbhc_init,nocomponent); +__weak_alias(rump_dev_sysmon_init,nocomponent); __weak_alias(rump_device_configuration,nocomponent); __weak_alias(rump_wscons_configuration,nocomponent); @@ -66,6 +67,7 @@ rump_dev_init(void) rump_dev_netsmb_init(); rump_dev_rnd_init(); rump_dev_rumpusbhc_init(); + rump_dev_sysmon_init(); rump_pdev_finalize(); @@ -105,4 +107,3 @@ device_register_post_config(struct device *dev, void *v) /* nada */ } #endif - diff --git a/sys/rump/librump/rumpdev/rump_dev_private.h b/sys/rump/librump/rumpdev/rump_dev_private.h index 32a3dcdeb8a..460c0b517ab 100644 --- a/sys/rump/librump/rumpdev/rump_dev_private.h +++ b/sys/rump/librump/rumpdev/rump_dev_private.h @@ -1,4 +1,4 @@ -/* $NetBSD: rump_dev_private.h,v 1.8 2010/01/19 22:38:21 pooka Exp $ */ +/* $NetBSD: rump_dev_private.h,v 1.9 2010/01/31 03:07:00 pooka Exp $ */ /* * Copyright (c) 2009 Antti Kantee. All Rights Reserved. @@ -40,6 +40,7 @@ void rump_dev_raidframe_init(void); void rump_dev_netsmb_init(void); void rump_dev_rnd_init(void); void rump_dev_rumpusbhc_init(void); +void rump_dev_sysmon_init(void); void rump_device_configuration(void); void rump_wscons_configuration(void); |
