Changeset 4232

Timestamp:

11/12/06 14:17:32 (7 years ago)

Author:

khali

Message:

Add user-space support for the Fintek F71872F/FG (chip name f71872f).

Location:

lm-sensors/trunk

Files:

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

lm-sensors/trunk/CHANGES

@@ -10 +10 @@
            Major update/optimization of config-file scanner
            Add config-file scanner regression tests
+           Add f71872f support
   Man page i2cdetect.8: Describe the output convention
   Man page sensors.1: Update (option -c) and clean up
@@ -21 +22 @@
                    Handle option -c more efficiently
                    Drop option -a (show algorithm names)
+                   Add f71872f support
   Program sensors-detect: Add SMSC DME1737 detection
                           Add EPoX EP1308 detection (Hans Edgington)

lm-sensors/trunk/lib/chips.c

@@ -5817 +5817 @@
 static sensors_chip_feature f71805f_features[] =
 {
-/* 9 voltage inputs */
+/* 9 to 11 voltage inputs */
         { SENSORS_F71805F_IN(0), "in0", NOMAP, NOMAP, R,
           F71805F_SYSCTL_IN0, VALUE(3), 3 },
@@ -5836 +5836 @@
         { SENSORS_F71805F_IN(8), "in8", NOMAP, NOMAP, R,
           F71805F_SYSCTL_IN8, VALUE(3), 3 },
+        { SENSORS_F71805F_IN(9), "in9", NOMAP, NOMAP, R,
+          NOSYSCTL, VALUE(3), 3 },
+        { SENSORS_F71805F_IN(10), "in10", NOMAP, NOMAP, R,
+          NOSYSCTL, VALUE(3), 3 },
         { SENSORS_F71805F_IN_MIN(0), "in0_min",
           SENSORS_F71805F_IN(0), SENSORS_F71805F_IN(0), RW,
@@ -5863 +5867 @@
           SENSORS_F71805F_IN(8), SENSORS_F71805F_IN(8), RW,
           F71805F_SYSCTL_IN8, VALUE(1), 3 },
+        { SENSORS_F71805F_IN_MIN(9), "in9_min",
+          SENSORS_F71805F_IN(9), SENSORS_F71805F_IN(9), RW,
+          NOSYSCTL, VALUE(1), 3 },
+        { SENSORS_F71805F_IN_MIN(10), "in10_min",
+          SENSORS_F71805F_IN(10), SENSORS_F71805F_IN(10), RW,
+          NOSYSCTL, VALUE(1), 3 },
         { SENSORS_F71805F_IN_MAX(0), "in0_max",
           SENSORS_F71805F_IN(0), SENSORS_F71805F_IN(0), RW,
@@ -5890 +5900 @@
           SENSORS_F71805F_IN(8), SENSORS_F71805F_IN(8), RW,
           F71805F_SYSCTL_IN8, VALUE(2), 3 },
+        { SENSORS_F71805F_IN_MAX(9), "in9_max",
+          SENSORS_F71805F_IN(9), SENSORS_F71805F_IN(9), RW,
+          NOSYSCTL, VALUE(2), 3 },
+        { SENSORS_F71805F_IN_MAX(10), "in10_max",
+          SENSORS_F71805F_IN(10), SENSORS_F71805F_IN(10), RW,
+          NOSYSCTL, VALUE(2), 3 },
 /* 3 fan tachometers */
         { SENSORS_F71805F_FAN(1), "fan1", NOMAP, NOMAP, R,
@@ -6145 +6161 @@
  { SENSORS_SMSC47B397_PREFIX, smsc47b397_features },
  { SENSORS_F71805F_PREFIX, f71805f_features },
+ { SENSORS_F71872F_PREFIX, f71805f_features },
  { SENSORS_ABITUGURU_PREFIX, abituguru_features },
  { SENSORS_K8TEMP_PREFIX, k8temp_features },

lm-sensors/trunk/lib/chips.h

@@ -2179 +2179 @@
 #define SENSORS_SMSC47B397_FAN4         0x14 /* R */
 
-/* Fintek F71805F chip */
+/* Fintek F71805F/FG and F71872F/FG chips */
 #define SENSORS_F71805F_PREFIX          "f71805f"
-
-/* in n from 0 to 8 */
+#define SENSORS_F71872F_PREFIX          "f71872f"
+
+/* in n from 0 to 10 */
 #define SENSORS_F71805F_IN(n)           (1 + (n))
 #define SENSORS_F71805F_IN_MIN(n)       (16 + (n))

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

@@ -6032 +6032 @@
   double cur, min, max;
   int alarms, valid, i;
+  const int is_f71872f = !strcmp(name->prefix, "f71872f");
 
   if (!sensors_get_feature(*name, SENSORS_F71805F_ALARMS_IN, &cur))
@@ -6040 +6041 @@
   }
 
-  for (i = 0; i < 9; i++) {
+  for (i = 0; i < (is_f71872f ? 11 : 9); i++) {
     if (!sensors_get_label_and_valid(*name, SENSORS_F71805F_IN(i),
         &label, &valid)

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

@@ -417 +417 @@
         { "smsc47b397", print_smsc47b397 },
         { "f71805f", print_f71805f },
+        { "f71872f", print_f71805f },
         { "abituguru", print_abituguru },
         { "k8temp", print_k8temp },