Changeset 4214

Timestamp:

10/15/06 21:26:10 (2 years ago)

Author:

ruik

Message:

Add the coretemp driver userspace support.

Files:

• lm-sensors/trunk/CHANGES (modified) (2 diffs)
• lm-sensors/trunk/lib/chips.c (modified) (2 diffs)
• lm-sensors/trunk/lib/chips.h (modified) (1 diff)
• lm-sensors/trunk/prog/detect/sensors-detect (modified) (2 diffs)
• 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

@@ -6 +6 @@
-           Probe for busses before chips
-           Drop support for algorithm names
+           Add support for coretemp driver   
-  Man page i2cdetect.8: Describe the output convention
-  Man page sensors.1: Update (option -c) and clean up
@@ -17 +18 @@
-  Program sensors-detect: Add SMSC DME1737 detection
-                          Add EPoX EP1308 detection (Hans Edgington)
+                          Add Intel Core thermal sensor detection
-
-2.10.1 (20060924)

lm-sensors/trunk/lib/chips.c

@@ -6029 +6029 @@
-  };
-
+static sensors_chip_feature coretemp_features[] =
+  {
+    { SENSORS_CORETEMP_TEMP1, "temp1", NOMAP, NOMAP,
+                       R, NOSYSCTL, VALUE(2), 0 },
+    { SENSORS_CORETEMP_TEMP1_CRIT, "temp1_crit", SENSORS_CORETEMP_TEMP1,
+                       SENSORS_CORETEMP_TEMP1, R, NOSYSCTL, VALUE(1), 0 },
+    { SENSORS_CORETEMP_TEMP1_CRIT_ALARM, "temp1_crit_alarm", SENSORS_CORETEMP_TEMP1,
+                       NOMAP, R, NOSYSCTL, VALUE(1), 0 },
+    { 0 }
+  };
-
-sensors_chip_features sensors_chip_features_list[] =
@@ -6137 +6147 @@
- { SENSORS_ABITUGURU_PREFIX, abituguru_features },
- { SENSORS_K8TEMP_PREFIX, k8temp_features },
+ { SENSORS_CORETEMP_PREFIX, coretemp_features },
- { 0 }
-};

lm-sensors/trunk/lib/chips.h

@@ -2225 +2225 @@
-#define SENSORS_K8TEMP_TEMP4    0x04 /* R */
-
+/* coretemp */
+
+#define SENSORS_CORETEMP_PREFIX "coretemp"
+#define SENSORS_CORETEMP_TEMP1                  0x01 /* R */
+#define SENSORS_CORETEMP_TEMP1_CRIT             0x02 /* R */
+#define SENSORS_CORETEMP_TEMP1_CRIT_ALARM       0x03 /* R */
+
-#endif /* def LIB_SENSORS_CHIPS_H */

lm-sensors/trunk/prog/detect/sensors-detect

@@ -1849 +1849 @@
-    detect => sub { k8temp_pci_detect(); },
-  },
+  {
+    name => "Intel Core family thermal sensor",
+    driver => "coretemp",
+    detect => sub { coretemp_detect(); },
+  },
-);
-
@@ -5125 +5130 @@
-}
-
+# Returns: undef if not detected, (9) if detected.
+sub coretemp_detect
+{
+        my $probecpu;
+        foreach $probecpu (@cpu) {
+                if ($probecpu->{'vendor_id'} eq 'GenuineIntel' && 
+                                $probecpu->{'cpu family'} == 6 &&
+                                ($probecpu->{'model'} == 14 ||
+                                 $probecpu->{'model'} == 15)) {
+                        return 9;
+                }
+        }
+        return;
+}
-
-################

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

@@ -6235 +6235 @@
-}
-
+void print_coretemp(const sensors_chip_name *name)
+{
+  char *label;
+  double cur, over, alarm;
+  int valid;
+
+  if (!sensors_get_label_and_valid(*name, SENSORS_CORETEMP_TEMP1, &label, &valid)
+   && !sensors_get_feature(*name, SENSORS_CORETEMP_TEMP1, &cur)
+   && !sensors_get_feature(*name, SENSORS_CORETEMP_TEMP1_CRIT_ALARM, &alarm)
+   && !sensors_get_feature(*name, SENSORS_CORETEMP_TEMP1_CRIT, &over)) {
+    if (valid) {
+      print_label(label, 10);
+      print_temp_info(cur, over, 0, MAXONLY, 0, 0);
+      printf(" %s\n", alarm ? "ALARM" : "");
+    }
+  } else
+    printf("ERROR: Can't get temperature data!\n");
+  free(label);
+}
-
-void print_unknown_chip(const sensors_chip_name *name)

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

@@ -77 +77 @@
-extern void print_abituguru(const sensors_chip_name *name);
-extern void print_k8temp(const sensors_chip_name *name);
+extern void print_coretemp(const sensors_chip_name *name);
-
-#endif /* def PROG_SENSORS_CHIPS_H */

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

@@ -419 +419 @@
-        { "abituguru", print_abituguru },
-        { "k8temp", print_k8temp },
+        { "coretemp", print_coretemp },
-        { NULL, NULL }
-};