On Tue, Jun 30, 2020 at 6:40 AM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> From: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> To make the next commit easier to review, clean this code first.
>
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> hw/sd/sd.c | 24 ++++++++++++++++--------
> 1 file changed, 16 insertions(+), 8 deletions(-)
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index 97a9d32964..cac8d7d828 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -1170,8 +1170,9 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
> sd->data_start = addr;
> sd->data_offset = 0;
>
> - if (sd->data_start + sd->blk_len > sd->size)
> + if (sd->data_start + sd->blk_len > sd->size) {
> sd->card_status |= ADDRESS_ERROR;
> + }
> return sd_r1;
>
> default:
> @@ -1186,8 +1187,9 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
> sd->data_start = addr;
> sd->data_offset = 0;
>
> - if (sd->data_start + sd->blk_len > sd->size)
> + if (sd->data_start + sd->blk_len > sd->size) {
> sd->card_status |= ADDRESS_ERROR;
> + }
> return sd_r1;
>
> default:
> @@ -1232,12 +1234,15 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
> sd->data_offset = 0;
> sd->blk_written = 0;
>
> - if (sd->data_start + sd->blk_len > sd->size)
> + if (sd->data_start + sd->blk_len > sd->size) {
> sd->card_status |= ADDRESS_ERROR;
> - if (sd_wp_addr(sd, sd->data_start))
> + }
> + if (sd_wp_addr(sd, sd->data_start)) {
> sd->card_status |= WP_VIOLATION;
> - if (sd->csd[14] & 0x30)
> + }
> + if (sd->csd[14] & 0x30) {
> sd->card_status |= WP_VIOLATION;
> + }
> return sd_r1;
>
> default:
> @@ -1256,12 +1261,15 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
> sd->data_offset = 0;
> sd->blk_written = 0;
>
> - if (sd->data_start + sd->blk_len > sd->size)
> + if (sd->data_start + sd->blk_len > sd->size) {
> sd->card_status |= ADDRESS_ERROR;
> - if (sd_wp_addr(sd, sd->data_start))
> + }
> + if (sd_wp_addr(sd, sd->data_start)) {
> sd->card_status |= WP_VIOLATION;
> - if (sd->csd[14] & 0x30)
> + }
> + if (sd->csd[14] & 0x30) {
> sd->card_status |= WP_VIOLATION;
> + }
> return sd_r1;
>
> default:
> --
> 2.21.3
>
>