From patchwork Wed Dec 13 19:58:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 10110823 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A7FD060327 for ; Wed, 13 Dec 2017 20:01:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D2A1295B5 for ; Wed, 13 Dec 2017 20:01:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 921AD295EE; Wed, 13 Dec 2017 20:01:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 047BF295B5 for ; Wed, 13 Dec 2017 20:01:09 +0000 (UTC) Received: from localhost ([::1]:37353 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePDDI-0004CI-UQ for patchwork-qemu-devel@patchwork.kernel.org; Wed, 13 Dec 2017 15:01:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57647) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePDBk-0002nI-Hw for qemu-devel@nongnu.org; Wed, 13 Dec 2017 14:59:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePDBj-0005W4-GO for qemu-devel@nongnu.org; Wed, 13 Dec 2017 14:59:32 -0500 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:39075) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ePDBj-0005Vz-Bv; Wed, 13 Dec 2017 14:59:31 -0500 Received: by mail-qt0-x244.google.com with SMTP id k19so5215577qtj.6; Wed, 13 Dec 2017 11:59:31 -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=RmG/wUcbgmzb7Ka3YwOgkzKBo14/fgQtu6bUWRa0u7o=; b=HQL/gxvWh2MO1WXmnpdlaeao5l4bu63SouYSavcqzINt0kqdCaQok1nBio6TY4Orr8 +585HO1EtGyRKI1NxR+uZX/LwmRknFKdp1sO38IREylJRwhVf5qTOGRi/lD2+EdDYFUg mN60kTfajgdYAt5XtpYII+Jn76yGSeiM+Njx8e4vYwBkoi4srIjipRXk8bApmv4LgMZc axu2rQwOTQmW4K4wPk5dBQ50H4SzDjTJPb7MAX19KyvfB1FCw8zirq8Ik0nqy1yYayIk amBbtX3Nbc7ecdALex2Pt92Qw27WwzpkDpbCRDEDWBSA0JJzBf7ZunacnNJNAF9hLZzC HZVQ== 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=RmG/wUcbgmzb7Ka3YwOgkzKBo14/fgQtu6bUWRa0u7o=; b=nQV1ol/IhMzLxj7NKnJI7J71WTnXHAYQ9Wu7ECkqAJV0BN/1UYDuzO8E1wl+l7FrSU cgtcr5+/pUCmR1u2bmshS97reyDbA6/jG0/72/Up67kRYvJMqSTKXpWuK+VYHLOaqjPh gvOF8gr+VK7pY36Wptgxz+2F3Vgc9nWKvI1xfcU5H4NPAcmiEFveRbpGU/c0Yr+UpDw9 vB6CxzACN+iEhJSgX29juRI4EVWGaUfmV60Rvu81uhkoyyxUP/n4C2mxP6ZGPLlvhu/3 P5xZ6ZaarGlEBlW+C1DRlmRhD//w9cKO4BcZjGXks8jKtxvbi5CV07zud8ZYa+6kdfd6 Hwfw== X-Gm-Message-State: AKGB3mJEEJOOJYIWnSsOvU54ZKezi2x3afjk5EptyxXMltp193MP9wyR Jm9YQo9G2uYZb991b92UUKw= X-Google-Smtp-Source: ACJfBosU9c+WbXNR/CIIPseqAZQhRPEDeeQPV3RdZj0OEDsgTDnb2rSpFb+UElRcjNW+uNWpiEmDBA== X-Received: by 10.200.39.196 with SMTP id x4mr12269552qtx.246.1513195170769; Wed, 13 Dec 2017 11:59:30 -0800 (PST) Received: from x1.local ([138.117.48.211]) by smtp.gmail.com with ESMTPSA id o5sm1518876qtc.72.2017.12.13.11.59.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 11:59:30 -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 Date: Wed, 13 Dec 2017 16:58:43 -0300 Message-Id: <20171213195852.30439-6-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171213195852.30439-1-f4bug@amsat.org> References: <20171213195852.30439-1-f4bug@amsat.org> MIME-Version: 1.0 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 05/14] sdhci: move MASK_TRNMOD with other SDHC_TRN* defines in "sd-internal.h" 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: qemu-trivial@nongnu.org, Sai Pavan Boddu , Peter Crosthwaite , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- hw/sd/sdhci-internal.h | 1 + hw/sd/sdhci.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index 248fd027f9..e941bc2386 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -43,6 +43,7 @@ #define SDHC_TRNS_ACMD12 0x0004 #define SDHC_TRNS_READ 0x0010 #define SDHC_TRNS_MULTI 0x0020 +#define SDHC_TRNMOD_MASK 0x0037 /* R/W Command Register 0x0 */ #define SDHC_CMDREG 0x0E diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 295a89e5d3..a56c0c273e 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -120,7 +120,6 @@ (SDHC_CAPAB_BASECLKFREQ << 8) | (SDHC_CAPAB_TOUNIT << 7) | \ (SDHC_CAPAB_TOCLKFREQ)) -#define MASK_TRNMOD 0x0037 #define MASKED_WRITE(reg, mask, val) (reg = (reg & (mask)) | (val)) static uint8_t sdhci_slotint(SDHCIState *s) @@ -1043,7 +1042,7 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) if (!(s->capareg & SDHC_CAN_DO_DMA)) { value &= ~SDHC_TRNS_DMA; } - MASKED_WRITE(s->trnmod, mask, value & MASK_TRNMOD); + MASKED_WRITE(s->trnmod, mask, value & SDHC_TRNMOD_MASK); MASKED_WRITE(s->cmdreg, mask >> 16, value >> 16); /* Writing to the upper byte of CMDREG triggers SD command generation */