Changeset 5944

Timestamp:

03/16/11 22:31:25 (14 months ago)

Author:

khali

Message:

Ensure that hysteresis and the limit it relates to are always
printed on the same line.

Files:

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

lm-sensors/trunk/prog/sensors/chips.c

@@ -68 +68 @@
 }
 
+static const char hyst_str[] = "hyst";
+
 static inline double deg_ctof(double cel)
 {
@@ -155 +157 @@
                          const char *fmt)
 {
-        int i;
+        int i, slot, skip;
         int alarms_printed = 0;
 
-        for (i = 0; i < limit_count; i++) {
-                if (!(i & 1)) {
-                        if (i)
+        /*
+         * We print limits on two columns, filling lines first, except for
+         * hysteresis which must always go on the right column, with the
+         * limit it relates to being in the left column on the same line.
+         */
+        for (i = slot = 0; i < limit_count; i++, slot++) {
+                if (!(slot & 1)) {
+                        if (slot)
                                 printf("\n%*s", label_size + 10, "");
                         printf("(");
@@ -168 +175 @@
                 printf(fmt, limits[i].name, limits[i].value,
                              limits[i].unit);
-                if ((i & 1) || i == limit_count - 1) {
+
+                /* If needed, skip one slot to avoid hyst on first column */
+                skip = i + 2 < limit_count && limits[i + 2].name == hyst_str &&
+                       !(slot & 1);
+
+                if (((slot + skip) & 1) || i == limit_count - 1) {
                         printf(")");
                         if (alarm_count && !alarms_printed) {
                                 print_alarms(alarms, alarm_count,
-                                             (i & 1) ? 0 : 16);
+                                             (slot & 1) ? 0 : 16);
                                 alarms_printed = 1;
                         }
                 }
+                slot += skip;
         }
         if (alarm_count && !alarms_printed)
@@ -240 +253 @@
 
 static const struct sensor_subfeature_list temp_max_sensors[] = {
-        { SENSORS_SUBFEATURE_TEMP_MAX_HYST, NULL, 0, "hyst" },
+        { SENSORS_SUBFEATURE_TEMP_MAX_HYST, NULL, 0, hyst_str },
         { -1, NULL, 0, NULL }
 };
 
 static const struct sensor_subfeature_list temp_crit_sensors[] = {
-        { SENSORS_SUBFEATURE_TEMP_CRIT_HYST, NULL, 0, "crit hyst" },
+        { SENSORS_SUBFEATURE_TEMP_CRIT_HYST, NULL, 0, hyst_str },
         { -1, NULL, 0, NULL }
 };
@@ -251 +264 @@
 static const struct sensor_subfeature_list temp_emergency_sensors[] = {
         { SENSORS_SUBFEATURE_TEMP_EMERGENCY_HYST, NULL, 0,
-            "emerg hyst" },
+            hyst_str },
         { -1, NULL, 0, NULL }
 };