[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/26] sdcard: move Memory Card registers together
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH 18/26] sdcard: move Memory Card registers together |
Date: |
Wed, 13 Dec 2017 20:20:17 -0300 |
Aesthetic, but ease review.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/sd/sd.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index d8e3f60536..992236df75 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -85,14 +85,17 @@ struct SDState {
uint32_t mode; /* current card mode, one of SDCardModes */
int32_t state; /* current card state, one of SDCardStates */
- uint32_t ocr;
QEMUTimer *ocr_power_timer;
- uint8_t scr[8];
- uint8_t cid[16];
- uint8_t csd[16];
- uint16_t rca;
- uint32_t card_status;
- uint8_t sd_status[64];
+
+ /* SD Memory Card Registers */
+ uint8_t cid[128 / BITS_PER_BYTE]; /* Card Identification Number */
+ uint16_t rca; /* Relative Card Address */
+ uint8_t csd[128 / BITS_PER_BYTE]; /* Card Specific Data */
+ uint8_t scr[64 / BITS_PER_BYTE]; /* SD Configuration */
+ uint32_t ocr; /* Operation Conditions */
+ uint8_t sd_status[512 / BITS_PER_BYTE]; /* SD Status */
+ uint32_t card_status; /* Card Status */
+
uint32_t vhs;
bool wp_switch;
unsigned long *wp_groups;
--
2.15.1
- [Qemu-devel] [PATCH 08/26] sdcard: add sd_set_state(), (continued)
- [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é, 2017/12/13
- [Qemu-devel] [PATCH 18/26] sdcard: move Memory Card registers together,
Philippe Mathieu-Daudé <=
- [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
- Re: [Qemu-devel] [PATCH 00/26] SDCard housekeeping, Alistair Francis, 2017/12/15