diff for duplicates of <42261C39.30000@acm.org> diff --git a/a/1.txt b/N1/1.txt index 6d86859..a2cc655 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,54 +1 @@ See part 1 for details on what this does... - --------------- next part -------------- -This adds back in the i2c_smbus_read_block_data() function -which is needed by the IPMI SMB driver (coming soon). - -Signed-off-by: Corey Minyard <minyard@acm.org> - -Index: linux-2.6.11-rc5-mm1/drivers/i2c/i2c-core.c -=================================--- linux-2.6.11-rc5-mm1.orig/drivers/i2c/i2c-core.c -+++ linux-2.6.11-rc5-mm1/drivers/i2c/i2c-core.c -@@ -1250,6 +1250,23 @@ - } - - /* Returns the number of read bytes */ -+s32 i2c_smbus_read_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_BLOCK_DATA,&data)) -+ return -1; -+ else { -+ for (i = 1; i <= data.block[0]; i++) -+ values[i-1] = data.block[i]; -+ return data.block[0]; -+ } -+} -+ -+/* Returns the number of read bytes */ - s32 i2c_smbus_read_i2c_block_data(struct i2c_client *client, u8 command, u8 *values) - { - union i2c_smbus_data data; -@@ -1731,6 +1748,7 @@ - EXPORT_SYMBOL(i2c_smbus_read_word_data); - EXPORT_SYMBOL(i2c_smbus_write_word_data); - EXPORT_SYMBOL(i2c_smbus_write_block_data); -+EXPORT_SYMBOL(i2c_smbus_read_block_data); - EXPORT_SYMBOL(i2c_smbus_read_i2c_block_data); - - EXPORT_SYMBOL(i2c_non_blocking_capable); -Index: linux-2.6.11-rc5-mm1/include/linux/i2c.h -=================================--- linux-2.6.11-rc5-mm1.orig/include/linux/i2c.h -+++ linux-2.6.11-rc5-mm1/include/linux/i2c.h -@@ -99,6 +99,8 @@ - extern s32 i2c_smbus_write_block_data(struct i2c_client * client, - u8 command, u8 length, - u8 *values); -+extern s32 i2c_smbus_read_block_data(struct i2c_client * client, -+ u8 command, u8 *values); - extern s32 i2c_smbus_read_i2c_block_data(struct i2c_client * client, - u8 command, u8 *values); diff --git a/N1/2.hdr b/N1/2.hdr new file mode 100644 index 0000000..9195048 --- /dev/null +++ b/N1/2.hdr @@ -0,0 +1,5 @@ +Content-Type: text/plain; + name="i2c_add_read_block.diff" +Content-Transfer-Encoding: 7bit +Content-Disposition: inline; + filename="i2c_add_read_block.diff" diff --git a/N1/2.txt b/N1/2.txt new file mode 100644 index 0000000..261e5d8 --- /dev/null +++ b/N1/2.txt @@ -0,0 +1,53 @@ +This adds back in the i2c_smbus_read_block_data() function +which is needed by the IPMI SMB driver (coming soon). + +Signed-off-by: Corey Minyard <minyard@acm.org> + +Index: linux-2.6.11-rc5-mm1/drivers/i2c/i2c-core.c +=================================================================== +--- linux-2.6.11-rc5-mm1.orig/drivers/i2c/i2c-core.c ++++ linux-2.6.11-rc5-mm1/drivers/i2c/i2c-core.c +@@ -1250,6 +1250,23 @@ + } + + /* Returns the number of read bytes */ ++s32 i2c_smbus_read_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_BLOCK_DATA,&data)) ++ return -1; ++ else { ++ for (i = 1; i <= data.block[0]; i++) ++ values[i-1] = data.block[i]; ++ return data.block[0]; ++ } ++} ++ ++/* Returns the number of read bytes */ + s32 i2c_smbus_read_i2c_block_data(struct i2c_client *client, u8 command, u8 *values) + { + union i2c_smbus_data data; +@@ -1731,6 +1748,7 @@ + EXPORT_SYMBOL(i2c_smbus_read_word_data); + EXPORT_SYMBOL(i2c_smbus_write_word_data); + EXPORT_SYMBOL(i2c_smbus_write_block_data); ++EXPORT_SYMBOL(i2c_smbus_read_block_data); + EXPORT_SYMBOL(i2c_smbus_read_i2c_block_data); + + EXPORT_SYMBOL(i2c_non_blocking_capable); +Index: linux-2.6.11-rc5-mm1/include/linux/i2c.h +=================================================================== +--- linux-2.6.11-rc5-mm1.orig/include/linux/i2c.h ++++ linux-2.6.11-rc5-mm1/include/linux/i2c.h +@@ -99,6 +99,8 @@ + extern s32 i2c_smbus_write_block_data(struct i2c_client * client, + u8 command, u8 length, + u8 *values); ++extern s32 i2c_smbus_read_block_data(struct i2c_client * client, ++ u8 command, u8 *values); + extern s32 i2c_smbus_read_i2c_block_data(struct i2c_client * client, + u8 command, u8 *values); diff --git a/a/content_digest b/N1/content_digest index 62383a4..b0d032b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,22 +1,23 @@ - "ref\042261AFB.40001@acm.org\0" - "From\0minyard@acm.org (Corey Minyard)\0" + "From\0Corey Minyard <minyard@acm.org>\0" "Subject\0[PATCH] Add a non-blocking interface to the I2C code, part 6\0" - "Date\0Thu, 19 May 2005 06:25:40 +0000\0" + "Date\0Wed, 02 Mar 2005 14:04:09 -0600\0" "To\0Greg KH <greg@kroah.com>" lkml <linux-kernel@vger.kernel.org> " Sensors <sensors@stimpy.netroedge.com>\0" - "\00:1\0" + "\01:1\0" + "b\0" + See part 1 for details on what this does... + "\01:2\0" + "fn\0i2c_add_read_block.diff\0" "b\0" - "See part 1 for details on what this does...\n" - "\n" - "-------------- next part --------------\n" "This adds back in the i2c_smbus_read_block_data() function\n" "which is needed by the IPMI SMB driver (coming soon).\n" "\n" "Signed-off-by: Corey Minyard <minyard@acm.org>\n" "\n" "Index: linux-2.6.11-rc5-mm1/drivers/i2c/i2c-core.c\n" - "=================================--- linux-2.6.11-rc5-mm1.orig/drivers/i2c/i2c-core.c\n" + "===================================================================\n" + "--- linux-2.6.11-rc5-mm1.orig/drivers/i2c/i2c-core.c\n" "+++ linux-2.6.11-rc5-mm1/drivers/i2c/i2c-core.c\n" "@@ -1250,6 +1250,23 @@\n" " }\n" @@ -51,7 +52,8 @@ " \n" " EXPORT_SYMBOL(i2c_non_blocking_capable);\n" "Index: linux-2.6.11-rc5-mm1/include/linux/i2c.h\n" - "=================================--- linux-2.6.11-rc5-mm1.orig/include/linux/i2c.h\n" + "===================================================================\n" + "--- linux-2.6.11-rc5-mm1.orig/include/linux/i2c.h\n" "+++ linux-2.6.11-rc5-mm1/include/linux/i2c.h\n" "@@ -99,6 +99,8 @@\n" " extern s32 i2c_smbus_write_block_data(struct i2c_client * client,\n" @@ -62,4 +64,4 @@ " extern s32 i2c_smbus_read_i2c_block_data(struct i2c_client * client,\n" " \t\t\t\t\t u8 command, u8 *values);" -a1d5858abc331d4b5c11009849f21fb1f44e351960cba55d824d00995c07afde +295752185b5441e878c398250bfaca0d9d3cab57bd15720fb733124e6515768a
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.