Changeset 5127

Timestamp:

02/20/08 20:33:56 (5 years ago)

Author:

khali

Message:

Move south bridge sensor detection to the right section.

Location:

lm-sensors/trunk

Files:

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

lm-sensors/trunk/CHANGES

@@ -46 +46 @@
                           Add SMSC SCH5027D detection
                           Do not access I/O ports on PPC
+                          Move south bridge sensor detection to the right
+                           section
   Program unhide_ICH_SMBus: Add support for the 82801AA (ICH)
 

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

@@ -1328 +1328 @@
      },
      {
-       name => "Silicon Integrated Systems SIS5595",
-       driver => "sis5595",
-       isa_addrs => [ 0 ],
-       isa_detect => sub { sis5595_pci_detect(); },
-     },
-     {
-       name => "VIA VT82C686 Integrated Sensors",
-       driver => "via686a",
-       isa_addrs => [ 0 ],
-       isa_detect => sub { via686a_pci_detect(); },
-     },
-     {
-       name => "VIA VT8231 Integrated Sensors",
-       driver => "vt8231",
-       isa_addrs => [ 0 ],
-       isa_detect => sub { via8231_pci_detect(); },
-     },
-     {
        name => "VIA VT1211 (I2C)",
        driver => "use-isa-instead",
@@ -2152 +2134 @@
 @cpu_ids = (
   {
+    name => "Silicon Integrated Systems SIS5595",
+    driver => "sis5595",
+    detect => sub { sis5595_pci_detect(); },
+  },
+  {
+    name => "VIA VT82C686 Integrated Sensors",
+    driver => "via686a",
+    detect => sub { via686a_pci_detect(); },
+  },
+  {
+    name => "VIA VT8231 Integrated Sensors",
+    driver => "vt8231",
+    detect => sub { via8231_pci_detect(); },
+  },
+  {
     name => "AMD K8 thermal sensors",
     driver => "k8temp",
@@ -3257 +3254 @@
     next if not exists $chip->{isa_addrs} or not exists $chip->{isa_detect};
     foreach $addr (@{$chip->{isa_addrs}}) {
-      printf("\%-60s", sprintf("Probing for `\%s'\%s... ", $chip->{name},
-                               $addr ? sprintf(" at 0x\%x", $addr) : ''));
+      printf("\%-60s", sprintf("Probing for `\%s'\ at 0x\%x... ", $chip->{name},
+                               $addr));
       $conf = &{$chip->{isa_detect}} ($addr);
       print("No\n"), next if not defined $conf;
@@ -5838 +5835 @@
   }
 
-  print "Some CPUs or memory controllers may also contain embedded sensors.\n";
-  print "Do you want to scan for them? (YES/no): ";
+  print "Some south bridges, CPUs or memory controllers may also contain \n";
+  print "embedded sensors. Do you want to scan for them? (YES/no): ";
   unless (<STDIN> =~ /^\s*n/i) {
     $| = 1;