Changeset 4799

Timestamp:

09/17/07 13:10:07 (1 year ago)

Author:

khali

Message:

Better thmc50/adm1022 support. Original patch by Krzysztof Helt.

Files:

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

lm-sensors/trunk/CHANGES

@@ -14 +14 @@
-           Fix smsc47m192 temperature faults
-           Add sch311x support
+           Add support for adm1022 temp3
-  Makefile: Fix kernel version detection (#2187)
-  Module fscher: Add missing read of control register (2.6 backport)
@@ -21 +22 @@
-                   Add sch311x support
-                   Hide error on missing dme1737 fan and pwm
+                   Add thmc50/adm1022 support
-  Program sensors-detect: Don't probe i2c-isa as a regular i2c bus
-                          Add Winbond W83L786NR/NG/R/G detection

lm-sensors/trunk/lib/chips.c

@@ -2757 +2757 @@
-                                         THMC50_SYSCTL_REMOTE_TEMP, VALUE(1), 
-                                         0 },
+    { { SENSORS_ADM1022_REMOTE_TEMP2, "remote_temp2", NOMAP, NOMAP, R }, 
+                                      NOSYSCTL, VALUE(3),
+                                      0, "temp3_input", 3 },
+    { { SENSORS_ADM1022_REMOTE_TEMP2_HYST, "remote_temp2_hyst", 
+                                           SENSORS_ADM1022_REMOTE_TEMP2, 
+                                           SENSORS_ADM1022_REMOTE_TEMP2, RW }, 
+                                           NOSYSCTL, VALUE(2), 
+                                           0, "temp3_min", 3 },
+    { { SENSORS_ADM1022_REMOTE_TEMP2_OVER, "remote2_temp_over", 
+                                           SENSORS_ADM1022_REMOTE_TEMP2, 
+                                           SENSORS_ADM1022_REMOTE_TEMP2, RW }, 
+                                           NOSYSCTL, VALUE(1), 
+                                           0, "temp3_max", 3 },
-    { { SENSORS_THMC50_ANALOG_OUT, "analog output", NOMAP, NOMAP, RW }, 
-                                   THMC50_SYSCTL_ANALOG_OUT, VALUE(1), 0,

lm-sensors/trunk/lib/chips.h

@@ -1192 +1192 @@
-#define SENSORS_THMC50_REMOTE_TEMP_HYST 55 /* RW */
-#define SENSORS_THMC50_REMOTE_TEMP_OVER 56 /* RW */
+#define SENSORS_ADM1022_REMOTE_TEMP2 57 /* R */
+#define SENSORS_ADM1022_REMOTE_TEMP2_HYST 58 /* RW */
+#define SENSORS_ADM1022_REMOTE_TEMP2_OVER 59 /* RW */
-#define SENSORS_THMC50_ANALOG_OUT 71 /* RW */
-#define SENSORS_THMC50_INTER 81 /* R */

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

@@ -6252 +6252 @@
-}
-
+void print_thmc50(const sensors_chip_name *name)
+{
+  char *label;
+  double cur, hyst, over;
+  int valid;
+
+  if (!sensors_get_label_and_valid(*name, SENSORS_THMC50_TEMP,
+                                   &label, &valid) &&
+      !sensors_get_feature(*name, SENSORS_THMC50_TEMP, &cur) &&
+      !sensors_get_feature(*name, SENSORS_THMC50_TEMP_HYST, &hyst) &&
+      !sensors_get_feature(*name, SENSORS_THMC50_TEMP_OVER, &over)) {
+    if (valid) {
+      print_label(label, 10);
+      print_temp_info(cur, over, hyst, MINMAX, 0, 0);
+      printf("\n");
+    }
+  } else
+    printf("ERROR: Can't get temperature1 data!\n");
+  free(label);
+
+  if (!sensors_get_label_and_valid(*name, SENSORS_THMC50_REMOTE_TEMP,
+                                   &label, &valid) &&
+      !sensors_get_feature(*name, SENSORS_THMC50_REMOTE_TEMP, &cur) &&
+      !sensors_get_feature(*name, SENSORS_THMC50_REMOTE_TEMP_HYST, &hyst) &&
+      !sensors_get_feature(*name, SENSORS_THMC50_REMOTE_TEMP_OVER, &over)) {
+    if (valid) {
+      print_label(label, 10);
+      print_temp_info(cur, over, hyst, MINMAX, 0, 0);
+      printf("\n");
+    }
+  } else
+    printf("ERROR: Can't get temperature2 data!\n");
+  free(label);
+
+  if (!sensors_get_label_and_valid(*name, SENSORS_ADM1022_REMOTE_TEMP2,
+                                   &label, &valid) &&
+      !sensors_get_feature(*name, SENSORS_ADM1022_REMOTE_TEMP2, &cur) &&
+      !sensors_get_feature(*name, SENSORS_ADM1022_REMOTE_TEMP2_HYST, &hyst) &&
+      !sensors_get_feature(*name, SENSORS_ADM1022_REMOTE_TEMP2_OVER, &over)) {
+    if (valid) {
+      print_label(label, 10);
+      print_temp_info(cur, over, hyst, MINMAX, 0, 0);
+      printf("\n");
+    }
+  }
+  /* No error if files are missing as it will happen for original thmc50 */
+  free(label);
+}
+
-void print_unknown_chip(const sensors_chip_name *name)
-{

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

@@ -81 +81 @@
-extern void print_applesmc(const sensors_chip_name *name);
-extern void print_f71882fg(const sensors_chip_name *name);
+extern void print_thmc50(const sensors_chip_name *name);
-
-#endif /* def PROG_SENSORS_CHIPS_H */

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

@@ -428 +428 @@
-        { "applesmc", print_applesmc },
-        { "f71882fg", print_f71882fg },
+        { "thmc50", print_thmc50 },
+        { "adm1022", print_thmc50 },
-        { NULL, NULL }
-};