From e944415f254f26a113476e09f3b992e7d672c980 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sat, 2 Sep 2006 07:49:35 +0000 Subject: [PATCH] The adt7463 may not have in4 (#2119) git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4133 7894878c-1315-0410-8ee3-d5d059ff63e0 --- CHANGES | 1 + etc/sensors.conf.eg | 1 + prog/sensors/chips.c | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 3b00a145..1d95b184 100644 --- a/CHANGES +++ b/CHANGES @@ -55,6 +55,7 @@ lm_sensors CHANGES file Make each it87 fan and fan div optional Print missing w83791d values Add w83793 support (Yuan Mu) + The adt7463 may not have in4 (#2119) Program sensors-detect: Add ServerWorks HT-1000 SMBus detection Add ATI IXP200/300/400 SMBus detection Prevent warning on 64-bit PCI addresses diff --git a/etc/sensors.conf.eg b/etc/sensors.conf.eg index ec60bfdd..5ba91f20 100644 --- a/etc/sensors.conf.eg +++ b/etc/sensors.conf.eg @@ -2392,6 +2392,7 @@ chip "asb100-*" chip "lm85c-*" "adm1027-*" "adt7463-*" "lm85-*" "lm85b-*" # Voltage inputs +# Depending on the hardware setup, the ADT7463 may not have in4. label in0 "V1.5" # AGP on Intel S845WD1-E label in1 "VCore" label in2 "V3.3" diff --git a/prog/sensors/chips.c b/prog/sensors/chips.c index 726151d9..eeeaa31d 100644 --- a/prog/sensors/chips.c +++ b/prog/sensors/chips.c @@ -1561,13 +1561,14 @@ void print_lm85(const sensors_chip_name *name) char *label; double cur, min, max; int alarms, alarm_mask = 0, valid; - int is85, is1027, is6d100; + int is85, is1027, is7463, is6d100; is85 = !strcmp(name->prefix,"lm85") || !strcmp(name->prefix,"lm85b") || !strcmp(name->prefix,"lm85c") ; is1027 = !strcmp(name->prefix,"adm1027") || !strcmp(name->prefix,"adt7463") ; + is7463 = !strcmp(name->prefix, "adt7463"); is6d100 = !strcmp(name->prefix,"emc6d100") ; if (!sensors_get_feature(*name,SENSORS_LM85_ALARMS,&cur)) @@ -1649,7 +1650,7 @@ void print_lm85(const sensors_chip_name *name) if (is1027) { printf(alarm_mask&LM85_ALARM_IN4?" MASKED":""); } putchar( '\n' ); } - } else + } else if (!is7463) printf("ERROR: Can't get IN4 data!\n"); free(label);