Changeset 5087

Timestamp:

01/04/08 17:08:03 (5 years ago)

Author:

khali

Message:

Don't print anything by default if the checksum fails. There are many more
EEPROMs in modern computers than just SPD EEPROMs, and there's no reason
to include them in the output of decode-dimms.pl.

Location:

i2c-tools/trunk

Files:

• CHANGES (modified) (1 diff)
• eeprom/decode-dimms.pl (modified) (3 diffs)

i2c-tools/trunk/CHANGES

@@ -5 +5 @@
   decode-dimms: Fix DDR2 SDRAM module speed decoding
                 Update manufacturer IDs.
+                Don't print anything by default if checksum fails
   decode-vaio: Private data might not be readable by non-root users
                Print the asset tag

i2c-tools/trunk/eeprom/decode-dimms.pl

@@ -1112 +1112 @@
         if (($use_sysfs && /^\d+-\d+$/)
          || (!$use_sysfs && /^eeprom-/)) {
+                my @bytes = readspd64(0, $dimm_list[$i]);
+                my $dimm_checksum = 0;
+                $dimm_checksum += $bytes[$_] foreach (0 .. 62);
+                $dimm_checksum &= 0xff;
+
+                next unless $bytes[63] == $dimm_checksum || $opt_igncheck;
+                $dimm_count++;
+
                 print "<b><u>" if $opt_html;
                 printl2 "\n\nDecoding EEPROM", ($use_sysfs ?
@@ -1127 +1135 @@
                 prints "SPD EEPROM Information";
 
-                my @bytes = readspd64(0, $dimm_list[$i]);
-                my $dimm_checksum = 0;
-                $dimm_checksum += $bytes[$_] foreach (0 .. 62);
-                $dimm_checksum &= 0xff;
-
                 my $l = "EEPROM Checksum of bytes 0-62";
                 printl $l, ($bytes[63] == $dimm_checksum ?
@@ -1138 +1141 @@
                                 $bytes[63], $dimm_checksum));
 
-                unless ($bytes[63] == $dimm_checksum or $opt_igncheck) {
-                        print "</table>\n" if $opt_html;
-                        next;
-                }
-                
-                $dimm_count++;
                 # Simple heuristic to detect Rambus
                 my $is_rambus = $bytes[0] < 4;