Changeset 5695 for i2c-tools/trunk/eeprom/decode-dimms

Timestamp:

03/20/09 15:10:53 (4 years ago)

Author:

khali

Message:

Change the dimm list to a more complex data structure where we will
be able to store extra attributes for each DIMM.

Files:

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

i2c-tools/trunk/eeprom/decode-dimms

@@ -42 +42 @@
 use Fcntl qw(:DEFAULT :seek);
 use vars qw($opt_html $opt_bodyonly $opt_igncheck $use_sysfs $use_hexdump
-            @vendors %decode_callback $revision @dimm_list %hexdump_cache);
+            @vendors %decode_callback $revision @dimm %hexdump_cache);
 
 use constant LITTLEENDIAN       => "little-endian";
@@ -1595 +1595 @@
         }
 
-        push @dimm_list, $_ if $use_hexdump;
+        push @dimm, { file => $_ } if $use_hexdump;
 }
 
@@ -1628 +1628 @@
                         next if $use_sysfs && $file !~ /^\d+-[\da-f]+$/i;
                         next if !$use_sysfs && $file !~ /^eeprom-/;
-                        push @files, "$dir/$file";
+                        push @files, { file => "$dir/$file" };
                 }
                 close(DIR);
-                return sort @files;
+                return sort { $a->{file} cmp $b->{file} } @files;
         } elsif (! -d '/sys/module/eeprom') {
                 print "No EEPROM found, are you sure the eeprom module is loaded?\n";
@@ -1638 +1638 @@
 }
 
-@dimm_list = get_dimm_list() unless $use_hexdump;
-
-for my $i (0 .. $#dimm_list) {
-        my @bytes = readspd(0, 128, $dimm_list[$i]);
+# @dimm is a list of hashes. There's one hash for each EEPROM we found.
+# Each hash has the following keys:
+#  * file: Full path to the eeprom data file
+# Keys are added over time.
+@dimm = get_dimm_list() unless $use_hexdump;
+
+for my $i (0 .. $#dimm) {
+        my @bytes = readspd(0, 128, $dimm[$i]->{file});
         my $is_rambus = $bytes[0] < 4;          # Simple heuristic
         my ($label, $chk_valid, $chk_spd, $chk_calc);
@@ -1656 +1660 @@
 
         print "<b><u>" if $opt_html;
-        printl2("\n\nDecoding EEPROM", $dimm_list[$i]);
+        printl2("\n\nDecoding EEPROM", $dimm[$i]->{file});
         print "</u></b>" if $opt_html;
         print "<table border=1>\n" if $opt_html;
         if (!$use_hexdump) {
-                if ($dimm_list[$i] =~ /-([\da-f]+)$/i) {
+                if ($dimm[$i]->{file} =~ /-([\da-f]+)$/i) {
                         my $dimm_num = hex($1) - 0x50 + 1;
                         if ($dimm_num >= 1 && $dimm_num <= 8) {
@@ -1693 +1697 @@
                         push (@bytes,
                               readspd(@bytes, $spd_used - @bytes,
-                                      $dimm_list[$i]));
+                                      $dimm[$i]->{file}));
                 }
         }