From 6707ff8c591aac0e7010fdd3b2257297f3f0de03 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Mon, 17 May 2004 18:36:31 +0000 Subject: [PATCH] Support pc87366 thermistor inputs. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2543 7894878c-1315-0410-8ee3-d5d059ff63e0 --- lib/chips.c | 39 +++++++++++++++++++++++++++++++++++++++ prog/sensors/chips.c | 6 +++--- 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/lib/chips.c b/lib/chips.c index ca2e091b..b34f152b 100644 --- a/lib/chips.c +++ b/lib/chips.c @@ -4432,6 +4432,12 @@ static sensors_chip_feature pc87365_features[] = PC87365_SYSCTL_TEMP2, VALUE(4), 0 }, { SENSORS_PC87360_TEMP3, "temp3", NOMAP, NOMAP, R, PC87365_SYSCTL_TEMP3, VALUE(4), 0 }, + { SENSORS_PC87360_TEMP4, "temp4", NOMAP, NOMAP, R, + PC87365_SYSCTL_TEMP4, VALUE(4), 2 }, + { SENSORS_PC87360_TEMP5, "temp5", NOMAP, NOMAP, R, + PC87365_SYSCTL_TEMP5, VALUE(4), 2 }, + { SENSORS_PC87360_TEMP6, "temp6", NOMAP, NOMAP, R, + PC87365_SYSCTL_TEMP6, VALUE(4), 2 }, { SENSORS_PC87360_TEMP1_MIN, "temp1_min", SENSORS_PC87360_TEMP1, SENSORS_PC87360_TEMP1, RW, PC87365_SYSCTL_TEMP1, VALUE(2), 0 }, @@ -4441,6 +4447,15 @@ static sensors_chip_feature pc87365_features[] = { SENSORS_PC87360_TEMP3_MIN, "temp3_min", SENSORS_PC87360_TEMP3, SENSORS_PC87360_TEMP3, RW, PC87365_SYSCTL_TEMP3, VALUE(2), 0 }, + { SENSORS_PC87360_TEMP4_MIN, "temp4_min", SENSORS_PC87360_TEMP4, + SENSORS_PC87360_TEMP4, RW, PC87365_SYSCTL_TEMP4, + VALUE(2), 2 }, + { SENSORS_PC87360_TEMP5_MIN, "temp5_min", SENSORS_PC87360_TEMP5, + SENSORS_PC87360_TEMP5, RW, PC87365_SYSCTL_TEMP5, + VALUE(2), 2 }, + { SENSORS_PC87360_TEMP6_MIN, "temp6_min", SENSORS_PC87360_TEMP6, + SENSORS_PC87360_TEMP6, RW, PC87365_SYSCTL_TEMP6, + VALUE(2), 2 }, { SENSORS_PC87360_TEMP1_MAX, "temp1_max", SENSORS_PC87360_TEMP1, SENSORS_PC87360_TEMP1, RW, PC87365_SYSCTL_TEMP1, VALUE(1), 0 }, @@ -4450,6 +4465,15 @@ static sensors_chip_feature pc87365_features[] = { SENSORS_PC87360_TEMP3_MAX, "temp3_max", SENSORS_PC87360_TEMP3, SENSORS_PC87360_TEMP3, RW, PC87365_SYSCTL_TEMP3, VALUE(1), 0 }, + { SENSORS_PC87360_TEMP4_MAX, "temp4_max", SENSORS_PC87360_TEMP4, + SENSORS_PC87360_TEMP4, RW, PC87365_SYSCTL_TEMP4, + VALUE(1), 2 }, + { SENSORS_PC87360_TEMP5_MAX, "temp5_max", SENSORS_PC87360_TEMP5, + SENSORS_PC87360_TEMP5, RW, PC87365_SYSCTL_TEMP5, + VALUE(1), 2 }, + { SENSORS_PC87360_TEMP6_MAX, "temp6_max", SENSORS_PC87360_TEMP6, + SENSORS_PC87360_TEMP6, RW, PC87365_SYSCTL_TEMP6, + VALUE(1), 2 }, { SENSORS_PC87360_TEMP1_CRIT, "temp1_crit", SENSORS_PC87360_TEMP1, SENSORS_PC87360_TEMP1, RW, PC87365_SYSCTL_TEMP1, VALUE(3), 0 }, @@ -4459,12 +4483,27 @@ static sensors_chip_feature pc87365_features[] = { SENSORS_PC87360_TEMP3_CRIT, "temp3_crit", SENSORS_PC87360_TEMP3, SENSORS_PC87360_TEMP3, RW, PC87365_SYSCTL_TEMP3, VALUE(3), 0 }, + { SENSORS_PC87360_TEMP4_CRIT, "temp4_crit", SENSORS_PC87360_TEMP4, + SENSORS_PC87360_TEMP4, RW, PC87365_SYSCTL_TEMP4, + VALUE(3), 2 }, + { SENSORS_PC87360_TEMP5_CRIT, "temp5_crit", SENSORS_PC87360_TEMP5, + SENSORS_PC87360_TEMP5, RW, PC87365_SYSCTL_TEMP5, + VALUE(3), 2 }, + { SENSORS_PC87360_TEMP6_CRIT, "temp6_crit", SENSORS_PC87360_TEMP6, + SENSORS_PC87360_TEMP6, RW, PC87365_SYSCTL_TEMP6, + VALUE(3), 2 }, { SENSORS_PC87360_TEMP1_STATUS, "temp1_status", SENSORS_PC87360_TEMP1, NOMAP, R, PC87365_SYSCTL_TEMP1_STATUS, VALUE(1), 0 }, { SENSORS_PC87360_TEMP2_STATUS, "temp2_status", SENSORS_PC87360_TEMP2, NOMAP, R, PC87365_SYSCTL_TEMP2_STATUS, VALUE(1), 0 }, { SENSORS_PC87360_TEMP3_STATUS, "temp3_status", SENSORS_PC87360_TEMP3, NOMAP, R, PC87365_SYSCTL_TEMP3_STATUS, VALUE(1), 0 }, + { SENSORS_PC87360_TEMP4_STATUS, "temp4_status", SENSORS_PC87360_TEMP4, + NOMAP, R, PC87365_SYSCTL_TEMP4_STATUS, VALUE(1), 0 }, + { SENSORS_PC87360_TEMP5_STATUS, "temp5_status", SENSORS_PC87360_TEMP5, + NOMAP, R, PC87365_SYSCTL_TEMP5_STATUS, VALUE(1), 0 }, + { SENSORS_PC87360_TEMP6_STATUS, "temp6_status", SENSORS_PC87360_TEMP6, + NOMAP, R, PC87365_SYSCTL_TEMP6_STATUS, VALUE(1), 0 }, { 0 } }; diff --git a/prog/sensors/chips.c b/prog/sensors/chips.c index 2eeb8162..875e0d2c 100644 --- a/prog/sensors/chips.c +++ b/prog/sensors/chips.c @@ -4105,13 +4105,13 @@ void print_pc87366(const sensors_chip_name *name) print_pc87364(name); if (!strcmp(name->prefix, "pc87366")) - tempnr = 3; + tempnr = 6; for (i = 0; i < tempnr; i++) { if (!sensors_get_feature(*name, SENSORS_PC87360_TEMP1_STATUS + i, &cur)) status = cur + 0.5; else { - printf("ERROR: Can't get IN%d status data!\n", i + 1); + printf("ERROR: Can't get TEMP%d status data!\n", i + 1); status = 0; } @@ -4122,7 +4122,7 @@ void print_pc87366(const sensors_chip_name *name) if (valid) { print_label(label, 10); print_temp_info(cur, max, min, MINMAX, 0, 0); - if (status&PC87365_STATUS_TEMP_OPEN) + if (i<3 && status&PC87365_STATUS_TEMP_OPEN) printf("OPEN"); else if (status&(PC87365_STATUS_TEMP_MIN|PC87365_STATUS_TEMP_MAX)) printf("ALARM");