Changeset 5195

Timestamp:

04/20/08 19:32:12 (5 years ago)

Author:

khali

Message:

Make it possible to pass the i2c bus by name instead of by number. As
there is no guarantee that i2c bus numbering will stay the same over
time (for example if hardware is added of removed, or simply due to
loading the drivers in a different order), passing the i2c bus by name
is more robust.

The i2c bus names are supposed to be unique. If you request a bus by
name and this name happens to not be unique, then the tools will play
it safe and quit. This is better than writing to the wrong device.

Location:

i2c-tools/trunk/tools

Files:

• i2cbusses.c (modified) (2 diffs)
• i2cdetect.8 (modified) (2 diffs)
• i2cdump.8 (modified) (2 diffs)
• i2cget.8 (modified) (2 diffs)
• i2cset.8 (modified) (2 diffs)

i2c-tools/trunk/tools/i2cbusses.c

@@ -341 +341 @@
 }
 
+static int lookup_i2c_bus_by_name(const char *bus_name)
+{
+        struct i2c_adap *adapters;
+        int i, i2cbus = -1;
+
+        adapters = gather_i2c_busses();
+        if (adapters == NULL) {
+                fprintf(stderr, "Error: Out of memory!\n");
+                return -3;
+        }
+
+        /* Walk the list of i2c busses, looking for the one with the
+           right name */
+        for (i = 0; adapters[i].name; i++) {
+                if (strcmp(adapters[i].name, bus_name) == 0) {
+                        if (i2cbus >= 0) {
+                                fprintf(stderr,
+                                        "Error: I2C bus name is not unique!\n");
+                                i2cbus = -4;
+                                goto done;
+                        }
+                        i2cbus = adapters[i].nr;
+                }
+        }
+
+        if (i2cbus == -1)
+                fprintf(stderr, "Error: I2CBUS argument doesn't match any "
+                        "I2C bus name\n");
+
+done:
+        free_adapters(adapters);
+        return i2cbus;
+}
+
 /*
  * Parse an I2CBUS command line argument and return the corresponding
@@ -352 +386 @@
         i2cbus = strtol(i2cbus_arg, &end, 0);
         if (*end || !*i2cbus_arg) {
-                fprintf(stderr, "Error: I2CBUS argument not a number!\n");
-                return -1;
+                /* Not a number, maybe a name? */
+                return lookup_i2c_bus_by_name(i2cbus_arg);
         }
         if (i2cbus < 0 || i2cbus > 0xff) {

i2c-tools/trunk/tools/i2cdetect.8

@@ -1 @@
-.TH I2CDETECT 8 "June 2007"
+.TH I2CDETECT 8 "April 2008"
 .SH NAME
 i2cdetect \- detect I2C chips
@@ -24 +24 @@
 i2cdetect is a userspace program to scan an I2C bus for devices. It
 outputs a table with the list of detected devices on the specified bus.
-\fIi2cbus\fR indicates the number of the I2C bus to be scanned, and
+\fIi2cbus\fR indicates the number or name of the I2C bus to be scanned, and
 should correspond to one of the busses listed by \fIi2cdetect -l\fR.
 The optional parameters \fIfirst\fR and \fIlast\fR restrict the scanning

i2c-tools/trunk/tools/i2cdump.8

@@ -1 @@
-.TH I2CDUMP 8 "March 2008"
+.TH I2CDUMP 8 "April 2008"
 .SH NAME
 i2cdump \- examine I2C registers
@@ -44 +44 @@
 .PP
 At least two options must be provided to i2cdump. \fIi2cbus\fR indicates the
-number of the I2C bus to be scanned. This number should correspond to one
+number or name of the I2C bus to be scanned. This number should correspond to one
 of the busses listed by \fIi2cdetect -l\fR. \fIaddress\fR indicates the
 address to be scanned on that bus, and is an integer between 0x00 and 0x7F.

i2c-tools/trunk/tools/i2cget.8

@@ -1 @@
-.TH I2CGET 8 "June 2007"
+.TH I2CGET 8 "April 2008"
 .SH "NAME"
 i2cget \- read from I2C/SMBus chip registers
@@ -37 +37 @@
 .PP
 There are two required options to i2cget. \fIi2cbus\fR indicates the number
-of the I2C bus to be scanned.  This number should correspond to one of
+or name of the I2C bus to be scanned.  This number should correspond to one of
 the busses listed by \fIi2cdetect -l\fR. \fIchip-address\fR specifies the
 address of the chip on that bus, and is an integer between 0x03 and 0x77.

i2c-tools/trunk/tools/i2cset.8

@@ -1 @@
-.TH I2CSET 8 "June 2007"
+.TH I2CSET 8 "April 2008"
 .SH "NAME"
 i2cset \- set I2C registers
@@ -41 +41 @@
 .PP
 There are four required options to i2cset. \fIi2cbus\fR indicates the number
-of the I2C bus to be scanned.  This number should correspond to one of
+or name of the I2C bus to be scanned.  This number should correspond to one of
 the busses listed by \fIi2cdetect -l\fR. \fIchip-address\fR specifies the
 address of the chip on that bus, and is an integer between 0x00 and 0x7F.