summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-08-24 13:17:45 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-08-24 13:17:45 +0100
commit66d9aa790fa9d5c251dcbd5b8ff1db79e04dc06d (patch)
tree0ad143f2cd9201b56e6ccd65ab5732a8a5dace4d /hw
parent1d52866f5a53feef036c2e8f9b3a6a30209d48a7 (diff)
downloadqemu-66d9aa790fa9d5c251dcbd5b8ff1db79e04dc06d.zip
hw/ssi/pl022: Set up reset function in class init
Currently the PL022 calls pl022_reset() from its class init function. Make it register a DeviceState reset method instead, so that we reset the device on system reset. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-id: 20180820141116.9118-17-peter.maydell@linaro.org Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'hw')
-rw-r--r--hw/ssi/pl022.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/hw/ssi/pl022.c b/hw/ssi/pl022.c
index 379d309398..0b5f90b857 100644
--- a/hw/ssi/pl022.c
+++ b/hw/ssi/pl022.c
@@ -203,8 +203,10 @@ static void pl022_write(void *opaque, hwaddr offset,
}
}
-static void pl022_reset(PL022State *s)
+static void pl022_reset(DeviceState *dev)
{
+ PL022State *s = PL022(dev);
+
s->rx_fifo_len = 0;
s->tx_fifo_len = 0;
s->im = 0;
@@ -277,7 +279,6 @@ static int pl022_init(SysBusDevice *sbd)
sysbus_init_mmio(sbd, &s->iomem);
sysbus_init_irq(sbd, &s->irq);
s->ssi = ssi_create_bus(dev, "ssi");
- pl022_reset(s);
vmstate_register(dev, -1, &vmstate_pl022, s);
return 0;
}
@@ -285,8 +286,10 @@ static int pl022_init(SysBusDevice *sbd)
static void pl022_class_init(ObjectClass *klass, void *data)
{
SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass);
+ DeviceClass *dc = DEVICE_CLASS(klass);
sdc->init = pl022_init;
+ dc->reset = pl022_reset;
}
static const TypeInfo pl022_info = {