On Thu, May 28, 2015 at 5:09 AM, Peter Maydell <peter.mayd...@linaro.org> wrote:
> Convert the pxa2xx-fir device to QOM, including using a
> VMState for its migration info.
>
> Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
> ---
> hw/arm/pxa2xx.c | 137
> +++++++++++++++++++++++++++++++++-----------------------
> 1 file changed, 82 insertions(+), 55 deletions(-)
>
> diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c
> index 8123f05..fc77b44 100644
> --- a/hw/arm/pxa2xx.c
> +++ b/hw/arm/pxa2xx.c
> @@ -1759,24 +1759,33 @@ static PXA2xxI2SState *pxa2xx_i2s_init(MemoryRegion
> *sysmem,
> }
>
> /* PXA Fast Infra-red Communications Port */
> +#define TYPE_PXA2XX_FIR "pxa2xx-fir"
> +#define PXA2XX_FIR(obj) OBJECT_CHECK(PXA2xxFIrState, (obj), TYPE_PXA2XX_FIR)
> +
> struct PXA2xxFIrState {
> + /*< private >*/
> + SysBusDevice parent_obj;
> + /*< public >*/
> +
> MemoryRegion iomem;
> qemu_irq irq;
> qemu_irq rx_dma;
> qemu_irq tx_dma;
> - int enable;
> + uint32_t enable;
> CharDriverState *chr;
>
> uint8_t control[3];
> uint8_t status[2];
>
> - int rx_len;
> - int rx_start;
> + uint32_t rx_len;
> + uint32_t rx_start;
> uint8_t rx_fifo[64];
> };
>
> -static void pxa2xx_fir_reset(PXA2xxFIrState *s)
> +static void pxa2xx_fir_reset(DeviceState *d)
> {
> + PXA2xxFIrState *s = PXA2XX_FIR(d);
> +
> s->control[0] = 0x00;
> s->control[1] = 0x00;
> s->control[2] = 0x00;
> @@ -1953,73 +1962,91 @@ static void pxa2xx_fir_event(void *opaque, int event)
> {
> }
>
> -static void pxa2xx_fir_save(QEMUFile *f, void *opaque)
> +static void pxa2xx_fir_instance_init(Object *obj)
> {
> - PXA2xxFIrState *s = (PXA2xxFIrState *) opaque;
> - int i;
> -
> - qemu_put_be32(f, s->enable);
> -
> - qemu_put_8s(f, &s->control[0]);
> - qemu_put_8s(f, &s->control[1]);
> - qemu_put_8s(f, &s->control[2]);
> - qemu_put_8s(f, &s->status[0]);
> - qemu_put_8s(f, &s->status[1]);
> + PXA2xxFIrState *s = PXA2XX_FIR(obj);
> + SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
>
> - qemu_put_byte(f, s->rx_len);
> - for (i = 0; i < s->rx_len; i ++)
> - qemu_put_byte(f, s->rx_fifo[(s->rx_start + i) & 63]);
> + memory_region_init_io(&s->iomem, NULL, &pxa2xx_fir_ops, s,
> + "pxa2xx-fir", 0x1000);
> + sysbus_init_mmio(sbd, &s->iomem);
Should there be some sysbus_init_irq's?
Regards,
Peter
> }
>
> -static int pxa2xx_fir_load(QEMUFile *f, void *opaque, int version_id)
> +static void pxa2xx_fir_realize(DeviceState *dev, Error **errp)
> {
> - PXA2xxFIrState *s = (PXA2xxFIrState *) opaque;
> - int i;
> + PXA2xxFIrState *s = PXA2XX_FIR(dev);
