diff for duplicates of <51CD5C59.2020909@renesas.com> diff --git a/a/1.txt b/N1/1.txt index c9be30b..0471121 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -68,7 +68,7 @@ I will add a new WAIT state. >> @@ -1212,13 +1236,35 @@ static irqreturn_t sh_mmcif_irqt(int irq, void *dev_id) > > Now, when we enter sh_mmcif_irqt() after an SBC command completion, we -> still have "host->wait_for == MMCIF_WAIT_FOR_CMD" so we enter +> still have "host->wait_for = MMCIF_WAIT_FOR_CMD" so we enter > sh_mmcif_end_cmd(), right? But you set mrq->data = NULL above, so, it just > (possibly) gets a response and returns. So far so good. @@ -98,7 +98,7 @@ I got it, I will modify this. >> return IRQ_HANDLED; >> } >> ->> + if (mrq->sbc && (mrq->cmd->opcode == MMC_WRITE_MULTIPLE_BLOCK) && +>> + if (mrq->sbc && (mrq->cmd->opcode = MMC_WRITE_MULTIPLE_BLOCK) && >> + (host->wait_for != MMCIF_WAIT_FOR_WRITE_END)) { >> + /* Wait for end of data phase */ >> + host->wait_for = MMCIF_WAIT_FOR_WRITE_END; @@ -108,7 +108,7 @@ I got it, I will modify this. >> + return IRQ_HANDLED; >> + } >> + ->> + if (mrq->sbc && (mrq->cmd->opcode == MMC_READ_MULTIPLE_BLOCK) && +>> + if (mrq->sbc && (mrq->cmd->opcode = MMC_READ_MULTIPLE_BLOCK) && >> + (host->wait_for != MMCIF_WAIT_FOR_READ_END)) { >> + /* Wait for end of data phase */ >> + host->wait_for = MMCIF_WAIT_FOR_READ_END; @@ -148,8 +148,7 @@ even if we use SBC: >> struct mmc_data *data = mrq->data; >> if (!mrq->cmd->error && data && !data->error) ->> data->bytes_xfered = ->> data->blocks * data->blksz; +>> data->bytes_xfered >> data->blocks * data->blksz; We need this code. @@ -164,7 +163,7 @@ We need this code. >> } >> } >> ->> + if ((mrq->cmd->opcode == MMC_SET_BLOCK_COUNT) && !mrq->cmd->error) { +>> + if ((mrq->cmd->opcode = MMC_SET_BLOCK_COUNT) && !mrq->cmd->error) { > > This won't be needed. diff --git a/a/content_digest b/N1/content_digest index 62f7e33..0f49d46 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\0Pine.LNX.4.64.1306280843140.29767@axis700.grange\0" "From\0Shimoda, Yoshihiro <yoshihiro.shimoda.uh@renesas.com>\0" "Subject\0Re: [PATCH v2] mmc: sh_mmcif: add SET_BLOCK_COUNT support\0" - "Date\0Fri, 28 Jun 2013 18:50:17 +0900\0" + "Date\0Fri, 28 Jun 2013 09:50:17 +0000\0" "To\0Guennadi Liakhovetski <g.liakhovetski@gmx.de>\0" "Cc\0cjb@laptop.org" linux-mmc@vger.kernel.org @@ -79,7 +79,7 @@ ">> @@ -1212,13 +1236,35 @@ static irqreturn_t sh_mmcif_irqt(int irq, void *dev_id)\n" ">\n" "> Now, when we enter sh_mmcif_irqt() after an SBC command completion, we\n" - "> still have \"host->wait_for == MMCIF_WAIT_FOR_CMD\" so we enter\n" + "> still have \"host->wait_for = MMCIF_WAIT_FOR_CMD\" so we enter\n" "> sh_mmcif_end_cmd(), right? But you set mrq->data = NULL above, so, it just\n" "> (possibly) gets a response and returns. So far so good.\n" "\n" @@ -109,7 +109,7 @@ ">> \t\treturn IRQ_HANDLED;\n" ">> \t}\n" ">>\n" - ">> +\tif (mrq->sbc && (mrq->cmd->opcode == MMC_WRITE_MULTIPLE_BLOCK) &&\n" + ">> +\tif (mrq->sbc && (mrq->cmd->opcode = MMC_WRITE_MULTIPLE_BLOCK) &&\n" ">> +\t\t\t(host->wait_for != MMCIF_WAIT_FOR_WRITE_END)) {\n" ">> +\t\t/* Wait for end of data phase */\n" ">> +\t\thost->wait_for = MMCIF_WAIT_FOR_WRITE_END;\n" @@ -119,7 +119,7 @@ ">> +\t\treturn IRQ_HANDLED;\n" ">> +\t}\n" ">> +\n" - ">> +\tif (mrq->sbc && (mrq->cmd->opcode == MMC_READ_MULTIPLE_BLOCK) &&\n" + ">> +\tif (mrq->sbc && (mrq->cmd->opcode = MMC_READ_MULTIPLE_BLOCK) &&\n" ">> +\t\t\t(host->wait_for != MMCIF_WAIT_FOR_READ_END)) {\n" ">> +\t\t/* Wait for end of data phase */\n" ">> +\t\thost->wait_for = MMCIF_WAIT_FOR_READ_END;\n" @@ -159,8 +159,7 @@ "\n" ">> \t\tstruct mmc_data *data = mrq->data;\n" ">> \t\tif (!mrq->cmd->error && data && !data->error)\n" - ">> \t\t\tdata->bytes_xfered =\n" - ">> \t\t\t\tdata->blocks * data->blksz;\n" + ">> \t\t\tdata->bytes_xfered >> \t\t\t\tdata->blocks * data->blksz;\n" "\n" "We need this code.\n" "\n" @@ -175,7 +174,7 @@ ">> \t\t}\n" ">> \t}\n" ">>\n" - ">> +\tif ((mrq->cmd->opcode == MMC_SET_BLOCK_COUNT) && !mrq->cmd->error) {\n" + ">> +\tif ((mrq->cmd->opcode = MMC_SET_BLOCK_COUNT) && !mrq->cmd->error) {\n" ">\n" "> This won't be needed.\n" "\n" @@ -205,4 +204,4 @@ "> http://www.open-technology.de/\n" > -1453a909ef41ab08c21723a3f6e7a0e45441ba3b495a32424e0eb5c27fcfdec8 +354107adc0c58f69b66c52085ecaff6a09cf758c0f5f06124dcbc2e2663c4c39
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.