Changeset 4357 for lm-sensors/branches/lm-sensors-3.0.0/prog/detect/sensors-detect

Timestamp:

04/03/07 14:55:30 (6 years ago)

Author:

mmh

Message:

Merge from trunk (4303:4355) out to 3.0.0 branch.

Files:

• lm-sensors/branches/lm-sensors-3.0.0/prog/detect/sensors-detect (modified) (91 diffs)

lm-sensors/branches/lm-sensors-3.0.0/prog/detect/sensors-detect

@@ -48 +48 @@
 #########################
 
-use vars qw(@pci_adapters @chip_ids @superio_ids @cpu_ids $revision);
+use vars qw(@pci_adapters @chip_ids $i2c_addresses_to_scan @superio_ids
+            @cpu_ids $revision);
 
 $revision = '$Revision$ ($Date$)';
@@ -247 +248 @@
      } ,
      {
+       vendid => 0x1106,
+       devid  => 0x8324,
+       procid => "VIA Technologies CX700 South Bridge",
+       driver => "i2c-viapro",
+       match => qr/^SMBus V(IA|ia) Pro adapter at/,
+     },
+     {
        vendid => 0x1039,
        devid  => 0x5597,
@@ -530 +538 @@
        devid => 0x03eb,
        procid => "nVidia Corporation nForce4 SMBus (MCP61)",
-       driver => "to-be-tested",
+       driver => "i2c-nforce2",
        match => qr/^SMBus nForce2 adapter at /,
      },
@@ -537 +545 @@
        devid => 0x0446,
        procid => "nVidia Corporation nForce4 SMBus (MCP65)",
-       driver => "to-be-tested",
+       driver => "i2c-nforce2",
        match => qr/^SMBus nForce2 adapter at /,
      },
@@ -812 +820 @@
        driver => "lm75",
        i2c_addrs => [0x48..0x4f],
-       i2c_detect => sub { lm75_detect(@_); },
-     } ,
+       i2c_detect => sub { lm75_detect(0, @_); },
+     },
+     {
+       name => "Dallas Semiconductor DS75",
+       driver => "lm75",
+       i2c_addrs => [0x48..0x4f],
+       i2c_detect => sub { lm75_detect(1, @_); },
+     },
      {
        name => "National Semiconductor LM77",
@@ -968 +982 @@
      {
        name => "Winbond W83627HF",
-       driver => "w83781d",
-       i2c_addrs => [0x20..0x2f], 
+       driver => "use-isa-instead",
+       i2c_addrs => [0x28..0x2f],
        i2c_detect => sub { w83781d_detect(3, @_); },
-       isa_addrs => [0x290],
-       isa_detect => sub { w83781d_isa_detect(3, @_); },
-       alias_detect => sub { w83781d_alias_detect(3, @_); },
-     } ,
+     },
      {
        name => "Winbond W83627EHF",
@@ -1138 +1149 @@
      },
      {
+       name => "Maxim MAX1668",
+       driver => "max1668",
+       i2c_addrs => [0x18..0x1a,0x29..0x2b,0x4c..0x4e],
+       i2c_detect => sub { max1668_detect(0, @_); },
+     },
+     {
+       name => "Maxim MAX1805",
+       driver => "max1668",
+       i2c_addrs => [0x18..0x1a,0x29..0x2b,0x4c..0x4e],
+       i2c_detect => sub { max1668_detect(1, @_); },
+     },
+     {
+       name => "Maxim MAX1989",
+       driver => "max1668",
+       i2c_addrs => [0x18..0x1a,0x29..0x2b,0x4c..0x4e],
+       i2c_detect => sub { max1668_detect(2, @_); },
+     },
+     {
        name => "Maxim MAX6650/MAX6651",
        driver => "max6650",
@@ -1144 +1173 @@
      },
      {
+       name => "Maxim MAX6655/MAX6656",
+       driver => "max6655",
+       i2c_addrs => [0x18..0x1a, 0x29..0x2b, 0x4c..0x4e],
+       i2c_detect => sub { max6655_detect(0, @_); },
+     },
+     {
        name => "TI THMC10",
        driver => "adm1021",
@@ -1353 +1388 @@
        i2c_detect => sub { eeprom_detect(1, @_); },
      },
-# Disabled by default (potentially dangerous)
-#     {
-#       name => "SPD EEPROM with Software Write-Protect",
-#       driver => "eeprom",
-#       i2c_addrs => [0x50..0x57],
-#       i2c_detect => sub { eeprom_detect(2, @_); },
-#     },
      {
        name => "EDID EEPROM",
@@ -1391 +1419 @@
      },
      {
-       name => "SMSC LPC47M15x, LPC47M192 or LPC47M997",
+       name => "SMSC LPC47M15x/192/292/997",
        driver => "smsc47m192",
        i2c_addrs => [0x2c..0x2d],
@@ -1398 +1426 @@
      {
        name => "SMSC DME1737",
-       driver => "to-be-written",
+       driver => "dme1737",
        i2c_addrs => [0x2c..0x2e],
        i2c_detect => sub { dme1737_detect(@_); },
@@ -1470 +1498 @@
      {
        name => "Maxim MAX6900",
-       driver => "to-be-written",
+       driver => "not-a-sensor",
        i2c_addrs => [0x50],
        i2c_detect => sub { max6900_detect(@_); },
-     },
-     {
-       name => "SMBus 2.0 ARP-Capable Device",
-       driver => "not-a-sensor",
-       i2c_addrs => [0x61],
-       i2c_detect => sub { arp_detect(@_); },
      },
      {
@@ -1537 +1559 @@
 #      capabilities (listing such chips here removes the need of manual
 #      lookup when people report them).
+#      Put in exactly "via-smbus-only" if this is a Super-I/O chip whose
+#      hardware monitoring registers can only be accessed via the SMBus.
 #  devid: The device ID(s) we have to match (base device)
 #  devid_mask (optional): Bitmask to apply before checking the device ID
@@ -1550 +1574 @@
 #  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",
@@ -1603 +1587 @@
     chips =>
     [
+      {
+        name => "Nat. Semi. PC8374L Super IO Sensors",
+        driver => "to-be-written",
+        devid => 0xf1,
+        logdev => 0x08,
+      },
       {
         name => "Nat. Semi. PC87351 Super IO Fan Sensors",
@@ -1749 +1739 @@
       },
       {
+        name => "SMSC LPC47M292 Super IO Fan Sensors",
+        driver => "smsc47m1",
+        devid => 0x6b,
+        logdev => 0x0a,
+      },
+      {
         name => "SMSC LPC47S42x Super IO Fan Sensors",
         driver => "to-be-written",
@@ -1785 +1781 @@
       },
       {
+        name => "SMSC SCH5504-NS Super IO",
+        # No datasheet
+        driver => "not-a-sensor",
+        devid => 0x79,
+      },
+      {
         name => "SMSC LPC47M584-NC Super IO",
         # No datasheet
@@ -1792 +1794 @@
         name => "SMSC DME1737 Super IO",
         # Hardware monitoring features are accessed on the SMBus
-        driver => "not-a-sensor",
+        driver => "via-smbus-only",
         devid => 0x78,
+      },
+      {
+        name => "SMSC DME1737 Super IO",
+        # The DME1737 shows up twice in this list because it can return either
+        # 0x78 or 0x77 as its device ID.
+        # Hardware monitoring features are accessed on the SMBus
+        driver => "via-smbus-only",
+        devid => 0x77,
       },
     ],
@@ -1819 +1829 @@
         devid => 0x52,
         logdev => 0x0b,
+        alias_detect => sub { w83781d_alias_detect(3, @_); },
       },
       {
@@ -1904 +1915 @@
     ],
   },
+  {
+    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,
+      },
+    ],
+  },
 );
 
@@ -2478 +2532 @@
 {
   my ($file,$addr) = @_;
+  $addr += 0; # Make sure it's a number not a string
   ioctl $file, IOCTL_I2C_SLAVE, $addr or return 0;
   return 1;
@@ -2820 +2875 @@
 }
 
+# From the list of known I2C/SMBus devices, build a list of I2C addresses
+# which are worth probing. There's no point in probing an address for which
+# we don't know a single device, and probing some addresses has caused
+# random trouble in the past.
+sub i2c_addresses_to_scan()
+{
+  my @used;
+  my @addresses;
+  my $addr;
+
+  foreach my $chip (@chip_ids) {
+    next unless defined $chip->{'i2c_addrs'};
+    next if $chip->{'driver'} eq 'not-a-sensor';
+    foreach $addr (@{$chip->{'i2c_addrs'}}) {
+      $used[$addr]++;
+    }
+  }
+
+  for ($addr = 0x03; $addr <= 0x77; $addr++) {
+    push @addresses, $addr if $used[$addr];
+  }
+  return \@addresses;
+}
+
 # $_[0]: The number of the adapter to scan
 # $_[1]: The name of the adapter, as appearing in /proc/bus/i2c
@@ -2852 +2931 @@
 
   # Now scan each address in turn
-  foreach $addr (0x03..0x77) {
+  foreach $addr (@{$i2c_addresses_to_scan}) {
     # As the not_to_scan list is sorted, we can check it fast
     if (@not_to_scan and $not_to_scan[0] == $addr) {
@@ -2901 +2980 @@
     printf "Client found at address 0x%02x\n",$addr;
 
+    $| = 1;
     foreach $chip (@chip_ids) {
       if (exists $chip->{i2c_addrs} and contains $addr, @{$chip->{i2c_addrs}}) {
@@ -2932 +3012 @@
       }
     }
+    $| = 0;
   }
 }
@@ -2938 +3019 @@
 {
   my ($chip,$addr,$conf);
+  $| = 1;
   foreach $chip (@chip_ids) {
     next if not exists $chip->{isa_addrs} or not exists $chip->{isa_detect};
@@ -2959 +3041 @@
     }
   }
+  $| = 0;
 }
 
@@ -3038 +3121 @@
     return;
   }
+  if ($chip->{driver} eq "via-smbus-only") {
+    print "\n    (hardware monitoring capabilities accessible via SMBus only)\n";
+    return;
+  }
 
   # Switch to the sensor logical device
@@ -3077 +3164 @@
   printf("Probing for Super-I/O at 0x\%x/0x\%x\n", $addrreg, $datareg);
 
+  $| = 1;
+# reset state to avoid false positives
+  exit_superio($addrreg, $datareg);
   FAMILY: 
   foreach my $family (@superio_ids) {
@@ -3100 +3190 @@
        || ($chip->{devid} <= 0xff && ($val >> 8) == $chip->{devid})) {
         probe_superio($addrreg, $datareg, $chip);
-        $found++;
+        $found++;
       }
     }
@@ -3112 +3202 @@
 
     exit_superio($addrreg, $datareg);
-  }
+    last FAMILY;
+  }
+  $| = 0;
 }
 
@@ -3171 +3263 @@
 
 # $_[0]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[1]: Address
 # Returns: undef if not detected, (7) if detected.
@@ -3184 +3275 @@
 # $_[0]: Chip to detect (0 = LM78, 1 = LM78-J, 2 = LM79)
 # $_[1]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[2]: Address
 # Returns: undef if not detected, (6) if detected.
@@ -3217 +3307 @@
             inb ($addr + 7) != $val;
 
-  $val = inb($addr + 5) & 0x7f;
-  outb($addr + 5, ~$val & 0xff);
+  $val = inb($addr + 5);
+  outb($addr + 5, ~$val & 0x7f);
   if ((inb ($addr+5) & 0x7f) != (~ $val & 0x7f)) {
     outb($addr+5,$val);
@@ -3230 +3320 @@
                 ($chip == 2 and ($reg & 0xfe) == 0xc0);
 
-  # Explicitely prevent misdetection of Winbond chips
+  # Explicitly prevent misdetection of Winbond chips
   $reg = &$readproc(0x4f);
   return if $reg == 0xa3 || $reg == 0x5c;
 
-  # Explicitely prevent misdetection of ITE chips
+  # Explicitly prevent misdetection of ITE chips
   $reg = &$readproc(0x58);
   return if $reg == 0x90;
@@ -3258 +3348 @@
 }
 
-# $_[0]: A reference to the file descriptor to access this chip.
-#        We assume an i2c_set_slave_addr was already done.
-# $_[1]: Address
+# $_[0]: Chip to detect (0 = LM75, 1 = DS75)
+# $_[1]: A reference to the file descriptor to access this chip.
+# $_[2]: Address (unused)
 # Returns: undef if not detected, 3 or 6 if detected;
 #   6 means that the temperatures make sense;
@@ -3276 +3366 @@
 # documented.
 # Note that register 0x00 may change, so we can't use the modulo trick on it.
+# The DS75 is a bit different, it doesn't cycle over 8-byte boundaries, and
+# all register addresses from 0x04 to 0x0f behave like 0x04-0x07 do for
+# the LM75.
 sub lm75_detect
 {
   my $i;
-  my ($file,$addr) = @_;
+  my ($chip, $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);
-  return if i2c_smbus_read_word_data($file,0x04) != $hyst;
-  return if i2c_smbus_read_word_data($file,0x05) != $hyst;
-  return if i2c_smbus_read_word_data($file,0x06) != $hyst;
-  return if i2c_smbus_read_word_data($file,0x07) != $hyst;
+  my $maxreg = $chip == 1 ? 0x0f : 0x07;
+  for $i (0x04 .. $maxreg) {
+    return if i2c_smbus_read_word_data($file, $i) != $hyst;
+  }
 
   my $os = i2c_smbus_read_word_data($file,0x03);
-  return if i2c_smbus_read_word_data($file,0x04) != $os;
-  return if i2c_smbus_read_word_data($file,0x05) != $os;
-  return if i2c_smbus_read_word_data($file,0x06) != $os;
-  return if i2c_smbus_read_word_data($file,0x07) != $os;
-
-  for ($i = 0x00; $i < 0xff; $i += 8) {
-    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;
+  for $i (0x04 .. $maxreg) {
+    return if i2c_smbus_read_word_data($file, $i) != $os;
+  }
+
+  if ($chip == 0) {
+    for ($i = 8; $i <= 248; $i += 40) {
+      return if i2c_smbus_read_byte_data($file, $i + 0x01) != $conf
+             or i2c_smbus_read_word_data($file, $i + 0x02) != $hyst
+             or i2c_smbus_read_word_data($file, $i + 0x03) != $os;
+    }
   }
 
   # 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;
 
@@ -3321 +3403 @@
   $os = swap_bytes($os);
   # Unused bits
-  return if ($conf & 0xe0);
+  return if $chip == 0 and ($conf & 0xe0);
+  return if $chip == 1 and ($conf & 0x80);
 
   $cur = $cur >> 8;
@@ -3333 +3416 @@
 
 # $_[0]: A reference to the file descriptor to access this chip.
-#        We assume an i2c_set_slave_addr was already done.
 # $_[1]: Address
 # Returns: undef if not detected, 3 or 6 if detected;
@@ -3357 +3439 @@
   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);
@@ -3370 +3451 @@
   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;
 
@@ -3416 +3490 @@
 # $_[0]: Chip to detect (0 = LM92, 1 = LM76, 2 = MAX6633/MAX6634/MAX6635)
 # $_[1]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[2]: Address
 # Returns: undef if not detected, 2 or 4 if detected;
@@ -3466 +3539 @@
   
 # $_[0]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[1]: Address
 # Returns: undef if not detected, 3 if detected
@@ -3493 +3565 @@
 
 # $_[0]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[1]: Address
 # Returns: undef if not detected, 1 to 3 if detected.
@@ -3556 +3627 @@
 #   (0 = LM82/LM83)
 # $_[1]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[2]: Address
 # Returns: undef if not detected, 4 to 8 if detected.
@@ -3598 +3668 @@
 #    5 = ADT7461, 6 = MAX6648/MAX6692)
 # $_[1]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[2]: Address
 # Returns: undef if not detected, 4, 6 or 8 if detected.
@@ -3671 +3740 @@
 #   (1 = LM63, 2 = F75363SG)
 # $_[1]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[2]: Address (unused)
 # Returns: undef if not detected, 8 if detected.
@@ -3752 +3820 @@
 #   (0 = ADM1030, 1=ADM1031)
 # $_[1]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[2]: Address
 # Returns: undef if not detected, 3 to 7 (ADM1031) or 9 (ADM1030)
@@ -3838 +3905 @@
 #    4 = ADT7470)
 # $_[1]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[2]: Address
 # Returns: undef if not detected, 5 or 7 if detected.
@@ -4006 +4072 @@
 
 # $_[0]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[1]: Address
 # Returns: undef if not detected, (7) if detected.
@@ -4024 +4089 @@
 #                        8 = W83792D, 9 = W83627EHF 10 = W83627DHG)
 # $_[1]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[2]: Address
 # Returns: undef if not detected, (8,addr1,addr2) if detected, but only
@@ -4123 +4187 @@
 
 # $_[0]: A reference to the file descriptor to access this chip.
-#        We assume an i2c_set_slave_addr was already done.
 # $_[1]: Address
 # Returns: undef if not detected, 3 if detected
@@ -4197 +4260 @@
 }
 
-# $_[0]: Chip to detect (0 = W83781D, 1 = W83782D, 3 = W83627HF)
+# $_[0]: Chip to detect (0 = W83781D, 1 = W83782D)
 # $_[1]: Address
 # Returns: undef if not detected, (8) if detected.
@@ -4208 +4271 @@
             inb ($addr + 7) != $val;
 
-  $val = inb($addr + 5) & 0x7f;
-  outb($addr+5, ~$val & 0xff);
+  $val = inb($addr + 5);
+  outb($addr+5, ~$val & 0x7f);
   if ((inb ($addr+5) & 0x7f) != (~ $val & 0x7f)) {
     outb($addr+5,$val);
@@ -4224 +4287 @@
   return if $chip == 0 and  ($reg1 & 0xfe) != 0x10;
   return if $chip == 1 and  ($reg1 & 0xfe) != 0x30;
-  return if $chip == 3 and  ($reg1 & 0xfe) != 0x20;
 
   return 8;
@@ -4231 +4293 @@
 # $_[0]: Chip to detect (0 = Revision 0x00, 1 = Revision 0x80)
 # $_[1]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[2]: Address
 # Returns: undef if not detected, (6) if detected.
@@ -4252 +4313 @@
 
 # $_[0]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[1]: Address
 # Returns: undef if not detected, (5) if detected.
@@ -4271 +4331 @@
 
 # $_[0]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[1]: Address
 # Returns: undef if not detected, (5) if detected.
@@ -4286 +4345 @@
 # $_[0]: Chip to detect (0 = ADM9240, 1 = DS1780, 2 = LM81)
 # $_[1]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[2]: Address
 # Returns: undef if not detected, (7) if detected.
@@ -4310 +4368 @@
 # $_[0]: Chip to detect (0 = ADM1022, 1 = THMC50, 2 = ADM1028)
 # $_[1]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[2]: Address
 # Returns: undef if not detected, (8) if detected.
@@ -4327 +4384 @@
                 ($chip == 2 and $reg == 0x41);
   return unless (i2c_smbus_read_byte_data($file,0x40) & 0x80) == 0x00;
-  $reg = i2c_smbus_read_byte_data($file, 0x3f);
-  return unless ($reg & 0xc0) == 0xc0;
-  return if $chip == 0 and ($reg & 0xc0) != 0xc0;
-  return if $chip == 2 and ($reg & 0xc0) == 0xc0;
+  $reg = i2c_smbus_read_byte_data($file, 0x3f) & 0xf0;
+  return unless ($chip == 0 and $reg == 0xc0) or
+                ($chip == 1 and $reg == 0xc0) or
+                ($chip == 2 and $reg == 0xd0);
   return (8);
 }
@@ -4336 +4393 @@
 # $_[0]: Chip to detect (0 = ADM1025, 1 = NE1619)
 # $_[1]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[2]: Address
 # Returns: undef if not detected, (8) if detected.
@@ -4365 +4421 @@
 # $_[0]: Chip to detect (0 = ADM1026)
 # $_[1]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[2]: Address
 # Returns: undef if not detected, (8) if detected.
@@ -4383 +4438 @@
 # $_[0]: Chip to detect (0 = ADM1024)
 # $_[1]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[2]: Address
 # Returns: undef if not detected, (8) if detected.
@@ -4405 +4459 @@
 #    5 = LM84, 6 = GL523, 7 = MC1066)
 # $_[1]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[2]: Address
 # Returns: undef if not detected, 3 if simply detected, 5 if detected and
@@ -4490 +4543 @@
 
 # $_[0]: Chip to detect
+#   (0 = MAX1668, 1 = MAX1805, 2 = MAX1989)
+# $_[1]: A reference to the file descriptor to access this chip.
+#        We may assume an i2c_set_slave_addr was already done.
+# $_[2]: Address
+# Returns: undef if not detected, 7 if detected
+# Registers used:
+#   0xfe: Company ID
+#   0xff: Device ID
+sub max1668_detect
+{
+  my ($chip, $file, $addr) = @_;
+  my $man_id = i2c_smbus_read_byte_data($file, 0xfe);
+  my $dev_id = i2c_smbus_read_byte_data($file, 0xff);
+
+  return if $man_id != 0x4d;
+  return if $chip == 0 and $dev_id != 0x03;
+  return if $chip == 1 and $dev_id != 0x05;
+  return if $chip == 2 and $dev_id != 0x0b;
+
+  return 7;
+}
+
+# $_[0]: Chip to detect
 #   (0 = MAX1619)
 # $_[1]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[2]: Address
 # Returns: undef if not detected, 7 if detected
@@ -4541 +4616 @@
 # $_[0]: Chip to detect (0 = IT8712F)
 # $_[1]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[2]: Address
 # Returns: undef if not detected, 7 or 8 if detected (tops LM78).
@@ -4579 +4653 @@
 }
 
-# $_[0]: Chip to detect (0 = SPD EEPROM, 1 = Sony Vaio EEPROM,
-#                        2 = SPD EEPROM with Software Write Protect)
+# $_[0]: Chip to detect (0 = SPD EEPROM, 1 = Sony Vaio EEPROM)
 # $_[1]: A reference to the file descriptor to access this chip
 # $_[2]: Address
-# Returns: 8 for a memory eeprom (9 if write-protect register found),
-#          4 to 9 for a Sony Vaio eeprom,
-#          1 for an unknown eeprom (2 if write-protect register found)
+# Returns: 8 for a memory eeprom
+#          4 to 9 for a Sony Vaio eeprom
 # Registers used:
 #   0-63: SPD Data and Checksum
@@ -4599 +4671 @@
 
   # Check the checksum for validity (works for most DIMMs and RIMMs)
-  if ($chip != 1) {
-          for (my $i = 0; $i <= 62; $i ++) {
-            $checksum += i2c_smbus_read_byte_data($file,$i);
-          }
-          $checksum &= 255;
-          $checksum -= i2c_smbus_read_byte_data($file,63);
-  }     
   if ($chip == 0) {
-        if($checksum == 0) {
-                return 8;
-        } else {
-                return 1;
+        for (my $i = 0; $i <= 62; $i++) {
+          $checksum += i2c_smbus_read_byte_data($file, $i);
         }
-  }     
-  if ($chip == 2) {
-        # check for 'shadow' write-protect register at 0x30-0x37
-        # could be dangerous
-        i2c_set_slave_addr($file,$addr - 0x20);
-        if(i2c_smbus_write_quick($file, SMBUS_WRITE) >= 0 &&
-           i2c_smbus_read_byte_data($file,0x80) == -1) {
-                i2c_set_slave_addr($file,$addr);
-                if($checksum == 0) {
-                        return (9, $addr - 0x20);
-                } else {
-                        return (2, $addr - 0x20);
-                }
-        }
-        i2c_set_slave_addr($file,$addr);
+        $checksum &= 255;
+
+        return 8
+          if $checksum == i2c_smbus_read_byte_data($file, 63);
         return;
   }
@@ -4657 +4709 @@
 
 # $_[0]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[1]: Address
-# Returns: undef if not detected, (1) if detected.
+# Returns: undef if not detected, 8 if detected.
 # Registers used:
 #   0x00..0x07: DDC signature
-#   0x08..0x7E: checksumed area
-#   0x7F:       checksum
 sub ddcmonitor_detect
 {
   my ($file,$addr) = @_;
-  my $i;
 
   return unless
@@ -4679 +4727 @@
     i2c_smbus_read_byte_data($file,0x07) == 0x00;
 
-  # Check the checksum for validity.
-  my $checksum = 0;
-  for ($i = 0; $i <= 127; $i = $i + 1) {
-    $checksum = $checksum + i2c_smbus_read_byte_data($file,$i);
-  }
-  $checksum=$checksum & 255;
-  if ($checksum != 0) {
-    # I have one such monitor...
-    return (2,$addr+1,$addr+2,$addr+3,$addr+4,$addr+5,$addr+6,$addr+7);
-  }
   return (8,$addr+1,$addr+2,$addr+3,$addr+4,$addr+5,$addr+6,$addr+7);
 }
 
 # $_[0]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[1]: Address
 # Returns: undef if not detected, (8) if detected.
@@ -4715 +4752 @@
 
 # $_[0]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[1]: Address
 # Returns: undef if not detected, (8) if detected.
@@ -4737 +4773 @@
 
 # $_[0]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[1]: Address
 # Returns: undef if not detected, (8) if detected.
@@ -4759 +4794 @@
 
 # $_[0]: A reference to the file descriptor to access this chip.
-#        We assume an i2c_set_slave_addr was already done.
 # $_[1]: Address (unused)
 # Returns: undef if not detected, 5 if detected.
@@ -4774 +4808 @@
 
 # $_[0]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[1]: Address
 # Returns: undef if not detected, (7) if detected.
@@ -4804 +4837 @@
 
 # $_[0]: A reference to the file descriptor to access this chip.
-#        We assume an i2c_set_slave_addr was already done.
 # $_[1]: Address
 # Returns: undef if not detected, 5 or 6 if detected.
@@ -4823 +4855 @@
 
 # $_[0]: A reference to the file descriptor to access this chip.
-#        We assume an i2c_set_slave_addr was already done.
 # $_[1]: Address
 # Returns: undef if not detected, 5 or 6 if detected.
@@ -4829 +4860 @@
 #   0x3E: Manufacturer ID
 #   0x3F: Version/Stepping
-#   0x40: Configuration (2 reserved bits)
-#   0x42: Interrupt Status 2 (1 reserved bit)
-#   0x43: VID (2 reserved bits)
+#   0x73: Read-only test register (4 test bits)
+#   0x8A: Read-only test register (7 test bits)
 sub dme1737_detect
 {
   my ($file, $addr) = @_;
-  return unless i2c_smbus_read_byte_data($file, 0x3E) == 0x55
+  return unless i2c_smbus_read_byte_data($file, 0x3E) == 0x5c
            and (i2c_smbus_read_byte_data($file, 0x3F) & 0xF8) == 0x88
-           and (i2c_smbus_read_byte_data($file, 0x40) & 0xC4) == 0x04
-           and (i2c_smbus_read_byte_data($file, 0x42) & 0x02) == 0x00
-           and (i2c_smbus_read_byte_data($file, 0x43) & 0xC0) == 0x00;
+           and (i2c_smbus_read_byte_data($file, 0x73) & 0x0F) == 0x09
+           and (i2c_smbus_read_byte_data($file, 0x8A) & 0x7F) == 0x4D;
   return ($addr == 0x2e ? 6 : 5);
 }
@@ -4848 +4877 @@
 #    7 = custom power control IC)
 # $_[1]: A reference to the file descriptor to access this chip.
-#        We assume an i2c_set_slave_addr was already done.
 # $_[2]: Address (unused)
 # Returns: undef if not detected, 7 if detected.
@@ -4885 +4913 @@
 
 # $_[0]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[1]: Address
 # Returns: undef if not detected, 4 or 7 if detected
@@ -4908 +4935 @@
 
 # $_[0]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[1]: Address
 # Returns: undef if not detected, 1 if detected
@@ -4927 +4953 @@
 
 # $_[0]: A reference to the file descriptor to access this chip.
-#        We assume an i2c_set_slave_addr was already done.
 # $_[1]: Address (unused)
 # Returns: undef if not detected, 1 if detected
@@ -4956 +4981 @@
 
 # $_[0]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[1]: Address
 # Returns: undef if not detected, 3 if detected
@@ -5022 +5046 @@
 }
 
-# $_[0]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
-# $_[1]: Address
-# Returns: 1
-# This is a placeholder so we get a report if any device responds
-# to the SMBus Device Default Address (0x61), which is used for
-# ARP in SMBus 2.0.
-sub arp_detect
-{
-  return (1);
-}
-
 # This checks for non-FFFF values for SpecInfo and Status.
 # The address (0x09) is specified by the SMBus standard so it's likely
 # that this really is a smart battery charger.
 # $_[0]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[1]: Address
 # Returns: 5
@@ -5058 +5069 @@
 # that this really is a smart battery manager/selector.
 # $_[0]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[1]: Address
 # Returns: 5
@@ -5078 +5088 @@
 # that this really is a smart battery.
 # $_[0]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[1]: Address
 # Returns: 5
@@ -5153 +5162 @@
 # $_[0]: Chip to detect (0 = W83L785TS-S)
 # $_[1]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[2]: Address
 # Returns: undef if not detected, 8 if detected
@@ -5172 +5180 @@
 #        if somebody finds a way to distinguish MAX6650 and MAX6651.
 # $_[1]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[2]: Address
 # Returns: undef if not detected, 4 if detected.
@@ -5204 +5211 @@
 }
 
+# $_[0]: Chip to detect. Always zero.
+# $_[1]: A reference to the file descriptor to access this chip.
+# $_[2]: Address.
+#
+# Returns: undef if not detected, 6 if detected.
+sub max6655_detect
+{
+  my ($chip, $file, $addr) = @_;
+
+  # checking RDID (Device ID)
+  return unless i2c_smbus_read_byte_data($file, 0xfe) == 0x0a;
+  # checking RDRV (Manufacturer ID)
+  return unless i2c_smbus_read_byte_data($file, 0xff) == 0x4d;
+  # checking unused bits (conversion rate, extended temperature)
+  return unless i2c_smbus_read_byte_data($file, 0x04) & 0xf8;
+  return unless i2c_smbus_read_byte_data($file, 0x10) & 0x1f;
+  return unless i2c_smbus_read_byte_data($file, 0x11) & 0x1f;
+  return unless i2c_smbus_read_byte_data($file, 0x12) & 0x1f;
+
+  return 6;
+}
+
 # $_[0]: Chip to detect (0 = VT1211)
 # $_[1]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
 # $_[2]: Address
 #
@@ -5582 +5610 @@
   # added to the chip_ids list
   chip_special_cases();
+  $i2c_addresses_to_scan = i2c_addresses_to_scan();
 
   print "We are now going to do the I2C/SMBus adapter probings. Some chips may\n",
@@ -5642 +5671 @@
   print "Do you want to scan for them? (YES/no): ";
   unless (<STDIN> =~ /^\s*n/i) {
+    $| = 1;
     foreach my $entry (@cpu_ids) {
       scan_cpu($entry);
     }
+    $| = 0;
   }
   print "\n";