[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH 03/10] hw/sd/sd.c: Convert sd_reset() function into De
From: |
Peter Maydell |
Subject: |
[Qemu-arm] [PATCH 03/10] hw/sd/sd.c: Convert sd_reset() function into Device reset method |
Date: |
Fri, 11 Dec 2015 16:37:04 +0000 |
Convert the sd_reset() function into a proper Device reset method.
Signed-off-by: Peter Maydell <address@hidden>
---
hw/sd/sd.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 7c79217..b4a5a62 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -393,8 +393,9 @@ static inline uint64_t sd_addr_to_wpnum(uint64_t addr)
return addr >> (HWBLOCK_SHIFT + SECTOR_SHIFT + WPGROUP_SHIFT);
}
-static void sd_reset(SDState *sd)
+static void sd_reset(DeviceState *dev)
{
+ SDState *sd = SD(dev);
uint64_t size;
uint64_t sect;
@@ -435,7 +436,7 @@ static void sd_cardchange(void *opaque, bool load)
qemu_set_irq(sd->inserted_cb, 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);
}
}
@@ -677,7 +678,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,
default:
sd->state = sd_idle_state;
- sd_reset(sd);
+ sd_reset(DEVICE(sd));
return sd->spi ? sd_r1 : sd_r0;
}
break;
@@ -1783,8 +1784,6 @@ static void sd_realize(DeviceState *dev, Error ** errp)
if (sd->blk) {
blk_set_dev_ops(sd->blk, &sd_block_ops, sd);
}
-
- sd_reset(sd);
}
static Property sd_properties[] = {
@@ -1804,6 +1803,7 @@ static void sd_class_init(ObjectClass *klass, void *data)
dc->realize = sd_realize;
dc->props = sd_properties;
dc->vmsd = &sd_vmstate;
+ dc->reset = sd_reset;
}
static const TypeInfo sd_info = {
--
1.9.1
- [Qemu-arm] [PATCH 06/10] sdhci_sysbus: Create SD card device in users, not the device itself, (continued)
[Qemu-arm] [PATCH 03/10] hw/sd/sd.c: Convert sd_reset() function into Device reset method,
Peter Maydell <=
[Qemu-arm] [PATCH 07/10] hw/sd/pxa2xx_mmci: convert to SysBusDevice object, Peter Maydell, 2015/12/11
[Qemu-arm] [PATCH 09/10] hw/sd/pxa2xx_mmci: Convert to VMStateDescription, Peter Maydell, 2015/12/11
[Qemu-arm] [PATCH 05/10] hw/sd/sdhci.c: Update to use SDBus APIs, Peter Maydell, 2015/12/11