From patchwork Thu Dec 23 17:19:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 76533 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1DC5BB70A4 for ; Fri, 24 Dec 2010 04:31:36 +1100 (EST) Received: from localhost ([127.0.0.1]:45280 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PVp0n-0004c3-G2 for incoming@patchwork.ozlabs.org; Thu, 23 Dec 2010 12:31:33 -0500 Received: from [140.186.70.92] (port=39972 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PVopl-0005Am-4j for qemu-devel@nongnu.org; Thu, 23 Dec 2010 12:20:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PVopi-0003d2-Ri for qemu-devel@nongnu.org; Thu, 23 Dec 2010 12:20:09 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:41349) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PVopi-0003bQ-JX for qemu-devel@nongnu.org; Thu, 23 Dec 2010 12:20:06 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.69) (envelope-from ) id 1PVopa-0001Oh-9l for qemu-devel@nongnu.org; Thu, 23 Dec 2010 17:19:58 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 23 Dec 2010 17:19:56 +0000 Message-Id: <1293124798-5335-7-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1293124798-5335-1-git-send-email-peter.maydell@linaro.org> References: <1293124798-5335-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 6/8] pl110: Implement save/restore X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Peter Maydell --- hw/pl110.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 40 insertions(+), 4 deletions(-) diff --git a/hw/pl110.c b/hw/pl110.c index a4adb63..06d2dfa 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)