Changeset 1445

Timestamp:

07/11/02 04:24:56 (11 years ago)

Author:

mds

Message:

add PEC support

Files:

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

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

@@ -1 +1 @@
 /*
     i2cdump.c - Part of i2cdump, a user-space program to dump I2C registers
-    Copyright (c) 2000  Frodo Looijaard <frodol@dds.nl>, and
+    Copyright (c) 2002  Frodo Looijaard <frodol@dds.nl>, and
     Mark D. Studebaker <mdsxyz123@yahoo.com>
 
@@ -38 +38 @@
 #endif
 
+#ifdef I2C_FUNC_SMBUS_BLOCK_DATA_PEC
+#define HAVE_PEC 1
+#endif
 
 void help(void)
@@ -46 +49 @@
   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,"  Append MODE with 'p' for PEC checking\n");
   fprintf(stderr,"  I2CBUS is an integer\n");
   fprintf(stderr,"  ADDRESS is an integer 0x00 - 0x7f\n");
@@ -71 +75 @@
   unsigned char cblock[256];  
   int block[256];  
+  int pec = 0;
 
   if (argc < 2) {
@@ -106 +111 @@
 
   if (argc < 4) {
-    fprintf(stderr,"Warning: no size specified (using byte-data access)\n");
+    fprintf(stderr,"No size specified (using byte-data access)\n");
     size = I2C_SMBUS_BYTE_DATA;
-  } else if (!strcmp(argv[3],"b"))
+  } else if (!strncmp(argv[3],"b",1)) {
     size = I2C_SMBUS_BYTE_DATA;
-  else if (!strcmp(argv[3],"w"))
+    pec = argv[3][1] == 'p';
+  } else if (!strncmp(argv[3],"w",1)) {
     size = I2C_SMBUS_WORD_DATA;
-  else if (!strcmp(argv[3],"s"))
+    pec = argv[3][1] == 'p';
+  } else if (!strncmp(argv[3],"s",1)) {
     size = I2C_SMBUS_BLOCK_DATA;
-  else if (!strcmp(argv[3],"i"))
+    pec = argv[3][1] == 'p';
+  } else if (!strcmp(argv[3],"i"))
     size = I2C_SMBUS_I2C_BLOCK_DATA;
   else {
@@ -214 +222 @@
   switch(size) {
      case I2C_SMBUS_BYTE_DATA:
-        if (! (funcs & I2C_FUNC_SMBUS_READ_BYTE_DATA)) {
-           fprintf(stderr, "Error: Adapter for i2c bus %d", i2cbus);
-           fprintf(stderr, " does not have byte read capability\n");
-           exit(1);
-        }       
+#ifdef HAVE_PEC
+        if(pec) {
+          if (! (funcs & I2C_FUNC_SMBUS_READ_BYTE_DATA_PEC)) {
+             fprintf(stderr, "Error: Adapter for i2c bus %d", i2cbus);
+             fprintf(stderr, " does not have byte read w/ PEC capability\n");
+             exit(1);
+          }       
+        } else
+#endif
+        {
+          if (! (funcs & I2C_FUNC_SMBUS_READ_BYTE_DATA)) {
+             fprintf(stderr, "Error: Adapter for i2c bus %d", i2cbus);
+             fprintf(stderr, " does not have byte read capability\n");
+             exit(1);
+          }       
+        }
         break;
 
      case I2C_SMBUS_WORD_DATA:
-        if (! (funcs & I2C_FUNC_SMBUS_READ_WORD_DATA)) {
-           fprintf(stderr, "Error: Adapter for i2c bus %d", i2cbus);
-           fprintf(stderr, " does not have word read capability\n");
-           exit(1);
-        }       
+#ifdef HAVE_PEC
+        if(pec) {
+          if (! (funcs & I2C_FUNC_SMBUS_READ_WORD_DATA_PEC)) {
+             fprintf(stderr, "Error: Adapter for i2c bus %d", i2cbus);
+             fprintf(stderr, " does not have word read w/ PEC capability\n");
+             exit(1);
+          }       
+        } else
+#endif
+        {
+          if (! (funcs & I2C_FUNC_SMBUS_READ_WORD_DATA)) {
+             fprintf(stderr, "Error: Adapter for i2c bus %d", i2cbus);
+             fprintf(stderr, " does not have word read capability\n");
+             exit(1);
+          }       
+        }
         break;
 
      case I2C_SMBUS_BLOCK_DATA:
-        if (! (funcs & I2C_FUNC_SMBUS_READ_BLOCK_DATA)) {
-           fprintf(stderr, "Error: Adapter for i2c bus %d", i2cbus);
-           fprintf(stderr, " does not have smbus block read capability\n");
-           exit(1);
-        }       
+#ifdef HAVE_PEC
+        if(pec) {
+          if (! (funcs & I2C_FUNC_SMBUS_READ_BLOCK_DATA_PEC)) {
+             fprintf(stderr, "Error: Adapter for i2c bus %d", i2cbus);
+             fprintf(stderr, " does not have smbus block read capability\n");
+             exit(1);
+          }       
+        } else
+#endif
+        {
+          if (! (funcs & I2C_FUNC_SMBUS_READ_BLOCK_DATA)) {
+             fprintf(stderr, "Error: Adapter for i2c bus %d", i2cbus);
+             fprintf(stderr, " does not have smbus block read w/ PEC capability\n");
+             exit(1);
+          }       
+        }
         break;
 
@@ -254 +295 @@
   }
  
+  if(pec) {
+#ifdef HAVE_PEC
+    if (ioctl(file,I2C_PEC, 1) < 0) {
+      fprintf(stderr,"Error: Could not set PEC: %s\n", strerror(errno));
+      exit(1);
+    }
+#else
+    fprintf(stderr,"Error: PEC not supported in your kernel\n");
+    exit(1);
+#endif
+  }
+
   fprintf(stderr,"  WARNING! This program can confuse your I2C bus, "
           "cause data loss and worse!\n");
@@ -260 +313 @@
                            size == I2C_SMBUS_I2C_BLOCK_DATA ? "i2c block" :
                            size == I2C_SMBUS_BYTE_DATA ? "byte" : "word");
-  if(bank)      
+  if(pec)
+    fprintf(stderr,"  with PEC checking.\n", bank);
+  if(bank) {    
     if(size == I2C_SMBUS_BLOCK_DATA)
       fprintf(stderr,"  Using command 0x%02x.\n", bank);
@@ -266 +321 @@
       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);