From 0b6ac4f953f155d267c618f6672479907517ebd1 Mon Sep 17 00:00:00 2001 From: Rudolf Marek Date: Wed, 22 Mar 2006 13:53:30 +0000 Subject: [PATCH] Add the W83627EHF Voltages and voltage alarms support git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@3271 7894878c-1315-0410-8ee3-d5d059ff63e0 --- lib/chips.c | 100 +++++++++++++++++++++++++++++++++++++++++++ lib/chips.h | 40 +++++++++++++++++ prog/sensors/chips.c | 21 ++++++++- 3 files changed, 159 insertions(+), 2 deletions(-) diff --git a/lib/chips.c b/lib/chips.c index 135f0de2..057c616e 100644 --- a/lib/chips.c +++ b/lib/chips.c @@ -1875,6 +1875,106 @@ static sensors_chip_feature w83l785ts_features[] = /* No support for Linux 2.4 yet (sysctl) */ static sensors_chip_feature w83627ehf_features[] = { + { SENSORS_W83627EHF_IN0, "in0", NOMAP, NOMAP, + R, NOSYSCTL, VALUE(3), 3 }, + { SENSORS_W83627EHF_IN1, "in1", NOMAP, NOMAP, + R, NOSYSCTL, VALUE(3), 3 }, + { SENSORS_W83627EHF_IN2, "in2", NOMAP, NOMAP, + R, NOSYSCTL, VALUE(3), 3 }, + { SENSORS_W83627EHF_IN3, "in3", NOMAP, NOMAP, + R, NOSYSCTL, VALUE(3), 3 }, + { SENSORS_W83627EHF_IN4, "in4", NOMAP, NOMAP, + R, NOSYSCTL, VALUE(3), 3 }, + { SENSORS_W83627EHF_IN5, "in5", NOMAP, NOMAP, + R, NOSYSCTL, VALUE(3), 3 }, + { SENSORS_W83627EHF_IN6, "in6", NOMAP, NOMAP, + R, NOSYSCTL, VALUE(3), 3 }, + { SENSORS_W83627EHF_IN7, "in7", NOMAP, NOMAP, + R, NOSYSCTL, VALUE(3), 3 }, + { SENSORS_W83627EHF_IN8, "in8", NOMAP, NOMAP, + R, NOSYSCTL, VALUE(3), 3 }, + { SENSORS_W83627EHF_IN9, "in9", NOMAP, NOMAP, + R, NOSYSCTL, VALUE(3), 3 }, + { SENSORS_W83627EHF_IN0_ALARM, "in0_alarm", SENSORS_W83627EHF_IN0, NOMAP, + R, NOSYSCTL, VALUE(1), 0 }, + { SENSORS_W83627EHF_IN1_ALARM, "in1_alarm", SENSORS_W83627EHF_IN1, NOMAP, + R, NOSYSCTL, VALUE(1), 0 }, + { SENSORS_W83627EHF_IN2_ALARM, "in2_alarm", SENSORS_W83627EHF_IN2, NOMAP, + R, NOSYSCTL, VALUE(1), 0 }, + { SENSORS_W83627EHF_IN3_ALARM, "in3_alarm", SENSORS_W83627EHF_IN3, NOMAP, + R, NOSYSCTL, VALUE(1), 0 }, + { SENSORS_W83627EHF_IN4_ALARM, "in4_alarm", SENSORS_W83627EHF_IN4, NOMAP, + R, NOSYSCTL, VALUE(1), 0 }, + { SENSORS_W83627EHF_IN5_ALARM, "in5_alarm", SENSORS_W83627EHF_IN5, NOMAP, + R, NOSYSCTL, VALUE(1), 0 }, + { SENSORS_W83627EHF_IN6_ALARM, "in6_alarm", SENSORS_W83627EHF_IN6, NOMAP, + R, NOSYSCTL, VALUE(1), 0 }, + { SENSORS_W83627EHF_IN7_ALARM, "in7_alarm", SENSORS_W83627EHF_IN7, NOMAP, + R, NOSYSCTL, VALUE(1), 0 }, + { SENSORS_W83627EHF_IN8_ALARM, "in8_alarm", SENSORS_W83627EHF_IN8, NOMAP, + R, NOSYSCTL, VALUE(1), 0 }, + { SENSORS_W83627EHF_IN9_ALARM, "in9_alarm", SENSORS_W83627EHF_IN9, NOMAP, + R, NOSYSCTL, VALUE(1), 0 }, + { SENSORS_W83627EHF_IN0_MIN, "in0_min", SENSORS_W83627EHF_IN0, + SENSORS_W83627EHF_IN0, RW, + NOSYSCTL, VALUE(1), 3 }, + { SENSORS_W83627EHF_IN1_MIN, "in1_min", SENSORS_W83627EHF_IN1, + SENSORS_W83627EHF_IN1, RW, + NOSYSCTL, VALUE(1), 3 }, + { SENSORS_W83627EHF_IN2_MIN, "in2_min", SENSORS_W83627EHF_IN2, + SENSORS_W83627EHF_IN2, RW, + NOSYSCTL, VALUE(1), 3 }, + { SENSORS_W83627EHF_IN3_MIN, "in3_min", SENSORS_W83627EHF_IN3, + SENSORS_W83627EHF_IN3, RW, + NOSYSCTL, VALUE(1), 3 }, + { SENSORS_W83627EHF_IN4_MIN, "in4_min", SENSORS_W83627EHF_IN4, + SENSORS_W83627EHF_IN4, RW, + NOSYSCTL, VALUE(1), 3 }, + { SENSORS_W83627EHF_IN5_MIN, "in5_min", SENSORS_W83627EHF_IN5, + SENSORS_W83627EHF_IN5, RW, + NOSYSCTL, VALUE(1), 3 }, + { SENSORS_W83627EHF_IN6_MIN, "in6_min", SENSORS_W83627EHF_IN6, + SENSORS_W83627EHF_IN6, RW, + NOSYSCTL, VALUE(1), 3 }, + { SENSORS_W83627EHF_IN7_MIN, "in7_min", SENSORS_W83627EHF_IN7, + SENSORS_W83627EHF_IN7, RW, + NOSYSCTL, VALUE(1), 3 }, + { SENSORS_W83627EHF_IN8_MIN, "in8_min", SENSORS_W83627EHF_IN8, + SENSORS_W83627EHF_IN8, RW, + NOSYSCTL, VALUE(1), 3 }, + { SENSORS_W83627EHF_IN9_MIN, "in9_min", SENSORS_W83627EHF_IN9, + SENSORS_W83627EHF_IN9, RW, + NOSYSCTL, VALUE(1), 3 }, + { SENSORS_W83627EHF_IN0_MAX, "in0_max", SENSORS_W83627EHF_IN0, + SENSORS_W83627EHF_IN0, RW, + NOSYSCTL, VALUE(2), 3 }, + { SENSORS_W83627EHF_IN1_MAX, "in1_max", SENSORS_W83627EHF_IN1, + SENSORS_W83627EHF_IN1, RW, + NOSYSCTL, VALUE(2), 3 }, + { SENSORS_W83627EHF_IN2_MAX, "in2_max", SENSORS_W83627EHF_IN2, + SENSORS_W83627EHF_IN2, RW, + NOSYSCTL, VALUE(2), 3 }, + { SENSORS_W83627EHF_IN3_MAX, "in3_max", SENSORS_W83627EHF_IN3, + SENSORS_W83627EHF_IN3, RW, + NOSYSCTL, VALUE(2), 3 }, + { SENSORS_W83627EHF_IN4_MAX, "in4_max", SENSORS_W83627EHF_IN4, + SENSORS_W83627EHF_IN4, RW, + NOSYSCTL, VALUE(2), 3 }, + { SENSORS_W83627EHF_IN5_MAX, "in5_max", SENSORS_W83627EHF_IN5, + SENSORS_W83627EHF_IN5, RW, + NOSYSCTL, VALUE(2), 3 }, + { SENSORS_W83627EHF_IN6_MAX, "in6_max", SENSORS_W83627EHF_IN6, + SENSORS_W83627EHF_IN6, RW, + NOSYSCTL, VALUE(2), 3 }, + { SENSORS_W83627EHF_IN7_MAX, "in7_max", SENSORS_W83627EHF_IN7, + SENSORS_W83627EHF_IN7, RW, + NOSYSCTL, VALUE(2), 3 }, + { SENSORS_W83627EHF_IN8_MAX, "in8_max", SENSORS_W83627EHF_IN8, + SENSORS_W83627EHF_IN8, RW, + NOSYSCTL, VALUE(2), 3 }, + { SENSORS_W83627EHF_IN9_MAX, "in9_max", SENSORS_W83627EHF_IN9, + SENSORS_W83627EHF_IN9, RW, + NOSYSCTL, VALUE(2), 3 }, { SENSORS_W83627EHF_FAN1, "fan1", NOMAP, NOMAP, R, NOSYSCTL, VALUE(2), 0 }, { SENSORS_W83627EHF_FAN2, "fan2", NOMAP, NOMAP, diff --git a/lib/chips.h b/lib/chips.h index 9779eff9..cfb51988 100644 --- a/lib/chips.h +++ b/lib/chips.h @@ -849,6 +849,46 @@ #define SENSORS_W83627EHF_PREFIX "w83627ehf" +#define SENSORS_W83627EHF_IN0 1 /* R */ +#define SENSORS_W83627EHF_IN1 2 /* R */ +#define SENSORS_W83627EHF_IN2 3 /* R */ +#define SENSORS_W83627EHF_IN3 4 /* R */ +#define SENSORS_W83627EHF_IN4 5 /* R */ +#define SENSORS_W83627EHF_IN5 6 /* R */ +#define SENSORS_W83627EHF_IN6 7 /* R */ +#define SENSORS_W83627EHF_IN7 8 /* R */ +#define SENSORS_W83627EHF_IN8 9 /* R */ +#define SENSORS_W83627EHF_IN9 10 /* R */ +#define SENSORS_W83627EHF_IN0_ALARM 111 /* R */ +#define SENSORS_W83627EHF_IN1_ALARM 112 /* R */ +#define SENSORS_W83627EHF_IN2_ALARM 113 /* R */ +#define SENSORS_W83627EHF_IN3_ALARM 114 /* R */ +#define SENSORS_W83627EHF_IN4_ALARM 115 /* R */ +#define SENSORS_W83627EHF_IN5_ALARM 116 /* R */ +#define SENSORS_W83627EHF_IN6_ALARM 117 /* R */ +#define SENSORS_W83627EHF_IN7_ALARM 118 /* R */ +#define SENSORS_W83627EHF_IN8_ALARM 119 /* R */ +#define SENSORS_W83627EHF_IN9_ALARM 120 /* R */ +#define SENSORS_W83627EHF_IN0_MIN 11 /* RW */ +#define SENSORS_W83627EHF_IN1_MIN 12 /* RW */ +#define SENSORS_W83627EHF_IN2_MIN 13 /* RW */ +#define SENSORS_W83627EHF_IN3_MIN 14 /* RW */ +#define SENSORS_W83627EHF_IN4_MIN 15 /* RW */ +#define SENSORS_W83627EHF_IN5_MIN 16 /* RW */ +#define SENSORS_W83627EHF_IN6_MIN 17 /* RW */ +#define SENSORS_W83627EHF_IN7_MIN 18 /* RW */ +#define SENSORS_W83627EHF_IN8_MIN 19 /* RW */ +#define SENSORS_W83627EHF_IN9_MIN 20 /* RW */ +#define SENSORS_W83627EHF_IN0_MAX 21 /* RW */ +#define SENSORS_W83627EHF_IN1_MAX 22 /* RW */ +#define SENSORS_W83627EHF_IN2_MAX 23 /* RW */ +#define SENSORS_W83627EHF_IN3_MAX 24 /* RW */ +#define SENSORS_W83627EHF_IN4_MAX 25 /* RW */ +#define SENSORS_W83627EHF_IN5_MAX 26 /* RW */ +#define SENSORS_W83627EHF_IN6_MAX 27 /* RW */ +#define SENSORS_W83627EHF_IN7_MAX 28 /* RW */ +#define SENSORS_W83627EHF_IN8_MAX 29 /* RW */ +#define SENSORS_W83627EHF_IN9_MAX 30 /* RW */ #define SENSORS_W83627EHF_FAN1 31 /* R */ #define SENSORS_W83627EHF_FAN2 32 /* R */ #define SENSORS_W83627EHF_FAN3 33 /* R */ diff --git a/prog/sensors/chips.c b/prog/sensors/chips.c index d7e6107a..38a6adc8 100644 --- a/prog/sensors/chips.c +++ b/prog/sensors/chips.c @@ -2813,9 +2813,27 @@ void print_w83627ehf(const sensors_chip_name *name) { char *label; int i, valid; + double cur, min, div, max, alarm, over, hyst; + + + for (i = 0; i < 10; i++) { + if (!sensors_get_label_and_valid(*name,SENSORS_W83627EHF_IN0+i, + &label,&valid) + && !sensors_get_feature(*name,SENSORS_W83627EHF_IN0+i,&cur) + && !sensors_get_feature(*name,SENSORS_W83627EHF_IN0_MIN+i,&min) + && !sensors_get_feature(*name,SENSORS_W83627EHF_IN0_MAX+i,&max) + && !sensors_get_feature(*name,SENSORS_W83627EHF_IN0_ALARM+i,&alarm)) { + if (valid) { + print_label(label,10); + printf("%+6.2f V (min = %+6.2f V, max = %+6.2f V) %s\n", + cur,min,max,alarm ? "ALARM" : ""); + } + } else + printf("ERROR: Can't get IN%d data!\n",i + 1); + free(label); + } for (i = 0; i < 5; i++) { - double cur, min, div; if (!sensors_get_label_and_valid(*name, SENSORS_W83627EHF_FAN1+i, &label, &valid) && !sensors_get_feature(*name, SENSORS_W83627EHF_FAN1+i, &cur) @@ -2833,7 +2851,6 @@ void print_w83627ehf(const sensors_chip_name *name) } for (i = 0; i < 3; i++) { - double cur, over, hyst; if (!sensors_get_label_and_valid(*name, SENSORS_W83627EHF_TEMP1+i, &label, &valid) && !sensors_get_feature(*name, SENSORS_W83627EHF_TEMP1+i, &cur)