From df7a40a8b24e3b01e4e54ad1c4da2c77220d0698 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Wed, 24 Jan 2007 06:58:16 +0000
Subject: [PATCH] sensors-detect: - Only probe I2C addresses for which we know
 at least one device. This will   speed up the probing a bit, and hopefully
 limit both user and hardware   confusion. - Drop ARP-capable device
 detection, we don't do anything useful with   the information and we have no
 other reason to probe I2C address 0x61. i2cdetect can be used instead when we
 want to know more about a given I2C bus.

git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4304 7894878c-1315-0410-8ee3-d5d059ff63e0
---
 CHANGES                    |  3 +++
 prog/detect/sensors-detect | 49 ++++++++++++++++++++++----------------
 2 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/CHANGES b/CHANGES
index d80b4f36..b6f26bcb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ lm_sensors CHANGES file
 -----------------------
 
 SVN HEAD
+  Program sensors-detect: Only probe relevant I2C addresses
+                          Drop ARP-capable device detection
+
 
 2.10.2 (20070115)
   RPM: Obsolete, removed
diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
index 440ee6e3..1919eb88 100755
--- a/prog/detect/sensors-detect
+++ b/prog/detect/sensors-detect
@@ -47,7 +47,8 @@ $ENV{PATH} = '/usr/local/sbin:'.$ENV{PATH}
 # CONSTANT DECLARATIONS #
 #########################
 
-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$)';
 $revision =~ s/\$\w+: (.*?) \$/$1/g;
@@ -1473,12 +1474,6 @@ use vars qw(@pci_adapters_sis5595 @pci_adapters_sis645 @pci_adapters_sis96x);
        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(@_); },
-     },
      {
        name => "IPMI BMC KCS",
        driver => "bmcsensors",
@@ -2477,6 +2472,7 @@ sub i2c_get_funcs($)
 sub i2c_set_slave_addr
 {
   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;
 }
@@ -2819,6 +2815,30 @@ sub add_isa_to_chips_detected
   }
 }
 
+# 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
 # $_[2]: The driver of the adapter
@@ -2851,7 +2871,7 @@ sub scan_adapter
   }
 
   # 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) {
       shift @not_to_scan;
@@ -5021,18 +5041,6 @@ sub max6900_detect
 	return 3;
 }
 
-# $_[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.
@@ -5581,6 +5589,7 @@ sub main
   # Before looking for chips, make sure any special case chips are
   # 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",
         "be double detected; we choose the one with the highest confidence\n",