diff options
| -rw-r--r-- | hw/pl110.c | 44 |
1 files changed, 40 insertions, 4 deletions
diff --git a/hw/pl110.c b/hw/pl110.c index a4adb630b0..06d2dfada6 100644 --- a/hw/pl110.c +++ b/hw/pl110.c @@ -48,6 +48,28 @@ typedef struct { qemu_irq irq; } pl110_state; +static const VMStateDescription vmstate_pl110 = { + .name = "pl110", + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_INT32(versatile, pl110_state), + VMSTATE_UINT32_ARRAY(timing, pl110_state, 4), + VMSTATE_UINT32(cr, pl110_state), + VMSTATE_UINT32(upbase, pl110_state), + VMSTATE_UINT32(lpbase, pl110_state), + VMSTATE_UINT32(int_status, pl110_state), + VMSTATE_UINT32(int_mask, pl110_state), + VMSTATE_INT32(cols, pl110_state), + VMSTATE_INT32(rows, pl110_state), + VMSTATE_UINT32(bpp, pl110_state), + VMSTATE_INT32(invalidate, pl110_state), + VMSTATE_UINT32_ARRAY(pallette, pl110_state, 256), + VMSTATE_UINT32_ARRAY(raw_pallette, pl110_state, 128), + VMSTATE_END_OF_LIST() + } +}; + static const unsigned char pl110_id[] = { 0x10, 0x11, 0x04, 0x00, 0x0d, 0xf0, 0x05, 0xb1 }; @@ -365,7 +387,6 @@ static int pl110_init(SysBusDevice *dev) s->ds = graphic_console_init(pl110_update_display, pl110_invalidate_display, NULL, NULL, s); - /* ??? Save/restore. */ return 0; } @@ -376,11 +397,26 @@ static int pl110_versatile_init(SysBusDevice *dev) return pl110_init(dev); } +static SysBusDeviceInfo pl110_info = { + .init = pl110_init, + .qdev.name = "pl110", + .qdev.size = sizeof(pl110_state), + .qdev.vmsd = &vmstate_pl110, + .qdev.no_user = 1, +}; + +static SysBusDeviceInfo pl110_versatile_info = { + .init = pl110_versatile_init, + .qdev.name = "pl110_versatile", + .qdev.size = sizeof(pl110_state), + .qdev.vmsd = &vmstate_pl110, + .qdev.no_user = 1, +}; + static void pl110_register_devices(void) { - sysbus_register_dev("pl110", sizeof(pl110_state), pl110_init); - sysbus_register_dev("pl110_versatile", sizeof(pl110_state), - pl110_versatile_init); + sysbus_register_withprop(&pl110_info); + sysbus_register_withprop(&pl110_versatile_info); } device_init(pl110_register_devices) |