Changeset 5390 for i2c-tools/trunk/tools/i2cset.c

Timestamp:

11/20/08 09:22:18 (4 years ago)

Author:

khali

Message:

Set the data value mask with -m. The old method is still supported for
compatibility, but is considered deprecated and is no longer documented.

Files:

• i2c-tools/trunk/tools/i2cset.c (modified) (4 diffs)

i2c-tools/trunk/tools/i2cset.c

@@ -36 +36 @@
 {
         fprintf(stderr,
-                "Usage: i2cset [-f] [-y] I2CBUS CHIP-ADDRESS DATA-ADDRESS [VALUE [MODE [MASK]]]\n"
+                "Usage: i2cset [-f] [-y] [-m MASK] I2CBUS CHIP-ADDRESS DATA-ADDRESS [VALUE [MODE]]\n"
                 "  I2CBUS is an integer or an I2C bus name\n"
                 "  ADDRESS is an integer (0x03 - 0x77)\n"
@@ -129 +129 @@
 {
         char *end;
+        const char *maskp = NULL;
         int res, i2cbus, address, size, file;
         int value, daddress, vmask = 0;
@@ -142 +143 @@
                 case 'f': force = 1; break;
                 case 'y': yes = 1; break;
+                case 'm':
+                        if (2+flags < argc)
+                                maskp = argv[2+flags];
+                        flags++;
+                        break;
                 default:
                         fprintf(stderr, "Error: Unsupported option "
@@ -196 +202 @@
         }
 
+        /* Old method to provide the value mask, deprecated and no longer
+           documented but still supported for compatibility */
         if (argc > flags + 6) {
-                vmask = strtol(argv[flags+6], &end, 0);
+                if (maskp) {
+                        fprintf(stderr, "Error: Data value mask provided twice!\n");
+                        help();
+                }
+                fprintf(stderr, "Warning: Using deprecated way to set the data value mask!\n");
+                fprintf(stderr, "         Please switch to using -m.\n");
+                maskp = argv[flags+6];
+        }
+
+        if (maskp && size != I2C_SMBUS_BYTE) {
+                vmask = strtol(maskp, &end, 0);
                 if (*end || vmask == 0) {
                         fprintf(stderr, "Error: Data value mask invalid!\n");