Changeset 5390

Timestamp:

11/20/08 09:22:18 (5 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.

Location:

i2c-tools/trunk

Files:

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

i2c-tools/trunk/CHANGES

@@ -23 +23 @@
           Add support for short writes (SMBus send byte)
           Better error message on missing adapter functionality
+          Set the data value mask with -m
   i2c-stub-from-dump: Add support for partial dumps
                       Report if only garbage is found in dump file

i2c-tools/trunk/tools/i2cset.8

@@ -1 @@
-.TH I2CSET 8 "May 2008"
+.TH I2CSET 8 "November 2008"
 .SH "NAME"
 i2cset \- set I2C registers
@@ -7 +7 @@
 .RB [ -f ]
 .RB [ -y ]
+.RB [ "-m mask" ]
 .I i2cbus
 .I chip-address
 .I data-address
-.RI [ "value " [ "mode " [ mask ]]]
+.RI [ "value " [ "mode" ]]
 .br
 .B i2cset
@@ -37 +38 @@
 will perform the operation directly. This is mainly meant to be used in
 scripts.
+.TP
+.B -m mask
+The \fImask\fR parameter, if specified, describes which bits of \fIvalue\fR
+will be actually written to \fIdata-address\fR. Bits set to 1 in the mask
+are taken from \fIvalue\fR, while bits set to 0 will be read from
+\fIdata-address\fR and thus preserved by the operation.
 .PP
 There are three required options to i2cset. \fIi2cbus\fR indicates the number
@@ -58 +65 @@
 mode without PEC. The \fIvalue\fR provided must be within range for the
 specified data type (0x00-0xFF for bytes, 0x0000-0xFFFF for words).
-.PP
-The \fImask\fR parameter, if specified, describes which bits of \fIvalue\fR
-will be actually written to \fIdata-address\fR. Bits set to 1 in the mask
-are taken from \fIvalue\fR, while bits set to 0 will be read from
-\fIdata-address\fR and thus preserved by the operation.
 
 .SH WARNING

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");