[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/26] sdcard: rename sd_set_REG() functions called
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH 17/26] sdcard: rename sd_set_REG() functions called by sd_reset() as sd_reset_REG() |
Date: |
Wed, 13 Dec 2017 20:20:16 -0300 |
They are only called once, during reset :)
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/sd/sd.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index b231411108..d8e3f60536 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -245,7 +245,7 @@ static uint16_t sd_crc16(void *message, size_t width)
return shift_reg;
}
-static void sd_set_ocr(SDState *sd)
+static void sd_reset_ocr(SDState *sd)
{
/* All voltages OK, Standard Capacity SD Memory Card, not yet powered up */
sd->ocr = 0x00ffff00;
@@ -260,7 +260,7 @@ static void sd_ocr_powerup(void *opaque)
sd->ocr |= OCR_POWER_UP;
}
-static void sd_set_scr(SDState *sd)
+static void sd_reset_scr(SDState *sd)
{
sd->scr[0] = 0x00; /* SCR Structure */
sd->scr[1] = 0x2f; /* SD Security Support */
@@ -279,7 +279,7 @@ static void sd_set_scr(SDState *sd)
#define MDT_YR 2006
#define MDT_MON 2
-static void sd_set_cid(SDState *sd)
+static void sd_reset_cid(SDState *sd)
{
sd->cid[0] = MID; /* Fake card manufacturer ID (MID) */
sd->cid[1] = OID[0]; /* OEM/Application ID (OID) */
@@ -311,7 +311,7 @@ static const uint8_t sd_csd_rw_mask[16] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfe,
};
-static void sd_set_csd(SDState *sd, uint64_t size)
+static void sd_reset_csd(SDState *sd, uint64_t size)
{
uint32_t csize = (size >> (CMULT_SHIFT + HWBLOCK_SHIFT)) - 1;
uint32_t sectsize = (1 << (SECTOR_SHIFT + 1)) - 1;
@@ -380,12 +380,12 @@ static void sd_set_rca(SDState *sd)
#define CARD_STATUS_B 0x00c01e00
#define CARD_STATUS_C 0xfd39a028
-static void sd_set_cardstatus(SDState *sd)
+static void sd_reset_cardstatus(SDState *sd)
{
sd->card_status = 0x00000100;
}
-static void sd_set_sdstatus(SDState *sd)
+static void sd_reset_sdstatus(SDState *sd)
{
memset(sd->sd_status, 0, 64);
}
@@ -455,12 +455,12 @@ static void sd_reset(DeviceState *dev)
sd_set_state(sd, sd_idle_state);
sd->rca = 0x0000;
- sd_set_ocr(sd);
- sd_set_scr(sd);
- sd_set_cid(sd);
- sd_set_csd(sd, size);
- sd_set_cardstatus(sd);
- sd_set_sdstatus(sd);
+ sd_reset_ocr(sd);
+ sd_reset_scr(sd);
+ sd_reset_cid(sd);
+ sd_reset_csd(sd, size);
+ sd_reset_cardstatus(sd);
+ sd_reset_sdstatus(sd);
g_free(sd->wp_groups);
sd->wp_switch = sd->blk ? blk_is_read_only(sd->blk) : false;
--
2.15.1
- [Qemu-devel] [PATCH 07/26] sdcard: add sdcard_set_mode() trace event, (continued)
- [Qemu-devel] [PATCH 07/26] sdcard: add sdcard_set_mode() trace event, Philippe Mathieu-Daudé, 2017/12/13
- [Qemu-devel] [PATCH 08/26] sdcard: add sd_set_state(), Philippe Mathieu-Daudé, 2017/12/13
- [Qemu-devel] [PATCH 10/26] sdcard: use more detailled state/mode trace events, Philippe Mathieu-Daudé, 2017/12/13
- [Qemu-devel] [PATCH 09/26] sdcard: add a sdcard_set_state() trace event, Philippe Mathieu-Daudé, 2017/12/13
- [Qemu-devel] [PATCH 11/26] sdcard: use warn_report() instead of fprintf(), Philippe Mathieu-Daudé, 2017/12/13
- [Qemu-devel] [PATCH 12/26] sdcard: replace DPRINTF() by trace events, Philippe Mathieu-Daudé, 2017/12/13
- [Qemu-devel] [PATCH 13/26] sdcard: add more trace events, Philippe Mathieu-Daudé, 2017/12/13
- [Qemu-devel] [RFC PATCH 14/26] sdcard: use qemu_hexbuf_strdup() to trace command response, Philippe Mathieu-Daudé, 2017/12/13
- [Qemu-devel] [PATCH 15/26] sdcard: use PW_LEN define instead of '16' magic, Philippe Mathieu-Daudé, 2017/12/13
- [Qemu-devel] [PATCH 16/26] sdcard: let cmd_valid_while_locked() returns a bool, Philippe Mathieu-Daudé, 2017/12/13
- [Qemu-devel] [PATCH 17/26] sdcard: rename sd_set_REG() functions called by sd_reset() as sd_reset_REG(),
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH 18/26] sdcard: move Memory Card registers together, Philippe Mathieu-Daudé, 2017/12/13
- [Qemu-devel] [PATCH 19/26] sdcard: add DSR register, Philippe Mathieu-Daudé, 2017/12/13
- [Qemu-devel] [PATCH 20/26] sdcard: add/use SD_CMD_MAX to check valid SD commands, Philippe Mathieu-Daudé, 2017/12/13
- [Qemu-devel] [PATCH 21/26] sdcard: add sd_cmd_abbreviation() to resolve the SD command id, Philippe Mathieu-Daudé, 2017/12/13
- [Qemu-devel] [PATCH 23/26] sdcard: add ACMD trace events, Philippe Mathieu-Daudé, 2017/12/13
- [Qemu-devel] [PATCH 24/26] sdcard: use a 16-bit type for the 16-bit RCA register, Philippe Mathieu-Daudé, 2017/12/13
- [Qemu-devel] [PATCH 22/26] sdcard: reduce sd_cmd traces, Philippe Mathieu-Daudé, 2017/12/13
- [Qemu-devel] [PATCH 25/26] sdcard: add/use a SDCardCommandClass enum instead of magic numbers, Philippe Mathieu-Daudé, 2017/12/13
- [Qemu-devel] [PATCH 26/26] sdcard: add/use a ccc_spi enum for the commands supported in SPI mode, Philippe Mathieu-Daudé, 2017/12/13
- Re: [Qemu-devel] [PATCH 00/26] SDCard housekeeping, Philippe Mathieu-Daudé, 2017/12/13