Changeset 4910 for lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/chips.c

Timestamp:

09/30/07 19:56:19 (6 years ago)

Author:

khali

Message:

sensors: Better handling of the fault flags.

Files:

• lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/chips.c (modified) (4 diffs)

lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/chips.c

@@ -149 +149 @@
 
         sf = sensors_get_subfeature(name, feature,
-                                    SENSORS_SUBFEATURE_TEMP_INPUT);
-        val = sf ? get_value(name, sf) : 0;
-
-        sf = sensors_get_subfeature(name, feature,
                                     SENSORS_SUBFEATURE_TEMP_ALARM);
         alarm = sf && get_value(name, sf);
@@ -231 +227 @@
                 printf("   FAULT  ");
         } else {
-                if (fahrenheit)
-                        val = deg_ctof(val);
-                printf("%+6.1f%s  ", val, degstr);
+                sf = sensors_get_subfeature(name, feature,
+                                            SENSORS_SUBFEATURE_TEMP_INPUT);
+                if (sf) {
+                        val = get_value(name, sf);
+                        if (fahrenheit)
+                                val = deg_ctof(val);
+                        printf("%+6.1f%s  ", val, degstr);
+                } else
+                        printf("     N/A  ");
         }
         print_temp_limits(limit1, limit2, s1, s2, alarm);
@@ -351 +353 @@
         const sensors_subfeature *sf, *sfmin, *sfdiv;
         char *label;
-        double val;
 
         if (!(label = sensors_get_label(name, feature))) {
@@ -362 +363 @@
 
         sf = sensors_get_subfeature(name, feature,
-                                    SENSORS_SUBFEATURE_FAN_INPUT);
-        val = sf ? get_value(name, sf) : 0;
-        sf = sensors_get_subfeature(name, feature,
                                     SENSORS_SUBFEATURE_FAN_FAULT);
         if (sf && get_value(name, sf))
                 printf("   FAULT");
-        else
-                printf("%4.0f RPM", val);
+        else {
+                sf = sensors_get_subfeature(name, feature,
+                                            SENSORS_SUBFEATURE_FAN_INPUT);
+                if (sf)
+                        printf("%4.0f RPM", get_value(name, sf));
+                else
+                        printf("     N/A");
+        }
 
         sfmin = sensors_get_subfeature(name, feature,