Changeset 5507

Timestamp:

12/03/08 10:47:57 (4 years ago)

Author:

khali

Message:

Have scan_superio return a list of features instead of a boolean value.

Files:

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

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

@@ -2966 +2966 @@
 }
 
-# Returns: 1 if device added to chips_detected, undef if not
+# Returns: features bitmask if device added to chips_detected, 0 if not
 sub probe_superio
 {
@@ -2977 +2977 @@
         if (!exists $chip->{driver}) {
                 print "\n    (no information available)\n";
-                return;
+                return 0;
         }
         if ($chip->{driver} eq "not-a-sensor") {
                 print "\n    (no hardware monitoring capabilities)\n";
-                return;
+                return 0;
         }
         if ($chip->{driver} eq "via-smbus-only") {
                 print "\n    (hardware monitoring capabilities accessible via SMBus only)\n";
-                return;
+                return 0;
         }
 
@@ -2997 +2997 @@
         if (!($val & $superio{actmask})) {
                 print "\n    (but not activated)\n";
-                return;
+                return 0;
         }
 
@@ -3007 +3007 @@
         if ($addr == 0) {
                 print "\n    (but no address specified)\n";
-                return;
+                return 0;
         }
         print "Success!\n";
@@ -3017 +3017 @@
         };
         add_isa_to_chips_detected($chip->{driver}, $new_hash);
-        return 1;
+        return $chip->{features};
 }
 
@@ -3048 +3048 @@
 }
 
-# Returns: number of device added to chips_detected (0 or 1)
+# Returns: features supported by the device added, if any
 sub scan_superio
 {
         my ($addrreg, $datareg) = @_;
         my ($val, $found);
-        my $added = 0;
+        my $features = 0;
 
         printf("Probing for Super-I/O at 0x\%x/0x\%x\n", $addrreg, $datareg);
@@ -3089 +3089 @@
                          || ($chip->{devid} <= 0xff &&
                              ($val >> 8) == $chip->{devid})) {
-                                $added = 1 if probe_superio($addrreg, $datareg, $chip);
+                                $features |= probe_superio($addrreg, $datareg, $chip);
                                 $found++;
                         }
@@ -3104 +3104 @@
         exit_superio($addrreg, $datareg);
         $| = 0;
-        return $added;
+        return $features;
 }
 
@@ -4973 +4973 @@
 sub main
 {
-        my ($input, $superio_found);
+        my ($input, $superio_features);
 
         # We won't go very far if not root
@@ -5021 +5021 @@
                 unless (<STDIN> =~ /^\s*n/i) {
                         initialize_ioports();
-                        $superio_found += scan_superio(0x2e, 0x2f);
-                        $superio_found += scan_superio(0x4e, 0x4f);
+                        $superio_features |= scan_superio(0x2e, 0x2f);
+                        $superio_features |= scan_superio(0x4e, 0x4f);
                         close_ioports();
                 }
@@ -5031 +5031 @@
                        "safe though. Yes, you do have ISA I/O ports even if you do not have any\n".
                        "ISA slots! Do you want to scan the ISA I/O ports? (\%s): ",
-                       $superio_found ? "yes/no/IPMI ONLY" : "YES/no/ipmi only";
+                       $superio_features ? "yes/no/IPMI ONLY" : "YES/no/ipmi only";
                 $input = <STDIN>;
                 unless ($input =~ /^\s*n/i) {
-                        my $ipmi_only = ($superio_found && $input !~ /^\s*y/i)
-                                     || (!$superio_found && $input =~ /^\s*i/i);
+                        my $ipmi_only = ($superio_features && $input !~ /^\s*y/i)
+                                     || (!$superio_features && $input =~ /^\s*i/i);
                         initialize_ioports();
                         scan_isa_bus($ipmi_only);