ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sdcard: reorder SDState struct members 

place card registers first, this will ease further code movements.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Message-id: 20180215220540.6556-2-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:52 +00:00 committed by Peter Maydell
parent c3abd91309
commit d49b1ce0a3
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/sd/sd.c
View File

@ -88,16 +88,21 @@ enum SDCardStates {
struct SDState { struct SDState {
DeviceState parent_obj; DeviceState parent_obj;
uint32_t mode; /* current card mode, one of SDCardModes */ /* SD Memory Card Registers */
int32_t state; /* current card state, one of SDCardStates */
uint32_t ocr; uint32_t ocr;
QEMUTimer *ocr_power_timer;
uint8_t scr[8]; uint8_t scr[8];
uint8_t cid[16]; uint8_t cid[16];
uint8_t csd[16]; uint8_t csd[16];
uint16_t rca; uint16_t rca;
uint32_t card_status; uint32_t card_status;
uint8_t sd_status[64]; uint8_t sd_status[64];
/* Configurable properties */
BlockBackend *blk;
bool spi;
uint32_t mode; /* current card mode, one of SDCardModes */
int32_t state; /* current card state, one of SDCardStates */
uint32_t vhs; uint32_t vhs;
bool wp_switch; bool wp_switch;
unsigned long *wp_groups; unsigned long *wp_groups;
@ -110,8 +115,6 @@ struct SDState {
uint8_t pwd[16]; uint8_t pwd[16];
uint32_t pwd_len; uint32_t pwd_len;
uint8_t function_group[6]; uint8_t function_group[6];
bool spi;
uint8_t current_cmd; uint8_t current_cmd;
/* True if we will handle the next command as an ACMD. Note that this does /* True if we will handle the next command as an ACMD. Note that this does
* *not* track the APP_CMD status bit! * *not* track the APP_CMD status bit!
@ -123,8 +126,7 @@ struct SDState {
uint8_t data[512]; uint8_t data[512];
qemu_irq readonly_cb; qemu_irq readonly_cb;
qemu_irq inserted_cb; qemu_irq inserted_cb;
BlockBackend *blk; QEMUTimer *ocr_power_timer;
bool enable; bool enable;
uint8_t dat_lines; uint8_t dat_lines;
bool cmd_line; bool cmd_line;