Changeset 4312

Timestamp:

01/25/07 10:18:23 (6 years ago)

Author:

khali

Message:

sensors-detect: Speed up the LM75 and LM77 detection. The previous code
was using a brute force approach, quite reliable but very slow. The new
code should be just as reliable but about ten times faster.

Location:

lm-sensors/trunk

Files:

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

lm-sensors/trunk/CHANGES

@@ -10 +10 @@
                           Drop legacy W83627HF ISA detection
                           Don't bufferize stdout during probes
+                          Speed up the LM75 and LM77 detection
 
 

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

@@ -3315 +3315 @@
   my ($file,$addr) = @_;
   my $cur = i2c_smbus_read_word_data($file,0x00);
-  my $cur_varies = 0;
   my $conf = i2c_smbus_read_byte_data($file,0x01);
 
@@ -3330 +3329 @@
   return if i2c_smbus_read_word_data($file,0x07) != $os;
 
-  for ($i = 0x00; $i < 0xff; $i += 8) {
+  for ($i = 8; $i <= 248; $i += 40) {
     return if i2c_smbus_read_byte_data($file, $i + 0x01) != $conf;
     return if i2c_smbus_read_word_data($file, $i + 0x02) != $hyst;
-    return if i2c_smbus_read_word_data($file, $i + 0x04) != $hyst;
-    return if i2c_smbus_read_word_data($file, $i + 0x05) != $hyst;
-    return if i2c_smbus_read_word_data($file, $i + 0x06) != $hyst;
-    return if i2c_smbus_read_word_data($file, $i + 0x07) != $hyst;
     return if i2c_smbus_read_word_data($file, $i + 0x03) != $os;
-    return if i2c_smbus_read_word_data($file, $i + 0x04) != $os;
-    return if i2c_smbus_read_word_data($file, $i + 0x05) != $os;
-    return if i2c_smbus_read_word_data($file, $i + 0x06) != $os;
-    return if i2c_smbus_read_word_data($file, $i + 0x07) != $os;
-    $cur_varies = 1
-      if (! $cur_varies) and
-        i2c_smbus_read_word_data($file, $i) != $cur;
   }
 
   # All registers hold the same value, obviously a misdetection
-  return if (! $cur_varies) and $conf == ($cur & 0xff) and $cur == $hyst
+  return if $conf == ($cur & 0xff) and $cur == $hyst
     and $cur == $os;
 
@@ -3390 +3378 @@
   my ($file,$addr) = @_;
   my $cur = i2c_smbus_read_word_data($file,0x00);
-  my $cur_varies = 0;
   my $conf = i2c_smbus_read_byte_data($file,0x01);
   my $hyst = i2c_smbus_read_word_data($file,0x02);
@@ -3403 +3390 @@
   return if i2c_smbus_read_word_data($file,0x07) != $high;
 
-  for ($i = 0x00; $i < 0xff; $i += 8) {
+  for ($i = 8; $i <= 248; $i += 40) {
     return if i2c_smbus_read_byte_data($file, $i + 0x01) != $conf;
     return if i2c_smbus_read_word_data($file, $i + 0x02) != $hyst;
     return if i2c_smbus_read_word_data($file, $i + 0x03) != $os;
     return if i2c_smbus_read_word_data($file, $i + 0x04) != $low;
-    return if i2c_smbus_read_word_data($file, $i + 0x06) != $low;
-    return if i2c_smbus_read_word_data($file, $i + 0x07) != $low;
     return if i2c_smbus_read_word_data($file, $i + 0x05) != $high;
-    return if i2c_smbus_read_word_data($file, $i + 0x06) != $high;
-    return if i2c_smbus_read_word_data($file, $i + 0x07) != $high;
-    $cur_varies = 1
-      if (! $cur_varies) and
-        i2c_smbus_read_word_data($file, $i) != $cur;
   }
 
   # All registers hold the same value, obviously a misdetection
-  return if (! $cur_varies) and $conf == ($cur & 0xff) and $cur == $hyst
+  return if $conf == ($cur & 0xff) and $cur == $hyst
     and $cur == $os and $cur == $low and $cur == $high;