Changeset 1390

Timestamp:

06/12/02 04:52:16 (11 years ago)

Author:

mds

Message:

add ability to specify the "command" on a smbus block read

(previously forced to zero). Limit smbus block read printout to 32 bytes.

Files:

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

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

@@ -47 +47 @@
   fprintf(stderr,"  MODE is 'b[yte]', 'w[ord]', 's[mbusblock], or 'i[2cblock]' (default b)\n");
   fprintf(stderr,"  I2CBUS is an integer\n");
+  fprintf(stderr,"  ADDRESS is an integer 0x00 - 0x7f\n");
+  fprintf(stderr,"  BANK and BANKREG are for byte and word accesses (default bank 0, reg 0x4e)\n");
+  fprintf(stderr,"  BANK is the command for smbusblock accesses (default 0)\n");
   if((fptr = fopen("/proc/bus/i2c", "r"))) {
     fprintf(stderr,"  Installed I2C busses:\n");
@@ -121 +124 @@
   if(argc > 4) {
     bank = strtol(argv[4],&end,0);
-    if (*end) {
+    if (*end || size == I2C_SMBUS_I2C_BLOCK_DATA) {
       fprintf(stderr,"Error: Invalid bank number!\n");
       help();
       exit(1);
     }
-    if ((bank < 0) || (bank > 15)) {
-      fprintf(stderr,"Error: bank out of range (0-15)!\n");
+    if (((size == I2C_SMBUS_BYTE_DATA) || (size == I2C_SMBUS_WORD_DATA)) &&
+        ((bank < 0) || (bank > 15))) {
+      fprintf(stderr,"Error: bank out of range!\n");
       help();
       exit(1);
     }
+    if (((size == I2C_SMBUS_BLOCK_DATA)) &&
+        ((bank < 0) || (bank > 0xff))) {
+      fprintf(stderr,"Error: block command out of range!\n");
+      help();
+      exit(1);
+    }
 
     if(argc > 5) {
       bankreg = strtol(argv[5],&end,0);
-      if (*end) {
+      if (*end || size == I2C_SMBUS_BLOCK_DATA) {
         fprintf(stderr,"Error: Invalid bank register number!\n");
         help();
@@ -251 +261 @@
                            size == I2C_SMBUS_BYTE_DATA ? "byte" : "word");
   if(bank)      
-    fprintf(stderr,"  Probing bank %d using bank register 0x%02x.\n",
-            bank, bankreg);
+    if(size == I2C_SMBUS_BLOCK_DATA)
+      fprintf(stderr,"  Using command 0x%02x.\n", bank);
+    else
+      fprintf(stderr,"  Probing bank %d using bank register 0x%02x.\n",
+              bank, bankreg);
   fprintf(stderr,"  You have five seconds to reconsider and press CTRL-C!\n\n");
   sleep(5);
 
   /* See Winbond w83781d data sheet for bank details */
-  if(bank) {
+  if(bank && size != I2C_SMBUS_BLOCK_DATA) {
     i2c_smbus_write_byte_data(file,bankreg,bank | 0x80);
   }
@@ -267 +280 @@
     if(size == I2C_SMBUS_BLOCK_DATA || size == I2C_SMBUS_I2C_BLOCK_DATA) {
       if(size == I2C_SMBUS_BLOCK_DATA) {
-        res = i2c_smbus_read_block_data(file,0,cblock);
+        res = i2c_smbus_read_block_data(file, bank, cblock);
       } else if(size == I2C_SMBUS_I2C_BLOCK_DATA) {
 #if USE_I2C_BLOCK
@@ -321 +334 @@
       }
       printf("\n");
+    if(size == I2C_SMBUS_BLOCK_DATA && i == 16)
+      break;            
     }
   } else {
@@ -336 +351 @@
     }
   }
-  if(bank) {
+  if(bank && size != I2C_SMBUS_BLOCK_DATA) {
     i2c_smbus_write_byte_data(file,bankreg,0x80);
   }