Changeset 4565

Timestamp:

07/06/07 17:44:28 (1 year ago)

Author:

khali

Message:

Add user-space support for it87 fan4 and fan5. Closes half of ticket #2227.

Files:

• lm-sensors/trunk/CHANGES (modified) (2 diffs)
• lm-sensors/trunk/kernel/chips/it87.c (modified) (1 diff)
• lm-sensors/trunk/lib/chips.c (modified) (2 diffs)
• lm-sensors/trunk/lib/chips.h (modified) (1 diff)
• lm-sensors/trunk/prog/sensors/chips.c (modified) (2 diffs)

lm-sensors/trunk/CHANGES

@@ -13 +13 @@
-           Add support for the w83627ehf VID function
-           Add support for the w83627ehf thermal sensor types
+           Add support for it87 fan4 and fan5
-  Man page sensors.conf.5: Update the chip statement section
-  Module i2c-nforce2: Add nForce MCP61, MCP65 support (2.6 backport)
@@ -42 +43 @@
-                   Add support for the w83627ehf VID function
-                   Add support for the w83627ehf thermal sensor types
+                   Add support for it87 fan4 and fan5
-  Program sensors-detect: Stop Super-I/O probe after first family success
-                          Fix SMSC DME1737 detection

lm-sensors/trunk/kernel/chips/it87.c

@@ -334 +334 @@
-#define IT87_ALARM_FAN2 0x0002
-#define IT87_ALARM_FAN3 0x0004
+#define IT87_ALARM_FAN4 0x0008
+#define IT87_ALARM_FAN5 0x0040
-#define IT87_ALARM_TEMP1 0x00010000
-#define IT87_ALARM_TEMP2 0x00020000

lm-sensors/trunk/lib/chips.c

@@ -4163 +4163 @@
-    { { SENSORS_IT87_FAN3, "fan3", NOMAP, NOMAP, R }, 
-                           IT87_SYSCTL_FAN3, VALUE(2), 0 },
+    { { SENSORS_IT87_FAN4, "fan4", NOMAP, NOMAP, R },
+                           NOSYSCTL, VALUE(2), 0 },
+    { { SENSORS_IT87_FAN5, "fan5", NOMAP, NOMAP, R },
+                           NOSYSCTL, VALUE(2), 0 },
-    { { SENSORS_IT87_FAN1_MIN, "fan1_min", SENSORS_IT87_FAN1, SENSORS_IT87_FAN1, 
-                               RW }, 
@@ -4172 +4176 @@
-                               RW }, 
-                               IT87_SYSCTL_FAN3, VALUE(1), 0 },
+    { { SENSORS_IT87_FAN4_MIN, "fan4_min", SENSORS_IT87_FAN4, SENSORS_IT87_FAN4,
+                               RW },
+                               NOSYSCTL, VALUE(1), 0 },
+    { { SENSORS_IT87_FAN5_MIN, "fan5_min", SENSORS_IT87_FAN5, SENSORS_IT87_FAN5,
+                               RW },
+                               NOSYSCTL, VALUE(1), 0 },
-    { { SENSORS_IT87_TEMP1, "temp1", NOMAP, NOMAP, R }, 
-                            IT87_SYSCTL_TEMP1, VALUE(3), 1 },

lm-sensors/trunk/lib/chips.h

@@ -1629 +1629 @@
-#define SENSORS_IT87_FAN2 32 /* R */
-#define SENSORS_IT87_FAN3 33 /* R */
+#define SENSORS_IT87_FAN4 34 /* R */
+#define SENSORS_IT87_FAN5 35 /* R */
-#define SENSORS_IT87_FAN1_MIN 41 /* RW */
-#define SENSORS_IT87_FAN2_MIN 42 /* RW */
-#define SENSORS_IT87_FAN3_MIN 43 /* RW */
+#define SENSORS_IT87_FAN4_MIN 44 /* RW */
+#define SENSORS_IT87_FAN5_MIN 45 /* RW */
-#define SENSORS_IT87_TEMP1 51 /* R */
-#define SENSORS_IT87_TEMP2 52 /* R */

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

@@ -3272 +3272 @@
-  char *label;
-  double cur, min, max, fdiv, sens;
-
+
+
+
+
+
-
-  if (!sensors_get_feature(*name,SENSORS_IT87_ALARMS, &cur)) {
@@ -3431 +3435 @@
-  }
-  free(label);
+
+  if (fan45) {
+    if (!sensors_get_label_and_valid(*name, SENSORS_IT87_FAN4, &label, &valid) &&
+        !sensors_get_feature(*name, SENSORS_IT87_FAN4, &cur) &&
+        !sensors_get_feature(*name, SENSORS_IT87_FAN4_MIN, &min)) {
+      if (valid) {
+        print_label(label, 10);
+        printf("%4.0f RPM  (min = %4.0f RPM)                   %s\n",
+               cur, min, alarms&IT87_ALARM_FAN4?"ALARM":"");
+      }
+    }
+    free(label);
+    if (!sensors_get_label_and_valid(*name, SENSORS_IT87_FAN5, &label, &valid) &&
+        !sensors_get_feature(*name, SENSORS_IT87_FAN5, &cur) &&
+        !sensors_get_feature(*name, SENSORS_IT87_FAN5_MIN, &min)) {
+      if (valid) {
+        print_label(label, 10);
+        printf("%4.0f RPM  (min = %4.0f RPM)                   %s\n",
+               cur, min, alarms&IT87_ALARM_FAN5?"ALARM":"");
+      }
+    }
+    free(label);
+  }
-
-  if (!sensors_get_label_and_valid(*name,SENSORS_IT87_TEMP1,&label,&valid) &&