Module Name: src
Committed By: pgoyette
Date: Mon Jun 1 20:08:45 UTC 2009
Modified Files:
src/share/man/man9: sysmon_envsys.9
src/sys/arch/x86/x86: ipmi.c
src/sys/dev/acpi: acpi_tz.c
src/sys/dev/i2c: dbcool.c sdtemp.c
src/sys/dev/sysmon: sysmon_envsys_events.c
src/sys/sys: envsys.h param.h
Log Message:
Since we no longer have individual events for each sensor value limit,
we don't need individual flag bits. Clean up extra bit definitions.
Bump kernel version - welcome to 5.99.13
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/share/man/man9/sysmon_envsys.9
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/x86/x86/ipmi.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/acpi/acpi_tz.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/i2c/dbcool.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/i2c/sdtemp.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/sysmon/sysmon_envsys_events.c
cvs rdiff -u -r1.23 -r1.24 src/sys/sys/envsys.h
cvs rdiff -u -r1.346 -r1.347 src/sys/sys/param.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man9/sysmon_envsys.9
diff -u src/share/man/man9/sysmon_envsys.9:1.23 src/share/man/man9/sysmon_envsys.9:1.24
--- src/share/man/man9/sysmon_envsys.9:1.23 Mon May 18 12:14:48 2009
+++ src/share/man/man9/sysmon_envsys.9 Mon Jun 1 20:08:44 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: sysmon_envsys.9,v 1.23 2009/05/18 12:14:48 wiz Exp $
+.\" $NetBSD: sysmon_envsys.9,v 1.24 2009/06/01 20:08:44 pgoyette Exp $
.\"
.\" Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd February 28, 2008
+.Dd June 1, 2009
.Dt SYSMON_ENVSYS 9
.Os
.Sh NAME
@@ -432,14 +432,9 @@
value as valid.
.It ENVSYS_FMONCRITICAL
Enables and registers a new event to monitor a critical state.
-.It ENVSYS_FMONCRITUNDER
-Enables and registers a new event to monitor a critical under state.
-.It ENVSYS_FMONCRITOVER
-Enables and registers a new event to monitor a critical over state.
-.It ENVSYS_FMONWARNUNDER
-Enables and registers a new event to monitor a warning under state.
-.It ENVSYS_FMONWARNOVER
-Enables and registers a new event to monitor a warning over state.
+.It ENVSYS_FMONLIMITS
+Enables and registers a new event to monitor a sensor's value crossing
+limits or thresholds.
.It ENVSYS_FMONSTCHANGED
Enables and registers a new event to monitor Battery capacity or drive state
sensors.
Index: src/sys/arch/x86/x86/ipmi.c
diff -u src/sys/arch/x86/x86/ipmi.c:1.33 src/sys/arch/x86/x86/ipmi.c:1.34
--- src/sys/arch/x86/x86/ipmi.c:1.33 Fri Apr 24 17:42:03 2009
+++ src/sys/arch/x86/x86/ipmi.c Mon Jun 1 20:08:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ipmi.c,v 1.33 2009/04/24 17:42:03 ad Exp $ */
+/* $NetBSD: ipmi.c,v 1.34 2009/06/01 20:08:44 pgoyette Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.33 2009/04/24 17:42:03 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.34 2009/06/01 20:08:44 pgoyette Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -1779,12 +1779,9 @@
sc->sc_sensor[i].state = ENVSYS_SINVALID;
sc->sc_sensor[i].monitor = true;
/*
- * Monitor critical/critical-over/warning-over states
- * in the sensors.
+ * Monitor threshold limits in the sensors.
*/
- sc->sc_sensor[i].flags |= ENVSYS_FMONCRITICAL;
- sc->sc_sensor[i].flags |= ENVSYS_FMONCRITOVER;
- sc->sc_sensor[i].flags |= ENVSYS_FMONWARNOVER;
+ sc->sc_sensor[i].flags |= ENVSYS_FMONLIMITS;
(void)strlcpy(sc->sc_sensor[i].desc, ipmi_s->i_envdesc,
sizeof(sc->sc_sensor[i].desc));
if (sysmon_envsys_sensor_attach(sc->sc_envsys,
Index: src/sys/dev/acpi/acpi_tz.c
diff -u src/sys/dev/acpi/acpi_tz.c:1.39 src/sys/dev/acpi/acpi_tz.c:1.40
--- src/sys/dev/acpi/acpi_tz.c:1.39 Sun Nov 9 13:54:06 2008
+++ src/sys/dev/acpi/acpi_tz.c Mon Jun 1 20:08:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_tz.c,v 1.39 2008/11/09 13:54:06 pgoyette Exp $ */
+/* $NetBSD: acpi_tz.c,v 1.40 2009/06/01 20:08:44 pgoyette Exp $ */
/*
* Copyright (c) 2003 Jared D. McNeill <[email protected]>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.39 2008/11/09 13:54:06 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.40 2009/06/01 20:08:44 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -585,7 +585,7 @@
sc->sc_sme = sysmon_envsys_create();
sc->sc_sensor.monitor = true;
- sc->sc_sensor.flags = (ENVSYS_FMONCRITOVER|ENVSYS_FMONWARNOVER);
+ sc->sc_sensor.flags = ENVSYS_FMONLIMITS;
strlcpy(sc->sc_sensor.desc, "temperature", sizeof(sc->sc_sensor.desc));
if (sysmon_envsys_sensor_attach(sc->sc_sme, &sc->sc_sensor)) {
sysmon_envsys_destroy(sc->sc_sme);
Index: src/sys/dev/i2c/dbcool.c
diff -u src/sys/dev/i2c/dbcool.c:1.11 src/sys/dev/i2c/dbcool.c:1.12
--- src/sys/dev/i2c/dbcool.c:1.11 Mon Feb 9 20:27:21 2009
+++ src/sys/dev/i2c/dbcool.c Mon Jun 1 20:08:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dbcool.c,v 1.11 2009/02/09 20:27:21 pgoyette Exp $ */
+/* $NetBSD: dbcool.c,v 1.12 2009/06/01 20:08:44 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.11 2009/02/09 20:27:21 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.12 2009/06/01 20:08:44 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1688,9 +1688,7 @@
sc->sc_regs[idx] = &sc->sc_chip->table[idx].reg;
sc->sc_nom_volt[idx] = sc->sc_chip->table[idx].nom_volt_index;
- sc->sc_sensor[idx].flags |= ENVSYS_FMONCRITUNDER;
- if (sc->sc_chip->table[idx].type != DBC_FAN)
- sc->sc_sensor[idx].flags |= ENVSYS_FMONCRITOVER;
+ sc->sc_sensor[idx].flags |= ENVSYS_FMONLIMITS;
error = sysmon_envsys_sensor_attach(sc->sc_sme, &sc->sc_sensor[idx]);
if (error)
Index: src/sys/dev/i2c/sdtemp.c
diff -u src/sys/dev/i2c/sdtemp.c:1.2 src/sys/dev/i2c/sdtemp.c:1.3
--- src/sys/dev/i2c/sdtemp.c:1.2 Tue May 19 23:43:27 2009
+++ src/sys/dev/i2c/sdtemp.c Mon Jun 1 20:08:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sdtemp.c,v 1.2 2009/05/19 23:43:27 pgoyette Exp $ */
+/* $NetBSD: sdtemp.c,v 1.3 2009/06/01 20:08:44 pgoyette Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.2 2009/05/19 23:43:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.3 2009/06/01 20:08:44 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -245,12 +245,7 @@
/* Initialize sensor data. */
sc->sc_sensor->units = ENVSYS_STEMP;
sc->sc_sensor->state = ENVSYS_SINVALID;
-#ifdef ENVSYS_FMONLIMITS
sc->sc_sensor->flags |= ENVSYS_FMONLIMITS;
-#else
- sc->sc_sensor->flags |= ENVSYS_FMONWARNOVER | ENVSYS_FMONWARNUNDER |
- ENVSYS_FMONCRITOVER;
-#endif
(void)strlcpy(sc->sc_sensor->desc, device_xname(self),
sizeof(sc->sc_sensor->desc));
Index: src/sys/dev/sysmon/sysmon_envsys_events.c
diff -u src/sys/dev/sysmon/sysmon_envsys_events.c:1.63 src/sys/dev/sysmon/sysmon_envsys_events.c:1.64
--- src/sys/dev/sysmon/sysmon_envsys_events.c:1.63 Tue Apr 7 21:49:36 2009
+++ src/sys/dev/sysmon/sysmon_envsys_events.c Mon Jun 1 20:08:45 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys_events.c,v 1.63 2009/04/07 21:49:36 dyoung Exp $ */
+/* $NetBSD: sysmon_envsys_events.c,v 1.64 2009/06/01 20:08:45 pgoyette Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys_events.c,v 1.63 2009/04/07 21:49:36 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys_events.c,v 1.64 2009/06/01 20:08:45 pgoyette Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -444,8 +444,7 @@
PENVSYS_EVENT_CRITICAL,
"critical");
- SEE_REGEVENT(ENVSYS_FMONCRITUNDER | ENVSYS_FMONCRITOVER |
- ENVSYS_FMONWARNUNDER | ENVSYS_FMONWARNOVER,
+ SEE_REGEVENT(ENVSYS_FMONLIMITS,
PENVSYS_EVENT_HW_LIMITS,
"hw-range-limits");
Index: src/sys/sys/envsys.h
diff -u src/sys/sys/envsys.h:1.23 src/sys/sys/envsys.h:1.24
--- src/sys/sys/envsys.h:1.23 Fri Aug 22 11:27:50 2008
+++ src/sys/sys/envsys.h Mon Jun 1 20:08:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: envsys.h,v 1.23 2008/08/22 11:27:50 pgoyette Exp $ */
+/* $NetBSD: envsys.h,v 1.24 2009/06/01 20:08:44 pgoyette Exp $ */
/*-
* Copyright (c) 1999, 2007 The NetBSD Foundation, Inc.
@@ -132,10 +132,7 @@
/* monitoring flags */
#define ENVSYS_FMONCRITICAL 0x00000020 /* monitor a critical state */
-#define ENVSYS_FMONCRITUNDER 0x00000040 /* monitor a critunder state */
-#define ENVSYS_FMONCRITOVER 0x00000080 /* monitor a critover state */
-#define ENVSYS_FMONWARNUNDER 0x00000100 /* monitor a warnunder state */
-#define ENVSYS_FMONWARNOVER 0x00000200 /* monitor a warnover state */
+#define ENVSYS_FMONLIMITS 0x00000040 /* monitor limits/thresholds */
#define ENVSYS_FMONSTCHANGED 0x00000400 /* monitor a battery/drive state */
#define ENVSYS_FMONNOTSUPP 0x00000800 /* monitoring not supported */
#define ENVSYS_FNEED_REFRESH 0x00001000 /* sensor needs refreshing */
Index: src/sys/sys/param.h
diff -u src/sys/sys/param.h:1.346 src/sys/sys/param.h:1.347
--- src/sys/sys/param.h:1.346 Sat May 23 18:28:26 2009
+++ src/sys/sys/param.h Mon Jun 1 20:08:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.346 2009/05/23 18:28:26 ad Exp $ */
+/* $NetBSD: param.h,v 1.347 2009/06/01 20:08:44 pgoyette Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1993
@@ -63,7 +63,7 @@
* 2.99.9 (299000900)
*/
-#define __NetBSD_Version__ 599001200 /* NetBSD 5.99.12 */
+#define __NetBSD_Version__ 599001300 /* NetBSD 5.99.13 */
#define __NetBSD_Prereq__(M,m,p) (((((M) * 100000000) + \
(m) * 1000000) + (p) * 100) <= __NetBSD_Version__)
