Changeset 5434

Timestamp:

11/26/08 17:36:04 (4 years ago)

Author:

khali

Message:

Fix handling of bus driver names with an underscore.
Simplify loading of bus drivers: we don't really need to make this
part interactive, as nothing can really go wrong at this point.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

• CHANGES (modified) (1 diff)
• prog/detect/sensors-detect (modified) (7 diffs)

lm-sensors/branches/lm-sensors-3.0.0/CHANGES

@@ -27 +27 @@
                   Let kernel 2.6.28 and later handle chips aliases
                   Unload kernel drivers when we are done with them (#2329)
+                  Fix handling of bus driver names with an underscore
+                  Simplify loading of bus drivers
 
 3.0.3 (2008-09-28)

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

@@ -2298 +2298 @@
   local $_;
   while (<INPUTFILE>) {
-    tr/_/-/;
+    tr/-/_/; # Probably not needed
     $modules_list{$1} = 1 if m/^(\S*)/;
   }
+}
+
+sub is_module_loaded
+{
+        my $module = shift;
+        $module =~ tr/-/_/;
+        return exists $modules_list{$module}
+}
+
+sub load_module
+{
+        my $module = shift;
+
+        return if is_module_loaded($module);
+
+        system("modprobe", $module);
+        if (($? >> 8) != 0) {
+                print "Failed to load module $module.\n";
+                return -1;
+        }
+        
+        print "Module $module loaded successfully.\n";
+        push @modules_we_loaded, $module;
+
+        # Update the list of loaded modules
+        my $normalized = $module;
+        $normalized =~ tr/-/_/;
+        $modules_list{$normalized} = 1;
 }
 
@@ -2448 +2476 @@
 sub adapter_pci_detection
 {
-  my ($key, $device, $try, @res, %smbus);
+  my ($key, $device, $try, %smbus, $count);
   print "Probing for PCI bus adapters...\n";
 
@@ -2479 +2507 @@
           }
         } else {
-          printf "Use driver `\%s' for device \%s: \%s\n",
+          printf "Using driver `\%s' for device \%s: \%s\n",
                  $try->{driver}, pci_busid($device), $try->{procid};
-          push @res, $try->{driver};
+          $count++;
+          load_module($try->{driver});
         }
 
@@ -2496 +2525 @@
   }
 
-  if (! @res) {
+  if (!$count) {
     print "Sorry, no supported PCI bus adapters found.\n";
   }
-  return @res;
 }
 
@@ -5302 +5330 @@
 sub main
 {
-  my (@adapters, $res, $did_adapter_detection, $adapter);
-
   # We won't go very far if not root
   unless ($> == 0) {
@@ -5333 +5359 @@
   print "\n";
 
-  print "We can start with probing for (PCI) I2C or SMBus adapters.\n";
-  print "Do you want to probe now? (YES/no): ";
-  @adapters = adapter_pci_detection()
-                        if ($did_adapter_detection = not <STDIN> =~ /\s*[Nn]/);
+  adapter_pci_detection();
   print "\n";
-
-  if (not $did_adapter_detection) {
-    print "As you skipped adapter detection, we will only scan already loaded\n".
-          "adapter modules.\n";
-  } else {
-    print "We will now try to load each adapter module in turn.\n"
-      if (@adapters);
-    foreach $adapter (@adapters) {
-      if (exists($modules_list{$adapter})) {
-        print "Module `$adapter' already loaded.\n";
-      } else {
-        print "Load `$adapter' (say NO if built into your kernel)? (YES/no): ";
-        unless (<STDIN> =~ /^\s*[Nn]/) {
-          if (system("modprobe", $adapter)) {
-            print "Loading failed... skipping.\n";
-          } else {
-            print "Module loaded successfully.\n";
-            push @modules_we_loaded, $adapter;
-            $modules_list{$adapter} = 1;
-          }
-        }
-      }
-    }
-  }
 
   print "If you have undetectable or unsupported I2C/SMBus adapters, you can have\n".
@@ -5367 +5366 @@
   initialize_i2c_adapters_list();
 
-  if (! -e "$sysfs_root/class/i2c-dev") {
-    print "To continue, we need module `i2c-dev' to be loaded.\n";
-    print "Do you want to load `i2c-dev' now? (YES/no): ";
-    if (<STDIN> =~ /^\s*n/i) {
-      print "Well, you will know best.\n";
-    } elsif (system("modprobe", "i2c-dev")) {
-      print "Loading failed, expect problems later on.\n";
-    } else {
-      print "Module loaded successfully.\n";
-      push @modules_we_loaded, "i2c-dev";
-      $modules_list{"i2c-dev"} = 1;
-    }
-    print "\n";
-  }
+  load_module("i2c-dev") unless -e "$sysfs_root/class/i2c-dev";
 
   $i2c_addresses_to_scan = i2c_addresses_to_scan();