| Message ID | 20180123033034.29493-6-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | SDCard: bugfixes, support UHS-I (part 5) | expand |
On Mon, Jan 22, 2018 at 7:30 PM, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > This device does not model MMCA Specification previous to v4.2 > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Alistair Francis <alistair.francis@xilinx.com> Alistair > --- > hw/sd/sd.c | 33 --------------------------------- > 1 file changed, 33 deletions(-) > > diff --git a/hw/sd/sd.c b/hw/sd/sd.c > index 5d50d48097..3c66521862 100644 > --- a/hw/sd/sd.c > +++ b/hw/sd/sd.c > @@ -1044,24 +1044,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) > } > break; > > - case 11: /* CMD11: READ_DAT_UNTIL_STOP */ > - if (sd->spi) > - goto bad_cmd; > - switch (sd->state) { > - case sd_transfer_state: > - sd->state = sd_sendingdata_state; > - sd->data_start = req.arg; > - sd->data_offset = 0; > - > - if (sd->data_start + sd->blk_len > sd->size) > - sd->card_status |= ADDRESS_ERROR; > - return sd_r0; > - > - default: > - break; > - } > - break; > - > case 12: /* CMD12: STOP_TRANSMISSION */ > switch (sd->state) { > case sd_sendingdata_state: > @@ -1874,21 +1856,6 @@ uint8_t sd_read_data(SDState *sd) > sd->state = sd_transfer_state; > break; > > - case 11: /* CMD11: READ_DAT_UNTIL_STOP */ > - if (sd->data_offset == 0) > - BLK_READ_BLOCK(sd->data_start, io_len); > - ret = sd->data[sd->data_offset ++]; > - > - if (sd->data_offset >= io_len) { > - sd->data_start += io_len; > - sd->data_offset = 0; > - if (sd->data_start + io_len > sd->size) { > - sd->card_status |= ADDRESS_ERROR; > - break; > - } > - } > - break; > - > case 13: /* ACMD13: SD_STATUS */ > ret = sd->sd_status[sd->data_offset ++]; > > -- > 2.15.1 > >
diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 5d50d48097..3c66521862 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1044,24 +1044,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) } break; - case 11: /* CMD11: READ_DAT_UNTIL_STOP */ - if (sd->spi) - goto bad_cmd; - switch (sd->state) { - case sd_transfer_state: - sd->state = sd_sendingdata_state; - sd->data_start = req.arg; - sd->data_offset = 0; - - if (sd->data_start + sd->blk_len > sd->size) - sd->card_status |= ADDRESS_ERROR; - return sd_r0; - - default: - break; - } - break; - case 12: /* CMD12: STOP_TRANSMISSION */ switch (sd->state) { case sd_sendingdata_state: @@ -1874,21 +1856,6 @@ uint8_t sd_read_data(SDState *sd) sd->state = sd_transfer_state; break; - case 11: /* CMD11: READ_DAT_UNTIL_STOP */ - if (sd->data_offset == 0) - BLK_READ_BLOCK(sd->data_start, io_len); - ret = sd->data[sd->data_offset ++]; - - if (sd->data_offset >= io_len) { - sd->data_start += io_len; - sd->data_offset = 0; - if (sd->data_start + io_len > sd->size) { - sd->card_status |= ADDRESS_ERROR; - break; - } - } - break; - case 13: /* ACMD13: SD_STATUS */ ret = sd->sd_status[sd->data_offset ++];
This device does not model MMCA Specification previous to v4.2 Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/sd/sd.c | 33 --------------------------------- 1 file changed, 33 deletions(-)