Changeset 4353

Timestamp:

03/25/07 17:25:57 (6 years ago)

Author:

khali

Message:

sensors-detect: Probe the Super-I/O families from the shorter enter
sequence to the longer one, and stop as soon as one enter sequence worked.
This avoids false positives.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• prog/detect/sensors-detect (modified) (4 diffs)

lm-sensors/trunk/CHANGES

@@ -5 +5 @@
   Program isadump: Detect when address bit 7 is a busy flag
   Program sensors: Drop ddcmon and eeprom support
+  Program sensors-detect: Stop Super-I/O probe after first family success
 
 

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

@@ -1572 +1572 @@
 #  enter: The password sequence to write to the address register
 #  chips: Array of chips
+# The order of families matters, because we stop as soon as one family
+# succeeds. So we have to list families with shorter password sequences
+# first.
 @superio_ids = (
-  {
-    family => "ITE",
-    guess => 0x290,
-    enter =>
-    {
-      0x2e => [0x87, 0x01, 0x55, 0x55],
-      0x4e => [0x87, 0x01, 0x55, 0xaa],
-    },
-    chips =>
-    [
-      {
-        name => "ITE IT8702F Super IO Sensors",
-        driver => "to-be-written",
-        devid => 0x8702,
-        logdev => 0x04,
-      },
-      {
-        name => "ITE IT8705F Super IO Sensors",
-        driver => "it87",
-        devid => 0x8705,
-        logdev => 0x04,
-      },
-      {
-        name => "ITE IT8712F Super IO Sensors",
-        driver => "it87",
-        devid => 0x8712,
-        logdev => 0x04,
-        alias_detect => sub { ite_alias_detect(0, @_); },
-      },
-      {
-        name => "ITE IT8716F Super IO Sensors",
-        driver => "it87",
-        devid => 0x8716,
-        logdev => 0x04,
-      },
-      {
-        name => "ITE IT8718F Super IO Sensors",
-        driver => "it87",
-        devid => 0x8718,
-        logdev => 0x04,
-      },
-    ],
-  },
   {
     family => "National Semiconductor",
@@ -1945 +1905 @@
     ],
   },
+  {
+    family => "ITE",
+    guess => 0x290,
+    enter =>
+    {
+      0x2e => [0x87, 0x01, 0x55, 0x55],
+      0x4e => [0x87, 0x01, 0x55, 0xaa],
+    },
+    chips =>
+    [
+      {
+        name => "ITE IT8702F Super IO Sensors",
+        driver => "to-be-written",
+        devid => 0x8702,
+        logdev => 0x04,
+      },
+      {
+        name => "ITE IT8705F Super IO Sensors",
+        driver => "it87",
+        devid => 0x8705,
+        logdev => 0x04,
+      },
+      {
+        name => "ITE IT8712F Super IO Sensors",
+        driver => "it87",
+        devid => 0x8712,
+        logdev => 0x04,
+        alias_detect => sub { ite_alias_detect(0, @_); },
+      },
+      {
+        name => "ITE IT8716F Super IO Sensors",
+        driver => "it87",
+        devid => 0x8716,
+        logdev => 0x04,
+      },
+      {
+        name => "ITE IT8718F Super IO Sensors",
+        driver => "it87",
+        devid => 0x8718,
+        logdev => 0x04,
+      },
+    ],
+  },
 );
 
@@ -3148 +3151 @@
 
   $| = 1;
+# reset state to avoid false positives
+  exit_superio($addrreg, $datareg);
   FAMILY: 
   foreach my $family (@superio_ids) {
@@ -3183 +3188 @@
 
     exit_superio($addrreg, $datareg);
+    last FAMILY;
   }
   $| = 0;