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

Timestamp:

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

Author:

khali

Message:

Carry the path to eeprom data files around, instead of hard-coding it
in several places. This makes the code less fragile and easier to
modify.

Files:

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

i2c-tools/trunk/eeprom/decode-dimms

@@ -1483 +1483 @@
         } elsif ($use_sysfs) {
                 # Kernel 2.6 with sysfs
-                sysopen(HANDLE, "/sys/bus/i2c/drivers/eeprom/$dimm_i/eeprom", O_RDONLY)
-                        or die "Cannot open /sys/bus/i2c/drivers/eeprom/$dimm_i/eeprom";
+                sysopen(HANDLE, "$dimm_i/eeprom", O_RDONLY)
+                        or die "Cannot open $dimm_i/eeprom";
                 binmode HANDLE;
                 sysseek(HANDLE, $offset, SEEK_SET);
@@ -1494 +1494 @@
                 for my $i (0 .. ($size-1)/16) {
                         my $hexoff = sprintf('%02x', $offset + $i * 16);
-                        push @bytes, split(" ", `cat /proc/sys/dev/sensors/$dimm_i/$hexoff`);
+                        push @bytes, split(" ", `cat $dimm_i/$hexoff`);
                 }
         }
@@ -1628 +1628 @@
                         next if $use_sysfs && $file !~ /^\d+-[\da-f]+$/i;
                         next if !$use_sysfs && $file !~ /^eeprom-/;
-                        push @files, $file;
+                        push @files, "$dir/$file";
                 }
                 close(DIR);
@@ -1656 +1656 @@
 
         print "<b><u>" if $opt_html;
-        printl2("\n\nDecoding EEPROM",
-                $use_hexdump ? $dimm_list[$i] : ($use_sysfs ?
-                "/sys/bus/i2c/drivers/eeprom/$dimm_list[$i]" :
-                "/proc/sys/dev/sensors/$dimm_list[$i]"));
+        printl2("\n\nDecoding EEPROM", $dimm_list[$i]);
         print "</u></b>" if $opt_html;
         print "<table border=1>\n" if $opt_html;