Changeset 2782

Timestamp:

12/03/04 23:33:56 (8 years ago)

Author:

khali

Message:

Find eeproms on non-0 i2c bus too.

Files:

• lm-sensors/trunk/prog/eeprom/decode-vaio.pl (modified) (4 diffs)

lm-sensors/trunk/prog/eeprom/decode-vaio.pl

@@ -38 +38 @@
 # Version 1.1  2004-01-17  Jean Delvare <khali@linux-fr.org>
 #  Added support for Linux 2.5/2.6 (i.e. sysfs).
+# Version 1.1  2004-11-28  Jean Delvare <khali@linux-fr.org>
+#  Support bus number 0 to 4 instead of only 0.
 #
 # EEPROM data decoding for Sony Vaio laptops. 
@@ -72 +74 @@
 use strict;
 use Fcntl qw(:DEFAULT :seek);
-use vars qw($sysfs);
+use vars qw($sysfs $found);
 
 sub print_item
@@ -189 +191 @@
         print("Copyright (c) 2002-2004  Jean Delvare\n");
         print("Version 1.1\n\n");
-        
-        $sysfs = 0;
 }
 
@@ -198 +198 @@
 }
 
-if (-r '/proc/sys/dev/sensors/eeprom-i2c-0-57')
-{
-        if (-r '/proc/sys/dev/sensors/eeprom-i2c-0-57/data0-15')
-        {
-                print("Deprecated old interface found.  Please upgrade to lm_sensors 2.6.3 or greater.");
-        }
-        else
-        {
-                vaio_decode('0', '57');
-        }
-}
-elsif (-r '/sys/bus/i2c/devices/0-0057/eeprom')
-{
-        $sysfs = 1;
-        vaio_decode('0', '57');
-}
-else
+for (my $i = 0, $found=0; $i <= 4 && !$found; $i++)
+{
+        if (-r "/sys/bus/i2c/devices/$i-0057/eeprom")
+        {
+                $sysfs = 1;
+                vaio_decode($i, '57');
+                $found++;
+        }
+        elsif (-r "/proc/sys/dev/sensors/eeprom-i2c-$i-57")
+        {
+                if (-r "/proc/sys/dev/sensors/eeprom-i2c-$i-57/data0-15")
+                {
+                        print("Deprecated old interface found.  Please upgrade to lm_sensors 2.6.3 or greater.");
+                        exit;
+                }
+                else
+                {
+                        $sysfs = 0;
+                        vaio_decode($i, '57');
+                        $found++;
+                }
+        }
+}
+
+if (!$found)
 {
         print("Vaio EEPROM not found.  Please make sure that the eeprom module is loaded.\n");