[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 01/25] sdcard: reorder SDState struct members
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v2 01/25] sdcard: reorder SDState struct members |
Date: |
Wed, 3 Jan 2018 18:24:12 -0300 |
place card registers first, this will ease further code movements.
Signed-off-by: Philippe Mathieu-Daudé <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 7755bedfa0..180c43e218 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -89,16 +89,15 @@ enum SDCardStates {
struct SDState {
DeviceState parent_obj;
- uint32_t mode; /* current card mode, one of SDCardModes */
- int32_t state; /* current card state, one of SDCardStates */
+ /* SD Memory Card Registers */
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];
+
uint32_t vhs;
bool wp_switch;
unsigned long *wp_groups;
@@ -113,6 +112,9 @@ struct SDState {
uint8_t function_group[6];
bool spi;
+
+ uint32_t mode; /* current card mode, one of SDCardModes */
+ int32_t state; /* current card state, one of SDCardStates */
uint8_t current_cmd;
/* True if we will handle the next command as an ACMD. Note that this does
* *not* track the APP_CMD status bit!
@@ -125,6 +127,7 @@ struct SDState {
qemu_irq readonly_cb;
qemu_irq inserted_cb;
BlockBackend *blk;
+ QEMUTimer *ocr_power_timer;
bool enable;
};
--
2.15.1
- [Qemu-devel] [PATCH v2 00/25] SDCard: housekeeping, improve SPI, introduce new Specs, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v2 01/25] sdcard: reorder SDState struct members,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v2 02/25] sdcard: replace DPRINTF() by trace events, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v2 03/25] sdcard: add more trace events, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v2 04/25] sdcard: define SDCARD_CMD_MAX instead of using the magic '64', Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v2 05/25] sdcard: display command name when tracing CMD/ACMD, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v2 06/25] sdcard: let cmd_valid_while_locked() returns a bool, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v2 07/25] sdcard: rename sd_set_$REG() functions called once as sd_reset_$REG(), Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v2 08/25] sdcard: use the registerfields API to access the OCR register, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v2 09/25] sdcard: use G_BYTE from cutils, Philippe Mathieu-Daudé, 2018/01/03