Changeset 4044

Timestamp:

06/18/06 18:53:02 (7 years ago)

Author:

khali

Message:

sensors-detect: Handle the W83791D driver difference between kernels.
Patch from Charles Spirakis.

Location:

lm-sensors/trunk

Files:

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

lm-sensors/trunk/CHANGES

@@ -41 +41 @@
                            F75384S/M, F75387SG/RG and F81218D detection
                           Add Winbond W83793R/G detection
+                          Handle the W83791D driver difference between kernels
 
 

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

@@ -1066 +1066 @@
      } ,
      {
-       name => "Winbond W83791D",
-       driver => "w83781d",
-       i2c_addrs => [0x2c..0x2f],
-       i2c_detect => sub { w83781d_detect 7, @_},
-     },
-     {
        name => "Winbond W83792D",
        driver => "w83792d",
@@ -1625 +1619 @@
      },
 );
+
+# Special case chip information goes here and would be included in
+# the chip_special_cases routine below
+use vars qw($chip_kern24_w83791d $chip_kern26_w83791d);
+$chip_kern24_w83791d = {
+        name => "Winbond W83791D",
+        driver => "w83781d",
+        i2c_addrs => [0x2c..0x2f],
+        i2c_detect => sub { w83781d_detect 7, @_ },
+};
+
+$chip_kern26_w83791d = {
+        name => "Winbond W83791D",
+        driver => "w83791d",
+        i2c_addrs => [0x2c..0x2f],
+        i2c_detect => sub { w83781d_detect 7, @_ },
+};
 
 # This is a list of all recognized superio chips. 
@@ -2902 +2913 @@
 ##################
 
+# This routine allows you to select which chips are optionally added to the
+# chip detection list. The most common use is to allow for different chip
+# detection/drivers based on different linux kernels
+# This routine follows the pattern of the SiS adapter special cases
+sub chip_special_cases
+{
+        # Based on the kernel, add the appropriate chip structure to the
+        # chip_ids detection list
+        if (kernel_version_at_least(2, 6, 0)) {
+                push @chip_ids, $chip_kern26_w83791d;
+        } else {
+                push @chip_ids, $chip_kern24_w83791d;
+        }
+}
+
 # Each function returns a confidence value. The higher this value, the more
 # sure we are about this chip. A Winbond W83781D, for example, will be
@@ -5261 +5287 @@
     }
   }
+
+  # Before looking for chips, make sure any special case chips are
+  # added to the chip_ids list
+  chip_special_cases();
 
   print "\n We are now going to do the adapter probings. Some adapters may ",