Changeset 4610

Timestamp:

07/14/07 18:29:52 (6 years ago)

Author:

khali

Message:

Don't add non-sensor I2C chips to the list of detected I2C chips. Even
if we discard them later, their presence in the list can prevent the
"no sensors found" event from triggering. It also causes the script to
suggest loading i2c bus drivers which are not needed for hardware
monitoring.

Files:

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

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

@@ -736 +736 @@
 #  driver: The driver name (without .o extension). Put in exactly
 #      "to-be-written" if it is not yet available. Put in exactly
-#      "not-a-sensor" if it is not a hardware monitoring chip and
-#      there is no known driver for it.
+#      "not-a-sensor" if it is not a hardware monitoring chip.
 #      Put in exactly "use-isa-instead" if no i2c driver will be written.
 #  i2c_addrs (optional): For I2C chips, the range of valid I2C addresses to
@@ -3113 +3112 @@
         printf("\%-60s", sprintf("Probing for `\%s'... ", $chip->{name}));
         if (($conf,@chips) = &{$chip->{i2c_detect}} (\*FILE ,$addr)) {
-          print "Success!\n",
-                "    (confidence $conf, driver `$chip->{driver}')";
+          if ($chip->{driver} eq "not-a-sensor") {
+            print "Yes\n",
+                  "    (confidence $conf, not a hardware monitoring chip";
+          } else {
+            print "Success!\n",
+                  "    (confidence $conf, driver `$chip->{driver}'";
+          }
           if (@chips) {
             print ", other addresses:";
@@ -3122 +3126 @@
             }
           }
-          printf "\n";
+          printf ")\n";
+
+          next if ($chip->{driver} eq "not-a-sensor"
+                || $chip->{driver} eq "use-isa-instead");
+
           $new_hash = { conf => $conf,
                         i2c_addr => $addr,
@@ -5439 +5447 @@
   foreach $chip (@chips_detected) {
     next if not @{$chip->{detected}};
-    next if $chip->{driver} eq "not-a-sensor";    
-    next if $chip->{driver} eq "use-isa-instead";
     if ($chip->{driver} eq "to-be-written") {
       $modprobes .= "# no driver for $chip->{detected}[0]{chipname} yet\n";
@@ -5672 +5678 @@
   my ($chip,$data);
   foreach $chip (@chips_detected) {
-    next if $chip->{driver} eq "not-a-sensor";
-    next if $chip->{driver} eq "use-isa-instead";
     print "\nDriver `$chip->{driver}' ";
     if (@{$chip->{detected}}) {