From nobody Tue Oct 28 12:35:08 2025 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 151501516898846.19028512654518; Wed, 3 Jan 2018 13:32:48 -0800 (PST) Received: from localhost ([::1]:37660 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWqeW-0008TE-5k for importer@patchew.org; Wed, 03 Jan 2018 16:32:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51620) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWqXG-0002H8-MQ for qemu-devel@nongnu.org; Wed, 03 Jan 2018 16:25:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWqXF-0007rt-HK for qemu-devel@nongnu.org; Wed, 03 Jan 2018 16:25:18 -0500 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:33450) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWqXF-0007ri-98 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 16:25:17 -0500 Received: by mail-qk0-x243.google.com with SMTP id x7so3255544qkb.0 for ; Wed, 03 Jan 2018 13:25:17 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id a19sm1104402qtj.74.2018.01.03.13.25.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 13:25:16 -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=eWmmGiJFdyCdPi7saHx++ie8aK5DztCIvuh1Ii+BjOI=; b=FaAJ+oA2sx6VlFzuo9R5qQh2jlfb5Xa+nTG24qDGszBzdRwmeQ7++Zoqgzx0SJB62z OhkEBG2KBMEu5ZkWShz2qaAnmYOi8orSYBG10J1+xfBhiyXXh/rGtjbEHXlXbblThJQo HJ1ngKgxzNQgr50k5/H/VdU6vFV0HSN4NvYY9CSqZos3mDLARjwcgmZbHBge3O+JBeJH d6p+Hj9DCP9sbVglVbTbn1Pt9jf5kqnPR8FMo+eYnRwaLcziZNXHN7cLcgL8f5DAedr1 yRCtnZJXTDHd9gR1YM4pBi/uc1bLNfSQ3hSVbrcIrUKxelSCIAVaYXYuKDoWa7COJSya VozQ== 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=eWmmGiJFdyCdPi7saHx++ie8aK5DztCIvuh1Ii+BjOI=; b=Ufni4aMna/BGG2Z3KmzYKXkveldKNgmsLdkj9nCamwVuvcgkxhlDu9aXw40UvqczVJ iQDLUMKuhqFS2njUmC6c6T+igSzJEw4UmJWrzeRtptDpOrRLkDKNTbCeuRf44bRuNLrO lG7fgSdp2Ih2V8MWZxHWq89bh+vOo73J2QD22eOb3mOxTubLfT7tAjIoROwbcD0azwWw COHFY62bRMf7u1rD/PblJvfmJINEJRcBCEkVQnDsdOKRzz+CxzkQZs1+Bs22XXiru9hS qR5jonotrQZ2BI78P77VMdQG/x+EZeOx+9JlC6ijb11/jhe+XgE5talbN6/HCxD+1bdZ wJsg== X-Gm-Message-State: AKGB3mJtlQcmNHL3L31tndZ1ipvJaOzJsFlSWkBm6JIgz9kXfCzkfEqz LbIS/aukKCGetImUw/eRO9U= X-Google-Smtp-Source: ACJfBovGN1fP2Y4eTLXpHbBlLCfinh8KmYqrO8apNEqxBxQxvybE5neWvqV6DGSK7UNtwZU9i/h3LQ== X-Received: by 10.55.22.131 with SMTP id 3mr3714840qkw.22.1515014716728; Wed, 03 Jan 2018 13:25:16 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell , Igor Mitsyanko , Andrew Baumann , Olbrich , Andrzej Zaborowski Date: Wed, 3 Jan 2018 18:24:18 -0300 Message-Id: <20180103212436.15762-8-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103212436.15762-1-f4bug@amsat.org> References: <20180103212436.15762-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::243 Subject: [Qemu-devel] [PATCH v2 07/25] 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, Paul Brook , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= 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 b0e54f69d8..7d43ab072b 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -293,7 +293,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; @@ -308,7 +308,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 */ @@ -327,7 +327,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) */ @@ -359,7 +359,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; @@ -414,6 +414,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; @@ -428,12 +433,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); } @@ -517,13 +522,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