Changeset 1244

Timestamp:

11/19/01 22:14:43 (12 years ago)

Author:

mds

Message:

add i2c block read capability to i2cdump

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• prog/dump/i2cdump.c (modified) (2 diffs)

lm-sensors/trunk/CHANGES

@@ -21 +21 @@
   Library: Add PCF8591 support
   Module pcf8591: new
+  Program i2cdump: Add i2c block read capability
   Program sensors: Add PCF8591 support
   Program sensors-detect: Add several Nvidia chips, add PCF8591

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

@@ -26 +26 @@
 #include <fcntl.h>
 #include <linux/i2c-dev.h>
+
+/*
+   We don't use this #define but it was put into i2c.h at the same time as
+   i2c_smbus_read_i2c_block_data() was implemented (i2c 2.6.3),
+   so we use it as a version check.
+*/
+#if defined(I2C_FUNC_SMBUS_READ_I2C_BLOCK_2)
+#define USE_I2C_BLOCK 1
+#else
+#define USE_I2C_BLOCK 0
+#endif
+
 
 void help(void)
@@ -257 +269 @@
         res = i2c_smbus_read_block_data(file,0,cblock);
       } else if(size == I2C_SMBUS_I2C_BLOCK_DATA) {
-/*
+#if USE_I2C_BLOCK
         res = i2c_smbus_read_i2c_block_data(file,0,cblock);
-*/
+#else
         fprintf(stderr, "Error: I2C block read unimplemented\n");
         exit(1);
-      }
-      if(res < 0) {
+#endif
+      }
+      if(res <= 0) {
         fprintf(stderr, "Error: Block read failed, return code %d\n", res);
         exit(1);