sdcard: update the CSD CRC register regardless the CSD structure version

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Message-id: 20180215221325.7611-3-f4bug@amsat.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2018-02-22 15:12:53 +00:00 committed by Peter Maydell
parent 9273ea6123
commit e8feec808e

View File

@ -378,7 +378,6 @@ static void sd_set_csd(SDState *sd, uint64_t size)
sd->csd[13] = 0x20 | /* Max. write data block length */ sd->csd[13] = 0x20 | /* Max. write data block length */
((HWBLOCK_SHIFT << 6) & 0xc0); ((HWBLOCK_SHIFT << 6) & 0xc0);
sd->csd[14] = 0x00; /* File format group */ sd->csd[14] = 0x00; /* File format group */
sd->csd[15] = (sd_crc7(sd->csd, 15) << 1) | 1;
} else { /* SDHC */ } else { /* SDHC */
size /= 512 * 1024; size /= 512 * 1024;
size -= 1; size -= 1;
@ -397,8 +396,8 @@ static void sd_set_csd(SDState *sd, uint64_t size)
sd->csd[12] = 0x0a; sd->csd[12] = 0x0a;
sd->csd[13] = 0x40; sd->csd[13] = 0x40;
sd->csd[14] = 0x00; sd->csd[14] = 0x00;
sd->csd[15] = 0x00;
} }
sd->csd[15] = (sd_crc7(sd->csd, 15) << 1) | 1;
} }
static void sd_set_rca(SDState *sd) static void sd_set_rca(SDState *sd)