Changeset 3646

Timestamp:

06/18/02 02:46:02 (11 years ago)

Author:

mds

Message:

add i2c_smbus_block_process_call(). Untested.

Fix i2c emulated process call (wouldn't return the two bytes
to the caller).
Column 80 fixes.

Files:

• i2c/trunk/kernel/i2c-core.c (modified) (9 diffs)

i2c/trunk/kernel/i2c-core.c

@@ -19 +19 @@
 
 /* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi>.
-   All SMBus-related things are written by Frodo Looijaard <frodol@dds.nl> */
+   All SMBus-related things are written by Frodo Looijaard <frodol@dds.nl>
+   SMBus 2.0 support by Mark Studebaker <mdsxyz123@yahoo.com>                */
 
 /* $Id$ */
@@ -1031 +1032 @@
 }
 
+/* Special for block process call which has two blocks */
+u8 i2c_smbus_blkproc_pec(u8 first, u8 second, u8 *blk1, u8 third, u8 *blk2)
+{
+        int i;
+        u8 crc = 0;
+
+        crc = crc8((crc ^ first) << 8);
+        crc = crc8((crc ^ second) << 8);
+        for(i = 0; i <= blk1[0]; i++)
+                crc = crc8((crc ^ blk1[i]) << 8);
+        crc = crc8((crc ^ third) << 8);
+        for(i = 0; i <= blk2[0]; i++)
+                crc = crc8((crc ^ blk2[i]) << 8);
+        return crc;
+}
+
 extern s32 i2c_smbus_write_quick(struct i2c_client * client, u8 value)
 {
@@ -1050 +1067 @@
 {
         if((client->flags & I2C_CLIENT_PEC) &&
-           !(i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_HWPEC_CALC))) {
+           !(i2c_check_functionality(client->adapter,
+                                     I2C_FUNC_SMBUS_HWPEC_CALC))) {
                 union i2c_smbus_data data;
                 u8 d[2] = {(client->addr << 1), value};
@@ -1124 +1142 @@
         if (i2c_smbus_xfer(client->adapter,client->addr,client->flags,
                            I2C_SMBUS_READ,command,
-                           ((client->flags & I2C_CLIENT_PEC) ? I2C_SMBUS_BLOCK_DATA_PEC :
-                                                               I2C_SMBUS_BLOCK_DATA),
+                           ((client->flags & I2C_CLIENT_PEC) ?
+                                                 I2C_SMBUS_BLOCK_DATA_PEC :
+                                                 I2C_SMBUS_BLOCK_DATA),
                            &data))
                 return -1;
@@ -1155 +1174 @@
                 data.block[i] = values[i-1];
         if((client->flags & I2C_CLIENT_PEC) &&
-           !(i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_HWPEC_CALC))) {
+           !(i2c_check_functionality(client->adapter,
+                                     I2C_FUNC_SMBUS_HWPEC_CALC))) {
                 u8 d[2] = {(client->addr << 1), command};
                 data.block[length + 1] = i2c_smbus_pec(2, d, data.block);
@@ -1161 +1181 @@
         return i2c_smbus_xfer(client->adapter,client->addr,client->flags,
                               I2C_SMBUS_WRITE, command,
-                              ((client->flags & I2C_CLIENT_PEC) ? I2C_SMBUS_BLOCK_DATA_PEC :
-                                                                  I2C_SMBUS_BLOCK_DATA),
+                              ((client->flags & I2C_CLIENT_PEC) ?
+                                                    I2C_SMBUS_BLOCK_DATA_PEC :
+                                                    I2C_SMBUS_BLOCK_DATA),
                               &data);
+}
+
+/* Returns the number of read bytes */
+extern s32 i2c_smbus_block_process_call(struct i2c_client * client,
+                                        u8 command, u8 length, u8 *values)
+{
+        union i2c_smbus_data data;
+        int i;
+        if (length > I2C_SMBUS_BLOCK_MAX - 1)
+                return -1;
+        data.block[0] = length;
+        for (i = 1; i <= length; i++)
+                data.block[i] = values[i-1];
+        if(i2c_smbus_xfer(client->adapter,client->addr,client->flags,
+                          I2C_SMBUS_WRITE, command,
+                          I2C_SMBUS_BLOCK_PROC_CALL, &data))
+                return -1;
+        if((client->flags & I2C_CLIENT_PEC) &&
+           !(i2c_check_functionality(client->adapter,
+                                     I2C_FUNC_SMBUS_HWPEC_CALC))) {
+                i = i2c_smbus_blkproc_pec(client->addr << 1, command,
+                                          data.block,
+                                          (client->addr << 1) | 0x01,
+                                          data.block + length + 1);
+                if(i != data.block[data.block[length + 1] + length + 1]) {
+                        DEB(printk(KERN_DEBUG "i2c-core.o: Bad block proc PEC 0x%02x vs. 0x%02x\n",
+                                   i, data.block[data.block[0] + 1]));
+                        return(-1);
+                }
+        }
+        for (i = 1; i <= data.block[length + 1]; i++)
+                values[i-1] = data.block[length + i];
+        return data.block[length + 1];
 }
 
@@ -1251 +1305 @@
         case I2C_SMBUS_PROC_CALL:
                 num = 2; /* Special case */
+                read_write = I2C_SMBUS_READ;
                 msg[0].len = 3;
                 msg[1].len = 2;
@@ -1258 +1313 @@
         case I2C_SMBUS_BLOCK_DATA:
                 if (read_write == I2C_SMBUS_READ) {
-                        printk(KERN_ERR "i2c-core.o: Block read not supported under "
-                               "I2C emulation!\n");
-                return -1;
+                        printk(KERN_ERR "i2c-core.o: Block read not supported "
+                               "under I2C emulation!\n");
+                        return -1;
                 } else {
                         msg[0].len = data->block[0] + 2;
@@ -1273 +1328 @@
                 }
                 break;
+        case I2C_SMBUS_BLOCK_PROC_CALL:
+                printk(KERN_ERR "i2c-core.o: Block process call not supported "
+                       "under I2C emulation!\n");
+                return -1;
         case I2C_SMBUS_I2C_BLOCK_DATA:
                 if (read_write == I2C_SMBUS_READ) {