Changeset 336

Timestamp:

03/23/99 22:48:41 (14 years ago)

Author:

frodo

Message:

sensors-detect new feature

The detection program can now be told that it should probe for more
addresses than the kernel driver module; it automatically generates
the necessary insmod parameters for the module if chips are found on
these non-standard addresses. Very useful for the LM78, for instance;
the driver still only check 0x20-0x2f, but the probe program checks
all addresses.

Files:

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

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

@@ -93 +93 @@
 #  i2c_addrs (optional): For I2C chips, the range of valid I2C addresses to
 #      probe.
+#  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
@@ -98 +100 @@
 #  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
@@ -110 +114 @@
        driver => "lm78",
        i2c_addrs => [0x00..0x7f], 
+       i2c_driver_addrs => [0x20..0x2f], 
        i2c_detect => sub { lm78_detect 0, @_},
        isa_addrs => [0x290],
@@ -119 +124 @@
        driver => "lm78",
        i2c_addrs => [0x00..0x7f],
+       i2c_driver_addrs => [0x20..0x2f], 
        i2c_detect => sub { lm78_detect 1, @_ },
        isa_addrs => [0x290],
@@ -128 +134 @@
        driver => "lm78",
        i2c_addrs => [0x00..0x7f],
+       i2c_driver_addrs => [0x20..0x2f], 
        i2c_detect => sub { lm78_detect 2, @_ },
        isa_addrs => [0x290],
@@ -712 +719 @@
 #  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
@@ -842 +853 @@
                           $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};
         close FILE;
         return;
@@ -866 +879 @@
                           $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);
         close FILE;
@@ -956 +971 @@
             $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 {
@@ -981 +999 @@
       print "Success!\n";
       printf "    (confidence %d, driver `%s')\n", $conf, $$chip{driver};
-      add_isa_to_chips_detected $$chip{alias_detect},$$chip{driver}, 
-                                { conf => $conf,
-                                  isa_addr => $addr,
-                                  chipname =>  $$chip{name},
-                                };
+      my $new_hash = { conf => $conf,
+                       isa_addr => $addr,
+                       chipname =>  $$chip{name}
+                     };
+      $new_hash->{isa_extra} = 0 
+             if exists $chip->{isa_driver_addrs} and
+                not contains ($addr, @{$chip->{isa_driver_addrs}});
+      add_isa_to_chips_detected $$chip{alias_detect},$$chip{driver},$new_hash;
     }
   }
@@ -1402 +1423 @@
   my ($prefer_isa) = @_;
 
-  my ($chip,$detection,%adapters,$nr,$i,@optionlist);
+  my ($chip,$detection,%adapters,$nr,$i,@optionlist,@probelist);
   my $modprobes = "";
   my $configfile = "";
@@ -1438 +1459 @@
   foreach $chip (@chips_detected) {
     next if not @{$chip->{detected}};
-
-    # Handle misdetects
     $modprobes .= "modprobe $chip->{driver}\n";
     @optionlist = ();
+    @probelist = ();
+
+    # Handle detects out-of-range
+    foreach $detection (@{$chip->{detected}}) {
+      push @probelist, %adapters->{$detection->{i2c_driver}},
+                       $detection->{i2c_addr}
+           if exists $detection->{i2c_driver} and
+              exists %adapters->{$detection->{i2c_driver}} and
+              exists $detection->{i2c_extra};
+      push @probelist, -1, $detection->{isa_addr}
+           if exists $detection->{isa_addr} and
+              exists %adapters->{"i2c-isa"} and
+              exists $detection->{isa_extra};
+    }
+
+    # Handle misdetects
     foreach $detection (@{$chip->{misdetected}}) {
       push @optionlist, %adapters->{$detection->{i2c_driver}},
@@ -1467 +1502 @@
     }
 
-    next if not @optionlist;
+    next if not (@probelist or @optionlist);
     $configfile .= "options $chip->{driver}";
-    $configfile .= sprintf " ignore=0x%02x",shift @optionlist 
-                if @optionlist;
-    $configfile .= sprintf ",0x%02x",shift @optionlist 
-                while @optionlist;
+    $configfile .= sprintf " ignore=%d,0x%02x",shift @optionlist, 
+                                               shift @optionlist
+                  if @optionlist;
+    $configfile .= sprintf ",%d,0x%02x",shift @optionlist, shift @optionlist
+                  while @optionlist;
+    $configfile .= sprintf " probe=%d,0x%02x",shift @probelist,
+                                              shift @probelist
+                  if @probelist;
+    $configfile .= sprintf ",%d,0x%02x",shift @probelist, shift @probelist
+                  while @probelist;
     $configfile .= "\n";
   }