[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 20/32] sdcard: clean the SCR register and add few com
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 20/32] sdcard: clean the SCR register and add few comments |
Date: |
Thu, 22 Feb 2018 15:22:55 +0000 |
From: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
---
hw/sd/sd.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 3526269dbe..c87142d648 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -298,10 +298,13 @@ static void sd_ocr_powerup(void *opaque)
static void sd_set_scr(SDState *sd)
{
- sd->scr[0] = 0x00; /* SCR Structure */
- sd->scr[1] = 0x2f; /* SD Security Support */
- sd->scr[2] = 0x00;
+ sd->scr[0] = (0 << 4) /* SCR version 1.0 */
+ | 0; /* Spec Versions 1.0 and 1.01 */
+ sd->scr[1] = (2 << 4) /* SDSC Card (Security Version 1.01) */
+ | 0b0101; /* 1-bit or 4-bit width bus modes */
+ sd->scr[2] = 0x00; /* Extended Security is not supported. */
sd->scr[3] = 0x00;
+ /* reserved for manufacturer usage */
sd->scr[4] = 0x00;
sd->scr[5] = 0x00;
sd->scr[6] = 0x00;
--
2.16.1
- [Qemu-devel] [PULL 08/32] hw/sd/ssi-sd: use the SDBus API, connect the SDCard to the bus, (continued)
- [Qemu-devel] [PULL 08/32] hw/sd/ssi-sd: use the SDBus API, connect the SDCard to the bus, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 10/32] sdcard: replace DPRINTF() by trace events, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 07/32] hw/sd/milkymist-memcard: expose a SDBus and connect the SDCard to it, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 09/32] sdcard: reorder SDState struct members, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 11/32] sdcard: add a trace event for command responses, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 13/32] sdcard: add more trace events, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 12/32] sdcard: replace fprintf() by qemu_hexdump(), Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 14/32] sdcard: define SDMMC_CMD_MAX instead of using the magic '64', Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 17/32] sdcard: Don't always set the high capacity bit, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 19/32] sdcard: fix the 'maximum data transfer rate' to 25MHz, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 20/32] sdcard: clean the SCR register and add few comments,
Peter Maydell <=
- [Qemu-devel] [PULL 16/32] sdcard: use the registerfields API to access the OCR register, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 15/32] sdcard: use G_BYTE from cutils, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 21/32] sdcard: remove commands from unsupported old MMC specification, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 18/32] sdcard: update the CSD CRC register regardless the CSD structure version, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 23/32] sdcard: use the correct masked OCR in the R3 reply, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 22/32] sdcard: simplify using the ldst API, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 25/32] sdcard: handle CMD54 (SDIO), Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 24/32] sdcard: use the registerfields API for the CARD_STATUS register masks, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 26/32] sdcard: handle the Security Specification commands, Peter Maydell, 2018/02/22
- [Qemu-devel] [PULL 28/32] sdcard: handles more commands in SPI mode, Peter Maydell, 2018/02/22