Changeset 6013

Timestamp:

01/23/12 09:17:06 (17 months ago)

Author:

khali

Message:

i2c-stub-from-dump: Be more tolerant on input dump format

Allow for uppercase hexadecimal digits, "|" instead of ":" as the address
separator, and an optional space before said separator. i2cdump doesn't
use any of these but other dump tools do, so this improves
compatibility.

Location:

i2c-tools/trunk

Files:

• CHANGES (modified) (1 diff)
• stub/i2c-stub-from-dump (modified) (2 diffs)

i2c-tools/trunk/CHANGES

@@ -1 +1 @@
 i2c-tools CHANGES
 -----------------
+
+SVN HEAD
+  i2c-stub-from-dump: Be more tolerant on input dump format
 
 3.1.0 (2011-12-04)

i2c-tools/trunk/stub/i2c-stub-from-dump

@@ -128 +128 @@
  OUTER_LOOP:
         while (<DUMP>) {
-                if (m/^([0-9a-f]0):(( [0-9a-fX]{2}){16})/) {
+                if (m/^([0-9a-f]0) ?[:|](( [0-9a-fX]{2}){16})/i) {
                         # Byte dump
                         my $offset = hex($1);
@@ -143 +143 @@
                                 $bytes++;
                         }
-                } elsif (m/^([0-9a-f][08]):(( [0-9a-fX]{4}){8})/) {
+                } elsif (m/^([0-9a-f][08]) ?[:|](( [0-9a-fX]{4}){8})/i) {
                         # Word dump
                         my $offset = hex($1);