Add a new mode W. It uses SMBus Read Word transactions as mode w

does, but it only triggers a transaction on even register addresses,
relying on the target chip to increment its internal register pointer
between the high and low byte of the word. EEPROMs behave that way, so
this mode makes it possible to dump an EEPROM contents faster. I2C Block
Read is still faster but it isn't available on all busses, while SMBus
Read Word is very popular. This mode also makes it possible to test
SMBus Read Word transactions on a given adapter using common EEPROMs.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@3286 7894878c-1315-0410-8ee3-d5d059ff63e0

prog/dump/i2cdump.c

@@ -33,9 +33,14 @@ void help(void)
 	fprintf(stderr, "Syntax: i2cdump [-y] I2CBUS ADDRESS [MODE] [BANK "
 	        "[BANKREG]]\n"
 	        "        i2cdump -V\n"
-	        "  MODE is 'b[yte]', 'w[ord]', 's[mbusblock], 'i[2cblock]',\n"
-	        "       or 'c[onsecutive byte address mode]' (default b)\n"
-	        "  Append MODE with 'p' for PEC checking\n"
+	        "  MODE is one of:\n"
+		"    b (byte, default)\n"
+		"    w (word)\n"
+		"    W (word on even register addresses)\n"
+		"    s (SMBus block)\n"
+		"    i (I2C block)\n"
+	        "    c (consecutive byte)\n"
+	        "    Append 'p' to 'b', 'w', 's' or 'c' for PEC checking\n"
 	        "  I2CBUS is an integer\n"
 	        "  ADDRESS is an integer 0x00 - 0x7f\n"
 	        "  BANK and BANKREG are for byte and word accesses (default "
@@ -52,7 +57,7 @@ int main(int argc, char *argv[])
 	char filename[20];
 	long funcs;
 	int block[256];
-	int pec = 0;
+	int pec = 0, even = 0;
 	int flags = 0;
 	int yes = 0, version = 0;
 
@@ -118,6 +123,9 @@ int main(int argc, char *argv[])
 	} else if (!strncmp(argv[flags+3], "w", 1)) {
 		size = I2C_SMBUS_WORD_DATA;
 		pec = argv[flags+3][1] == 'p';
+	} else if (!strncmp(argv[flags+3], "W", 1)) {
+		size = I2C_SMBUS_WORD_DATA;
+		even = 1;
 	} else if (!strncmp(argv[flags+3], "s", 1)) {
 		size = I2C_SMBUS_BLOCK_DATA;
 		pec = argv[flags+3][1] == 'p';
@@ -259,6 +267,9 @@ int main(int argc, char *argv[])
 		        size == I2C_SMBUS_BYTE_DATA ? "byte" : "word");
 		if (pec)
 			fprintf(stderr, "PEC checking enabled.\n");
+		if (even)
+			fprintf(stderr, "Only probing even register "
+			        "addresses.\n");
 		if (bank) {
 			if (size == I2C_SMBUS_BLOCK_DATA)
 				fprintf(stderr, "Using command 0x%02x.\n",
@@ -290,8 +301,7 @@ int main(int argc, char *argv[])
 	}
 
 	/* handle all but word data */
-	if (size != I2C_SMBUS_WORD_DATA) {
-
+	if (size != I2C_SMBUS_WORD_DATA || even) {
 		/* do the block transaction */
 		if (size == I2C_SMBUS_BLOCK_DATA
 		 || size == I2C_SMBUS_I2C_BLOCK_DATA) {
@@ -338,15 +348,33 @@ int main(int argc, char *argv[])
 				if (size == I2C_SMBUS_BYTE_DATA) {
 					block[i+j] = res =
 					  i2c_smbus_read_byte_data(file, i+j);
+				} else if (size == I2C_SMBUS_WORD_DATA) {
+					res = i2c_smbus_read_word_data(file,
+					                               i+j);
+					if (res < 0) {
+						block[i+j] = res;
+						block[i+j+1] = res;
+					} else {
+						block[i+j] = res & 0xff;
+						block[i+j+1] = res >> 8;
+					}
 				} else if (size == I2C_SMBUS_BYTE) {
 					block[i+j] = res =
 					  i2c_smbus_read_byte(file);
 				} else
 					res = block[i+j];
-				if (res < 0)
+
+				if (res < 0) {
 					printf("XX ");
-				else
-					printf("%02x ", res & 0xff);
+					if (size == I2C_SMBUS_WORD_DATA)
+						printf("XX ");
+				} else {
+					printf("%02x ", block[i+j]);
+					if (size == I2C_SMBUS_WORD_DATA)
+						printf("%02x ", block[i+j+1]);
+				}
+				if (size == I2C_SMBUS_WORD_DATA)
+					j++;
 			}
 			printf("   ");
 			for (j = 0; j < 16; j++) {