From patchwork Fri Jul 27 19:29:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mitsyanko Igor X-Patchwork-Id: 173776 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 E4E2C2C0096 for ; Sat, 28 Jul 2012 06:02:18 +1000 (EST) Received: from localhost ([::1]:52255 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Suqjp-0008FZ-3p for incoming@patchwork.ozlabs.org; Fri, 27 Jul 2012 16:02:17 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38477) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SuqEp-0003Ve-5a for qemu-devel@nongnu.org; Fri, 27 Jul 2012 15:30:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SuqEm-0004bS-AK for qemu-devel@nongnu.org; Fri, 27 Jul 2012 15:30:15 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:51493) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SuqEm-0004RK-1m for qemu-devel@nongnu.org; Fri, 27 Jul 2012 15:30:12 -0400 Received: from eusync3.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0M7U00MEV3J03J90@mailout1.w1.samsung.com> for qemu-devel@nongnu.org; Fri, 27 Jul 2012 20:30:36 +0100 (BST) Received: from idodo.rnd.samsung.ru ([106.109.9.173]) by eusync3.samsung.com (Oracle Communications Messaging Server 7u4-23.01 (7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0M7U00EB53HNEH40@eusync3.samsung.com> for qemu-devel@nongnu.org; Fri, 27 Jul 2012 20:30:07 +0100 (BST) From: Igor Mitsyanko To: qemu-devel@nongnu.org Date: Fri, 27 Jul 2012 23:29:46 +0400 Message-id: <1343417387-13953-12-git-send-email-i.mitsyanko@samsung.com> X-Mailer: git-send-email 1.7.5.4 In-reply-to: <1343417387-13953-1-git-send-email-i.mitsyanko@samsung.com> References: <1343417387-13953-1-git-send-email-i.mitsyanko@samsung.com> X-TM-AS-MML: No X-detected-operating-system: by eggs.gnu.org: Solaris 10 (1203?) X-Received-From: 210.118.77.11 Cc: kwolf@redhat.com, peter.maydell@linaro.org, benoit.canet@gmail.com, wdongxu@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com, e.voevodin@samsung.com, armbru@redhat.com, andrew.zaborowski@intel.com, kyungmin.park@samsung.com, pbonzini@redhat.com, Igor Mitsyanko Subject: [Qemu-devel] [PATCH V4 11/12] 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 only while SD card object is not attached to any BlockDriverState. It defaults to "false". Signed-off-by: Igor Mitsyanko Cc: Paul Brook --- 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..611e1f3 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->bdrv) { + 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; }