Changeset 5957

Timestamp:

04/07/11 16:17:37 (14 months ago)

Author:

khali

Message:

Refactor the detection of AMD CPU sensors.

Files:

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

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

@@ -2178 +2178 @@
                 name => "AMD K8 thermal sensors",
                 driver => "k8temp",
-                detect => \&k8temp_pci_detect,
+                detect => sub { amd_pci_detect('1103') },
         }, {
                 name => "AMD Family 10h thermal sensors",
@@ -2186 +2186 @@
                 name => "AMD Family 11h thermal sensors",
                 driver => "k10temp",
-                detect => \&fam11h_pci_detect,
+                detect => sub { amd_pci_detect('1303') },
         }, {
                 name => "AMD Family 12h and 14h thermal sensors",
                 driver => "k10temp",
-                detect => \&fam12h_14h_pci_detect,
+                detect => sub { amd_pci_detect('1703') },
         }, {
                 name => "AMD Family 15h thermal sensors",
                 driver => "k10temp",
-                detect => \&fam15h_pci_detect,
+                detect => sub { amd_pci_detect('1603') },
         }, {
                 name => "Intel digital thermal sensor",
@@ -6111 +6111 @@
 }
 
-sub k8temp_pci_detect
-{
-        return unless exists $pci_list{'1022:1103'};
+sub amd_pci_detect
+{
+        my $f3_id = shift;
+        return unless exists $pci_list{"1022:$f3_id"};
         return 9;
 }
@@ -6141 +6142 @@
         
         return;
-}
-
-sub fam11h_pci_detect
-{
-        return unless exists $pci_list{'1022:1303'};
-        return 9;
-}
-
-sub fam12h_14h_pci_detect
-{
-        return unless exists $pci_list{'1022:1703'};
-        return 9;
-}
-
-sub fam15h_pci_detect
-{
-        return unless exists $pci_list{'1022:1603'};
-        return 9;
 }