summaryrefslogtreecommitdiff
path: root/sys/dev/sysmon
diff options
context:
space:
mode:
authorpgoyette <pgoyette@NetBSD.org>2011-06-04 02:02:55 +0000
committerpgoyette <pgoyette@NetBSD.org>2011-06-04 02:02:55 +0000
commit104c29ea4675cfc4a5265455ccb439eed6b22229 (patch)
treeed1785bdf3063a264b34455d7a5258f3b7fa4d2b /sys/dev/sysmon
parent1a2269f50d0aee3fc1316ba8e8b5c52f744e5fc4 (diff)
Enable creation of value_{max,min,avg} entries via the proplist, as well
as setting the ENVSYS_FPERCENT flag
Diffstat (limited to 'sys/dev/sysmon')
-rw-r--r--sys/dev/sysmon/swsensor.c38
1 files changed, 36 insertions, 2 deletions
diff --git a/sys/dev/sysmon/swsensor.c b/sys/dev/sysmon/swsensor.c
index 24d20bd5b60..f61f7ef2057 100644
--- a/sys/dev/sysmon/swsensor.c
+++ b/sys/dev/sysmon/swsensor.c
@@ -1,4 +1,4 @@
-/* $NetBSD: swsensor.c,v 1.7 2010/12/17 13:37:37 pooka Exp $ */
+/* $NetBSD: swsensor.c,v 1.8 2011/06/04 02:02:55 pgoyette Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: swsensor.c,v 1.7 2010/12/17 13:37:37 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: swsensor.c,v 1.8 2011/06/04 02:02:55 pgoyette Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -234,6 +234,40 @@ swsensor_init(void *arg)
if (po != NULL && prop_object_type(po) == PROP_TYPE_NUMBER)
sw_sensor_value = prop_number_integer_value(po);
+ /* Retrieve any value_{max,min,avg} that might be present */
+ if (pd != NULL) {
+ po = prop_dictionary_get(pd, "value_max");
+ if (po != NULL && prop_object_type(po) == PROP_TYPE_NUMBER) {
+ swsensor_edata.value_max =
+ prop_number_integer_value(po);
+ swsensor_edata.flags |= ENVSYS_FVALID_MAX;
+ }
+
+ po = prop_dictionary_get(pd, "value_min");
+ if (po != NULL && prop_object_type(po) == PROP_TYPE_NUMBER) {
+ swsensor_edata.value_min =
+ prop_number_integer_value(po);
+ swsensor_edata.flags |= ENVSYS_FVALID_MIN;
+ }
+
+ po = prop_dictionary_get(pd, "value_avg");
+ if (po != NULL && prop_object_type(po) == PROP_TYPE_NUMBER) {
+ swsensor_edata.value_avg =
+ prop_number_integer_value(po);
+ swsensor_edata.flags |= ENVSYS_FVALID_AVG;
+ }
+ }
+
+ /* See if this sensor should report percentages vs raw values */
+ if (pd != NULL) {
+ po = prop_dictionary_get(pd, "percentage");
+ if (po != NULL &&
+ prop_object_type(po) == PROP_TYPE_BOOL &&
+ prop_bool_true(po))
+ swsensor_edata.flags |= ENVSYS_FPERCENT;
+ }
+
+ swsensor_edata.state = ENVSYS_SVALID;
swsensor_edata.value_cur = 0;
strlcpy(swsensor_edata.desc, "sensor", ENVSYS_DESCLEN);