From 203aea1f5148c9e39f5b5024091d41b0a960c98b Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Mon, 17 Sep 2007 10:58:50 +0000 Subject: [PATCH] Hide error on missing dme1737 fan and pwm. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4798 7894878c-1315-0410-8ee3-d5d059ff63e0 --- CHANGES | 1 + prog/sensors/chips.c | 34 +++++++++++++++------------------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/CHANGES b/CHANGES index d5348b8e..32e20727 100644 --- a/CHANGES +++ b/CHANGES @@ -19,6 +19,7 @@ SVN HEAD Module lm93: Fix an array overrun (2.6 backport) Program sensors: Fix a memory leak on error (with -u) Add sch311x support + Hide error on missing dme1737 fan and pwm 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 diff --git a/prog/sensors/chips.c b/prog/sensors/chips.c index bb407f80..6980a603 100644 --- a/prog/sensors/chips.c +++ b/prog/sensors/chips.c @@ -6016,17 +6016,17 @@ static void print_dme1737_in(const sensors_chip_name *name, int i) if (!sensors_get_label_and_valid(*name, SENSORS_DME1737_IN(i), &label, &valid) && - !sensors_get_feature(*name, SENSORS_DME1737_IN(i), &cur) && - !sensors_get_feature(*name, SENSORS_DME1737_IN_MIN(i), &min) && - !sensors_get_feature(*name, SENSORS_DME1737_IN_MAX(i), &max) && - !sensors_get_feature(*name, SENSORS_DME1737_IN_ALARM(i), &alarm)) { - if (valid) { + valid) { + if (!sensors_get_feature(*name, SENSORS_DME1737_IN(i), &cur) && + !sensors_get_feature(*name, SENSORS_DME1737_IN_MIN(i), &min) && + !sensors_get_feature(*name, SENSORS_DME1737_IN_MAX(i), &max) && + !sensors_get_feature(*name, SENSORS_DME1737_IN_ALARM(i), &alarm)) { 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); } - } else { - printf("ERROR: Can't get in%d data!\n", i); } free(label); } @@ -6039,18 +6039,18 @@ static void print_dme1737_temp(const sensors_chip_name *name, int i) if (!sensors_get_label_and_valid(*name, SENSORS_DME1737_TEMP(i), &label, &valid) && - !sensors_get_feature(*name, SENSORS_DME1737_TEMP(i), &cur) && - !sensors_get_feature(*name, SENSORS_DME1737_TEMP_MIN(i), &min) && - !sensors_get_feature(*name, SENSORS_DME1737_TEMP_MAX(i), &max) && - !sensors_get_feature(*name, SENSORS_DME1737_TEMP_ALARM(i), &alarm) && - !sensors_get_feature(*name, SENSORS_DME1737_TEMP_FAULT(i), &fault)) { - if (valid) { + valid) { + if (!sensors_get_feature(*name, SENSORS_DME1737_TEMP(i), &cur) && + !sensors_get_feature(*name, SENSORS_DME1737_TEMP_MIN(i), &min) && + !sensors_get_feature(*name, SENSORS_DME1737_TEMP_MAX(i), &max) && + !sensors_get_feature(*name, SENSORS_DME1737_TEMP_ALARM(i), &alarm) && + !sensors_get_feature(*name, SENSORS_DME1737_TEMP_FAULT(i), &fault)) { print_label(label, 10); print_temp_info(cur, max, min, MINMAX, 0, 0); printf("%s%s\n", fault ? "FAULT " : "", alarm ? "ALARM" : ""); + } else { + printf("ERROR: Can't get temp%d data!\n", i); } - } else { - printf("ERROR: Can't get temp%d data!\n", i); } free(label); } @@ -6071,8 +6071,6 @@ static void print_dme1737_fan(const sensors_chip_name *name, int i) printf("%4.0f RPM (min = %4.0f RPM) %s\n", cur, min, alarm ? "ALARM" : ""); } - } else { - printf("ERROR: Can't get fan%d data!\n", i); } free(label); } @@ -6092,8 +6090,6 @@ static void print_dme1737_pwm(const sensors_chip_name *name, int i) print_label(label, 10); printf("%4.0f (enable = %1.0f, freq = %6.0f Hz)\n", cur, enable, freq); } - } else { - printf("ERROR: Can't get pwm%d data!\n", i); } free(label); }