Changeset 3878

Timestamp:

12/20/03 01:18:27 (9 years ago)

Author:

mds

Message:

tweaks to emulation patch.

• add I2C_M_RECV_PEC flag so adapter will receive one extra byte
• add PEC functionality to algo-bit
• copy over only what's necessary on read in i2c-core

Location:

i2c/trunk/kernel

Files:

• i2c-algo-bit.c (modified) (2 diffs)
• i2c-core.c (modified) (4 diffs)
• i2c.h (modified) (1 diff)

i2c/trunk/kernel/i2c-algo-bit.c

@@ -402 +402 @@
                                 count = inval + 1;      /* plus one for [Count] itself */
                                 msg->len = count;
+                                if (msg->flags & I2C_M_RECV_PEC)
+                                        count++; /* plus one for PEC */
                         } else {
                                 printk(KERN_ERR "i2c-algo-bit.o: readbytes: bad block count (%d).\n", inval);
@@ -537 +539 @@
                I2C_FUNC_PROTOCOL_MANGLING |
                I2C_FUNC_SMBUS_BLOCK_PROC_CALL |
-               I2C_FUNC_SMBUS_READ_BLOCK_DATA;
+               I2C_FUNC_SMBUS_READ_BLOCK_DATA |
+               I2C_FUNC_SMBUS_BLOCK_PROC_CALL_PEC |
+               I2C_FUNC_SMBUS_READ_BLOCK_DATA_PEC;
 }
 

i2c/trunk/kernel/i2c-core.c

@@ -1209 +1209 @@
           most things with sane defaults, to keep the code below somewhat
           simpler. */
-        unsigned char msgbuf0[34];
-        unsigned char msgbuf1[34];
+        unsigned char msgbuf0[I2C_SMBUS_BLOCK_MAX+2];
+        unsigned char msgbuf1[I2C_SMBUS_BLOCK_MAX+2];
         int num = read_write == I2C_SMBUS_READ?2:1;
         struct i2c_msg msg[2] = { { addr, flags, 1, msgbuf0 }, 
                                   { addr, flags | I2C_M_RD, 0, msgbuf1 }
                                 };
-        int i;
+        int i, len;
 
         msgbuf0[0] = command;
@@ -1271 +1271 @@
                         msg[1].flags |= I2C_M_RECV_LEN;
                         msg[1].len = I2C_SMBUS_BLOCK_MAX + 1;
-                        if (size == I2C_SMBUS_BLOCK_DATA_PEC)
+                        if (size == I2C_SMBUS_BLOCK_DATA_PEC) {
                                 msg[1].len++;
+                                msg[1].flags |= I2C_M_RECV_PEC;
+                        }
                 } else {
                         msg[0].len = data->block[0] + 2;
@@ -1312 +1314 @@
                 msg[1].flags |= I2C_M_RECV_LEN;
                 msg[1].len = I2C_SMBUS_BLOCK_MAX + 1;
-                if (size == I2C_SMBUS_BLOCK_PROC_CALL_PEC)
+                if (size == I2C_SMBUS_BLOCK_PROC_CALL_PEC) {
                         msg[1].len++;
+                        msg[1].flags |= I2C_M_RECV_PEC;
+                }
                 break;
         case I2C_SMBUS_I2C_BLOCK_DATA:
@@ -1358 +1362 @@
                                 break;
                         case I2C_SMBUS_BLOCK_DATA:
+                        case I2C_SMBUS_BLOCK_PROC_CALL:
                         case I2C_SMBUS_BLOCK_DATA_PEC:
-                        case I2C_SMBUS_BLOCK_PROC_CALL:
                         case I2C_SMBUS_BLOCK_PROC_CALL_PEC:
-                                for (i = 0; i < I2C_SMBUS_BLOCK_MAX + 2; i++)
+                                len = msgbuf1[0] + 1;
+                                if(size == I2C_SMBUS_BLOCK_DATA_PEC ||
+                                   size == I2C_SMBUS_BLOCK_PROC_CALL_PEC)
+                                        len++;
+                                for (i = 0; i < len; i++)
                                         data->block[i] = msgbuf1[i];
                                 break;

i2c/trunk/kernel/i2c.h

@@ -362 +362 @@
 #define I2C_M_IGNORE_NAK        0x1000
 #define I2C_M_NO_RD_ACK         0x0800
-#define I2C_M_RECV_LEN          0x0400
+#define I2C_M_RECV_LEN          0x0400 /* length will be first received byte */
+#define I2C_M_RECV_PEC          0x0200 /* receive one more than the returned
+                                          length byte for the PEC */
         __u16 len;              /* msg length                           */
         __u8 *buf;              /* pointer to msg data                  */