summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorkhali <khali@7894878c-1315-0410-8ee3-d5d059ff63e0>2012-03-06 07:34:13 +0000
committerkhali <khali@7894878c-1315-0410-8ee3-d5d059ff63e0>2012-03-06 07:34:13 +0000
commit194e92ef67b610714eafb5018ec099811a17a544 (patch)
tree8c346dc03cacdadf8a2b2f785cf6e8eeaaf44245 /lib
parente70a6eb0dfa94565b8fd7a48946456517548cce1 (diff)
downloadlm-sensors-194e92ef67b610714eafb5018ec099811a17a544.tar.gz
Add support for fan[1-*]_max, fan[1-*]_min_alarm and fan[1-*]_max_alarm
attributes. These are defined in the standard sysfs interface for quite some time, and at least three drivers (max6650, lm63 and applesmc) implement them so we should support them. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@6029 7894878c-1315-0410-8ee3-d5d059ff63e0
Diffstat (limited to 'lib')
-rw-r--r--lib/sensors.h3
-rw-r--r--lib/sysfs.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/sensors.h b/lib/sensors.h
index 6d947842..df91d243 100644
--- a/lib/sensors.h
+++ b/lib/sensors.h
@@ -169,11 +169,14 @@ typedef enum sensors_subfeature_type {
SENSORS_SUBFEATURE_FAN_INPUT = SENSORS_FEATURE_FAN << 8,
SENSORS_SUBFEATURE_FAN_MIN,
+ SENSORS_SUBFEATURE_FAN_MAX,
SENSORS_SUBFEATURE_FAN_ALARM = (SENSORS_FEATURE_FAN << 8) | 0x80,
SENSORS_SUBFEATURE_FAN_FAULT,
SENSORS_SUBFEATURE_FAN_DIV,
SENSORS_SUBFEATURE_FAN_BEEP,
SENSORS_SUBFEATURE_FAN_PULSES,
+ SENSORS_SUBFEATURE_FAN_MIN_ALARM,
+ SENSORS_SUBFEATURE_FAN_MAX_ALARM,
SENSORS_SUBFEATURE_TEMP_INPUT = SENSORS_FEATURE_TEMP << 8,
SENSORS_SUBFEATURE_TEMP_MAX,
diff --git a/lib/sysfs.c b/lib/sysfs.c
index 9068a71a..1a8091f8 100644
--- a/lib/sysfs.c
+++ b/lib/sysfs.c
@@ -271,9 +271,12 @@ static const struct subfeature_type_match in_matches[] = {
static const struct subfeature_type_match fan_matches[] = {
{ "input", SENSORS_SUBFEATURE_FAN_INPUT },
{ "min", SENSORS_SUBFEATURE_FAN_MIN },
+ { "max", SENSORS_SUBFEATURE_FAN_MAX },
{ "div", SENSORS_SUBFEATURE_FAN_DIV },
{ "pulses", SENSORS_SUBFEATURE_FAN_PULSES },
{ "alarm", SENSORS_SUBFEATURE_FAN_ALARM },
+ { "min_alarm", SENSORS_SUBFEATURE_FAN_MIN_ALARM },
+ { "max_alarm", SENSORS_SUBFEATURE_FAN_MAX_ALARM },
{ "fault", SENSORS_SUBFEATURE_FAN_FAULT },
{ "beep", SENSORS_SUBFEATURE_FAN_BEEP },
{ NULL, 0 }