Changeset 4718

Timestamp:

08/26/07 22:37:15 (1 year ago)

Author:

khali

Message:

Change print_temp_limits() to expose a sane interface. This lets us get
rid of arbitrary constants. Now we can reuse the same code to display
the extra temperature limits.

Files:

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

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

@@ -31 +31 @@
-{
-        return cel * (9.0F / 5.0F) + 32.0F;
-}
-
-#define HYST 0
-#define MINMAX 1
-#define MAXONLY 2
-#define CRIT 3
-#define SINGLE 4
-#define HYSTONLY 5
-
-/* symbolic constants for minmax defined above */
-static void print_temp_limits(float n_over, float n_hyst,
-                              int minmax)
-{
-        if (fahrenheit) {
-                n_over = deg_ctof(n_over);
-                n_hyst = deg_ctof(n_hyst);
-        }
-
-        if (minmax == MINMAX)
-                printf("(low  = %+5.1f%s, high = %+5.1f%s)  ",
-                       n_hyst, degstr,
-                       n_over, degstr);
-        else if (minmax == MAXONLY)
-                printf("(high = %+5.1f%s)                  ",
-                       n_over, degstr);
-        else if (minmax == CRIT)
-                printf("(high = %+5.1f%s, crit = %+5.1f%s)  ",
-                       n_over, degstr,
-                       n_hyst, degstr);
-        else if (minmax == HYST)
-                printf("(high = %+5.1f%s, hyst = %+5.1f%s)  ",
-                       n_over, degstr,
-                       n_hyst, degstr);
-        else if (minmax == HYSTONLY)
-                printf("(hyst = %+5.1f%s)                  ",
-                       n_over, degstr);
-        else if (minmax != SINGLE)
-                printf("Unknown temperature mode!");
-}
-
@@ -174 +136 @@
-}
-
+static void print_temp_limits(float limit1, float limit2,
+                              const char *name1, const char *name2, int alarm)
+{
+        if (fahrenheit) {
+                limit1 = deg_ctof(limit1);
+                limit2 = deg_ctof(limit2);
+        }
+
+        if (name2) {
+                printf("(%-4s = %+5.1f%s, %-4s = %+5.1f%s)  ",
+                       name1, limit1, degstr,
+                       name2, limit2, degstr);
+        } else if (name1) {
+                printf("(%-4s = %+5.1f%s)                  ",
+                       name1, limit1, degstr);
+        } else {
+                printf("                                  ");
+        }
+
+        if (alarm)
+                printf("ALARM  ");
+}
+
-#define TEMP_FEATURE(x)         has_features[x - SENSORS_FEATURE_TEMP - 1]
-#define TEMP_FEATURE_VAL(x)     feature_vals[x - SENSORS_FEATURE_TEMP - 1]
@@ -180 +165 @@
-                                    int i, int label_size)
-{
-
-
-
+
+
+
+
-        const int size = SENSORS_FEATURE_TEMP_SENS - SENSORS_FEATURE_TEMP;
-        short has_features[SENSORS_FEATURE_TEMP_SENS - SENSORS_FEATURE_TEMP] = { 0, };
@@ -202 +188 @@
-                                       SENSORS_FEATURE_TEMP);
-
+        alarm = TEMP_FEATURE(SENSORS_FEATURE_TEMP_ALARM) &&
+                TEMP_FEATURE_VAL(SENSORS_FEATURE_TEMP_ALARM);
-        if (TEMP_FEATURE(SENSORS_FEATURE_TEMP_MAX)) {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                } else {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-        } else {
-min = max
-type = SINGLE
+limit1 = limit2
+s1 = s2 = NULL
-        }
-
@@ -234 +240 @@
-                printf("%+6.1f%s  ", val, degstr);
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-