Changeset 5151

Timestamp:

03/19/08 15:43:04 (8 months ago)

Author:

khali

Message:

Let the user specify a register range.

Files:

• i2c-tools/trunk/CHANGES (modified) (1 diff)
• i2c-tools/trunk/tools/i2cdump.8 (modified) (2 diffs)
• i2c-tools/trunk/tools/i2cdump.c (modified) (10 diffs)

i2c-tools/trunk/CHANGES

@@ -11 +11 @@
-  i2cdump: Fix I2C block mode error code
-           Remove man page reference to hardware monitoring chips
+           Let the user specify a register range
-  i2cset: Final status messages go to stdout
-          Return success even when readback fails or doesn't match

i2c-tools/trunk/tools/i2cdump.8

@@ -6 +6 @@
-.B i2cdump
-.RB [ -f ]
+.RB [ "-r first-last" ]
-.RB [ -y ]
-.I i2cbus
@@ -30 +31 @@
-kernel driver in question. It can also cause i2cdump to return invalid
-results. So use at your own risk and only if you know what you're doing.
+.TP
+.B -r first-last
+Limit the range of registers being accessed. This option is only available
+with modes \fBb\fP, \fBw\fP, \fBc\fP and \fBW\fP. For mode \fBW\fP,
+\fBfirst\fR must be even and \fBlast\fR must be odd.
-.TP
-.B -y

i2c-tools/trunk/tools/i2cdump.c

@@ -3 +3 @@
-    Copyright (C) 2002-2003  Frodo Looijaard <frodol@dds.nl>, and
-                             Mark D. Studebaker <mdsxyz123@yahoo.com>
-7
+8
-
-    This program is free software; you can redistribute it and/or modify
@@ -32 +32 @@
-static void help(void)
-{
-y] I2CBUS ADDRESS [MODE]
-
+r first-last] [-y] I2CBUS
+ADDRESS [MODE] 
-                "        i2cdump -V\n"
-                "  MODE is one of:\n"
@@ -62 +62 @@
-        int flags = 0;
-        int force = 0, yes = 0, version = 0;
+        const char *range = NULL;
+        int first = 0x00, last = 0xff;
-
-        /* handle (optional) flags first */
@@ -68 +70 @@
-                case 'V': version = 1; break;
-                case 'f': force = 1; break;
+                case 'r': range = argv[1+(++flags)]; break;
-                case 'y': yes = 1; break;
-                default:
@@ -180 +183 @@
-        }
-
+        /* Parse optional range string */
+        if (range) {
+                char *dash;
+
+                first = strtol(range, &dash, 0);
+                if (dash == range || *dash != '-'
+                 || first < 0 || first > 0xff) {
+                        fprintf(stderr, "Error: Invalid range parameter!\n");
+                        exit(1);
+                }
+                last = strtol(++dash, &end, 0);
+                if (end == dash || *end != '\0'
+                 || last < first || last > 0xff) {
+                        fprintf(stderr, "Error: Invalid range parameter!\n");
+                        exit(1);
+                }
+
+                /* Check mode constraints */
+                switch (size) {
+                case I2C_SMBUS_BYTE:
+                case I2C_SMBUS_BYTE_DATA:
+                        break;
+                case I2C_SMBUS_WORD_DATA:
+                        if (!even || (!(first%2) && last%2))
+                                break;
+                        /* Fall through */
+                default:
+                        fprintf(stderr,
+                                "Error: Range parameter not compatible with selected mode!\n");
+                        exit(1);
+                }
+        }
+
-        file = open_i2c_dev(i2cbus, filename, 0);
-        if (file < 0) {
@@ -274 +310 @@
-                                        "register 0x%02x.\n", bank, bankreg);
-                }
+                if (range) {
+                        fprintf(stderr,
+                                "Probe range limited to 0x%02x-0x%02x.\n",
+                                first, last);
+                }
-
-                fprintf(stderr, "Continue? [Y/n] ");
@@ -335 +376 @@
-
-                if (size == I2C_SMBUS_BYTE) {
-0
+first
-                        if(res != 0) {
-                                fprintf(stderr, "Error: Write start address "
@@ -348 +389 @@
-                        if (size == I2C_SMBUS_BLOCK_DATA && i >= s_length)
-                                break;
+                        if (i/16 < first/16)
+                                continue;
+                        if (i/16 > last/16)
+                                break;
+
-                        printf("%02x: ", i);
-                        for (j = 0; j < 16; j++) {
-                                fflush(stdout);
+                                /* Skip unwanted registers */
+                                if (i+j < first || i+j > last) {
+                                        printf("   ");
+                                        if (size == I2C_SMBUS_WORD_DATA) {
+                                                printf("   ");
+                                                j++;
+                                        }
+                                        continue;
+                                }
+
-                                if (size == I2C_SMBUS_BYTE_DATA) {
-                                        block[i+j] = res =
@@ -391 +447 @@
-                                 && i+j >= s_length)
-                                        break;
+                                /* Skip unwanted registers */
+                                if (i+j < first || i+j > last) {
+                                        printf(" ");
+                                        continue;
+                                }
-
-                                res = block[i+j];
@@ -411 +472 @@
-                printf("     0,8  1,9  2,a  3,b  4,c  5,d  6,e  7,f\n");
-                for (i = 0; i < 256; i+=8) {
+                        if (i/8 < first/8)
+                                continue;
+                        if (i/8 > last/8)
+                                break;
+
-                        printf("%02x: ", i);
-                        for (j = 0; j < 8; j++) {
+                                /* Skip unwanted registers */
+                                if (i+j < first || i+j > last) {
+                                        printf("     ");
+                                        continue;
+                                }
+
-                                res = i2c_smbus_read_word_data(file, i+j);
-                                if (res < 0)