motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-09 10:34:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/sd/sd.c: Convert sd_reset() function into Device reset method

Browse source 
Convert the sd_reset() function into a proper Device reset method.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Message-id: 1455646193-13238-4-git-send-email-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2016-02-18 14:16:18 +00:00
parent 260bc9d8aa
commit ba3ed0fa94
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
hw/sd/sd.c
View file

@ -394,8 +394,9 @@ static inline uint64_t sd_addr_to_wpnum(uint64_t addr)
return addr >> (HWBLOCK_SHIFT + SECTOR_SHIFT + WPGROUP_SHIFT); return addr >> (HWBLOCK_SHIFT + SECTOR_SHIFT + WPGROUP_SHIFT);
} }
static void sd_reset(SDState *sd) static void sd_reset(DeviceState *dev)
{ {
SDState *sd = SD_CARD(dev);
uint64_t size; uint64_t size;
uint64_t sect; uint64_t sect;
@ -436,7 +437,7 @@ static void sd_cardchange(void *opaque, bool load)
qemu_set_irq(sd->inserted_cb, blk_is_inserted(sd->blk)); qemu_set_irq(sd->inserted_cb, blk_is_inserted(sd->blk));
if (blk_is_inserted(sd->blk)) { if (blk_is_inserted(sd->blk)) {
sd_reset(sd); sd_reset(DEVICE(sd));
qemu_set_irq(sd->readonly_cb, sd->wp_switch); qemu_set_irq(sd->readonly_cb, sd->wp_switch);
} }
} }
@ -680,7 +681,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,
default: default:
sd->state = sd_idle_state; sd->state = sd_idle_state;
sd_reset(sd); sd_reset(DEVICE(sd));
return sd->spi ? sd_r1 : sd_r0; return sd->spi ? sd_r1 : sd_r0;
} }
break; break;
@ -1787,8 +1788,6 @@ static void sd_realize(DeviceState *dev, Error **errp)
if (sd->blk) { if (sd->blk) {
blk_set_dev_ops(sd->blk, &sd_block_ops, sd); blk_set_dev_ops(sd->blk, &sd_block_ops, sd);
} }
sd_reset(sd);
} }
static Property sd_properties[] = { static Property sd_properties[] = {
@ -1808,6 +1807,7 @@ static void sd_class_init(ObjectClass *klass, void *data)
dc->realize = sd_realize; dc->realize = sd_realize;
dc->props = sd_properties; dc->props = sd_properties;
dc->vmsd = &sd_vmstate; dc->vmsd = &sd_vmstate;
dc->reset = sd_reset;
} }
static const TypeInfo sd_info = { static const TypeInfo sd_info = {