Changeset 2095

Timestamp:

11/26/03 04:45:18 (9 years ago)

Author:

mds

Message:

add 'c' mode for consecutive address byte reads

Files:

• lm-sensors/trunk/prog/dump/i2cdump.c (modified) (6 diffs)

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

@@ -48 +48 @@
 {
   fprintf(stderr,"Syntax: i2cdump I2CBUS ADDRESS [MODE] [BANK [BANKREG]]\n");
-  fprintf(stderr,"  MODE is 'b[yte]', 'w[ord]', 's[mbusblock], or 'i[2cblock]' (default b)\n");
+  fprintf(stderr,"  MODE is 'b[yte]', 'w[ord]', 's[mbusblock], 'i[2cblock]',\n");
+  fprintf(stderr,"       or 'c[onsectutive byte address mode]' (default b)\n");
   fprintf(stderr,"  Append MODE with 'p' for PEC checking\n");
   fprintf(stderr,"  I2CBUS is an integer\n");
@@ -121 +122 @@
   } else if (!strncmp(argv[3],"s",1)) {
     size = I2C_SMBUS_BLOCK_DATA;
+    pec = argv[3][1] == 'p';
+  } else if (!strncmp(argv[3],"c",1)) {
+    size = I2C_SMBUS_BYTE;
     pec = argv[3][1] == 'p';
   } else if (!strcmp(argv[3],"i"))
@@ -221 +225 @@
 
   switch(size) {
+     case I2C_SMBUS_BYTE:
+#ifdef HAVE_PEC
+        if(pec) {
+          if (! (funcs & I2C_FUNC_SMBUS_READ_BYTE_PEC)) {
+             fprintf(stderr, "Error: Adapter for i2c bus %d", i2cbus);
+             fprintf(stderr, " does not have read w/ PEC capability\n");
+             exit(1);
+          }       
+        } else
+#endif
+        {
+          if (! (funcs & I2C_FUNC_SMBUS_READ_BYTE)) {
+             fprintf(stderr, "Error: Adapter for i2c bus %d", i2cbus);
+             fprintf(stderr, " does not have read capability\n");
+             exit(1);
+          }       
+        }
+        break;
+
      case I2C_SMBUS_BYTE_DATA:
 #ifdef HAVE_PEC
@@ -312 +335 @@
           filename,address,size == I2C_SMBUS_BLOCK_DATA ? "smbus block" :
                            size == I2C_SMBUS_I2C_BLOCK_DATA ? "i2c block" :
+                           size == I2C_SMBUS_BYTE ? "byte consecutive read" :
                            size == I2C_SMBUS_BYTE_DATA ? "byte" : "word");
   if(pec)
@@ -363 +387 @@
     }
 
+    if(size == I2C_SMBUS_BYTE) {
+      res = i2c_smbus_write_byte(file, 0);
+      if(res != 0) {
+        fprintf(stderr, "Error: Write start address failed, return code %d\n", res);
+        exit(1);
+      }
+    }
     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) {
@@ -368 +399 @@
       for(j = 0; j < 16; j++) {
         if(size == I2C_SMBUS_BYTE_DATA) {
-          res = i2c_smbus_read_byte_data(file,i+j);
-          block[i+j] = res;
+          block[i+j] = res = i2c_smbus_read_byte_data(file,i+j);
+        } else if(size == I2C_SMBUS_BYTE) {
+          block[i+j] = res = i2c_smbus_read_byte(file);
         } else
           res = block[i+j];