From nobody Tue Feb 10 05:45:15 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513198423920775.0768749787603; Wed, 13 Dec 2017 12:53:43 -0800 (PST) Received: from localhost ([::1]:37600 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePE1w-0002Po-Km for importer@patchew.org; Wed, 13 Dec 2017 15:53:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39428) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePDty-0004Fy-9v for qemu-devel@nongnu.org; Wed, 13 Dec 2017 15:45:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePDtx-0006h1-6C for qemu-devel@nongnu.org; Wed, 13 Dec 2017 15:45:14 -0500 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:39656) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ePDtx-0006gX-0T for qemu-devel@nongnu.org; Wed, 13 Dec 2017 15:45:13 -0500 Received: by mail-qk0-x241.google.com with SMTP id u184so3674532qkd.6 for ; Wed, 13 Dec 2017 12:45:12 -0800 (PST) Received: from x1.local ([138.117.48.211]) by smtp.gmail.com with ESMTPSA id n64sm1507938qkd.97.2017.12.13.12.45.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 12:45:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lRY8Eqon+9m47r1KAUMpAjxByCFdMVzQWxUWff2FP2c=; b=O43+OkYZIMO3HrO5nVbCN05nYoiu/+jaEvt3TQSfkQ3+MWd2ffhtGhByeF+aUcvaRB sExOIo+oRsOn794jUkiZ0uK49KgI5m+SI9mOlhbB7QY1enyN+3V9aV2VTm3LZxR6g1C2 fwc4z+OV/l+lv8EqPso54JeJdmN/mkAPZt7XCWfirSCx2ibxa3C0O7KvJ2x1xT7qtR8j dAFBLZckvxzacpo4Dl308fO3JnTT6+jd8v3OZ0ngvcC3fYvZIuc91OM/+acZVUv15WAI 8q8/MFu2JZwjjif6s+g+9etVBxB7fTLmQmMh/t9O/j4m4wGKWwthfN+B5g3GewqVpymd J9SA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=lRY8Eqon+9m47r1KAUMpAjxByCFdMVzQWxUWff2FP2c=; b=e4DlFeDVU1V2D6HS+41GYKhvm1hdoplQnneojDU31Vul3S/YHpQhePdLeQpVVpDGlT TEH/qpV0pd0RwSluBq0uxocakAVWeVp9ZtOrpxJmPNfyf1/nQtKL7dXS5Au95g3HDZ0j jZVQKHJaEHnjYqYjZn0hxZNlPnKgA8XS7dZ4PXlDOludkp1KZwc6/P1FqM5/iIEUoiDt iKgMZeV2OyGMPXEESID6s/veoGUFrRa8SzldAt/o7zOjHFKUNfnAdKElag+oPv9Mji+C n6tqVGl12sqn+nAiWMclKxjsm5W/xJvBtxI99ohXh/Mfibg2RAUuyi2DZKQEXDAxr3Oo VQiQ== X-Gm-Message-State: AKGB3mKapndvw2ibNdg+NN+uTxosNwbbjewYO7OAM7U8IYlGdJbg41TS q1UXM7VhwQjEFDKPpgA+A/M= X-Google-Smtp-Source: ACJfBosOl1tBznhftQMHax/iDadcviZikY76M1ONSW+t4bPp4yDpDdwdFOjU5H01gqu3lo6xCwTzrw== X-Received: by 10.55.33.129 with SMTP id f1mr13018969qki.109.1513197912434; Wed, 13 Dec 2017 12:45:12 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , Prasad J Pandit , Peter Maydell , Andrew Baumann , Andrey Smirnov , Andrey Yurovsky , Clement Deschamps Date: Wed, 13 Dec 2017 17:44:31 -0300 Message-Id: <20171213204436.5379-7-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171213204436.5379-1-f4bug@amsat.org> References: <20171213204436.5379-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PATCH 06/11] sdbus: rename SDCardClass -> SDSlaveClass X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sai Pavan Boddu , Peter Crosthwaite , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 By default a SD bus connect SD cards, however it may accept other SD devices like a SDIO device. The current class is not restricted to a SD "Card" devi= ce. To better reflect this is a SD bus slave, simply rename it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Alistair Francis --- hw/sd/sd-internal.h | 10 +++++----- hw/sd/core.c | 16 ++++++++-------- hw/sd/sd.c | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/hw/sd/sd-internal.h b/hw/sd/sd-internal.h index afd5dbf194..85a747ea64 100644 --- a/hw/sd/sd-internal.h +++ b/hw/sd/sd-internal.h @@ -66,10 +66,10 @@ typedef enum { =20 typedef struct SDState SDState; =20 -#define SD_CARD_CLASS(klass) \ - OBJECT_CLASS_CHECK(SDCardClass, (klass), TYPE_SD_CARD) -#define SD_CARD_GET_CLASS(obj) \ - OBJECT_GET_CLASS(SDCardClass, (obj), TYPE_SD_CARD) +#define SDBUS_SLAVE_CLASS(klass) \ + OBJECT_CLASS_CHECK(SDSlaveClass, (klass), TYPE_SD_CARD) +#define SDBUS_SLAVE_GET_CLASS(obj) \ + OBJECT_GET_CLASS(SDSlaveClass, (obj), TYPE_SD_CARD) =20 typedef struct { /*< private >*/ @@ -83,7 +83,7 @@ typedef struct { void (*enable)(SDState *sd, bool enable); bool (*get_inserted)(SDState *sd); bool (*get_readonly)(SDState *sd); -} SDCardClass; +} SDSlaveClass; =20 #define SD_BUS_CLASS(klass) OBJECT_CLASS_CHECK(SDBusClass, (klass), TYPE_S= D_BUS) #define SD_BUS_GET_CLASS(obj) OBJECT_GET_CLASS(SDBusClass, (obj), TYPE_SD_= BUS) diff --git a/hw/sd/core.c b/hw/sd/core.c index fc9ccfedb2..cd5b531cfa 100644 --- a/hw/sd/core.c +++ b/hw/sd/core.c @@ -49,7 +49,7 @@ int sdbus_do_command(SDBus *sdbus, SDRequest *req, uint8_= t *response) =20 trace_sdbus_command(sdbus_name(sdbus), req->cmd, req->arg, req->crc); if (card) { - SDCardClass *sc =3D SD_CARD_GET_CLASS(card); + SDSlaveClass *sc =3D SDBUS_SLAVE_GET_CLASS(card); =20 sz =3D sc->do_command(card, req, response); hexbuf =3D qemu_hexbuf_strdup(response, sz, NULL, "resp: "); @@ -67,7 +67,7 @@ void sdbus_write_data(SDBus *sdbus, uint8_t value) =20 trace_sdbus_write(sdbus_name(sdbus), value); if (card) { - SDCardClass *sc =3D SD_CARD_GET_CLASS(card); + SDSlaveClass *sc =3D SDBUS_SLAVE_GET_CLASS(card); =20 sc->write_data(card, value); } @@ -79,7 +79,7 @@ uint8_t sdbus_read_data(SDBus *sdbus) uint8_t value =3D 0; =20 if (card) { - SDCardClass *sc =3D SD_CARD_GET_CLASS(card); + SDSlaveClass *sc =3D SDBUS_SLAVE_GET_CLASS(card); =20 value =3D sc->read_data(card); } @@ -93,7 +93,7 @@ bool sdbus_data_ready(SDBus *sdbus) SDState *card =3D get_card(sdbus); =20 if (card) { - SDCardClass *sc =3D SD_CARD_GET_CLASS(card); + SDSlaveClass *sc =3D SDBUS_SLAVE_GET_CLASS(card); =20 return sc->data_ready(card); } @@ -106,7 +106,7 @@ bool sdbus_get_inserted(SDBus *sdbus) SDState *card =3D get_card(sdbus); =20 if (card) { - SDCardClass *sc =3D SD_CARD_GET_CLASS(card); + SDSlaveClass *sc =3D SDBUS_SLAVE_GET_CLASS(card); =20 return sc->get_inserted(card); } @@ -119,7 +119,7 @@ bool sdbus_get_readonly(SDBus *sdbus) SDState *card =3D get_card(sdbus); =20 if (card) { - SDCardClass *sc =3D SD_CARD_GET_CLASS(card); + SDSlaveClass *sc =3D SDBUS_SLAVE_GET_CLASS(card); =20 return sc->get_readonly(card); } @@ -150,7 +150,7 @@ void sdbus_set_readonly(SDBus *sdbus, bool readonly) void sdbus_reparent_card(SDBus *from, SDBus *to) { SDState *card =3D get_card(from); - SDCardClass *sc; + SDSlaveClass *sc; bool readonly; =20 /* We directly reparent the card object rather than implementing this @@ -165,7 +165,7 @@ void sdbus_reparent_card(SDBus *from, SDBus *to) return; } =20 - sc =3D SD_CARD_GET_CLASS(card); + sc =3D SDBUS_SLAVE_GET_CLASS(card); readonly =3D sc->get_readonly(card); =20 sdbus_set_inserted(from, false); diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 9b7dee2ec4..97046df5c3 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1917,7 +1917,7 @@ static Property sd_properties[] =3D { static void sd_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - SDCardClass *sc =3D SD_CARD_CLASS(klass); + SDSlaveClass *sc =3D SDBUS_SLAVE_CLASS(klass); =20 dc->realize =3D sd_realize; dc->props =3D sd_properties; @@ -1938,7 +1938,7 @@ static const TypeInfo sd_info =3D { .name =3D TYPE_SD_CARD, .parent =3D TYPE_DEVICE, .instance_size =3D sizeof(SDState), - .class_size =3D sizeof(SDCardClass), + .class_size =3D sizeof(SDSlaveClass), .class_init =3D sd_class_init, .instance_init =3D sd_instance_init, .instance_finalize =3D sd_instance_finalize, --=20 2.15.1