diff for duplicates of <878v1vmtef.fsf@octavius.laptop.org> diff --git a/a/1.txt b/N1/1.txt index 1c94525..85ce33a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -39,7 +39,7 @@ On Mon, Jun 17 2013, Shimoda, Yoshihiro wrote: > @@ -802,7 +804,11 @@ static u32 sh_mmcif_set_cmd(struct sh_mmcif_host *host, > tmp |= CMD_SET_DWEN; > /* CMLTE/CMD12EN */ -> if (opc == MMC_READ_MULTIPLE_BLOCK || opc == MMC_WRITE_MULTIPLE_BLOCK) { +> if (opc = MMC_READ_MULTIPLE_BLOCK || opc = MMC_WRITE_MULTIPLE_BLOCK) { > - tmp |= CMD_SET_CMLTE | CMD_SET_CMD12EN; > + /* If SBC, we don't use CMD12(STOP) */ > + if (mrq->sbc) @@ -83,7 +83,7 @@ On Mon, Jun 17 2013, Shimoda, Yoshihiro wrote: > 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; @@ -93,7 +93,7 @@ On Mon, Jun 17 2013, Shimoda, Yoshihiro wrote: > + 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; @@ -106,8 +106,7 @@ On Mon, Jun 17 2013, Shimoda, Yoshihiro wrote: > if (host->wait_for != MMCIF_WAIT_FOR_STOP) { > 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; > > - if (mrq->stop && !mrq->cmd->error && (!data || !data->error)) { > + /* If SBC, we don't use CMD12(STOP) */ @@ -120,7 +119,7 @@ On Mon, Jun 17 2013, Shimoda, Yoshihiro wrote: > } > } > -> + if ((mrq->cmd->opcode == MMC_SET_BLOCK_COUNT) && !mrq->cmd->error) { +> + if ((mrq->cmd->opcode = MMC_SET_BLOCK_COUNT) && !mrq->cmd->error) { > + /* Send the original .request() command */ > + host->mrq = host->mrq_orig; > + sh_mmcif_start_cmd(host, host->mrq); diff --git a/a/content_digest b/N1/content_digest index 9a6aa21..f81bd70 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\051BFD0C0.4080908@renesas.com\0" "From\0Chris Ball <cjb@laptop.org>\0" "Subject\0Re: [PATCH v2] mmc: sh_mmcif: add SET_BLOCK_COUNT support\0" - "Date\0Thu, 27 Jun 2013 12:04:56 -0400\0" + "Date\0Thu, 27 Jun 2013 16:04:56 +0000\0" "To\0Shimoda" " Yoshihiro <yoshihiro.shimoda.uh@renesas.com>\0" "Cc\0linux-mmc@vger.kernel.org" @@ -50,7 +50,7 @@ "> @@ -802,7 +804,11 @@ static u32 sh_mmcif_set_cmd(struct sh_mmcif_host *host,\n" "> \t\ttmp |= CMD_SET_DWEN;\n" "> \t/* CMLTE/CMD12EN */\n" - "> \tif (opc == MMC_READ_MULTIPLE_BLOCK || opc == MMC_WRITE_MULTIPLE_BLOCK) {\n" + "> \tif (opc = MMC_READ_MULTIPLE_BLOCK || opc = MMC_WRITE_MULTIPLE_BLOCK) {\n" "> -\t\ttmp |= CMD_SET_CMLTE | CMD_SET_CMD12EN;\n" "> +\t\t/* If SBC, we don't use CMD12(STOP) */\n" "> +\t\tif (mrq->sbc)\n" @@ -94,7 +94,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" @@ -104,7 +104,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" @@ -117,8 +117,7 @@ "> \tif (host->wait_for != MMCIF_WAIT_FOR_STOP) {\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" "> -\t\tif (mrq->stop && !mrq->cmd->error && (!data || !data->error)) {\n" "> +\t\t/* If SBC, we don't use CMD12(STOP) */\n" @@ -131,7 +130,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" "> +\t\t/* Send the original .request() command */\n" "> +\t\thost->mrq = host->mrq_orig;\n" "> +\t\tsh_mmcif_start_cmd(host, host->mrq);\n" @@ -147,4 +146,4 @@ "Chris Ball <cjb@laptop.org> <http://printf.net/>\n" One Laptop Per Child -7b59d3cbb9ae01d8cdaaf20d5fd3c30f927c20bd1bcd52160024f44c67129301 +00dec85376efd7f104c71c99c2512a6c220b2464164c4aacde68c20af2c63539
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.