Changeset 5239

Timestamp:

05/05/08 15:02:34 (5 years ago)

Author:

khali

Message:

Split the functionality checking code into a separate function for
clarity.

Location:

i2c-tools/trunk

Files:

• CHANGES (modified) (1 diff)
• tools/i2cdump.c (modified) (4 diffs)

i2c-tools/trunk/CHANGES

@@ -9 +9 @@
            Shorten the usage message
            Restrict the chip address to 0x03-0x77
+           Split the functionality checking code into a separate function
   i2cget: Support i2c bus passed by name
           Shorten the usage message

i2c-tools/trunk/tools/i2cdump.c

@@ -47 +47 @@
 }
 
+static int check_funcs(int file, int i2cbus, int size, int pec)
+{
+        unsigned long funcs;
+
+        /* check adapter functionality */
+        if (ioctl(file, I2C_FUNCS, &funcs) < 0) {
+                fprintf(stderr, "Error: Could not get the adapter "
+                        "functionality matrix: %s\n", strerror(errno));
+                return -1;
+        }
+
+        switch(size) {
+        case I2C_SMBUS_BYTE:
+                if (!((funcs & I2C_FUNC_SMBUS_BYTE) == I2C_FUNC_SMBUS_BYTE)) {
+                        fprintf(stderr, "Error: Adapter for i2c bus %d does "
+                                "not have byte capability\n", i2cbus);
+                        return -1;
+                }
+                break;
+
+        case I2C_SMBUS_BYTE_DATA:
+                if (!(funcs & I2C_FUNC_SMBUS_READ_BYTE_DATA)) {
+                        fprintf(stderr, "Error: Adapter for i2c bus %d does "
+                                "not have byte read capability\n", i2cbus);
+                        return -1;
+                }
+                break;
+
+        case I2C_SMBUS_WORD_DATA:
+                if (!(funcs & I2C_FUNC_SMBUS_READ_WORD_DATA)) {
+                        fprintf(stderr, "Error: Adapter for i2c bus %d does "
+                                "not have word read capability\n", i2cbus);
+                        return -1;
+                }
+                break;
+
+        case I2C_SMBUS_BLOCK_DATA:
+                if (!(funcs & I2C_FUNC_SMBUS_READ_BLOCK_DATA)) {
+                        fprintf(stderr, "Error: Adapter for i2c bus %d does "
+                                "not have smbus block read capability\n",
+                                i2cbus);
+                        return -1;
+                }
+                break;
+
+        case I2C_SMBUS_I2C_BLOCK_DATA:
+                if (!(funcs & I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
+                        fprintf(stderr, "Error: Adapter for i2c bus %d does "
+                                "not have i2c block read capability\n",
+                                i2cbus);
+                        return -1;
+                }
+                break;
+        }
+
+        if (pec
+         && !(funcs & (I2C_FUNC_SMBUS_PEC | I2C_FUNC_I2C))) {
+                fprintf(stderr, "Warning: Adapter for i2c bus %d does "
+                        "not seem to support PEC\n", i2cbus);
+        }
+
+        return 0;
+}
+
 int main(int argc, char *argv[])
 {
@@ -53 +117 @@
         int bank = 0, bankreg = 0x4E, old_bank = 0;
         char filename[20];
-        unsigned long funcs;
         int block[256], s_length = 0;
         int pec = 0, even = 0;
@@ -201 +264 @@
 
         file = open_i2c_dev(i2cbus, filename, 0);
-        if (file < 0) {
-                exit(1);
-        }
-
-        /* check adapter functionality */
-        if (ioctl(file, I2C_FUNCS, &funcs) < 0) {
-                fprintf(stderr, "Error: Could not get the adapter "
-                        "functionality matrix: %s\n", strerror(errno));
-                exit(1);
-        }
-
-        switch(size) {
-        case I2C_SMBUS_BYTE:
-                if (!((funcs & I2C_FUNC_SMBUS_BYTE) == I2C_FUNC_SMBUS_BYTE)) {
-                        fprintf(stderr, "Error: Adapter for i2c bus %d does "
-                                "not have byte capability\n", i2cbus);
-                        exit(1);
-                }
-                break;
-
-        case I2C_SMBUS_BYTE_DATA:
-                if (!(funcs & I2C_FUNC_SMBUS_READ_BYTE_DATA)) {
-                        fprintf(stderr, "Error: Adapter for i2c bus %d does "
-                                "not have byte read capability\n", i2cbus);
-                        exit(1);
-                }
-                break;
-
-        case I2C_SMBUS_WORD_DATA:
-                if (!(funcs & I2C_FUNC_SMBUS_READ_WORD_DATA)) {
-                        fprintf(stderr, "Error: Adapter for i2c bus %d does "
-                                "not have word read capability\n", i2cbus);
-                        exit(1);
-                }
-                break;
-
-        case I2C_SMBUS_BLOCK_DATA:
-                if (!(funcs & I2C_FUNC_SMBUS_READ_BLOCK_DATA)) {
-                        fprintf(stderr, "Error: Adapter for i2c bus %d does "
-                                "not have smbus block read capability\n",
-                                i2cbus);
-                        exit(1);
-                }
-                break;
-
-        case I2C_SMBUS_I2C_BLOCK_DATA:
-                if (!(funcs & I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
-                        fprintf(stderr, "Error: Adapter for i2c bus %d does "
-                                "not have i2c block read capability\n",
-                                i2cbus);
-                        exit(1);
-                }
-                break;
-        }
-
-        if (set_slave_addr(file, address, force) < 0)
+        if (file < 0
+         || check_funcs(file, i2cbus, size, pec)
+         || set_slave_addr(file, address, force))
                 exit(1);
 
@@ -264 +274 @@
                                 strerror(errno));
                         exit(1);
-                }
-                if (!(funcs & (I2C_FUNC_SMBUS_PEC | I2C_FUNC_I2C))) {
-                        fprintf(stderr, "Warning: Adapter for i2c bus %d does "
-                                "not seem to actually support PEC\n", i2cbus);
                 }
         }