summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkhali <khali@7894878c-1315-0410-8ee3-d5d059ff63e0>2014-04-22 08:09:29 +0000
committerkhali <khali@7894878c-1315-0410-8ee3-d5d059ff63e0>2014-04-22 08:09:29 +0000
commit2edaa288560a36b183d965777b3801979f5760bd (patch)
tree457e7a3fbd9297053f72e6a5130303bcafaed3bd
parentda0f40bb246087500dc4ec11587ce0653773d776 (diff)
downloadlm-sensors-2edaa288560a36b183d965777b3801979f5760bd.tar.gz
sensors: Add support for temp[1-*]_min_hyst and temp[1-*]_lcrit_hyst
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@6245 7894878c-1315-0410-8ee3-d5d059ff63e0
-rw-r--r--CHANGES1
-rw-r--r--prog/sensors/chips.c14
2 files changed, 13 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index d9482ccf..e94f44f5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ SVN HEAD
sensors.conf.default: Add support for NCT6779 and NCT6791
libsensors: Get rid of arbitrary limit on per-type sensor count
Add support for temperature min and critical min hysteresis
+ sensors: Add support for temperature min and critical min hysteresis
fancontrol: Deal with moving hwmon attributes
sensors-detect: Add detection of ADC128D818
Add detection of AMD family 16h Kabini and Mullins
diff --git a/prog/sensors/chips.c b/prog/sensors/chips.c
index 2c67b0f1..5b9f08f0 100644
--- a/prog/sensors/chips.c
+++ b/prog/sensors/chips.c
@@ -237,6 +237,16 @@ static void get_sensor_limit_data(const sensors_chip_name *name,
}
}
+static const struct sensor_subfeature_list temp_min_sensors[] = {
+ { SENSORS_SUBFEATURE_TEMP_MIN_HYST, NULL, 0, hyst_str },
+ { -1, NULL, 0, NULL }
+};
+
+static const struct sensor_subfeature_list temp_lcrit_sensors[] = {
+ { SENSORS_SUBFEATURE_TEMP_LCRIT_HYST, NULL, 0, hyst_str },
+ { -1, NULL, 0, NULL }
+};
+
static const struct sensor_subfeature_list temp_max_sensors[] = {
{ SENSORS_SUBFEATURE_TEMP_MAX_HYST, NULL, 0, hyst_str },
{ -1, NULL, 0, NULL }
@@ -260,9 +270,9 @@ static const struct sensor_subfeature_list temp_sensors[] = {
{ SENSORS_SUBFEATURE_TEMP_MAX_ALARM, NULL, 1, "HIGH" },
{ SENSORS_SUBFEATURE_TEMP_CRIT_ALARM, NULL, 1, "CRIT" },
{ SENSORS_SUBFEATURE_TEMP_EMERGENCY_ALARM, NULL, 1, "EMERGENCY" },
- { SENSORS_SUBFEATURE_TEMP_MIN, NULL, 0, "low" },
+ { SENSORS_SUBFEATURE_TEMP_MIN, temp_min_sensors, 0, "low" },
{ SENSORS_SUBFEATURE_TEMP_MAX, temp_max_sensors, 0, "high" },
- { SENSORS_SUBFEATURE_TEMP_LCRIT, NULL, 0, "crit low" },
+ { SENSORS_SUBFEATURE_TEMP_LCRIT, temp_lcrit_sensors, 0, "crit low" },
{ SENSORS_SUBFEATURE_TEMP_CRIT, temp_crit_sensors, 0, "crit" },
{ SENSORS_SUBFEATURE_TEMP_EMERGENCY, temp_emergency_sensors, 0,
"emerg" },