From 217c7bbafff7a0cf778163cb72d97a65c2777d3b Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Sat, 3 Mar 2007 14:57:56 +0000
Subject: [PATCH] i2cdump: Cleaner output in SMBus block read mode (s).

git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4335 7894878c-1315-0410-8ee3-d5d059ff63e0
---
 CHANGES             |  1 +
 prog/dump/i2cdump.c | 24 ++++++++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9a14c12b..51a3a706 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,6 +18,7 @@ SVN HEAD
   Module smsc47m1: Add SMSC LPC47M292 support
                    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
   Program sensors-detect: Only probe relevant I2C addresses
diff --git a/prog/dump/i2cdump.c b/prog/dump/i2cdump.c
index 133e74da..ddcb65cd 100644
--- a/prog/dump/i2cdump.c
+++ b/prog/dump/i2cdump.c
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
 	int bank = 0, bankreg = 0x4E, old_bank = 0;
 	char filename[20];
 	unsigned long funcs;
-	int block[256];
+	int block[256], s_length = 0;
 	int pec = 0, even = 0;
 	int flags = 0;
 	int yes = 0, version = 0;
@@ -310,6 +310,9 @@ int main(int argc, char *argv[])
 			if (size == I2C_SMBUS_BLOCK_DATA) {
 				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) {
 					i = i2c_smbus_read_i2c_block_data(file,
@@ -327,8 +330,9 @@ int main(int argc, char *argv[])
 				res = 256;
 			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;
 		}
 
 		if (size == I2C_SMBUS_BYTE) {
@@ -343,6 +347,8 @@ int main(int argc, char *argv[])
 		printf("     0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f"
 		       "    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++) {
 				fflush(stdout);
@@ -365,7 +371,10 @@ int main(int argc, char *argv[])
 				} else
 					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)
 						printf("XX ");
@@ -378,7 +387,12 @@ int main(int argc, char *argv[])
 					j++;
 			}
 			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)
 					printf("X");
@@ -394,8 +408,6 @@ int main(int argc, char *argv[])
 					printf("%c", res & 0xff);
 			}
 			printf("\n");
-			if (size == I2C_SMBUS_BLOCK_DATA && i == 16)
-				break;
 		}
 	} else {
 		printf("     0,8  1,9  2,a  3,b  4,c  5,d  6,e  7,f\n");