From 5b1068a00750a0e835e6e0bfb67922a7af97515c Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Wed, 29 Aug 2007 14:08:47 +0000 Subject: [PATCH] Rename SENSORS_FEATURE_TEMP_SENS to SENSORS_FEATURE_TEMP_TYPE. This better reflects what this feature is, in line with the sysfs file name. git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4730 7894878c-1315-0410-8ee3-d5d059ff63e0 --- lib/access.c | 2 +- lib/sensors.h | 2 +- prog/sensors/chips.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/access.c b/lib/access.c index 632909a0..e7d6c98e 100644 --- a/lib/access.c +++ b/lib/access.c @@ -521,7 +521,7 @@ static const struct feature_subtype_match temp_matches[] = { { "max_alarm", SENSORS_FEATURE_TEMP_MAX_ALARM }, { "crit_alarm", SENSORS_FEATURE_TEMP_CRIT_ALARM }, { "fault", SENSORS_FEATURE_TEMP_FAULT }, - { "type", SENSORS_FEATURE_TEMP_SENS }, + { "type", SENSORS_FEATURE_TEMP_TYPE }, { NULL, 0 } }; diff --git a/lib/sensors.h b/lib/sensors.h index d1269e19..59455ffa 100644 --- a/lib/sensors.h +++ b/lib/sensors.h @@ -149,7 +149,7 @@ typedef enum sensors_feature_type { SENSORS_FEATURE_TEMP_MIN_ALARM, SENSORS_FEATURE_TEMP_CRIT_ALARM, SENSORS_FEATURE_TEMP_FAULT, - SENSORS_FEATURE_TEMP_SENS, + SENSORS_FEATURE_TEMP_TYPE, SENSORS_FEATURE_VID = 0x300, diff --git a/prog/sensors/chips.c b/prog/sensors/chips.c index 5d5ec5e7..ed710015 100644 --- a/prog/sensors/chips.c +++ b/prog/sensors/chips.c @@ -144,9 +144,9 @@ static void print_chip_temp(const sensors_chip_name *name, const char *s1, *s2; int alarm, crit_displayed = 0; char *label; - const int size = SENSORS_FEATURE_TEMP_SENS - SENSORS_FEATURE_TEMP; - short has_features[SENSORS_FEATURE_TEMP_SENS - SENSORS_FEATURE_TEMP] = { 0, }; - double feature_vals[SENSORS_FEATURE_TEMP_SENS - SENSORS_FEATURE_TEMP] = { 0.0, }; + const int size = SENSORS_FEATURE_TEMP_TYPE - SENSORS_FEATURE_TEMP; + short has_features[SENSORS_FEATURE_TEMP_TYPE - SENSORS_FEATURE_TEMP] = { 0, }; + double feature_vals[SENSORS_FEATURE_TEMP_TYPE - SENSORS_FEATURE_TEMP] = { 0.0, }; if (!(label = sensors_get_label(name, feature->number))) { printf("ERROR: Can't get temperature label!\n"); @@ -237,8 +237,8 @@ static void print_chip_temp(const sensors_chip_name *name, } /* print out temperature sensor info */ - if (TEMP_FEATURE(SENSORS_FEATURE_TEMP_SENS)) { - int sens = (int)TEMP_FEATURE_VAL(SENSORS_FEATURE_TEMP_SENS); + if (TEMP_FEATURE(SENSORS_FEATURE_TEMP_TYPE)) { + int sens = (int)TEMP_FEATURE_VAL(SENSORS_FEATURE_TEMP_TYPE); /* older kernels / drivers sometimes report a beta value for thermistors */