From 33a3d6fba2beb4931096917ff1868c0e8f98c3e0 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Tue, 29 May 2007 16:23:19 +0000 Subject: [PATCH] Drop SENSORS_FEATURE_TEMP_OVER, SENSORS_FEATURE_TEMP_HIGH and SENSORS_FEATURE_TEMP_LOW, they don't correspond to anything in the standard sysfs interface. git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4427 7894878c-1315-0410-8ee3-d5d059ff63e0 --- lib/access.c | 2 -- lib/sensors.h | 3 --- prog/sensors/chips_generic.c | 14 -------------- 3 files changed, 19 deletions(-) diff --git a/lib/access.c b/lib/access.c index 9f9726f5..fb7c7dc4 100644 --- a/lib/access.c +++ b/lib/access.c @@ -515,11 +515,9 @@ struct feature_type_match }; static struct feature_type_match temp_matches[] = { - { "over", SENSORS_FEATURE_TEMP_OVER }, { "max", SENSORS_FEATURE_TEMP_MAX }, { "max_hyst", SENSORS_FEATURE_TEMP_MAX_HYST }, { "min", SENSORS_FEATURE_TEMP_MIN }, - { "low", SENSORS_FEATURE_TEMP_LOW }, { "crit", SENSORS_FEATURE_TEMP_CRIT }, { "crit_hyst", SENSORS_FEATURE_TEMP_CRIT_HYST }, { "alarm", SENSORS_FEATURE_TEMP_ALARM }, diff --git a/lib/sensors.h b/lib/sensors.h index 5edcfc7d..9528bb6d 100644 --- a/lib/sensors.h +++ b/lib/sensors.h @@ -166,12 +166,9 @@ typedef enum sensors_feature_type { SENSORS_FEATURE_FAN_DIV, SENSORS_FEATURE_TEMP = 0x200, - SENSORS_FEATURE_TEMP_OVER, SENSORS_FEATURE_TEMP_MAX, SENSORS_FEATURE_TEMP_MAX_HYST, SENSORS_FEATURE_TEMP_MIN, - SENSORS_FEATURE_TEMP_HIGH, - SENSORS_FEATURE_TEMP_LOW, SENSORS_FEATURE_TEMP_LIM, SENSORS_FEATURE_TEMP_CRIT, SENSORS_FEATURE_TEMP_CRIT_HYST, diff --git a/prog/sensors/chips_generic.c b/prog/sensors/chips_generic.c index 1745a471..ccca26e6 100644 --- a/prog/sensors/chips_generic.c +++ b/prog/sensors/chips_generic.c @@ -154,20 +154,6 @@ static void print_generic_chip_temp(const sensors_chip_name *name, min = 0; type = MAXONLY; } - } else if (TEMP_FEATURE(SENSORS_FEATURE_TEMP_LOW)) { - min = TEMP_FEATURE_VAL(SENSORS_FEATURE_TEMP_LOW); - - if (TEMP_FEATURE(SENSORS_FEATURE_TEMP_HIGH)) { - max = TEMP_FEATURE_VAL(SENSORS_FEATURE_TEMP_HIGH); - } else { /* TEMP_FEATURE_VAL(SENSORS_FEATURE_TEMP_OVER) */ - max = TEMP_FEATURE_VAL(SENSORS_FEATURE_TEMP_OVER); - } - - type = MINMAX; - } else if (TEMP_FEATURE(SENSORS_FEATURE_TEMP_OVER)) { - max = TEMP_FEATURE_VAL(SENSORS_FEATURE_TEMP_OVER); - min = 0; - type = MAXONLY; } else { min = max = 0; type = SINGLE;