Changeset 5460

Timestamp:

11/30/08 10:09:04 (5 years ago)

Author:

khali

Message:

Move non-hwmon I2C device definitions to a separate array.

Files:

• lm-sensors/branches/lm-sensors-3.0.0/prog/detect/sensors-detect (modified) (9 diffs)

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

@@ -40 +40 @@
 
 use constant NO_CACHE => 1;
-use vars qw(@pci_adapters @chip_ids $i2c_addresses_to_scan @superio_ids
-            @cpu_ids $revision @i2c_byte_cache);
+use vars qw(@pci_adapters @chip_ids @non_hwmon_chip_ids $i2c_addresses_to_scan
+            @superio_ids @cpu_ids $revision @i2c_byte_cache);
 
 $revision = '$Revision$ ($Date$)';
@@ -440 +440 @@
 #  driver: The driver name. Put in exactly:
 #      * "to-be-written" if it is not yet available
-#      * "not-a-sensor" if it is not a hardware monitoring chip
 #      * "use-isa-instead" if no i2c driver will be written
 #  i2c_addrs (optional): For I2C chips, the list of I2C addresses to
@@ -640 +639 @@
                 i2c_detect => sub { w83793_detect(@_); },
         }, {
-                name => "Winbond W83791SD",
-                driver => "not-a-sensor",
-                i2c_addrs => [0x2c..0x2f],
-                i2c_detect => sub { w83791sd_detect(@_); },
-        }, {
                 name => "Winbond W83627HF",
                 driver => "use-isa-instead",
@@ -1002 +996 @@
                 i2c_detect => sub { it8712_i2c_detect(@_); },
         }, {
-                name => "ITE IT8201R/IT8203R/IT8206R/IT8266R",
-                driver => "not-a-sensor",
-                i2c_addrs => [0x4e],
-                i2c_detect => sub { ite_overclock_detect(@_); },
-        }, {
-                name => "SPD EEPROM",
-                driver => "not-a-sensor",
-                # Can also live at 0x54-0x57, but we don't care: we only check
-                # for SPD and EDID EEPROMs because some hardware monitoring
-                # chips can live at 0x50-0x53.
-                i2c_addrs => [0x50..0x53],
-                i2c_detect => sub { eeprom_detect(@_); },
-        }, {
-                name => "EDID EEPROM",
-                driver => "not-a-sensor",
-                i2c_addrs => [0x50..0x53],
-                i2c_detect => sub { ddcmonitor_detect(@_); },
-        }, {
                 name => "FSC Poseidon I",
                 driver => sub { kernel_version_at_least(2, 6, 24) ? "fschmd" : "fscpos" },
@@ -1069 +1045 @@
                 i2c_addrs => [0x2c..0x2e],
                 i2c_detect => sub { dme1737_detect(@_, 2); },
-        }, {
-                name => "Fintek F75111R/RG/N (GPIO)",
-                driver => "not-a-sensor",
-                i2c_addrs => [0x4e], # 0x37 not probed
-                i2c_detect => sub { fintek_detect(@_, 1); },
         }, {
                 name => "Fintek F75121R/F75122R/RG (VID+GPIO)",
@@ -1127 +1098 @@
 );
 
+# Here is a similar list, but for devices which are not hardware monitoring
+# chips. We only list popular devices which happen to live at the same I2C
+# address as recognized hardware monitoring chips. The idea is to make it
+# clear that the chip in question is of no interest for lm-sensors.
+@non_hwmon_chip_ids = (
+        {
+                name => "Winbond W83791SD",
+                driver => "not-a-sensor",
+                i2c_addrs => [0x2c..0x2f],
+                i2c_detect => sub { w83791sd_detect(@_); },
+        }, {
+                name => "Fintek F75111R/RG/N (GPIO)",
+                driver => "not-a-sensor",
+                i2c_addrs => [0x37, 0x4e],
+                i2c_detect => sub { fintek_detect(@_, 1); },
+        }, {
+                name => "ITE IT8201R/IT8203R/IT8206R/IT8266R",
+                driver => "not-a-sensor",
+                i2c_addrs => [0x4e],
+                i2c_detect => sub { ite_overclock_detect(@_); },
+        }, {
+                name => "SPD EEPROM",
+                driver => "not-a-sensor",
+                i2c_addrs => [0x50..0x57],
+                i2c_detect => sub { eeprom_detect(@_); },
+        }, {
+                name => "EDID EEPROM",
+                driver => "not-a-sensor",
+                i2c_addrs => [0x50],
+                i2c_detect => sub { ddcmonitor_detect(@_); },
+        }
+);
 
 # This is a list of all recognized superio chips.
@@ -2139 +2142 @@
         foreach my $chip (@chip_ids) {
                 next if $chip->{driver} eq "to-be-written";
-                next if $chip->{driver} eq "not-a-sensor";
                 next if $chip->{driver} eq "use-isa-instead";
 
@@ -2734 +2736 @@
   foreach my $chip (@chip_ids) {
     next unless defined $chip->{i2c_addrs};
-    next if $chip->{driver} eq 'not-a-sensor';
     foreach $addr (@{$chip->{i2c_addrs}}) {
       $used[$addr]++;
@@ -2834 +2835 @@
 
     $| = 1;
-    foreach $chip (@chip_ids) {
+    foreach $chip (@chip_ids, @non_hwmon_chip_ids) {
       if (exists $chip->{i2c_addrs} and contains($addr, @{$chip->{i2c_addrs}})) {
         printf("\%-60s", sprintf("Probing for `\%s'... ", $chip->{name}));