Changeset 5149 for i2c-tools/trunk/stub/i2c-stub-from-dump

Timestamp:

03/19/08 15:04:25 (4 years ago)

Author:

khali

Message:

Add support for word register access mode.

Files:

• i2c-tools/trunk/stub/i2c-stub-from-dump (modified) (4 diffs)

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

@@ -1 +1 @@
 #!/usr/bin/perl -w
 #
-# Copyright (C) 2007       Jean Delvare <khali@linux-fr.org>
+# Copyright (C) 2007-2008  Jean Delvare <khali@linux-fr.org>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -23 +23 @@
 
 use strict;
-use vars qw($bus_nr $addr $count);
+use vars qw($bus_nr $addr $bytes $words);
 
 # Kernel version detection code by Mark M. Hoffman,
@@ -67 +67 @@
 }
 
+sub process_dump
+{
+        my $dump = shift;
+
+        open(DUMP, $dump) || die "Can't open $dump: $!\n";
+ OUTER_LOOP:
+        while (<DUMP>) {
+                if (m/^([0-9a-f]0):(( [0-9a-f]{2}){16})/) {
+                        # Byte dump
+                        my $offset = hex($1);
+                        my @values = split(/ /, $2);
+                        shift(@values);
+                        for (my $i = 0; $i < 16 && (my $val = shift(@values)); $i++) {
+                                last OUTER_LOOP if system("i2cset", "-y",
+                                        $bus_nr, $addr,
+                                        sprintf("0x\%02x", $offset+$i),
+                                        "0x$val", "b");
+                                $bytes++;
+                        }
+                } elsif (m/^([0-9a-f][08]):(( [0-9a-f]{4}){8})/) {
+                        # Word dump
+                        my $offset = hex($1);
+                        my @values = split(/ /, $2);
+                        shift(@values);
+                        for (my $i = 0; $i < 8 && (my $val = shift(@values)); $i++) {
+                                last OUTER_LOOP if system("i2cset", "-y",
+                                        $bus_nr, $addr,
+                                        sprintf("0x\%02x", $offset+$i),
+                                        "0x$val", "w");
+                                $words++;
+                        }
+                }
+        }
+        close(DUMP);
+}
+
 if ($>) {
         print "You must be root to use this script\n";
@@ -96 +132 @@
 
 $bus_nr = get_i2c_stub_bus_number();
+$bytes = $words = 0;
 
 # We don't want to see the output of 256 i2cset
 open(SAVEOUT, ">&STDOUT");
 open(STDOUT, ">/dev/null");
-
-$count = 0;
-open(DUMP, $ARGV[1]) || die "Can't open $ARGV[1]: $!\n";
-OUTER_LOOP:
-while (<DUMP>) {
-        next unless m/^([0-9a-f]0):(( [0-9a-f]{2}){16})/;
-        my $offset = hex($1);
-        my @values = split(/ /, $2);
-        shift(@values);
-        for (my $i = 0; $i < 16 && (my $val = shift(@values)); $i++) {
-                last OUTER_LOOP if system("i2cset", "-y",
-                        $bus_nr, $addr,
-                        sprintf("0x\%02x", $offset+$i),
-                        sprintf("0x\%02x", hex($val)), "b");
-                $count++;
-        }
-}
-close(DUMP);
+process_dump($ARGV[1]);
 close(STDOUT);
 
-if ($count) {
-        printf SAVEOUT "$count byte values written to \%d-\%04x\n",
+if ($bytes) {
+        printf SAVEOUT "$bytes byte values written to \%d-\%04x\n",
                 $bus_nr, oct($addr);
 }
 
-exit($count == 0);
+if ($words) {
+        printf SAVEOUT "$words word values written to \%d-\%04x\n",
+                $bus_nr, oct($addr);
+}
+
+exit($bytes + $words == 0);