From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56939) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eUynd-0003HH-7k for qemu-devel@nongnu.org; Fri, 29 Dec 2017 12:50:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eUync-0006Nm-Dh for qemu-devel@nongnu.org; Fri, 29 Dec 2017 12:50:29 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:40249) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eUync-0006NI-7d for qemu-devel@nongnu.org; Fri, 29 Dec 2017 12:50:28 -0500 Received: by mail-qt0-x243.google.com with SMTP id u42so54931066qte.7 for ; Fri, 29 Dec 2017 09:50:28 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Fri, 29 Dec 2017 14:49:04 -0300 Message-Id: <20171229174933.1781-14-f4bug@amsat.org> In-Reply-To: <20171229174933.1781-1-f4bug@amsat.org> References: <20171229174933.1781-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v3 13/42] sdhci: rename the SDHC_CAPAB register List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alistair Francis , "Edgar E . Iglesias" , Peter Maydell , Andrey Smirnov Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Peter Crosthwaite Signed-off-by: Philippe Mathieu-Daudé --- hw/sd/sdhci-internal.h | 2 +- hw/sd/sdhci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index df240ea046..b7475a1b7b 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -176,7 +176,7 @@ FIELD(SDHC_PRNSTS, WRITE_PROTECT, 19, 1); #define SDHC_ACMD12ERRSTS 0x3C /* HWInit Capabilities Register 0x05E80080 */ -#define SDHC_CAPAREG 0x40 +#define SDHC_CAPAB 0x40 #define SDHC_CAN_DO_DMA 0x00400000 #define SDHC_CAN_DO_ADMA2 0x00080000 #define SDHC_CAN_DO_ADMA1 0x00100000 diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index b5ecbc9969..604ad525f6 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -903,7 +903,7 @@ static uint64_t sdhci_read(void *opaque, hwaddr offset, unsigned size) case SDHC_ACMD12ERRSTS: ret = s->acmd12errsts; break; - case SDHC_CAPAREG: + case SDHC_CAPAB: ret = s->capareg; break; case SDHC_MAXCURR: -- 2.15.1