diff for duplicates of <1233620263.13918.31.camel@localhost.localdomain> diff --git a/a/content_digest b/N1/content_digest index b923665..e900d89 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,14 +2,15 @@ "From\0Adrian McMenamin <adrian@newgolddream.dyndns.info>\0" "Subject\0Re: [PATCH] sh: maple: Add support for VMU devices (v2) [1/3]\0" "Date\0Tue, 03 Feb 2009 00:17:43 +0000\0" - "To\0greg KH <greg@kroah.com>\0" - "Cc\0Paul Mundt <lethal@linux-sh.org>" + "To\0greg KH <greg@kroah.com>" + " dwmw2 <dwmw2@infradead.org>\0" + "Cc\0linux-sh <linux-sh@vger.kernel.org>" Dmitry Torokhov <dmitry.torokhov@gmail.com> - dwmw2 <dwmw2@infradead.org> LKML <linux-kernel@vger.kernel.org> + Paul Mundt <lethal@linux-sh.org> MTD <linux-mtd@lists.infradead.org> - linux-sh <linux-sh@vger.kernel.org> - " linux-input <linux-input@vger.kernel.org>\0" + linux-input <linux-input@vger.kernel.org> + " dwmw2 <dwmw2@infradead.org>\0" "\00:1\0" "b\0" "Adding support for the Dreamcast VMU as an MTD map.\n" @@ -887,4 +888,4 @@ "+MODULE_AUTHOR(\"Adrian McMenamin\");\n" "+MODULE_DESCRIPTION(\"Flash mapping for Sega Dreamcast visual memory\");" -33ce61b1e1ffe870cab2b7002c1c8a15c08065d7c9e5bb3eb83f2dd7b54e7c4f +65ad9be0a686e37d1bb676a68e217a75c815aec7af51e70e8cbde0db723c23ce
diff --git a/a/1.txt b/N2/1.txt index 92d28ea..8bd5183 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -193,10 +193,10 @@ index 0000000..f5c77f5 + for (x = 0; x < card->readcnt; x++) { + sendbuf = cpu_to_be32(partition << 24 | x << 16 | num); + -+ if (mdev->busy == 1) { ++ if (mdev->busy = 1) { + wait_event_interruptible_timeout(mdev->maple_wait, -+ (mdev->busy == 0), HZ); -+ if (mdev->busy == 1) { ++ (mdev->busy = 0), HZ); ++ if (mdev->busy = 1) { + dev_notice(&mdev->dev, "VMU at (%d, %d)" + " is busy\n", mdev->port, mdev->unit); + error = -EAGAIN; @@ -218,24 +218,24 @@ index 0000000..f5c77f5 + error = maple_add_packet(mdev, MAPLE_FUNC_MEMCARD, + MAPLE_COMMAND_BREAD, 2, &sendbuf); + wait = wait_event_interruptible_timeout(mdev->maple_wait, -+ ((mdev->busy == 0) || (mdev->busy == 2)), HZ/2); ++ ((mdev->busy = 0) || (mdev->busy = 2)), HZ/2); + /* + * MTD layer does not handle hotplugging well + * so have to return errors when VMU is unplugged -+ * in the middle of a read (busy == 2) ++ * in the middle of a read (busy = 2) + */ -+ if (error || (mdev->busy == 2)) { -+ if (mdev->busy == 2) ++ if (error || (mdev->busy = 2)) { ++ if (mdev->busy = 2) + error = -ENXIO; + mdev->busy = 0; + goto outA; + } -+ if ((wait == 0) || (wait == -ERESTARTSYS)) { ++ if ((wait = 0) || (wait = -ERESTARTSYS)) { + kfree(mdev->mq->sendbuf); + list_del_init(&(mdev->mq->list)); + mdev->busy = 0; + error = -EIO; -+ if (wait == -ERESTARTSYS) ++ if (wait = -ERESTARTSYS) + dev_warn(&mdev->dev, "VMU read on (%d, %d)" + " interrupted on block 0x%X\n", + mdev->port, mdev->unit, num); @@ -289,10 +289,10 @@ index 0000000..f5c77f5 + memcpy(&sendbuf[1], buf + phaselen * x, phaselen); + /* wait until the device is not busy doing something else + * or 1 second - which ever is longer */ -+ if (mdev->busy == 1) { ++ if (mdev->busy = 1) { + wait_event_interruptible_timeout(mdev->maple_wait, -+ (mdev->busy == 0), HZ); -+ if (mdev->busy == 1) { ++ (mdev->busy = 0), HZ); ++ if (mdev->busy = 1) { + error = -EBUSY; + dev_notice(&mdev->dev, "VMU write at (%d, %d)" + "failed - device is busy\n", @@ -305,15 +305,15 @@ index 0000000..f5c77f5 + locking = maple_add_packet(mdev, MAPLE_FUNC_MEMCARD, + MAPLE_COMMAND_BWRITE, phaselen / 4 + 2, sendbuf); + wait = wait_event_interruptible_timeout(mdev->maple_wait, -+ (mdev->busy == 0), HZ/10); ++ (mdev->busy = 0), HZ/10); + if (locking) { + error = -EIO; + mdev->busy = 0; + goto fail_nolock; + } -+ if (mdev->busy == 2) { ++ if (mdev->busy = 2) { + mdev->busy = 0; -+ } else if ((wait == 0) || (wait == -ERESTARTSYS)) { ++ } else if ((wait = 0) || (wait = -ERESTARTSYS)) { + error = -EIO; + dev_warn(&mdev->dev, "Write at (%d, %d) of block" + " 0x%X at phase %d failed: could not" @@ -408,7 +408,7 @@ index 0000000..f5c77f5 + numblocks = card->parts[partition].numblocks; + if (from + len > numblocks * card->blocklen) + len = numblocks * card->blocklen - from; -+ if (len == 0) ++ if (len = 0) + return -EIO; + /* Have we cached this bit already? */ + pcache = (card->parts[partition]).pcache; @@ -419,7 +419,7 @@ index 0000000..f5c77f5 + /* Have we cached this and is the cache valid and timely? */ + if (pcache->valid && + time_before(jiffies, pcache->jiffies_atc + HZ) && -+ (pcache->block == vblock->num)) { ++ (pcache->block = vblock->num)) { + /* we have cached it, so do necessary copying */ + leftover = card->blocklen - vblock->ofs; + if (vblock->ofs + len - index < card->blocklen) { @@ -479,7 +479,7 @@ index 0000000..f5c77f5 + numblocks = card->parts[partition].numblocks; + if (to + len > numblocks * card->blocklen) + len = numblocks * card->blocklen - to; -+ if (len == 0) { ++ if (len = 0) { + error = -EIO; + goto failed; + } @@ -703,10 +703,10 @@ index 0000000..f5c77f5 + MAPLE_FUNC_MEMCARD); + + /* Make sure we are clear to go */ -+ if (mdev->busy == 1) { ++ if (mdev->busy = 1) { + wait_event_interruptible_timeout(mdev->maple_wait, -+ (mdev->busy == 0), HZ); -+ if (mdev->busy == 1) { ++ (mdev->busy = 0), HZ); ++ if (mdev->busy = 1) { + dev_notice(&mdev->dev, "VMU at (%d, %d) is busy\n", + mdev->port, mdev->unit); + error = -EAGAIN; diff --git a/a/content_digest b/N2/content_digest index b923665..465b7cd 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -207,10 +207,10 @@ "+\tfor (x = 0; x < card->readcnt; x++) {\n" "+\t\tsendbuf = cpu_to_be32(partition << 24 | x << 16 | num);\n" "+\n" - "+\t\tif (mdev->busy == 1) {\n" + "+\t\tif (mdev->busy = 1) {\n" "+\t\t\twait_event_interruptible_timeout(mdev->maple_wait,\n" - "+\t\t\t\t(mdev->busy == 0), HZ);\n" - "+\t\t\tif (mdev->busy == 1) {\n" + "+\t\t\t\t(mdev->busy = 0), HZ);\n" + "+\t\t\tif (mdev->busy = 1) {\n" "+\t\t\t\tdev_notice(&mdev->dev, \"VMU at (%d, %d)\"\n" "+\t\t\t\t\t\" is busy\\n\", mdev->port, mdev->unit);\n" "+\t\t\t\terror = -EAGAIN;\n" @@ -232,24 +232,24 @@ "+\t\terror = maple_add_packet(mdev, MAPLE_FUNC_MEMCARD,\n" "+\t\t\t\tMAPLE_COMMAND_BREAD, 2, &sendbuf);\n" "+\t\twait = wait_event_interruptible_timeout(mdev->maple_wait,\n" - "+\t\t\t((mdev->busy == 0) || (mdev->busy == 2)), HZ/2);\n" + "+\t\t\t((mdev->busy = 0) || (mdev->busy = 2)), HZ/2);\n" "+\t\t/*\n" "+\t\t* MTD layer does not handle hotplugging well\n" "+\t\t* so have to return errors when VMU is unplugged\n" - "+\t\t* in the middle of a read (busy == 2)\n" + "+\t\t* in the middle of a read (busy = 2)\n" "+\t\t*/\n" - "+\t\tif (error || (mdev->busy == 2)) {\n" - "+\t\t\tif (mdev->busy == 2)\n" + "+\t\tif (error || (mdev->busy = 2)) {\n" + "+\t\t\tif (mdev->busy = 2)\n" "+\t\t\t\terror = -ENXIO;\n" "+\t\t\tmdev->busy = 0;\n" "+\t\t\tgoto outA;\n" "+\t\t}\n" - "+\t\tif ((wait == 0) || (wait == -ERESTARTSYS)) {\n" + "+\t\tif ((wait = 0) || (wait = -ERESTARTSYS)) {\n" "+\t\t\tkfree(mdev->mq->sendbuf);\n" "+\t\t\tlist_del_init(&(mdev->mq->list));\n" "+\t\t\tmdev->busy = 0;\n" "+\t\t\terror = -EIO;\n" - "+\t\t\tif (wait == -ERESTARTSYS)\n" + "+\t\t\tif (wait = -ERESTARTSYS)\n" "+\t\t\t\tdev_warn(&mdev->dev, \"VMU read on (%d, %d)\"\n" "+\t\t\t\t\t\" interrupted on block 0x%X\\n\",\n" "+\t\t\t\t\tmdev->port, mdev->unit, num);\n" @@ -303,10 +303,10 @@ "+\t\tmemcpy(&sendbuf[1], buf + phaselen * x, phaselen);\n" "+\t\t/* wait until the device is not busy doing something else\n" "+\t\t* or 1 second - which ever is longer */\n" - "+\t\tif (mdev->busy == 1) {\n" + "+\t\tif (mdev->busy = 1) {\n" "+\t\t\twait_event_interruptible_timeout(mdev->maple_wait,\n" - "+\t\t\t\t(mdev->busy == 0), HZ);\n" - "+\t\t\tif (mdev->busy == 1) {\n" + "+\t\t\t\t(mdev->busy = 0), HZ);\n" + "+\t\t\tif (mdev->busy = 1) {\n" "+\t\t\t\terror = -EBUSY;\n" "+\t\t\t\tdev_notice(&mdev->dev, \"VMU write at (%d, %d)\"\n" "+\t\t\t\t\t\"failed - device is busy\\n\",\n" @@ -319,15 +319,15 @@ "+\t\tlocking = maple_add_packet(mdev, MAPLE_FUNC_MEMCARD,\n" "+\t\t\tMAPLE_COMMAND_BWRITE, phaselen / 4 + 2, sendbuf);\n" "+\t\twait = wait_event_interruptible_timeout(mdev->maple_wait,\n" - "+\t\t\t(mdev->busy == 0), HZ/10);\n" + "+\t\t\t(mdev->busy = 0), HZ/10);\n" "+\t\tif (locking) {\n" "+\t\t\terror = -EIO;\n" "+\t\t\tmdev->busy = 0;\n" "+\t\t\tgoto fail_nolock;\n" "+\t\t}\n" - "+\t\tif (mdev->busy == 2) {\n" + "+\t\tif (mdev->busy = 2) {\n" "+\t\t\tmdev->busy = 0;\n" - "+\t\t} else if ((wait == 0) || (wait == -ERESTARTSYS)) {\n" + "+\t\t} else if ((wait = 0) || (wait = -ERESTARTSYS)) {\n" "+\t\t\terror = -EIO;\n" "+\t\t\tdev_warn(&mdev->dev, \"Write at (%d, %d) of block\"\n" "+\t\t\t\t\" 0x%X at phase %d failed: could not\"\n" @@ -422,7 +422,7 @@ "+\tnumblocks = card->parts[partition].numblocks;\n" "+\tif (from + len > numblocks * card->blocklen)\n" "+\t\tlen = numblocks * card->blocklen - from;\n" - "+\tif (len == 0)\n" + "+\tif (len = 0)\n" "+\t\treturn -EIO;\n" "+\t/* Have we cached this bit already? */\n" "+\tpcache = (card->parts[partition]).pcache;\n" @@ -433,7 +433,7 @@ "+\t\t/* Have we cached this and is the cache valid and timely? */\n" "+\t\tif (pcache->valid &&\n" "+\t\t\ttime_before(jiffies, pcache->jiffies_atc + HZ) &&\n" - "+\t\t\t(pcache->block == vblock->num)) {\n" + "+\t\t\t(pcache->block = vblock->num)) {\n" "+\t\t\t/* we have cached it, so do necessary copying */\n" "+\t\t\tleftover = card->blocklen - vblock->ofs;\n" "+\t\t\tif (vblock->ofs + len - index < card->blocklen) {\n" @@ -493,7 +493,7 @@ "+\tnumblocks = card->parts[partition].numblocks;\n" "+\tif (to + len > numblocks * card->blocklen)\n" "+\t\tlen = numblocks * card->blocklen - to;\n" - "+\tif (len == 0) {\n" + "+\tif (len = 0) {\n" "+\t\terror = -EIO;\n" "+\t\tgoto failed;\n" "+\t}\n" @@ -717,10 +717,10 @@ "+\t\tMAPLE_FUNC_MEMCARD);\n" "+\n" "+\t/* Make sure we are clear to go */\n" - "+\tif (mdev->busy == 1) {\n" + "+\tif (mdev->busy = 1) {\n" "+\t\twait_event_interruptible_timeout(mdev->maple_wait,\n" - "+\t\t\t(mdev->busy == 0), HZ);\n" - "+\t\tif (mdev->busy == 1) {\n" + "+\t\t\t(mdev->busy = 0), HZ);\n" + "+\t\tif (mdev->busy = 1) {\n" "+\t\t\tdev_notice(&mdev->dev, \"VMU at (%d, %d) is busy\\n\",\n" "+\t\t\t\tmdev->port, mdev->unit);\n" "+\t\t\terror = -EAGAIN;\n" @@ -887,4 +887,4 @@ "+MODULE_AUTHOR(\"Adrian McMenamin\");\n" "+MODULE_DESCRIPTION(\"Flash mapping for Sega Dreamcast visual memory\");" -33ce61b1e1ffe870cab2b7002c1c8a15c08065d7c9e5bb3eb83f2dd7b54e7c4f +d123d54f6a64ea0fcb8d0bb3930d0ea1da24893ef10a80725544a5657df3c3bc
diff --git a/a/content_digest b/N3/content_digest index b923665..f555a03 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -2,7 +2,8 @@ "From\0Adrian McMenamin <adrian@newgolddream.dyndns.info>\0" "Subject\0Re: [PATCH] sh: maple: Add support for VMU devices (v2) [1/3]\0" "Date\0Tue, 03 Feb 2009 00:17:43 +0000\0" - "To\0greg KH <greg@kroah.com>\0" + "To\0greg KH <greg@kroah.com>" + " dwmw2 <dwmw2@infradead.org>\0" "Cc\0Paul Mundt <lethal@linux-sh.org>" Dmitry Torokhov <dmitry.torokhov@gmail.com> dwmw2 <dwmw2@infradead.org> @@ -887,4 +888,4 @@ "+MODULE_AUTHOR(\"Adrian McMenamin\");\n" "+MODULE_DESCRIPTION(\"Flash mapping for Sega Dreamcast visual memory\");" -33ce61b1e1ffe870cab2b7002c1c8a15c08065d7c9e5bb3eb83f2dd7b54e7c4f +e7387a0c53322d465afdcfdff2b8f698a318228d92f2843f5707e83002671ab0
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.