mirror of
https://github.com/lm-sensors/lm-sensors.git
synced 2026-11-06 15:51:34 +00:00
Handle gl518sm chips with no input values for in0, in1 and in2. This will happen
with the Linux 2.6 driver soon. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4976 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
1 parent
8e4794ad41
commit
9d60f01cec
2 files changed
+4
-6
No files matched your search
@@ -36,6 +36,7 @@ SVN HEAD
|
||||
Hide error on missing dme1737 fan and pwm
|
||||
Add thmc50/adm1022 support
|
||||
Hide error on missing adm1021 die code
|
||||
Handle gl518sm with no voltage input values
|
||||
Program sensors-detect: Don't probe i2c-isa as a regular i2c bus
|
||||
Add Winbond W83L786NR/NG/R/G detection
|
||||
Add Winbond W83L771W/G detection
|
||||
|
||||
@@ -1036,12 +1036,11 @@ void print_gl518(const sensors_chip_name *name)
|
||||
* of the GL518SM, we cannot read their values. This is detected when the
|
||||
* reading would be 0.0 V and displayed as "(n/a)" instead. */
|
||||
if (!sensors_get_label_and_valid(*name,SENSORS_GL518_VDD,&label,&valid) &&
|
||||
!sensors_get_feature(*name,SENSORS_GL518_VDD,&cur) &&
|
||||
!sensors_get_feature(*name,SENSORS_GL518_VDD_MIN,&min) &&
|
||||
!sensors_get_feature(*name,SENSORS_GL518_VDD_MAX,&max)) {
|
||||
if (valid) {
|
||||
print_label(label,10);
|
||||
if (cur == 0.0)
|
||||
if (sensors_get_feature(*name, SENSORS_GL518_VDD, &cur) || cur == 0.0)
|
||||
printf("(n/a) ");
|
||||
else
|
||||
printf("%+6.2f V ",cur);
|
||||
@@ -1054,12 +1053,11 @@ void print_gl518(const sensors_chip_name *name)
|
||||
free(label);
|
||||
|
||||
if (!sensors_get_label_and_valid(*name,SENSORS_GL518_VIN1,&label,&valid) &&
|
||||
!sensors_get_feature(*name,SENSORS_GL518_VIN1,&cur) &&
|
||||
!sensors_get_feature(*name,SENSORS_GL518_VIN1_MIN,&min) &&
|
||||
!sensors_get_feature(*name,SENSORS_GL518_VIN1_MAX,&max)) {
|
||||
if (valid) {
|
||||
print_label(label,10);
|
||||
if (cur == 0.0)
|
||||
if (sensors_get_feature(*name, SENSORS_GL518_VIN1, &cur) || cur == 0.0)
|
||||
printf("(n/a) ");
|
||||
else
|
||||
printf("%+6.2f V ",cur);
|
||||
@@ -1072,12 +1070,11 @@ void print_gl518(const sensors_chip_name *name)
|
||||
free(label);
|
||||
|
||||
if (!sensors_get_label_and_valid(*name,SENSORS_GL518_VIN2,&label,&valid) &&
|
||||
!sensors_get_feature(*name,SENSORS_GL518_VIN2,&cur) &&
|
||||
!sensors_get_feature(*name,SENSORS_GL518_VIN2_MIN,&min) &&
|
||||
!sensors_get_feature(*name,SENSORS_GL518_VIN2_MAX,&max)) {
|
||||
if (valid) {
|
||||
print_label(label,10);
|
||||
if (cur == 0.0)
|
||||
if (sensors_get_feature(*name, SENSORS_GL518_VIN2, &cur) || cur == 0.0)
|
||||
printf("(n/a) ");
|
||||
else
|
||||
printf("%+6.2f V ",cur);
|
||||
|
||||
Reference in new issue
Block a user