Module Name: src
Committed By: pooka
Date: Thu Mar 13 01:47:07 UTC 2014
Modified Files:
src/sys/rump/dev/lib/libsysmon: Makefile
Added Files:
src/sys/rump/dev/lib/libsysmon: sysmon_component.c
Removed Files:
src/sys/rump/dev/lib/libsysmon: component.c
Log Message:
rename component.c -> sysmon_component.c
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/dev/lib/libsysmon/Makefile
cvs rdiff -u -r1.6 -r0 src/sys/rump/dev/lib/libsysmon/component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libsysmon/sysmon_component.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/rump/dev/lib/libsysmon/Makefile
diff -u src/sys/rump/dev/lib/libsysmon/Makefile:1.5 src/sys/rump/dev/lib/libsysmon/Makefile:1.6
--- src/sys/rump/dev/lib/libsysmon/Makefile:1.5 Sun Dec 5 16:50:09 2010
+++ src/sys/rump/dev/lib/libsysmon/Makefile Thu Mar 13 01:47:07 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/12/05 16:50:09 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2014/03/13 01:47:07 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../dev/sysmon
@@ -10,7 +10,7 @@ SRCS= sysmon_taskq.c sysmon_power.c sysm
sysmon_envsys_tables.c sysmon_envsys_util.c sysmon_wdog.c sysmon.c \
swsensor.c swwdog.c
-SRCS+= component.c
+SRCS+= sysmon_component.c
CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs -I${.CURDIR}/opt
Added files:
Index: src/sys/rump/dev/lib/libsysmon/sysmon_component.c
diff -u /dev/null src/sys/rump/dev/lib/libsysmon/sysmon_component.c:1.1
--- /dev/null Thu Mar 13 01:47:07 2014
+++ src/sys/rump/dev/lib/libsysmon/sysmon_component.c Thu Mar 13 01:47:07 2014
@@ -0,0 +1,82 @@
+/* $NetBSD: sysmon_component.c,v 1.1 2014/03/13 01:47:07 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: sysmon_component.c,v 1.1 2014/03/13 01:47:07 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_private.h"
+#include "rump_dev_private.h"
+#include "rump_vfs_private.h"
+
+#include "ioconf.c"
+
+void swwdogattach(int);
+void swsensorattach(int);
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+ extern const struct cdevsw sysmon_cdevsw;
+ devmajor_t bmaj, cmaj;
+ int error;
+
+ if ((error = config_init_component(cfdriver_ioconf_swwdog,
+ cfattach_ioconf_swwdog, cfdata_ioconf_swwdog)) != 0) {
+ printf("cannot attach swwdog: %d\n", error);
+ return;
+ }
+
+ 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);
+}
