Changeset 5287

Timestamp:

06/19/08 14:37:06 (5 years ago)

Author:

khali

Message:

Add support for little-endian word hexdumps.

Location:

i2c-tools/trunk

Files:

• CHANGES (modified) (1 diff)
• eeprom/decode-dimms (modified) (7 diffs)

i2c-tools/trunk/CHANGES

@@ -3 +3 @@
 
 SVN
+  decode-dimms: Add support for little-endian word hexdumps
   decode-vaio: Remove history
   i2cdetect: Support i2c bus passed by name

i2c-tools/trunk/eeprom/decode-dimms

@@ -43 +43 @@
 use vars qw($opt_html $opt_bodyonly $opt_igncheck $use_sysfs $use_hexdump
             @vendors %decode_callback $revision @dimm_list %hexdump_cache);
+
+use constant LITTLEENDIAN       => "little-endian";
+use constant BIGENDIAN          => "big-endian";
 
 $revision = '$Revision$ ($Date$)';
@@ -1133 +1136 @@
                         if (/^(..)(..)$/) {
                                 $word |= 1;
-                                $bytes[$addr++] = hex($1);
-                                $bytes[$addr++] = hex($2);
+                                if ($use_hexdump eq LITTLEENDIAN) {
+                                        $bytes[$addr++] = hex($2);
+                                        $bytes[$addr++] = hex($1);
+                                } else {
+                                        $bytes[$addr++] = hex($1);
+                                        $bytes[$addr++] = hex($2);
+                                }
                         } else {
                                 $bytes[$addr++] = hex($_);
@@ -1142 +1150 @@
         close F;
         $header and die "Unable to parse any data from hexdump '$_[0]'";
-        $word and printc "Warning: Assuming big-endian order 16-bit hex dump";
+        $word and printc "Using $use_hexdump 16-bit hex dump";
 
         # Cache the data for later use
@@ -1178 +1186 @@
 foreach (@ARGV) {
         if ($_ eq '-h' || $_ eq '--help') {
-                print "Usage: $0 [-c] [-f [-b]] [-x file [files..]]\n",
+                print "Usage: $0 [-c] [-f [-b]] [-x|-X file [files..]]\n",
                         "       $0 -h\n\n",
                         "  -f, --format            Print nice html output\n",
@@ -1185 +1193 @@
                         "  -c, --checksum          Decode completely even if checksum fails\n",
                         "  -x,                     Read data from hexdump files\n",
+                        "  -X,                     Same as -x except treat multibyte hex\n",
+                        "                          data as little endian\n",
                         "  -h, --help              Display this usage summary\n";
                 print <<"EOF";
@@ -1191 +1201 @@
 likely many other progams producing hex dumps of one kind or another.  Note
 that the default output of "hexdump" will be byte-swapped on little-endian
-systems and will therefore not be parsed correctly.  It is better to use
-"hexdump -C", which is not ambiguous.
+systems and you must use -X instead of -x, otherwise the dump will not be
+parsed correctly.  It is better to use "hexdump -C", which is not ambiguous.
 EOF
                 exit;
@@ -1210 +1220 @@
         }
         if ($_ eq '-x') {
-                $use_hexdump = 1;
+                $use_hexdump = BIGENDIAN;
+                next;
+        }
+        if ($_ eq '-X') {
+                $use_hexdump = LITTLEENDIAN;
                 next;
         }