From f7568cc281e960215770455c68a520535a909b8b Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 6 Jul 2007 12:16:34 +0000 Subject: [PATCH] Add fintek f71882fg support to libsensors & sensors git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4563 7894878c-1315-0410-8ee3-d5d059ff63e0 --- lib/chips.c | 67 +++++++++++++++++++++++++++++ lib/chips.h | 20 +++++++++ prog/sensors/chips.c | 100 +++++++++++++++++++++++++++++++++++++++++++ prog/sensors/chips.h | 1 + prog/sensors/main.c | 1 + 5 files changed, 189 insertions(+) diff --git a/lib/chips.c b/lib/chips.c index 19b98852..5f7ed612 100644 --- a/lib/chips.c +++ b/lib/chips.c @@ -6141,6 +6141,72 @@ static sensors_chip_feature applesmc_features[] = { { 0 }, 0 } }; +#define SENSORS_F71882FG_IN_FEATURES(nr) \ + { { SENSORS_F71882FG_IN(nr), "in" #nr, \ + NOMAP, NOMAP, R }, \ + NOSYSCTL, VALUE(3), 3 } + +#define SENSORS_F71882FG_TEMP_FEATURES(nr) \ + { { SENSORS_F71882FG_TEMP(nr), "temp" #nr, \ + NOMAP, NOMAP, R }, \ + NOSYSCTL, VALUE(3), 3 }, \ + { { SENSORS_F71882FG_TEMP_MAX(nr), "temp" #nr "_max", \ + SENSORS_F71882FG_TEMP(nr), SENSORS_F71882FG_TEMP(nr), RW }, \ + NOSYSCTL, VALUE(1), 3 }, \ + { { SENSORS_F71882FG_TEMP_MAX_HYST(nr), "temp" #nr "_max_hyst", \ + SENSORS_F71882FG_TEMP(nr), SENSORS_F71882FG_TEMP(nr), RW }, \ + NOSYSCTL, VALUE(2), 3 }, \ + { { SENSORS_F71882FG_TEMP_CRIT(nr), "temp" #nr "_crit", \ + SENSORS_F71882FG_TEMP(nr), SENSORS_F71882FG_TEMP(nr), RW }, \ + NOSYSCTL, VALUE(4), 3 }, \ + { { SENSORS_F71882FG_TEMP_CRIT_HYST(nr), "temp" #nr "_crit_hyst", \ + SENSORS_F71882FG_TEMP(nr), SENSORS_F71882FG_TEMP(nr), R }, \ + NOSYSCTL, VALUE(5), 3 }, \ + { { SENSORS_F71882FG_TEMP_ALARM(nr), "temp" #nr "_alarm", \ + SENSORS_F71882FG_TEMP(nr), NOMAP, R }, \ + NOSYSCTL, VALUE(1), 0 }, \ + { { SENSORS_F71882FG_TEMP_FAULT(nr), "temp" #nr "_fault", \ + SENSORS_F71882FG_TEMP(nr), NOMAP, R }, \ + NOSYSCTL, VALUE(2), 0 }, \ + { { SENSORS_F71882FG_TEMP_TYPE(nr), "temp" #nr "_type", \ + SENSORS_F71882FG_TEMP(nr), NOMAP, R }, \ + NOSYSCTL, VALUE(3), 0 } + +#define SENSORS_F71882FG_FAN_FEATURES(nr) \ + { { SENSORS_F71882FG_FAN(nr), "fan" #nr, \ + NOMAP, NOMAP, R }, \ + NOSYSCTL, VALUE(2), 0 }, \ + { { SENSORS_F71882FG_FAN_ALARM(nr), "fan" #nr "_alarm", \ + SENSORS_F71882FG_FAN(nr), NOMAP, R }, \ + NOSYSCTL, VALUE(1), 0 } + +static sensors_chip_feature f71882fg_features[] = +{ + SENSORS_F71882FG_IN_FEATURES(0), + SENSORS_F71882FG_IN_FEATURES(1), + { { SENSORS_F71882FG_IN_MAX(1), "in1_max", + SENSORS_F71882FG_IN(1), SENSORS_F71882FG_IN(1), RW }, + NOSYSCTL, VALUE(1), 3 }, + { { SENSORS_F71882FG_IN_ALARM(1), "in1_alarm", + SENSORS_F71882FG_IN(1), NOMAP, R }, + NOSYSCTL, VALUE(1), 0 }, + SENSORS_F71882FG_IN_FEATURES(2), + SENSORS_F71882FG_IN_FEATURES(3), + SENSORS_F71882FG_IN_FEATURES(4), + SENSORS_F71882FG_IN_FEATURES(5), + SENSORS_F71882FG_IN_FEATURES(6), + SENSORS_F71882FG_IN_FEATURES(7), + SENSORS_F71882FG_IN_FEATURES(8), + SENSORS_F71882FG_TEMP_FEATURES(1), + SENSORS_F71882FG_TEMP_FEATURES(2), + SENSORS_F71882FG_TEMP_FEATURES(3), + SENSORS_F71882FG_FAN_FEATURES(1), + SENSORS_F71882FG_FAN_FEATURES(2), + SENSORS_F71882FG_FAN_FEATURES(3), + SENSORS_F71882FG_FAN_FEATURES(4), + { { 0 }, 0 } +}; + sensors_chip_features sensors_chip_features_list[] = { { SENSORS_LM78_PREFIX, lm78_features }, @@ -6257,5 +6323,6 @@ sensors_chip_features sensors_chip_features_list[] = { SENSORS_CORETEMP_PREFIX, coretemp_features }, { SENSORS_DME1737_PREFIX, dme1737_features }, { SENSORS_APPLESMC_PREFIX, applesmc_features }, + { SENSORS_F71882FG_PREFIX, f71882fg_features }, { 0 } }; diff --git a/lib/chips.h b/lib/chips.h index 5fbd516f..682b7282 100644 --- a/lib/chips.h +++ b/lib/chips.h @@ -2313,4 +2313,24 @@ #define SENSORS_APPLESMC_FAN_MAX(n) (0x61 + (n)) /* R */ #define SENSORS_APPLESMC_FAN_SAFE(n) (0x81 + (n)) /* R */ +/* Fintek F71882FG and F71883FG chips */ +#define SENSORS_F71882FG_PREFIX "f71882fg" + +/* in n from 0 to 8 */ +#define SENSORS_F71882FG_IN(n) (1 + (n)) +#define SENSORS_F71882FG_IN_MAX(n) (16 + (n)) +#define SENSORS_F71882FG_IN_ALARM(n) (31 + (n)) +/* fan n from 1 to 4 */ +#define SENSORS_F71882FG_FAN(n) (50 + (n)) +#define SENSORS_F71882FG_FAN_ALARM(n) (60 + (n)) +/* temp n from 1 to 3 */ +#define SENSORS_F71882FG_TEMP(n) (80 + (n)) +#define SENSORS_F71882FG_TEMP_MAX(n) (90 + (n)) +#define SENSORS_F71882FG_TEMP_MAX_HYST(n) (100 + (n)) +#define SENSORS_F71882FG_TEMP_CRIT(n) (110 + (n)) +#define SENSORS_F71882FG_TEMP_CRIT_HYST(n) (120 + (n)) +#define SENSORS_F71882FG_TEMP_ALARM(n) (130 + (n)) +#define SENSORS_F71882FG_TEMP_FAULT(n) (140 + (n)) +#define SENSORS_F71882FG_TEMP_TYPE(n) (150 + (n)) + #endif /* def LIB_SENSORS_CHIPS_H */ diff --git a/prog/sensors/chips.c b/prog/sensors/chips.c index bbef631b..3b3032af 100644 --- a/prog/sensors/chips.c +++ b/prog/sensors/chips.c @@ -6130,6 +6130,106 @@ void print_applesmc(const sensors_chip_name *name) } } +static void print_f71882fg_in(const sensors_chip_name *name, int i) +{ + char *label; + double cur, max, alarm; + int valid; + + if (!sensors_get_label_and_valid(*name, SENSORS_F71882FG_IN(i), &label, + &valid) && + !sensors_get_feature(*name, SENSORS_F71882FG_IN(i), &cur) && (i != 1 || ( + !sensors_get_feature(*name, SENSORS_F71882FG_IN_MAX(i), &max) && + !sensors_get_feature(*name, SENSORS_F71882FG_IN_ALARM(i), &alarm)))) { + if (valid) { + print_label(label, 10); + printf("%+6.2f V", cur); + if (i == 1) + printf(" (max = %+6.2f V) %s", max, alarm ? "ALARM" : ""); + printf("\n"); + } + } else { + printf("ERROR: Can't get in%d data!\n", i); + } + free(label); +} + +static void print_f71882fg_fan(const sensors_chip_name *name, int i) +{ + char *label; + double cur, alarm; + int valid; + + if (!sensors_get_label_and_valid(*name, SENSORS_F71882FG_FAN(i), &label, + &valid) && + !sensors_get_feature(*name, SENSORS_F71882FG_FAN(i), &cur) && + !sensors_get_feature(*name, SENSORS_F71882FG_FAN_ALARM(i), &alarm)) { + if (valid) { + print_label(label, 10); + printf("%4.0f RPM %s\n", cur, alarm ? "ALARM" : ""); + } + } else { + printf("ERROR: Can't get fan%d data!\n", i); + } + free(label); +} + +static void print_f71882fg_temp(const sensors_chip_name *name, int i) +{ + char *label; + double cur, max, max_hyst, crit, crit_hyst, alarm, fault, type; + int valid; + + if (!sensors_get_label_and_valid(*name, SENSORS_F71882FG_TEMP(i), &label, + &valid) && + !sensors_get_feature(*name, SENSORS_F71882FG_TEMP(i), &cur) && + !sensors_get_feature(*name, SENSORS_F71882FG_TEMP_MAX(i), &max) && + !sensors_get_feature(*name, SENSORS_F71882FG_TEMP_MAX_HYST(i), &max_hyst) && + !sensors_get_feature(*name, SENSORS_F71882FG_TEMP_CRIT(i), &crit) && + !sensors_get_feature(*name, SENSORS_F71882FG_TEMP_CRIT_HYST(i), &crit_hyst) && + !sensors_get_feature(*name, SENSORS_F71882FG_TEMP_ALARM(i), &alarm) && + !sensors_get_feature(*name, SENSORS_F71882FG_TEMP_FAULT(i), &fault) && + !sensors_get_feature(*name, SENSORS_F71882FG_TEMP_TYPE(i), &type)) { + if (valid) { + print_label(label, 10); + print_temp_info(cur, max, max_hyst, HYST, 0, 0); + printf("%s%s\n", fault ? "FAULT " : "", alarm ? "ALARM" : ""); + + if (fahrenheit) { + crit = deg_ctof(crit); + crit_hyst = deg_ctof(crit_hyst); + } + printf(" (crit = %+5.0f%s, hyst = %+5.0f%s) ", + crit, degstr, crit_hyst, degstr); + printf("sensor = %s\n", (int)type == 0 ? "disabled" : + (int)type == 1 ? "diode" : + (int)type == 2 ? "transistor" : + (int)type == 3 ? "thermal diode" : + (int)type == 4 ? "thermistor" : + (int)type == 5 ? "AMD AMDSI" : + (int)type == 6 ? "Intel PECI" : + "unknown"); + } + } else { + printf("ERROR: Can't get temp%d data!\n", i); + } + free(label); +} + +void print_f71882fg(const sensors_chip_name *name) +{ + int i; + + for (i = 0; i <= 8; i++) + print_f71882fg_in(name, i); + + for (i = 1; i <= 4; i++) + print_f71882fg_fan(name, i); + + for (i = 1; i <= 3; i++) + print_f71882fg_temp(name, i); +} + void print_unknown_chip(const sensors_chip_name *name) { int a,b,valid; diff --git a/prog/sensors/chips.h b/prog/sensors/chips.h index 8039a333..140c331e 100644 --- a/prog/sensors/chips.h +++ b/prog/sensors/chips.h @@ -79,5 +79,6 @@ extern void print_k8temp(const sensors_chip_name *name); extern void print_coretemp(const sensors_chip_name *name); extern void print_dme1737(const sensors_chip_name *name); extern void print_applesmc(const sensors_chip_name *name); +extern void print_f71882fg(const sensors_chip_name *name); #endif /* def PROG_SENSORS_CHIPS_H */ diff --git a/prog/sensors/main.c b/prog/sensors/main.c index fb62757b..dd216f94 100644 --- a/prog/sensors/main.c +++ b/prog/sensors/main.c @@ -425,6 +425,7 @@ static struct match matches[] = { { "coretemp", print_coretemp }, { "dme1737", print_dme1737 }, { "applesmc", print_applesmc }, + { "f71882fg", print_f71882fg }, { NULL, NULL } };