diff for duplicates of <200504210218.12399.dtor_core@ameritech.net> diff --git a/a/1.txt b/N1/1.txt index 14a00b2..b60e5be 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,7 +9,8 @@ Signed-off-by: Dmitry Torokhov <dtor@mail.ru> 3 files changed, 88 insertions(+), 89 deletions(-) Index: dtor/drivers/w1/w1.c -=================================--- dtor.orig/drivers/w1/w1.c +=================================================================== +--- dtor.orig/drivers/w1/w1.c +++ dtor/drivers/w1/w1.c @@ -488,93 +488,6 @@ static void w1_slave_found(struct w1_mas atomic_dec(&dev->refcnt); @@ -60,15 +61,15 @@ Index: dtor/drivers/w1/w1.c - if (id_bit && comp_bit) - break; - -- if (id_bit = 0 && comp_bit = 0) { -- if (i = desc_bit) +- if (id_bit == 0 && comp_bit == 0) { +- if (i == desc_bit) - search_bit = 1; - else if (i > desc_bit) - search_bit = 0; - else - search_bit = ((last >> i) & 0x1); - -- if (search_bit = 0) { +- if (search_bit == 0) { - last_zero = i; - if (last_zero < 9) - last_family_desc = last_zero; @@ -93,7 +94,7 @@ Index: dtor/drivers/w1/w1.c - } -#endif - -- if (desc_bit = last_zero) +- if (desc_bit == last_zero) - last_device = 1; - - desc_bit = last_zero; @@ -106,7 +107,8 @@ Index: dtor/drivers/w1/w1.c static int w1_process(void *data) { Index: dtor/drivers/w1/w1_io.c -=================================--- dtor.orig/drivers/w1/w1_io.c +=================================================================== +--- dtor.orig/drivers/w1/w1_io.c +++ dtor/drivers/w1/w1_io.c @@ -178,13 +178,100 @@ u8 w1_calc_crc8(u8 * data, int len) return crc; @@ -157,15 +159,15 @@ Index: dtor/drivers/w1/w1_io.c + if (id_bit && comp_bit) + break; + -+ if (id_bit = 0 && comp_bit = 0) { -+ if (i = desc_bit) ++ if (id_bit == 0 && comp_bit == 0) { ++ if (i == desc_bit) + search_bit = 1; + else if (i > desc_bit) + search_bit = 0; + else + search_bit = ((last >> i) & 0x1); + -+ if (search_bit = 0) { ++ if (search_bit == 0) { + last_zero = i; + if (last_zero < 9) + last_family_desc = last_zero; @@ -190,7 +192,7 @@ Index: dtor/drivers/w1/w1_io.c + } +#endif + -+ if (desc_bit = last_zero) ++ if (desc_bit == last_zero) + last_device = 1; + + desc_bit = last_zero; @@ -211,7 +213,8 @@ Index: dtor/drivers/w1/w1_io.c EXPORT_SYMBOL(w1_write_bit); Index: dtor/drivers/w1/w1.h -=================================--- dtor.orig/drivers/w1/w1.h +=================================================================== +--- dtor.orig/drivers/w1/w1.h +++ dtor/drivers/w1/w1.h @@ -132,7 +132,6 @@ struct w1_master struct w1_master *w1_allocate_master_device(void); diff --git a/a/content_digest b/N1/content_digest index 9bcda26..6f7ee20 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0200504210207.02421.dtor_core@ameritech.net\0" - "From\0dtor_core@ameritech.net (Dmitry Torokhov)\0" + "From\0Dmitry Torokhov <dtor_core@ameritech.net>\0" "Subject\0[RFC/PATCH 11/22] W1: move w1_search to the rest of IO code\0" - "Date\0Thu, 19 May 2005 06:25:53 +0000\0" + "Date\0Thu, 21 Apr 2005 02:18:12 -0500\0" "To\0sensors@stimpy.netroedge.com\0" "Cc\0LKML <linux-kernel@vger.kernel.org>" Greg KH <gregkh@suse.de> @@ -19,7 +19,8 @@ " 3 files changed, 88 insertions(+), 89 deletions(-)\n" "\n" "Index: dtor/drivers/w1/w1.c\n" - "=================================--- dtor.orig/drivers/w1/w1.c\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/w1.c\n" "+++ dtor/drivers/w1/w1.c\n" "@@ -488,93 +488,6 @@ static void w1_slave_found(struct w1_mas\n" " \tatomic_dec(&dev->refcnt);\n" @@ -70,15 +71,15 @@ "-\t\t\tif (id_bit && comp_bit)\n" "-\t\t\t\tbreak;\n" "-\n" - "-\t\t\tif (id_bit = 0 && comp_bit = 0) {\n" - "-\t\t\t\tif (i = desc_bit)\n" + "-\t\t\tif (id_bit == 0 && comp_bit == 0) {\n" + "-\t\t\t\tif (i == desc_bit)\n" "-\t\t\t\t\tsearch_bit = 1;\n" "-\t\t\t\telse if (i > desc_bit)\n" "-\t\t\t\t\tsearch_bit = 0;\n" "-\t\t\t\telse\n" "-\t\t\t\t\tsearch_bit = ((last >> i) & 0x1);\n" "-\n" - "-\t\t\t\tif (search_bit = 0) {\n" + "-\t\t\t\tif (search_bit == 0) {\n" "-\t\t\t\t\tlast_zero = i;\n" "-\t\t\t\t\tif (last_zero < 9)\n" "-\t\t\t\t\t\tlast_family_desc = last_zero;\n" @@ -103,7 +104,7 @@ "-\t\t}\n" "-#endif\n" "-\n" - "-\t\tif (desc_bit = last_zero)\n" + "-\t\tif (desc_bit == last_zero)\n" "-\t\t\tlast_device = 1;\n" "-\n" "-\t\tdesc_bit = last_zero;\n" @@ -116,7 +117,8 @@ " static int w1_process(void *data)\n" " {\n" "Index: dtor/drivers/w1/w1_io.c\n" - "=================================--- dtor.orig/drivers/w1/w1_io.c\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/w1_io.c\n" "+++ dtor/drivers/w1/w1_io.c\n" "@@ -178,13 +178,100 @@ u8 w1_calc_crc8(u8 * data, int len)\n" " \treturn crc;\n" @@ -167,15 +169,15 @@ "+\t\t\tif (id_bit && comp_bit)\n" "+\t\t\t\tbreak;\n" "+\n" - "+\t\t\tif (id_bit = 0 && comp_bit = 0) {\n" - "+\t\t\t\tif (i = desc_bit)\n" + "+\t\t\tif (id_bit == 0 && comp_bit == 0) {\n" + "+\t\t\t\tif (i == desc_bit)\n" "+\t\t\t\t\tsearch_bit = 1;\n" "+\t\t\t\telse if (i > desc_bit)\n" "+\t\t\t\t\tsearch_bit = 0;\n" "+\t\t\t\telse\n" "+\t\t\t\t\tsearch_bit = ((last >> i) & 0x1);\n" "+\n" - "+\t\t\t\tif (search_bit = 0) {\n" + "+\t\t\t\tif (search_bit == 0) {\n" "+\t\t\t\t\tlast_zero = i;\n" "+\t\t\t\t\tif (last_zero < 9)\n" "+\t\t\t\t\t\tlast_family_desc = last_zero;\n" @@ -200,7 +202,7 @@ "+\t\t}\n" "+#endif\n" "+\n" - "+\t\tif (desc_bit = last_zero)\n" + "+\t\tif (desc_bit == last_zero)\n" "+\t\t\tlast_device = 1;\n" "+\n" "+\t\tdesc_bit = last_zero;\n" @@ -221,7 +223,8 @@ " \n" " EXPORT_SYMBOL(w1_write_bit);\n" "Index: dtor/drivers/w1/w1.h\n" - "=================================--- dtor.orig/drivers/w1/w1.h\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/w1.h\n" "+++ dtor/drivers/w1/w1.h\n" "@@ -132,7 +132,6 @@ struct w1_master\n" " struct w1_master *w1_allocate_master_device(void);\n" @@ -231,4 +234,4 @@ " \n" #endif /* __KERNEL__ */ -1c779e650fed2b1bd2d08e318f4c2d9033b1936e2bbae44964b374d34ab103ff +b984ab9e0573d24aa48f87da1848a30f80793af74772916f420aa5f85263efc7
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.