Changeset 4164

Timestamp:

09/20/06 20:10:12 (7 years ago)

Author:

khali

Message:

decode-vaio.pl: Detect and skip false positives.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• prog/eeprom/decode-vaio.pl (modified) (7 diffs)

lm-sensors/trunk/CHANGES

@@ -47 +47 @@
                            Various output cleanups and fixes
   Program decode-edid.pl: Add /usr/sbin or /usr/local/sbin to $PATH if needed
+  Program decode-vaio.pl: Detect and skip false positives
   Program i2cdetect: Add a mode to print adapter functionalities
   Program i2cdump: Restore bank after bank switching

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

@@ -1 +1 @@
 #!/usr/bin/perl -w
 #
-# Copyright (C) 2002-2005 Jean Delvare <khali@linux-fr.org>
+# Copyright (C) 2002-2006 Jean Delvare <khali@linux-fr.org>
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -42 +42 @@
 # Version 1.3  2005-01-18  Jean Delvare <khali@linux-fr.org>
 #  Revision might be a Service Tag.
+# Version 1.4  2006-09-20  Jean Delvare <khali@linux-fr.org>
+#  Detect and skip false positives (e.g. EDID EEPROMs).
 #
 # EEPROM data decoding for Sony Vaio laptops. 
@@ -181 +183 @@
         my ($bus,$addr) = @_;
         
-        print_item('Machine Name', decode_string($bus, $addr, 128, 32));
+        my $name = decode_string($bus, $addr, 128, 32);
+        # Simple heuristic to skip false positives
+        return 0 unless $name =~ m/^[A-Z-]{4}/;
+
+        print_item('Machine Name', $name);
         print_item('Serial Number', decode_string($bus, $addr, 192, 32));
         print_item('UUID', decode_uuid($bus, $addr, 16));
@@ -190 +196 @@
         print_item('OEM Data', decode_string($bus, $addr, 32, 16));
         print_item('Timestamp', decode_string($bus, $addr, 224, 32));
+        return 1;
 }
 
@@ -195 +202 @@
 {
         print("Sony Vaio EEPROM Decoder\n");
-        print("Copyright (C) 2002-2005  Jean Delvare\n");
-        print("Version 1.3\n\n");
+        print("Copyright (C) 2002-2006  Jean Delvare\n");
+        print("Version 1.4\n\n");
 }
 
@@ -209 +216 @@
         {
                 $sysfs = 1;
-                vaio_decode($i, '57');
-                $found++;
+                $found += vaio_decode($i, '57');
         }
         elsif (-r "/proc/sys/dev/sensors/eeprom-i2c-$i-57")
@@ -222 +228 @@
                 {
                         $sysfs = 0;
-                        vaio_decode($i, '57');
-                        $found++;
+                        $found += vaio_decode($i, '57');
                 }
         }