Changeset 3272

Timestamp:

03/22/06 15:26:48 (7 years ago)

Author:

khali

Message:

Add W83627EHF fan and temperature alarm support.

Location:

lm-sensors/trunk

Files:

• lib/chips.c (modified) (2 diffs)
• lib/chips.h (modified) (2 diffs)
• prog/sensors/chips.c (modified) (4 diffs)

lm-sensors/trunk/lib/chips.c

@@ -1986 +1986 @@
     { SENSORS_W83627EHF_FAN5, "fan5", NOMAP, NOMAP,
                         R, NOSYSCTL, VALUE(2), 0 },
+    { SENSORS_W83627EHF_FAN1_ALARM, "fan1_alarm", SENSORS_W83627EHF_FAN1,
+                        NOMAP, R, NOSYSCTL, VALUE(1), 0 },
+    { SENSORS_W83627EHF_FAN2_ALARM, "fan2_alarm", SENSORS_W83627EHF_FAN2,
+                        NOMAP, R, NOSYSCTL, VALUE(1), 0 },
+    { SENSORS_W83627EHF_FAN3_ALARM, "fan3_alarm", SENSORS_W83627EHF_FAN3,
+                        NOMAP, R, NOSYSCTL, VALUE(1), 0 },
+    { SENSORS_W83627EHF_FAN4_ALARM, "fan4_alarm", SENSORS_W83627EHF_FAN4,
+                        NOMAP, R, NOSYSCTL, VALUE(1), 0 },
+    { SENSORS_W83627EHF_FAN5_ALARM, "fan5_alarm", SENSORS_W83627EHF_FAN5,
+                        NOMAP, R, NOSYSCTL, VALUE(1), 0 },
     { SENSORS_W83627EHF_FAN1_MIN, "fan1_min",
                         SENSORS_W83627EHF_FAN1, SENSORS_W83627EHF_FAN1,
@@ -2022 +2032 @@
     { SENSORS_W83627EHF_TEMP3, "temp3", NOMAP, NOMAP,
                         R, NOSYSCTL, VALUE(3), 1 },
+    { SENSORS_W83627EHF_TEMP1_ALARM, "temp1_alarm", SENSORS_W83627EHF_TEMP1,
+                        NOMAP, R, NOSYSCTL, VALUE(1), 0 },
+    { SENSORS_W83627EHF_TEMP2_ALARM, "temp2_alarm", SENSORS_W83627EHF_TEMP2,
+                        NOMAP, R, NOSYSCTL, VALUE(1), 0 },
+    { SENSORS_W83627EHF_TEMP3_ALARM, "temp3_alarm", SENSORS_W83627EHF_TEMP3,
+                        NOMAP, R, NOSYSCTL, VALUE(1), 0 },
     { SENSORS_W83627EHF_TEMP1_OVER, "temp1_over",
                         SENSORS_W83627EHF_TEMP1, SENSORS_W83627EHF_TEMP1,

lm-sensors/trunk/lib/chips.h

@@ -895 +895 @@
 #define SENSORS_W83627EHF_FAN4          34 /* R  */
 #define SENSORS_W83627EHF_FAN5          35 /* R  */
+#define SENSORS_W83627EHF_FAN1_ALARM    131 /* R  */
+#define SENSORS_W83627EHF_FAN2_ALARM    132 /* R  */
+#define SENSORS_W83627EHF_FAN3_ALARM    133 /* R  */
+#define SENSORS_W83627EHF_FAN4_ALARM    134 /* R  */
+#define SENSORS_W83627EHF_FAN5_ALARM    135 /* R  */
 #define SENSORS_W83627EHF_FAN1_MIN      41 /* RW */
 #define SENSORS_W83627EHF_FAN2_MIN      42 /* RW */
@@ -908 +913 @@
 #define SENSORS_W83627EHF_TEMP2         62 /* R  */
 #define SENSORS_W83627EHF_TEMP3         63 /* R  */
+#define SENSORS_W83627EHF_TEMP1_ALARM   161 /* R  */
+#define SENSORS_W83627EHF_TEMP2_ALARM   162 /* R  */
+#define SENSORS_W83627EHF_TEMP3_ALARM   163 /* R  */
 #define SENSORS_W83627EHF_TEMP1_OVER    71 /* RW */
 #define SENSORS_W83627EHF_TEMP2_OVER    72 /* RW */

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

@@ -2816 +2816 @@
   double cur, min, div, max, alarm, over, hyst;
 
-
   for (i = 0; i < 10; i++) {
     if (!sensors_get_label_and_valid(*name,SENSORS_W83627EHF_IN0+i,
@@ -2829 +2828 @@
                cur,min,max,alarm ? "ALARM" : "");
       }
-    } else
-      printf("ERROR: Can't get IN%d data!\n",i + 1);
+    }
+    /* Earlier versions of the driver did not have voltage support, so we
+       keep quiet on error */
     free(label);
   }
@@ -2844 +2844 @@
         if (!sensors_get_feature(*name, SENSORS_W83627EHF_FAN1_DIV+i, &div))
           printf(", div = %1.0f", div);
-        printf(")\n");
+        printf(")");
+        if (!sensors_get_feature(*name, SENSORS_W83627EHF_FAN1_ALARM+i,
+                                 &alarm) && alarm)
+          printf(" ALARM");
+        printf("\n");
       }
     } else if (i < 3)
@@ -2860 +2864 @@
         print_label(label,10);
         print_temp_info(cur, over, hyst, HYST, i ? 1 : 0, i ? 1 : 0);
+        if (!sensors_get_feature(*name, SENSORS_W83627EHF_TEMP1_ALARM+i,
+                                 &alarm) && alarm)
+          printf(" ALARM");
         printf("\n");
       }