Changeset 4417

Timestamp:

05/28/07 10:57:41 (1 year ago)

Author:

khali

Message:

Support and use the new I2C block read with variable length which will
be available in Linux kernel 2.6.23. Binary compatibility is guaranteed,
source code compatibility isn't, but the incompatibility will be
spotted quickly as the prototype of the helper function
i2c_smbus_read_i2c_block_data() changed. The only problem would be if
a program is calling i2c_smbus_access() directly. Hopefully this should
be a rare case. The py-smbus binding code is in this case and will be
adjusted soon.

Files:

• lm-sensors/trunk/CHANGES (modified) (2 diffs)
• lm-sensors/trunk/kernel/include/i2c-dev.h (modified) (3 diffs)
• lm-sensors/trunk/prog/dump/i2cdump.c (modified) (1 diff)

lm-sensors/trunk/CHANGES

@@ -3 +3 @@
-
-SVN HEAD
+  File i2c-dev.h: Support I2C block reads with specified length
-  File sensors.conf.eg: Add a dme1737 section
-  File lm_sensors.sysconfig: Delete, now generated by sensors-detect
@@ -10 +11 @@
-  Man page sensors.conf.5: Update the chip statement section
-  Module i2c-nforce2: Add nForce MCP61, MCP65 support (2.6 backport)
+  Program i2cdump: Use the new I2C block read function
-  Program isadump: Detect when address bit 7 is a busy flag
-                   Fix Super-I/O exit sequence for Winbond/Fintek chips

lm-sensors/trunk/kernel/include/i2c-dev.h

@@ -107 +107 @@
-#define I2C_SMBUS_PROC_CALL         4
-#define I2C_SMBUS_BLOCK_DATA        5
-DATA  
+BROKEN
-#define I2C_SMBUS_BLOCK_PROC_CALL   7           /* SMBus 2.0 */
+#define I2C_SMBUS_I2C_BLOCK_DATA    8
-
-
@@ -272 +273 @@
-
-/* Returns the number of read bytes */
+/* Until kernel 2.6.22, the length is hardcoded to 32 bytes. If you
+   ask for less than 32 bytes, your code will only work with kernels
+   2.6.23 and later. */
-static inline __s32 i2c_smbus_read_i2c_block_data(int file, __u8 command,
-
-
-
-
+
+
+
+
+
+
+
+
-        if (i2c_smbus_access(file,I2C_SMBUS_READ,command,
+                             length == 32 ? I2C_SMBUS_I2C_BLOCK_BROKEN :
-                              I2C_SMBUS_I2C_BLOCK_DATA,&data))
-                return -1;
@@ -298 +307 @@
-        data.block[0] = length;
-        return i2c_smbus_access(file,I2C_SMBUS_WRITE,command,
-DATA
+BROKEN
-}
-

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

@@ -317 +317 @@
-                                for (res = 0; res < 256; res += i) {
-                                        i = i2c_smbus_read_i2c_block_data(file,
-
+32, 
-                                        if (i <= 0)
-                                                break;