On Fri, Dec 11, 2015 at 04:37:11PM +0000, Peter Maydell wrote:
> Add a reset function to the pxa2xx_mmci device; previously it had
> no handling for system reset at all.
>
> Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
Reviewed-by: Peter Crosthwaite <crosthwaite.pe...@gmail.com>
> ---
> hw/sd/pxa2xx_mmci.c | 37 +++++++++++++++++++++++++++++++++++++
> 1 file changed, 37 insertions(+)
>
> diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c
> index 81fec4d..3df927e 100644
> --- a/hw/sd/pxa2xx_mmci.c
> +++ b/hw/sd/pxa2xx_mmci.c
> @@ -510,6 +510,35 @@ void pxa2xx_mmci_handlers(PXA2xxMMCIState *s, qemu_irq
> readonly,
> pxa2xx_mmci_set_readonly(dev, sdbus_get_readonly(&s->sdbus));
> }
>
> +static void pxa2xx_mmci_reset(DeviceState *d)
> +{
> + PXA2xxMMCIState *s = PXA2XX_MMCI(d);
> +
> + s->status = 0;
> + s->clkrt = 0;
> + s->spi = 0;
> + s->cmdat = 0;
> + s->resp_tout = 0;
> + s->read_tout = 0;
> + s->blklen = 0;
> + s->numblk = 0;
> + s->intmask = 0;
> + s->intreq = 0;
> + s->cmd = 0;
> + s->arg = 0;
> + s->active = 0;
> + s->bytesleft = 0;
> + s->tx_start = 0;
> + s->tx_len = 0;
> + s->rx_start = 0;
> + s->rx_len = 0;
> + s->resp_len = 0;
> + s->cmdreq = 0;
> + memset(s->tx_fifo, 0, sizeof(s->tx_fifo));
> + memset(s->rx_fifo, 0, sizeof(s->rx_fifo));
> + memset(s->resp_fifo, 0, sizeof(s->resp_fifo));
> +}
> +
> static void pxa2xx_mmci_instance_init(Object *obj)
> {
> PXA2xxMMCIState *s = PXA2XX_MMCI(obj);
> @@ -526,6 +555,13 @@ static void pxa2xx_mmci_instance_init(Object *obj)
> TYPE_PXA2XX_MMCI_BUS, DEVICE(obj), "sd-bus");
> }
>
> +static void pxa2xx_mmci_class_init(ObjectClass *klass, void *data)
> +{
> + DeviceClass *dc = DEVICE_CLASS(klass);
> +
> + dc->reset = pxa2xx_mmci_reset;
> +}
> +
> static void pxa2xx_mmci_bus_class_init(ObjectClass *klass, void *data)
> {
> SDBusClass *sbc = SD_BUS_CLASS(klass);
> @@ -539,6 +575,7 @@ static const TypeInfo pxa2xx_mmci_info = {
> .parent = TYPE_SYS_BUS_DEVICE,
> .instance_size = sizeof(PXA2xxMMCIState),
> .instance_init = pxa2xx_mmci_instance_init,
> + .class_init = pxa2xx_mmci_class_init,
> };
>
> static const TypeInfo pxa2xx_mmci_bus_info = {
> --
> 1.9.1
>
