Changeset 5553

Timestamp:

12/11/08 14:06:51 (5 years ago)

Author:

khali

Message:

Refactor manufacturing data decoding.

Files:

• i2c-tools/trunk/eeprom/decode-dimms (modified) (5 diffs)

i2c-tools/trunk/eeprom/decode-dimms

@@ -1286 +1286 @@
 }
 
+sub printl_mfg_location_code($)
+{
+        my $code = shift;
+        my $letter = chr($code);
+
+        return unless spd_written($code);
+        # Try the location code as ASCII first, as earlier specifications
+        # suggested this. As newer specifications don't mention it anymore,
+        # we still fall back to binary.
+        printl("Manufacturing Location Code",
+               $letter =~ m/^[\w\d]$/ ? $letter : sprintf("0x%.2X", $code));
+}
+
+sub printl_mfg_assembly_serial(@)
+{
+        return unless spd_written(@_);
+        printl("Assembly Serial Number", sprintf("0x%02X%02X%02X%02X\n", @_));
+}
+
 # Parameter: EEPROM bytes 0-175 (using 117-149)
 sub decode_ddr3_mfg_data($)
@@ -1302 +1321 @@
         }
 
-        if (spd_written($bytes->[119])) {
-                $l = "Manufacturing Location Code";
-                my $temp = (chr($bytes->[119]) =~ m/^[\w\d]$/) ? chr($bytes->[119])
-                      : sprintf("0x%.2X", $bytes->[119]);
-                printl $l, $temp;
-        }
+        printl_mfg_location_code($bytes->[119]);
 
         if (spd_written(@{$bytes}[120..121])) {
@@ -1314 +1328 @@
         }
 
-        if (spd_written(@{$bytes}[122..125])) {
-                $l = "Assembly Serial Number";
-                $temp = sprintf("0x%02X%02X%02X%02X\n", $bytes->[122], $bytes->[123],
-                        $bytes->[124], $bytes->[125]);
-                printl $l, $temp;
-        }
+        printl_mfg_assembly_serial(@{$bytes}[122..125]);
 
         $l = "Part Number";
-        $temp = "";
-        for (my $i = 128; $i <= 145; $i++) {
-                $temp .= chr($bytes->[$i]);
-        };
+        $temp = part_number(@{$bytes}[128..145]);
         printl $l, $temp;
 
@@ -1353 +1359 @@
         printl $l, $temp if defined $temp;
 
-        if (spd_written($bytes->[72])) {
-                # Try the location code as ASCII first, as earlier specifications
-                # suggested this. As newer specifications don't mention it anymore,
-                # we still fall back to binary.
-                $l = "Manufacturing Location Code";
-                $temp = (chr($bytes->[72]) =~ m/^[\w\d]$/) ? chr($bytes->[72])
-                      : sprintf("0x%.2X", $bytes->[72]);
-                printl $l, $temp;
-        }
+        printl_mfg_location_code($bytes->[72]);
 
         $l = "Part Number";
@@ -1378 +1376 @@
         }
 
-        if (spd_written(@{$bytes}[95..98])) {
-                $l = "Assembly Serial Number";
-                $temp = sprintf("0x%02X%02X%02X%02X\n",
-                                @{$bytes}[95..98]);
-                printl $l, $temp;
-        }
+        printl_mfg_assembly_serial(@{$bytes}[95..98]);
 }