From patchwork Mon Aug 6 02:16:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peter A. G. Crosthwaite" X-Patchwork-Id: 175229 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8D5DB2C008F for ; Mon, 6 Aug 2012 12:17:48 +1000 (EST) Received: from localhost ([::1]:50432 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SyCt8-0006yR-HF for incoming@patchwork.ozlabs.org; Sun, 05 Aug 2012 22:17:46 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54696) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SyCsr-0006m8-2g for qemu-devel@nongnu.org; Sun, 05 Aug 2012 22:17:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SyCsp-0001bL-Mc for qemu-devel@nongnu.org; Sun, 05 Aug 2012 22:17:28 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:49361) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SyCsp-0001ae-GB for qemu-devel@nongnu.org; Sun, 05 Aug 2012 22:17:27 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so4514247pbb.4 for ; Sun, 05 Aug 2012 19:17:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references:x-gm-message-state; bh=/dXy5VmOaQORVVXGINfksQg7IksRQN14Psuw4NfL5oc=; b=Dz0U3kDadPXx0/x2gMHtwiwWdNY/Mg2odLCxjxbzkrKzCGGmRz1TLpHTfpU7x4/Moh MdP5ndpHsw8c1EpHArDY7u8/1Sewa+SQJ008ELRWXfR2gbVEi7n0w1WBgpyI0kqBdyxz MAIPE/PaNYlmpARZAdRcp/BE5iqWmW3RxYjyWY2uGNsNsPDPWqGgtysp2DWHcNvhSBX5 W2GJUgssEqmyJf1FZYU26FJUcfw/qP5iez+tDbifhPFeGHaYDjp3LdxbawCj2u0iHrG1 nvhOUvXr6myhb6qq4Tb9i2BLfPmPikeL8wN9c0eLXZboh4Q6gxi2HVK0uHhupSrWlhTb APrg== Received: by 10.66.89.6 with SMTP id bk6mr13729940pab.81.1344219447075; Sun, 05 Aug 2012 19:17:27 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id pg9sm7869800pbb.26.2012.08.05.19.17.23 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 05 Aug 2012 19:17:26 -0700 (PDT) From: "Peter A. G. Crosthwaite" To: qemu-devel@nongnu.org, paul@codesourcery.com, edgar.iglesias@gmail.com, peter.maydell@linaro.org, stefanha@gmail.com Date: Mon, 6 Aug 2012 12:16:16 +1000 Message-Id: <49f6758224161a570d25b3ee24e1812fc747e0c1.1344218410.git.peter.crosthwaite@petalogix.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQnrdxj8P6CeN+XPmPlk32AnSTAtdIXxsDzWrEgOW++uxxb+OvtdA0aTVyHeWJkgdQ5c+IeJ X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: peter.crosthwaite@petalogix.com, i.mitsyanko@samsung.com, john.williams@petalogix.com Subject: [Qemu-devel] [PATCH v5 02/15] ssi: Added VMSD stub X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Added VMSD stub for SSI slaves. Fields may be added to this VMSD for generic SSI slave state (e.g. the CS line state). Signed-off-by: Peter A. G. Crosthwaite --- hw/ads7846.c | 1 + hw/max111x.c | 1 + hw/spitz.c | 2 ++ hw/ssi.c | 10 ++++++++++ hw/ssi.h | 10 ++++++++++ hw/stellaris.c | 1 + hw/z2.c | 1 + 7 files changed, 26 insertions(+), 0 deletions(-) diff --git a/hw/ads7846.c b/hw/ads7846.c index 41c7f10..6a523f6 100644 --- a/hw/ads7846.c +++ b/hw/ads7846.c @@ -124,6 +124,7 @@ static const VMStateDescription vmstate_ads7846 = { .minimum_version_id_old = 0, .post_load = ads7856_post_load, .fields = (VMStateField[]) { + VMSTATE_SSI_SLAVE(ssidev, ADS7846State), VMSTATE_INT32_ARRAY(input, ADS7846State, 8), VMSTATE_INT32(noise, ADS7846State), VMSTATE_INT32(cycle, ADS7846State), diff --git a/hw/max111x.c b/hw/max111x.c index 706d89f..948fd97 100644 --- a/hw/max111x.c +++ b/hw/max111x.c @@ -103,6 +103,7 @@ static const VMStateDescription vmstate_max111x = { .minimum_version_id = 0, .minimum_version_id_old = 0, .fields = (VMStateField[]) { + VMSTATE_SSI_SLAVE(ssidev, MAX111xState), VMSTATE_UINT8(tb1, MAX111xState), VMSTATE_UINT8(rb2, MAX111xState), VMSTATE_UINT8(rb3, MAX111xState), diff --git a/hw/spitz.c b/hw/spitz.c index 20e7835..f5d502d 100644 --- a/hw/spitz.c +++ b/hw/spitz.c @@ -1087,6 +1087,7 @@ static const VMStateDescription vmstate_corgi_ssp_regs = { .minimum_version_id = 1, .minimum_version_id_old = 1, .fields = (VMStateField []) { + VMSTATE_SSI_SLAVE(ssidev, CorgiSSPState), VMSTATE_UINT32_ARRAY(enable, CorgiSSPState, 3), VMSTATE_END_OF_LIST(), } @@ -1115,6 +1116,7 @@ static const VMStateDescription vmstate_spitz_lcdtg_regs = { .minimum_version_id = 1, .minimum_version_id_old = 1, .fields = (VMStateField []) { + VMSTATE_SSI_SLAVE(ssidev, SpitzLCDTG), VMSTATE_UINT32(bl_intensity, SpitzLCDTG), VMSTATE_UINT32(bl_power, SpitzLCDTG), VMSTATE_END_OF_LIST(), diff --git a/hw/ssi.c b/hw/ssi.c index 35d0a04..2db88fc 100644 --- a/hw/ssi.c +++ b/hw/ssi.c @@ -80,6 +80,16 @@ uint32_t ssi_transfer(SSIBus *bus, uint32_t val) return r; } +const VMStateDescription vmstate_ssi_slave = { + .name = "SSISlave", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .fields = (VMStateField[]) { + VMSTATE_END_OF_LIST() + } +}; + static void ssi_slave_register_types(void) { type_register_static(&ssi_bus_info); diff --git a/hw/ssi.h b/hw/ssi.h index 06657d7..975f9fb 100644 --- a/hw/ssi.h +++ b/hw/ssi.h @@ -38,6 +38,16 @@ struct SSISlave { #define SSI_SLAVE_FROM_QDEV(dev) DO_UPCAST(SSISlave, qdev, dev) #define FROM_SSI_SLAVE(type, dev) DO_UPCAST(type, ssidev, dev) +extern const VMStateDescription vmstate_ssi_slave; + +#define VMSTATE_SSI_SLAVE(_field, _state) { \ + .name = (stringify(_field)), \ + .size = sizeof(SSISlave), \ + .vmsd = &vmstate_ssi_slave, \ + .flags = VMS_STRUCT, \ + .offset = vmstate_offset_value(_state, _field, SSISlave), \ +} + DeviceState *ssi_create_slave(SSIBus *bus, const char *name); /* Master interface. */ diff --git a/hw/stellaris.c b/hw/stellaris.c index 562fbbf..4d26857 100644 --- a/hw/stellaris.c +++ b/hw/stellaris.c @@ -1188,6 +1188,7 @@ static const VMStateDescription vmstate_stellaris_ssi_bus = { .minimum_version_id = 1, .minimum_version_id_old = 1, .fields = (VMStateField[]) { + VMSTATE_SSI_SLAVE(ssidev, stellaris_ssi_bus_state), VMSTATE_INT32(current_dev, stellaris_ssi_bus_state), VMSTATE_END_OF_LIST() } diff --git a/hw/z2.c b/hw/z2.c index 289cee9..721aaf1 100644 --- a/hw/z2.c +++ b/hw/z2.c @@ -165,6 +165,7 @@ static VMStateDescription vmstate_zipit_lcd_state = { .minimum_version_id = 1, .minimum_version_id_old = 1, .fields = (VMStateField[]) { + VMSTATE_SSI_SLAVE(ssidev, ZipitLCD), VMSTATE_INT32(selected, ZipitLCD), VMSTATE_INT32(enabled, ZipitLCD), VMSTATE_BUFFER(buf, ZipitLCD),