Changeset 4335

Timestamp:

03/03/07 15:57:56 (6 years ago)

Author:

khali

Message:

i2cdump: Cleaner output in SMBus block read mode (s).

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• prog/dump/i2cdump.c (modified) (7 diffs)

lm-sensors/trunk/CHANGES

@@ -19 +19 @@
                    Get rid of a useless semaphore (2.6 backport)
   Programs i2cdetect, i2cdump, isadump: Flush output in real time
+  Program i2cdump: Cleaner output in SMBus block read mode
   Program sensors: Add smsc47m2 support (fans)
                    Fix -A option (hide adapter name) on error

lm-sensors/trunk/prog/dump/i2cdump.c

@@ -58 +58 @@
         char filename[20];
         unsigned long funcs;
-        int block[256];
+        int block[256], s_length = 0;
         int pec = 0, even = 0;
         int flags = 0;
@@ -311 +311 @@
                                 res = i2c_smbus_read_block_data(file, bank,
                                       cblock);
+                                /* Remember returned block length for a nicer
+                                   display later */
+                                s_length = res;
                         } else {
                                 for (res = 0; res < 256; res += i) {
@@ -328 +331 @@
                         for (i = 0; i < res; i++)
                                 block[i] = cblock[i];
-                        for (i = res; i < 256; i++)
-                                block[i] = -1;
+                        if (size != I2C_SMBUS_BLOCK_DATA)
+                                for (i = res; i < 256; i++)
+                                        block[i] = -1;
                 }
 
@@ -344 +348 @@
                        "    0123456789abcdef\n");
                 for (i = 0; i < 256; i+=16) {
+                        if (size == I2C_SMBUS_BLOCK_DATA && i >= s_length)
+                                break;
                         printf("%02x: ", i);
                         for (j = 0; j < 16; j++) {
@@ -366 +372 @@
                                         res = block[i+j];
 
-                                if (res < 0) {
+                                if (size == I2C_SMBUS_BLOCK_DATA
+                                 && i+j >= s_length) {
+                                        printf("   ");
+                                } else if (res < 0) {
                                         printf("XX ");
                                         if (size == I2C_SMBUS_WORD_DATA)
@@ -379 +388 @@
                         }
                         printf("   ");
+
                         for (j = 0; j < 16; j++) {
+                                if (size == I2C_SMBUS_BLOCK_DATA
+                                 && i+j >= s_length)
+                                        break;
+
                                 res = block[i+j];
                                 if (res < 0)
@@ -395 +409 @@
                         }
                         printf("\n");
-                        if (size == I2C_SMBUS_BLOCK_DATA && i == 16)
-                                break;
                 }
         } else {