Changeset 5402

Timestamp:

11/22/08 19:04:50 (5 years ago)

Author:

khali

Message:

Handle special case chips more efficiently. Instead of listing every
chip twice with just the driver field differing, we put the chip entry
in the main list directly and resolve the driver field at run-time.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

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

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

@@ -16 +16 @@
                   Add SMSC LPC47M233 support
                   Drop support for Linux 2.4 (#2325)
+                  Handle special case chips more efficiently
 
 3.0.3 (2008-09-28)

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

@@ -1288 +1288 @@
      },
      {
+       name => "FSC Poseidon I",
+       driver => sub { kernel_version_at_least(2, 6, 24) ? "fschmd" : "fscpos" },
+       i2c_addrs => [0x73],
+       i2c_detect => sub { fsc_detect(0, @_); },
+     },
+     {
        name => "FSC Poseidon II",
        driver => "to-be-written",
@@ -1300 +1306 @@
      },
      {
+       name => "FSC Hermes",
+       driver => sub { kernel_version_at_least(2, 6, 24) ? "fschmd" : "fscher" },
+       i2c_addrs => [0x73],
+       i2c_detect => sub { fsc_detect(3, @_); },
+     },
+     {
        name => "FSC Heimdal",
        driver => "fschmd",
@@ -1400 +1412 @@
        isa_addrs => [0x0ca8],
        isa_detect => sub { ipmi_smic_detect(@_); },
-     },
-);
-
-# Special case chip information goes here and would be included in
-# the chip_special_cases routine below
-use vars qw(@chip_oldfsc_ids @chip_fschmd_ids);
-
-# sigh special case for old seperate FSC drivers to new merged one mapping
-@chip_oldfsc_ids = (
-     {
-       name => "FSC Poseidon I",
-       driver => "fscpos",
-       i2c_addrs => [0x73],
-       i2c_detect => sub { fsc_detect(0, @_); },
-     },
-     {
-       name => "FSC Hermes",
-       driver => "fscher",
-       i2c_addrs => [0x73],
-       i2c_detect => sub { fsc_detect(3, @_); },
-     },
-);
-
-@chip_fschmd_ids = (
-     {
-       name => "FSC Poseidon I",
-       driver => "fschmd",
-       i2c_addrs => [0x73],
-       i2c_detect => sub { fsc_detect(0, @_); },
-     },
-     {
-       name => "FSC Hermes",
-       driver => "fschmd",
-       i2c_addrs => [0x73],
-       i2c_detect => sub { fsc_detect(3, @_); },
      },
 );
@@ -3438 +3415 @@
 ##################
 
-# 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
+# This routine allows you to dynamically update the chip detection list.
+# The most common use is to allow for different chip to driver mappings
+# based on different linux kernels
 sub chip_special_cases
 {
-        # Based on the kernel, add the appropriate chip structures to the
-        # chip_ids detection list
-        if (kernel_version_at_least(2, 6, 24)) {
-                push @chip_ids, @chip_fschmd_ids;
-        } else {
-                push @chip_ids, @chip_oldfsc_ids;
+        # Some chip to driver mappings depend on the environment
+        foreach my $chip (@chip_ids) {
+                if (ref($chip->{driver}) eq 'CODE') {
+                        $chip->{driver} = $chip->{driver}->();
+                }
         }
 }