From patchwork Fri Apr 27 15:50:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mitsyanko Igor X-Patchwork-Id: 155547 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 9AFB4B6FBD for ; Sat, 28 Apr 2012 02:46:23 +1000 (EST) Received: from localhost ([::1]:49148 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SNnSU-00062G-Tb for incoming@patchwork.ozlabs.org; Fri, 27 Apr 2012 11:51:46 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52516) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SNnS8-0005fK-0e for qemu-devel@nongnu.org; Fri, 27 Apr 2012 11:51:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SNnS6-0006w2-0K for qemu-devel@nongnu.org; Fri, 27 Apr 2012 11:51:23 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:64412) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SNnS5-0006vj-K6 for qemu-devel@nongnu.org; Fri, 27 Apr 2012 11:51:21 -0400 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from euspt1 ([210.118.77.13]) by mailout3.w1.samsung.com (Sun Java(tm) System Messaging Server 6.3-8.04 (built Jul 29 2009; 32bit)) with ESMTP id <0M3500DHAAONSD40@mailout3.w1.samsung.com> for qemu-devel@nongnu.org; Fri, 27 Apr 2012 16:50:47 +0100 (BST) Received: from dodo.rnd.samsung.ru ([106.109.8.162]) by spt1.w1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0M35001L4AOZLZ@spt1.w1.samsung.com> for qemu-devel@nongnu.org; Fri, 27 Apr 2012 16:51:19 +0100 (BST) Date: Fri, 27 Apr 2012 19:50:57 +0400 From: Igor Mitsyanko In-reply-to: <1335541859-28829-1-git-send-email-i.mitsyanko@samsung.com> To: qemu-devel@nongnu.org Message-id: <1335541859-28829-12-git-send-email-i.mitsyanko@samsung.com> X-Mailer: git-send-email 1.7.4.1 References: <1335541859-28829-1-git-send-email-i.mitsyanko@samsung.com> X-detected-operating-system: by eggs.gnu.org: Solaris 9.1 X-Received-From: 210.118.77.13 Cc: peter.maydell@linaro.org, Igor Mitsyanko , e.voevodin@samsung.com, quintela@redhat.com, kyungmin.park@samsung.com, michael@walle.cc, paul@codesourcery.com, m.kozlov@samsung.com, afaerber@suse.de, d.solodkiy@samsung.com Subject: [Qemu-devel] [PATCH V3 11/13] SD card: introduce "spi" property for SD card objects 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 And drop passing is_spi argument to SDCardClass::init function. "spi" property could be set while SD card is in IDLE state. It defaults to "false". Signed-off-by: Igor Mitsyanko --- hw/sd.c | 33 +++++++++++++++++++++++++++++++-- hw/sd.h | 8 ++++++-- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/hw/sd.c b/hw/sd.c index fe2c138..744c338 100644 --- a/hw/sd.c +++ b/hw/sd.c @@ -491,10 +491,9 @@ static const VMStateDescription sd_vmstate = { whether card should be in SSI or MMC/SD mode. It is also up to the board to ensure that ssi transfers only occur when the chip select is asserted. */ -static void sd_init_card(SDState *sd, BlockDriverState *bs, bool is_spi) +static void sd_init_card(SDState *sd, BlockDriverState *bs) { sd->buf = qemu_blockalign(bs, 512); - sd->spi = is_spi; sd->enable = true; sd_reset(sd, bs); if (sd->bdrv) { @@ -1766,10 +1765,40 @@ static void sd_class_init(ObjectClass *klass, void *data) k->enable = sd_enable_card; } +static void sd_is_spi(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + SDState *sd = SD_CARD(obj); + + visit_type_bool(v, &sd->spi, name, errp); +} + +static void sd_set_spimode(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + SDState *sd = SD_CARD(obj); + + if (sd->state != sd_idle_state) { + error_set(errp, QERR_DEVICE_IN_USE, bdrv_get_device_name(sd->bdrv)); + } else { + visit_type_bool(v, &sd->spi, name, errp); + } +} + +static void sd_initfn(Object *obj) +{ + SDState *sd = SD_CARD(obj); + + sd->spi = false; + object_property_add(obj, "spi", "boolean", sd_is_spi, sd_set_spimode, + NULL, NULL, NULL); +} + static const TypeInfo sd_type_info = { .name = TYPE_SD_CARD, .parent = TYPE_OBJECT, .instance_size = sizeof(SDState), + .instance_init = sd_initfn, .class_init = sd_class_init, .class_size = sizeof(SDClass) }; diff --git a/hw/sd.h b/hw/sd.h index f84e863..c78eaa1 100644 --- a/hw/sd.h +++ b/hw/sd.h @@ -31,6 +31,7 @@ #include "qemu-common.h" #include "qemu/object.h" +#include "qapi/qapi-visit-core.h" #define OUT_OF_RANGE (1 << 31) #define ADDRESS_ERROR (1 << 30) @@ -73,7 +74,7 @@ typedef struct SDState SDState; typedef struct SDClass { ObjectClass parent_class; - void (*init)(SDState *sd, BlockDriverState *bs, bool is_spi); + void (*init)(SDState *sd, BlockDriverState *bdrv); int (*do_command)(SDState *sd, SDRequest *req, uint8_t *response); void (*write_data)(SDState *sd, uint8_t value); uint8_t (*read_data)(SDState *sd); @@ -93,7 +94,10 @@ typedef struct SDClass { static inline SDState *sd_init(BlockDriverState *bs, bool is_spi) { SDState *sd = SD_CARD(object_new(TYPE_SD_CARD)); - SD_GET_CLASS(sd)->init(sd, bs, is_spi); + Error *errp = NULL; + object_property_set_bool(OBJECT(sd), is_spi, "spi", &errp); + assert_no_error(errp); + SD_GET_CLASS(sd)->init(sd, bs); return sd; }