Changeset 3600

Timestamp:

11/19/01 20:01:46 (12 years ago)

Author:

mds

Message:

add emulation layer for i2c block reads

i2c_smbus_read_i2c_block_data() for single-byte addresses.
Add #defines for 2-byte address block accesses:

#define I2C_FUNC_SMBUS_READ_I2C_BLOCK_2 0x10000000 /* I2C-like block xfer */
#define I2C_FUNC_SMBUS_WRITE_I2C_BLOCK_2 0x20000000 /* w/ 2-byte reg. addr. */

Location:

i2c/trunk/kernel

Files:

• i2c-core.c (modified) (4 diffs)
• i2c-dev.h (modified) (1 diff)
• i2c.h (modified) (4 diffs)

i2c/trunk/kernel/i2c-core.c

@@ -1110 +1110 @@
 }
 
+/* Returns the number of read bytes */
+extern s32 i2c_smbus_read_i2c_block_data(struct i2c_client * client,
+                                         u8 command, u8 *values)
+{
+        union i2c_smbus_data data;
+        int i;
+        if (i2c_smbus_xfer(client->adapter,client->addr,client->flags,
+                              I2C_SMBUS_READ,command,
+                              I2C_SMBUS_I2C_BLOCK_DATA,&data))
+                return -1;
+        else {
+                for (i = 1; i <= data.block[0]; i++)
+                        values[i-1] = data.block[i];
+                return data.block[0];
+        }
+}
+
 extern s32 i2c_smbus_write_i2c_block_data(struct i2c_client * client,
                                           u8 command, u8 length, u8 *values)
@@ -1193 +1210 @@
                                 printk(KERN_ERR "i2c-core.o: smbus_access called with "
                                        "invalid block write size (%d)\n",
-                                       msg[0].len);
+                                       data->block[0]);
                                 return -1;
                         }
                         for (i = 1; i <= msg[0].len; i++)
                                 msgbuf0[i] = data->block[i-1];
+                }
+                break;
+        case I2C_SMBUS_I2C_BLOCK_DATA:
+                if (read_write == I2C_SMBUS_READ) {
+                        msg[1].len = 32;
+                } else {
+                        msg[0].len = data->block[0] + 2;
+                        if (msg[0].len > 34) {
+                                printk("i2c-core.o: i2c_smbus_xfer_emulated called with "
+                                       "invalid block write size (%d)\n",
+                                       data->block[0]);
+                                return -1;
+                        }
+                        for (i = 0; i < data->block[0]; i++)
+                                msgbuf0[i] = data->block[i+1];
                 }
                 break;
@@ -1221 +1253 @@
                                 data->word = msgbuf1[0] | (msgbuf1[1] << 8);
                                 break;
+                        case I2C_SMBUS_I2C_BLOCK_DATA:
+                                /* fixed at 32 for now */
+                                data->block[0] = 32;
+                                for (i = 0; i < 32; i++)
+                                        data->block[i+1] = msgbuf1[i];
+                                break;
                 }
         return 0;
@@ -1401 +1439 @@
 EXPORT_SYMBOL(i2c_smbus_read_block_data);
 EXPORT_SYMBOL(i2c_smbus_write_block_data);
+EXPORT_SYMBOL(i2c_smbus_read_i2c_block_data);
+EXPORT_SYMBOL(i2c_smbus_write_i2c_block_data);
 
 EXPORT_SYMBOL(i2c_get_functionality);

i2c/trunk/kernel/i2c-dev.h

@@ -163 +163 @@
 }
 
+/* Returns the number of read bytes */
+static inline __s32 i2c_smbus_read_i2c_block_data(int file, __u8 command,
+                                                  __u8 *values)
+{
+        union i2c_smbus_data data;
+        int i;
+        if (i2c_smbus_access(file,I2C_SMBUS_READ,command,
+                              I2C_SMBUS_I2C_BLOCK_DATA,&data))
+                return -1;
+        else {
+                for (i = 1; i <= data.block[0]; i++)
+                        values[i-1] = data.block[i];
+                return data.block[0];
+        }
+}
+
 static inline __s32 i2c_smbus_write_i2c_block_data(int file, __u8 command,
                                                __u8 length, __u8 *values)

i2c/trunk/kernel/i2c.h

@@ -124 +124 @@
                                       u8 command, u8 length,
                                       u8 *values);
+extern s32 i2c_smbus_read_i2c_block_data(struct i2c_client * client,
+                                         u8 command, u8 *values);
 extern s32 i2c_smbus_write_i2c_block_data(struct i2c_client * client,
                                           u8 command, u8 length,
@@ -407 +409 @@
 #define I2C_FUNC_SMBUS_READ_BLOCK_DATA  0x01000000 
 #define I2C_FUNC_SMBUS_WRITE_BLOCK_DATA 0x02000000 
-#define I2C_FUNC_SMBUS_READ_I2C_BLOCK   0x04000000 /* New I2C-like block */
-#define I2C_FUNC_SMBUS_WRITE_I2C_BLOCK  0x08000000 /* transfer */
+#define I2C_FUNC_SMBUS_READ_I2C_BLOCK   0x04000000 /* I2C-like block xfer  */
+#define I2C_FUNC_SMBUS_WRITE_I2C_BLOCK  0x08000000 /* w/ 1-byte reg. addr. */
+#define I2C_FUNC_SMBUS_READ_I2C_BLOCK_2  0x10000000 /* I2C-like block xfer  */
+#define I2C_FUNC_SMBUS_WRITE_I2C_BLOCK_2 0x20000000 /* w/ 2-byte reg. addr. */
 
 #define I2C_FUNC_SMBUS_BYTE I2C_FUNC_SMBUS_READ_BYTE | \
@@ -420 +424 @@
 #define I2C_FUNC_SMBUS_I2C_BLOCK I2C_FUNC_SMBUS_READ_I2C_BLOCK | \
                                   I2C_FUNC_SMBUS_WRITE_I2C_BLOCK
+#define I2C_FUNC_SMBUS_I2C_BLOCK_2 I2C_FUNC_SMBUS_READ_I2C_BLOCK_2 | \
+                                   I2C_FUNC_SMBUS_WRITE_I2C_BLOCK_2
 
 #define I2C_FUNC_SMBUS_EMUL I2C_FUNC_SMBUS_QUICK | \
@@ -426 +432 @@
                             I2C_FUNC_SMBUS_WORD_DATA | \
                             I2C_FUNC_SMBUS_PROC_CALL | \
-                            I2C_FUNC_SMBUS_WRITE_BLOCK_DATA
+                            I2C_FUNC_SMBUS_WRITE_BLOCK_DATA | \
+                            I2C_FUNC_SMBUS_I2C_BLOCK | \
+                            I2C_FUNC_SMBUS_I2C_BLOCK_2
 
 /*