Changeset 5830

Timestamp:

03/08/10 15:00:52 (5 months ago)

Author:

khali

Message:

Add support for multiple dumps. This makes it easier to setup test
environments with more than one I2C chip.

Location:

i2c-tools/trunk

Files:

• CHANGES (modified) (1 diff)
• stub/i2c-stub-from-dump (modified) (6 diffs)
• stub/i2c-stub-from-dump.8 (modified) (1 diff)

i2c-tools/trunk/CHANGES

@@ -18 +18 @@
   i2c-stub-from-dump: Use udev settle to speed up initialization
                       Unload i2c-stub automatically if needed
+                      Add support for multiple dumps
 
 3.0.2 (2008-11-29)

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

@@ -23 +23 @@
 
 use strict;
-use vars qw($bus_nr $addr $err);
+use vars qw($bus_nr @addr $err);
 
 # Kernel version detection code by Mark M. Hoffman,
@@ -65 +65 @@
 sub check_chip_addr {
         my $chip_addr_file = shift;
-        my $addr = shift;
+        my @addr = @{shift()};
         local $_;
 
@@ -74 +74 @@
         close(CHIP_ADDR);
 
-        unless (exists $stub_addr{$addr}) {
-                print STDERR "Cycling i2c-stub to get the address we need\n";
-                system("/sbin/rmmod", "i2c-stub");
+        foreach my $addr (@addr) {
+                unless (exists $stub_addr{$addr}) {
+                        print STDERR "Cycling i2c-stub to get the address we need\n";
+                        system("/sbin/rmmod", "i2c-stub");
+                        return;
+                }
         }
 }
@@ -84 +87 @@
 {
         local $_;
-        my $addr = oct shift;
+        my @addr = @{shift()};
         my $nr;
 
         # i2c-stub may be loaded without the address we want
-        check_chip_addr("/sys/module/i2c_stub/parameters/chip_addr", $addr);
+        check_chip_addr("/sys/module/i2c_stub/parameters/chip_addr", \@addr);
 
         # Maybe everything is already loaded
@@ -96 +99 @@
         system("/sbin/modprobe", "i2c-dev") == 0 || exit 1;
         if (kernel_version_at_least(2, 6, 19)) {
-                system("/sbin/modprobe", "i2c-stub", "chip_addr=$addr") == 0 || exit 1;
+                system("/sbin/modprobe", "i2c-stub",
+                       "chip_addr=".join(',', @addr)) == 0 || exit 1;
         } else {
                 system("/sbin/modprobe", "i2c-stub") == 0 || exit 1;
@@ -181 +185 @@
 }
 
-if (@ARGV != 2) {
-        print STDERR "Usage: i2c-stub-from-dump <addr> <dump file>\n";
+if (@ARGV < 2) {
+        print STDERR "Usage: i2c-stub-from-dump <addr>[,<addr>,...] <dump file> [<dump file> ...]\n";
         exit 1;
 }
 
 # Check the parameters
-$addr = $ARGV[0];
-if ($addr !~ m/^0x[0-7][0-9a-f]$/i) {
-        print STDERR "Invalid address $addr\n";
-        exit 1;
+@addr = split(/,/, shift @ARGV);
+foreach (@addr) {
+        unless (m/^0x[0-7][0-9a-f]$/i) {
+                print STDERR "Invalid address $_\n";
+                exit 1;
+        }
+        $_ = oct $_;
+}
+
+if (@addr < @ARGV) {
+        print STDERR "Fewer addresses than dumps provided\n";
+        exit 4;
 }
 
 initialize_kernel_version();
-
-$bus_nr = load_kernel_drivers($addr);
+if (@addr > 1 && !kernel_version_at_least(2, 6, 24)) {
+        print STDERR "Multiple addresses not supported by this kernel version\n";
+        exit 5;
+}
+
+$bus_nr = load_kernel_drivers(\@addr);
 
 # We don't want to see the output of 256 i2cset
 open(SAVEOUT, ">&STDOUT");
 open(STDOUT, ">/dev/null");
-$err = process_dump(oct $addr, $ARGV[1]);
+foreach (@addr) {
+        if (!@ARGV) {
+                printf STDERR "Skipping \%d-\%04x, no dump file privided\n",
+                       $bus_nr, $_;
+                next;
+        }
+        $err = process_dump($_, shift @ARGV);
+        last if $err;
+}
 close(STDOUT);
 

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

@@ -1 @@
-.TH I2C-STUB-FROM-DUMP 8 "April 2008"
+.TH I2C-STUB-FROM-DUMP 8 "March 2010"
 .SH NAME
-i2c-stub-from-dump \- feed i2c-stub with a dump file
+i2c-stub-from-dump \- feed i2c-stub with dump files
 
 .SH SYNOPSIS
 .B i2c-stub-from-dump 
-.I address
-.I dump-file
+.IR address [, address ,...]
+.IR dump-file " [" dump-file " ...]"
 
 .SH DESCRIPTION
 i2c-stub-from-dump is a small helper script for the i2c-stub kernel driver.
-It lets you setup a fake I2C chip on the i2c-stub bus based on a dump of
-the chip you want to emulate.
+It lets you setup one or more fake I2C chips on the i2c-stub bus based on
+dumps of the chips you want to emulate.
 
 i2c-stub-from-dump requires i2cdetect and i2cset to be installed and
 reachable through the user's PATH. The former is used to find out the i2c-stub
-bus number, while the latter is used to write to the fake I2C chip.
+bus number, while the latter is used to write to the fake I2C chips.
 
 .SH EXAMPLE