Changeset 4082 for lm-sensors/trunk/prog/detect/sensors-detect

Timestamp:

08/02/06 21:53:20 (7 years ago)

Author:

khali

Message:

Kill some dead code, which dealt with the case where a driver probes
less I2C addresses by default than the script itself does. The feature
was never used, and I don't think it's particuarly useful, so removing
it for simpler code makes sense.

Files:

• lm-sensors/trunk/prog/detect/sensors-detect (modified) (9 diffs)

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

@@ -984 +984 @@
 #  i2c_addrs (optional): For I2C chips, the range of valid I2C addresses to
 #      probe. Recommend avoiding 0x69 because of clock chips.
-#  i2c_driver_addrs (optional): For I2C chips, the range of valid I2C
-#      addresses probed by the kernel driver. Strictly optional.
 #  i2c_detect (optional): For I2C chips, the function to call to detect
 #      this chip. The function should take two parameters: an open file
@@ -991 +989 @@
 #  isa_addrs (optional): For ISA chips, the range of valid port addresses to
 #      probe.
-#  isa_driver_addrs (optional): For ISA chips, the range of valid ISA
-#      addresses probed by the kernel driver. Strictly optional.
 #  isa_detect (optional): For ISA chips, the function to call to detect
 #      this chip. The function should take one parameter: the ISA address
@@ -2596 +2592 @@
 #  with field 'i2c_sub_addrs', containing a reference to a list of
 #       other I2C addresses (if this is an I2C detection)
-#  with field 'i2c_extra' if this is an I2C detection and the address
-#       is not normally probed by the kernel driver
 #  with field 'isa_addr' containing the ISA address this chip is on 
 #       (if this is an ISA detection)
-#  with field 'isa_extra' if this is an ISA detection and the address
-#       is not normally probed by the kernel driver
 #  with field 'conf', containing the confidence level of this detection
 #  with field 'chipname', containing the chip name
@@ -2743 +2735 @@
                           $new_misdetected_ref->[$i]->{i2c_addr})) {
         $new_misdetected_ref->[$i]->{isa_addr} = $datahash->{isa_addr};
-        $new_misdetected_ref->[$i]->{isa_extra} = $datahash->{isa_extra} 
-               if exists $datahash->{isa_extra};
         return $new_misdetected_ref->[$i]; 
       }
@@ -2767 +2757 @@
                           $new_detected_ref->[$i]->{i2c_addr})) {
         $new_detected_ref->[$i]->{isa_addr} = $datahash->{isa_addr};
-        $new_detected_ref->[$i]->{isa_extra} = $datahash->{isa_extra} 
-               if exists $datahash->{isa_extra};
         ($datahash) = splice (@$new_detected_ref, $i, 1);
         $isalias=1;
@@ -2857 +2845 @@
           i2c_devnr => $adapter_nr,
         };
-        $new_hash->{i2c_extra} = 0 
-            if exists $chip->{i2c_driver_addrs} and
-               not contains($addr, @{$chip->{i2c_driver_addrs}});
 
         printf "Client found at address 0x\%02x\n", $addr;
@@ -2908 +2893 @@
             $new_hash->{i2c_sub_addrs} = \@chips_copy;
           }
-          $new_hash->{i2c_extra} = 0 
-                 if exists $chip->{i2c_driver_addrs} and
-                    not contains( $addr , @{$chip->{i2c_driver_addrs}});
           add_i2c_to_chips_detected $chip->{driver}, $new_hash;
         } else {
@@ -2940 +2922 @@
                        chipname => $chip->{name}
                      };
-      $new_hash->{isa_extra} = 0 
-             if exists $chip->{isa_driver_addrs} and
-                not contains ($addr, @{$chip->{isa_driver_addrs}});
       $new_hash = add_isa_to_chips_detected $chip->{alias_detect},$chip->{driver},
                                             $new_hash;
@@ -5299 +5278 @@
        }
        $modprobes .= "modprobe $chip->{driver}\n";
-    }
-
-    # Handle detects at addresses normally not probed
-    foreach $detection (@{$chip->{detected}}) {
-      push @probelist, $adapters[$detection->{i2c_devnr}]->{nr_later},
-                       $detection->{i2c_addr}
-           if exists $detection->{i2c_addr} and
-              exists $detection->{i2c_extra};
-      push @probelist, -1, $detection->{isa_addr}
-           if exists $detection->{isa_addr} and
-              exists $detection->{isa_extra};
     }