On Wed, Jan 3, 2018 at 1:24 PM, Philippe Mathieu-Daudé <f4...@amsat.org> wrote:
> place card registers first, this will ease further code movements.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Reviewed-by: Alistair Francis <alistair.fran...@xilinx.com>
Alistair
> ---
> 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
>
>
