From nobody Tue Feb 10 11:55:38 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 1516678012311462.99014887172075; Mon, 22 Jan 2018 19:26:52 -0800 (PST) Received: from localhost ([::1]:59043 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edpEZ-0007Os-JA for importer@patchew.org; Mon, 22 Jan 2018 22:26:51 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35513) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edpA6-0003mW-Tf for qemu-devel@nongnu.org; Mon, 22 Jan 2018 22:22:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edpA5-0000ux-T9 for qemu-devel@nongnu.org; Mon, 22 Jan 2018 22:22:14 -0500 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:44335) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edpA5-0000ud-OL for qemu-devel@nongnu.org; Mon, 22 Jan 2018 22:22:13 -0500 Received: by mail-qt0-x244.google.com with SMTP id l20so25096815qtj.11 for ; Mon, 22 Jan 2018 19:22:13 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id x207sm5545567qka.91.2018.01.22.19.22.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jan 2018 19:22:12 -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=G0eFTsvM9lxSoJbtRrSh4698rVd0GevgUGXvA3jGdgc=; b=CraaM4TUEL5Azq1x7lXTcJXgjjcPPZ4lRHjD8bdTUgawDClcvTTX3+mPQxn1oLINl2 b1oO7Cl81Bw42+3uUNOvdMElqsqiidg3tu0LPn9586c61eIme6n86txnOyymeEbth+6I ePYyevzQZGz3iW4/SrJINQu0OWI3bG58shVOJIuNOT0j4vsBJjdIrT1BusdhxDF3Eaw6 YZFKwmTcgva/7I6gUCxMdeT9j+kUVioozANSgTOD8gki6LAg5RHpjyPPOCiZIXxOPuFo GrMFnw+nR2IgXQsxZOIiP5atX9lA1UWSDQD1PpWzmvn+OMCJbdIWNAT2Paq6qaULEiWA /mTA== 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=G0eFTsvM9lxSoJbtRrSh4698rVd0GevgUGXvA3jGdgc=; b=Asi2NJfP74YcL4VQCL+tjYyw4CgdBq6uMLKEWYUN3XyRLwQkUgmQQa0GIPojOQdq/U IHgcFqfQJtc7MLlLhXQw3oa3q4r3uezdK430QeaKJRFuP9H8FOnAl7H2Q81ObkMEfFX1 ZEGqUxHIRapJ5MWWWJmS9XD7VfViyQPVKiFytu9luS55VK6HIkXxLNnW71y8UUZFVNsW VAuJIfc0CD6AgoPjAbffnhB/qdFbHZgrXM57JjkIL5aoNtietwPzepdIrUVNdyIf5p+i CXkx0bJEOn7aoPb0hBwmgJovFCDUdL+q3w+pTy6mCHJglIFzRlom1mSxXxLiEx6W/0uY 6MdQ== X-Gm-Message-State: AKwxytdXgbURhtWmwh0rWXzNQ92RsR5seF1Au6HQIJNmheCVOnbZYVVI 1rDOSB8Kg6YQ97oL9XM1oDA= X-Google-Smtp-Source: AH8x226+u9d9FQBzOh8g+k3t/OqbdgQ3upcghCb/q6p13urIQLxIrGs7oBftxMl3jtvcPzUOcRUcaQ== X-Received: by 10.55.54.210 with SMTP id d201mr1560754qka.213.1516677733297; Mon, 22 Jan 2018 19:22:13 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell , Igor Mitsyanko Date: Tue, 23 Jan 2018 00:21:33 -0300 Message-Id: <20180123032135.28863-11-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180123032135.28863-1-f4bug@amsat.org> References: <20180123032135.28863-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:c0d::244 Subject: [Qemu-devel] [PATCH v3 10/12] sdcard: rename sd_set_$REG() functions called once as sd_reset_$REG() 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: "Edgar E . Iglesias" , Prasad J Pandit , 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 All are only called once at reset. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sd.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index c46e9c2818..8b5022a7db 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -269,7 +269,7 @@ static uint16_t sd_crc16(void *message, size_t width) return shift_reg; } =20 -static void sd_set_ocr(SDState *sd) +static void sd_reset_ocr(SDState *sd) { /* All voltages OK, Standard Capacity SD Memory Card, not yet powered = up */ sd->ocr =3D 0x00ffff00; @@ -285,7 +285,7 @@ static void sd_ocr_powerup(void *opaque) sd->ocr |=3D OCR_POWER_UP; } =20 -static void sd_set_scr(SDState *sd) +static void sd_reset_scr(SDState *sd) { sd->scr[0] =3D 0x00; /* SCR Structure */ sd->scr[1] =3D 0x2f; /* SD Security Support */ @@ -304,7 +304,7 @@ static void sd_set_scr(SDState *sd) #define MDT_YR 2006 #define MDT_MON 2 =20 -static void sd_set_cid(SDState *sd) +static void sd_reset_cid(SDState *sd) { sd->cid[0] =3D MID; /* Fake card manufacturer ID (MID) */ sd->cid[1] =3D OID[0]; /* OEM/Application ID (OID) */ @@ -336,7 +336,7 @@ static const uint8_t sd_csd_rw_mask[16] =3D { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfe, }; =20 -static void sd_set_csd(SDState *sd, uint64_t size) +static void sd_reset_csd(SDState *sd, uint64_t size) { uint32_t csize =3D (size >> (CMULT_SHIFT + HWBLOCK_SHIFT)) - 1; uint32_t sectsize =3D (1 << (SECTOR_SHIFT + 1)) - 1; @@ -391,6 +391,11 @@ static void sd_set_csd(SDState *sd, uint64_t size) } } =20 +static void sd_reset_rca(SDState *sd) +{ + sd->rca =3D 0; +} + static void sd_set_rca(SDState *sd) { sd->rca +=3D 0x4567; @@ -405,12 +410,12 @@ static void sd_set_rca(SDState *sd) #define CARD_STATUS_B 0x00c01e00 #define CARD_STATUS_C 0xfd39a028 =20 -static void sd_set_cardstatus(SDState *sd) +static void sd_reset_cardstatus(SDState *sd) { sd->card_status =3D 0x00000100; } =20 -static void sd_set_sdstatus(SDState *sd) +static void sd_reset_sdstatus(SDState *sd) { memset(sd->sd_status, 0, 64); } @@ -494,13 +499,13 @@ static void sd_reset(DeviceState *dev) sect =3D sd_addr_to_wpnum(size) + 1; =20 sd->state =3D sd_idle_state; - sd->rca =3D 0x0000; - sd_set_ocr(sd); - sd_set_scr(sd); - sd_set_cid(sd); - sd_set_csd(sd, size); - sd_set_cardstatus(sd); - sd_set_sdstatus(sd); + sd_reset_rca(sd); + sd_reset_ocr(sd); + sd_reset_scr(sd); + sd_reset_cid(sd); + sd_reset_csd(sd, size); + sd_reset_cardstatus(sd); + sd_reset_sdstatus(sd); =20 g_free(sd->wp_groups); sd->wp_switch =3D sd->blk ? blk_is_read_only(sd->blk) : false; --=20 2.15.1