Module Name: src
Committed By: pgoyette
Date: Tue Oct 19 11:58:01 UTC 2010
Modified Files:
src/distrib/sets/lists/man: mi
src/distrib/sets/lists/modules: mi
src/share/man/man4: Makefile
src/sys/modules: Makefile
src/sys/rump/dev/lib/libsysmon: Makefile component.c
Log Message:
Build the new swsensor(4) device and add to set lists
To generate a diff of this commit:
cvs rdiff -u -r1.1240 -r1.1241 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/modules/mi
cvs rdiff -u -r1.527 -r1.528 src/share/man/man4/Makefile
cvs rdiff -u -r1.47 -r1.48 src/sys/modules/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libsysmon/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/dev/lib/libsysmon/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/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1240 src/distrib/sets/lists/man/mi:1.1241
--- src/distrib/sets/lists/man/mi:1.1240 Tue Oct 12 23:01:55 2010
+++ src/distrib/sets/lists/man/mi Tue Oct 19 11:58:00 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1240 2010/10/12 23:01:55 gsutre Exp $
+# $NetBSD: mi,v 1.1241 2010/10/19 11:58:00 pgoyette Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1544,6 +1544,7 @@
./usr/share/man/cat4/svwsata.0 man-sys-catman .cat
./usr/share/man/cat4/sw.0 man-sys-catman .cat
./usr/share/man/cat4/swcrypto.0 man-sys-catman .cat
+./usr/share/man/cat4/swsensor.0 man-sys-catman .cat
./usr/share/man/cat4/swwdog.0 man-sys-catman .cat
./usr/share/man/cat4/sysbeep.0 man-sys-catman .cat
./usr/share/man/cat4/systrace.0 man-obsolete obsolete
@@ -4158,6 +4159,7 @@
./usr/share/man/html4/svwsata.html man-sys-htmlman html
./usr/share/man/html4/sw.html man-sys-htmlman html
./usr/share/man/html4/swcrypto.html man-sys-htmlman html
+./usr/share/man/html4/swsensor.html man-sys-htmlman html
./usr/share/man/html4/swwdog.html man-sys-htmlman html
./usr/share/man/html4/sysbeep.html man-sys-htmlman html
./usr/share/man/html4/tap.html man-sys-htmlman html
@@ -6694,6 +6696,7 @@
./usr/share/man/man4/svwsata.4 man-sys-man .man
./usr/share/man/man4/sw.4 man-sys-man .man
./usr/share/man/man4/swcrypto.4 man-sys-man .man
+./usr/share/man/man4/swsensor.4 man-sys-man .man
./usr/share/man/man4/swwdog.4 man-sys-man .man
./usr/share/man/man4/sysbeep.4 man-sys-man .man
./usr/share/man/man4/systrace.4 man-obsolete obsolete
Index: src/distrib/sets/lists/modules/mi
diff -u src/distrib/sets/lists/modules/mi:1.17 src/distrib/sets/lists/modules/mi:1.18
--- src/distrib/sets/lists/modules/mi:1.17 Sun May 30 17:44:07 2010
+++ src/distrib/sets/lists/modules/mi Tue Oct 19 11:58:00 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.17 2010/05/30 17:44:07 pgoyette Exp $
+# $NetBSD: mi,v 1.18 2010/10/19 11:58:00 pgoyette Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -116,6 +116,8 @@
./@MODULEDIR@/solaris/solaris.kmod base-kernel-modules kmod,solaris
./@MODULEDIR@/suser base-kernel-modules kmod
./@MODULEDIR@/suser/suser.kmod base-kernel-modules kmod
+./@MODULEDIR@/swsensor base-kernel-modules kmod
+./@MODULEDIR@/swsensor/swsensor.kmod base-kernel-modules kmod
./@MODULEDIR@/sysvbfs base-kernel-modules kmod
./@MODULEDIR@/sysvbfs/sysvbfs.kmod base-kernel-modules kmod
./@MODULEDIR@/tmpfs base-kernel-modules kmod
Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.527 src/share/man/man4/Makefile:1.528
--- src/share/man/man4/Makefile:1.527 Tue Oct 12 23:01:55 2010
+++ src/share/man/man4/Makefile Tue Oct 19 11:58:00 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.527 2010/10/12 23:01:55 gsutre Exp $
+# $NetBSD: Makefile,v 1.528 2010/10/19 11:58:00 pgoyette Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -54,7 +54,7 @@
shpcic.4 siisata.4 siop.4 sip.4 siside.4 sk.4 sl.4 slide.4 \
sm.4 smsh.4 sn.4 sony.4 spc.4 speaker.4 spif.4 sqphy.4 ss.4 \
st.4 ste.4 stge.4 sti.4 stpcide.4 sv.4 strip.4 \
- svwsata.4 swwdog.4 \
+ svwsata.4 swsensor.4 swwdog.4 \
tap.4 tc.4 tcds.4 tcp.4 termios.4 tfb.4 thinkpad.4 \
ti.4 tl.4 tlp.4 tlphy.4 \
tp.4 tr.4 tra.4 trm.4 tty.4 tun.4 tqphy.4 twa.4 twe.4 txp.4 \
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.47 src/sys/modules/Makefile:1.48
--- src/sys/modules/Makefile:1.47 Fri Oct 15 12:20:33 2010
+++ src/sys/modules/Makefile Tue Oct 19 11:58:01 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2010/10/15 12:20:33 tsutsui Exp $
+# $NetBSD: Makefile,v 1.48 2010/10/19 11:58:01 pgoyette Exp $
.include <bsd.own.mk>
@@ -53,6 +53,7 @@
SUBDIR+= smbfs
SUBDIR+= sysvbfs
SUBDIR+= suser
+SUBDIR+= swsensor
SUBDIR+= tmpfs
SUBDIR+= udf
SUBDIR+= umap
Index: src/sys/rump/dev/lib/libsysmon/Makefile
diff -u src/sys/rump/dev/lib/libsysmon/Makefile:1.3 src/sys/rump/dev/lib/libsysmon/Makefile:1.4
--- src/sys/rump/dev/lib/libsysmon/Makefile:1.3 Thu Jul 22 14:10:14 2010
+++ src/sys/rump/dev/lib/libsysmon/Makefile Tue Oct 19 11:58:01 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/07/22 14:10:14 pgoyette Exp $
+# $NetBSD: Makefile,v 1.4 2010/10/19 11:58:01 pgoyette Exp $
#
.PATH: ${.CURDIR}/../../../../dev/sysmon
@@ -8,7 +8,7 @@
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
+ swsensor.c swwdog.c
SRCS+= component.c
Index: src/sys/rump/dev/lib/libsysmon/component.c
diff -u src/sys/rump/dev/lib/libsysmon/component.c:1.4 src/sys/rump/dev/lib/libsysmon/component.c:1.5
--- src/sys/rump/dev/lib/libsysmon/component.c:1.4 Mon Oct 4 15:57:27 2010
+++ src/sys/rump/dev/lib/libsysmon/component.c Tue Oct 19 11:58:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: component.c,v 1.4 2010/10/04 15:57:27 pgoyette Exp $ */
+/* $NetBSD: component.c,v 1.5 2010/10/19 11:58:01 pgoyette Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.4 2010/10/04 15:57:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.5 2010/10/19 11:58:01 pgoyette Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -43,6 +43,7 @@
#include "ioconf.c"
void swwdogattach(int);
+void swsensorattach(int);
RUMP_COMPONENT(RUMP_COMPONENT_DEV)
{
@@ -78,4 +79,5 @@
sysmon_wdog_init();
rump_pdev_add(swwdogattach, 0);
+ rump_pdev_add(swsensorattach, 0);
}
