Changeset 4128

Timestamp:

09/01/06 18:45:50 (7 years ago)

Author:

khali

Message:

Attempt to make sensors-detect slightly more user-friendly, part two.

* Shorten the date part in revision string.
* Make the chip names more consistent.
* Align the result of ISA and Super-I/O probes.
* Replace "Failed!" with a less needlessly alarming "No".
* Make the ISA and Super-I/O probe results more compact.
* Adjust some explanations.
* Don't ask again before probing secondary Super-I/O address.

Files:

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

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

@@ -52 +52 @@
 $revision = '$Revision$ ($Date$)';
 $revision =~ s/\$\w+: (.*?) \$/$1/g;
+$revision =~ s/ \([^()]*\)//;
 
 # This is the list of SMBus or I2C adapters we recognize by their PCI
@@ -1406 +1407 @@
      },
      {
-       name => "VIA Technologies VT82C686 Integrated Sensors",
+       name => "VIA VT82C686 Integrated Sensors",
        driver => "via686a",
        isa_addrs => [ 0 ],
@@ -1412 +1413 @@
      },
      {
-       name => "VIA Technologies VT8231 Integrated Sensors",
+       name => "VIA VT8231 Integrated Sensors",
        driver => "vt8231",
        isa_addrs => [ 0 ],
@@ -1651 +1652 @@
     [
       {
-        name => "ITE 8702F Super IO Sensors",
+        name => "ITE IT8702F Super IO Sensors",
         driver => "to-be-written",
         devid => 0x8702,
@@ -1657 +1658 @@
       },
       {
-        name => "ITE 8705F Super IO Sensors",
+        name => "ITE IT8705F Super IO Sensors",
         driver => "it87",
         devid => 0x8705,
@@ -1663 +1664 @@
       },
       {
-        name => "ITE 8712F Super IO Sensors",
+        name => "ITE IT8712F Super IO Sensors",
         driver => "it87",
         devid => 0x8712,
@@ -1813 +1814 @@
     [
       {
-        name => "SMSC 47B27x Super IO Fan Sensors",
+        name => "SMSC LPC47B27x Super IO Fan Sensors",
         driver => "smsc47m1",
         devid => 0x51,
@@ -1819 +1820 @@
       },
       {
-        name => "SMSC 47M10x/13x Super IO Fan Sensors",
+        name => "SMSC LPC47M10x/13x Super IO Fan Sensors",
         driver => "smsc47m1",
         devid => 0x59,
@@ -1825 +1826 @@
       },
       {
-        name => "SMSC 47M14x Super IO Fan Sensors",
+        name => "SMSC LPC47M14x Super IO Fan Sensors",
         driver => "smsc47m1",
         devid => 0x5f,
@@ -1831 +1832 @@
       },
       {
-        name => "SMSC 47M15x/192/997 Super IO Fan Sensors",
+        name => "SMSC LPC47M15x/192/997 Super IO Fan Sensors",
         driver => "smsc47m1",
         devid => 0x60,
@@ -1837 +1838 @@
       },
       {
-        name => "SMSC 47S42x Super IO Fan Sensors",
+        name => "SMSC LPC47S42x Super IO Fan Sensors",
         driver => "to-be-written",
         devid => 0x57,
@@ -1843 +1844 @@
       },
       {
-        name => "SMSC 47S45x Super IO Fan Sensors",
+        name => "SMSC LPC47S45x Super IO Fan Sensors",
         driver => "to-be-written",
         devid => 0x62,
@@ -1849 +1850 @@
       },
       {
-        name => "SMSC 47M172 Super IO",
+        name => "SMSC LPC47M172 Super IO",
         driver => "not-a-sensor",
         devid => 0x14,
@@ -1882 +1883 @@
     [
       {
-        name => "VT1211 Super IO Sensors",
+        name => "VIA VT1211 Super IO Sensors",
         driver => "vt1211",
         devid => 0x3c,
@@ -2841 +2842 @@
     foreach $chip (@chip_ids) {
       if (exists $chip->{i2c_addrs} and contains $addr, @{$chip->{i2c_addrs}}) {
-        print "Probing for `$chip->{name}'... ";
+        printf("\%-60s", sprintf("Probing for `\%s'... ", $chip->{name}));
         if (($conf,@chips) = &{$chip->{i2c_detect}} (\*FILE ,$addr)) {
           print "Success!\n",
@@ -2866 +2867 @@
           add_i2c_to_chips_detected $chip->{driver}, $new_hash;
         } else {
-          print "Failed!\n";
+          print "No\n";
         }
       }
@@ -2878 +2879 @@
   foreach $chip (@chip_ids) {
     next if not exists $chip->{isa_addrs} or not exists $chip->{isa_detect};
-    print "Probing for `$chip->{name}'\n";
     foreach $addr (@{$chip->{isa_addrs}}) {
-      if ($addr) {
-        printf "  Trying address 0x%04x... ", $addr;
-      } else {
-        print "  Trying general detect... ";
-      }
+      printf("\%-60s", sprintf("Probing for `\%s'\%s... ", $chip->{name},
+                               $addr ? sprintf(" at 0x\%x", $addr) : ''));
       $conf = &{$chip->{isa_detect}} ($addr);
-      print("Failed!\n"), next if not defined $conf;
+      print("No\n"), next if not defined $conf;
       print "Success!\n";
       printf "    (confidence %d, driver `%s')\n", $conf, $chip->{driver};
@@ -2930 +2927 @@
 {
   my ($addrreg, $datareg) = @_;
-  my ($val, $addr);
+  my ($val, $addr, $name);
 
   my %superio = (
@@ -2940 +2937 @@
   );
   
+  printf("Probing for Super-I/O at 0x\%x/0x\%x\n", $addrreg, $datareg);
+
   FAMILY: 
   foreach my $family (@superio_ids) {
@@ -2947 +2946 @@
     }
     foreach my $chip (@{$family->{chips}}) {
-      print "Probing for `$chip->{name}'\n";
+      $name = $chip->{name};
+      $name =~ s/ Super IO//;
+      printf("\%-60s", sprintf("Probing for `\%s'... ", $name));
 # check the device ID
       outb($addrreg, $superio{devidreg});
       $val = inb($datareg);
       if ($val == 0x00 || $val == 0xff) {
-        print "  Failed! (skipping family)\n";
+        print "No\n";
         exit_superio($addrreg, $datareg, $family, 0);
         next FAMILY;
@@ -2961 +2962 @@
       }
       if (($val & ($chip->{devid_mask} || 0xffff)) != $chip->{devid}) {
-        printf "  Failed! (0x%0*x)\n", $chip->{devid}>0xff ? 4 : 2, $val;
+        printf "No (0x%0*x)\n", $chip->{devid}>0xff ? 4 : 2, $val;
         next;
       }
-      print "  Success...";
+      print "Success!\n";
 # does it have hardware monitoring capabilities
       if (!exists $chip->{driver}) {
-        print " (no information available)\n";
+        print "    (no information available)\n";
         next;
       }
       if($chip->{driver} eq "not-a-sensor") {
-        print " (no hardware monitoring capabilities)\n";
+        print "    (no hardware monitoring capabilities)\n";
         next;
       }
@@ -2981 +2982 @@
       $val = inb($datareg);
       if(!($val & $superio{actmask})) {
-        print " but not activated\n";
+        print "    (but not activated)\n";
         next;
       }
@@ -2990 +2991 @@
       $addr = ($addr << 8) | inb($datareg);
       if($addr == 0) {
-        print " but no address specified\n";
+        print "    (but no address specified)\n";
         next;
       }         
-      printf " found at address 0x%04x\n", $addr;
+      printf "    (address 0x\%x, driver `%s')\n", $addr, $chip->{driver};
       my $new_hash = { conf => 9,
                        isa_addr => $addr,
@@ -5340 +5341 @@
 
   print "We are now going to do the I2C/SMBus adapter probings. Some chips may\n",
-        "be double detected; we choose the one with the highest confidence value\n",
-        "in that case.\n",
-        "If you found that the adapter hung after probing a certain address, you\n",
-        "can specify that address to remain unprobed.\n";
+        "be double detected; we choose the one with the highest confidence\n",
+        "value in that case.\n",
+        "If you found that the adapter hung after probing a certain address,\n",
+        "you can specify that address to remain unprobed.\n";
 
   my ($inp,@not_to_scan,$inp2);
@@ -5374 +5375 @@
 
   print "Some chips are also accessible through the ISA I/O ports. We have to\n".
-        "write to arbitrary I/O ports to do this. This is usually safe though.\n".
+        "write to arbitrary I/O ports to probe them. This is usually safe though.\n".
         "Yes, you do have ISA I/O ports even if you do not have any ISA slots!\n";
   print "Do you want to scan the ISA I/O ports? (YES/no): ";
@@ -5385 +5386 @@
 
   print "Some Super I/O chips may also contain sensors. We have to write to\n".
-        "standard I/O ports to do this. This is usually safe.\n";
+        "standard I/O ports to probe them. This is usually safe.\n";
   print "Do you want to scan for Super I/O sensors? (YES/no): ";
   unless (<STDIN> =~ /^\s*n/i) {
     initialize_ioports();
     scan_superio(0x2e, 0x2f);
-    print "\nDo you want to scan for secondary Super I/O sensors? (YES/no): ";
-    unless (<STDIN> =~ /^\s*n/i) {
-      scan_superio(0x4e, 0x4f);
-    }
+    scan_superio(0x4e, 0x4f);
     close_ioports();
   }