[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 15/25] sdhci: rename the hostctl1 register
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v4 15/25] sdhci: rename the hostctl1 register |
Date: |
Wed, 3 Jan 2018 15:34:08 -0300 |
As per the Spec v3.00
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
include/hw/sd/sdhci.h | 2 +-
hw/sd/sdhci.c | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h
index 46e1e42fa1..c2da48c17c 100644
--- a/include/hw/sd/sdhci.h
+++ b/include/hw/sd/sdhci.h
@@ -65,7 +65,7 @@ typedef struct SDHCIState {
/* Buffer Data Port Register - virtual access point to R and W buffers */
uint32_t prnsts; /* Present State Register */
/* 0x28 */
- uint8_t hostctl; /* Host Control Register */
+ uint8_t hostctl1; /* Host Control Register */
uint8_t pwrcon; /* Power control Register */
uint8_t blkgap; /* Block Gap Control Register */
uint8_t wakcon; /* WakeUp Control Register */
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 58c07bae80..2bd3c5a4b9 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -600,7 +600,7 @@ static void get_adma_description(SDHCIState *s, ADMADescr
*dscr)
uint32_t adma1 = 0;
uint64_t adma2 = 0;
hwaddr entry_addr = (hwaddr)s->admasysaddr;
- switch (SDHC_DMA_TYPE(s->hostctl)) {
+ switch (SDHC_DMA_TYPE(s->hostctl1)) {
case SDHC_CTRL_ADMA2_32:
dma_memory_read(&s->dma_as, entry_addr, (uint8_t *)&adma2,
sizeof(adma2));
@@ -789,7 +789,7 @@ static void sdhci_data_transfer(void *opaque)
SDHCIState *s = (SDHCIState *)opaque;
if (s->trnmod & SDHC_TRNS_DMA) {
- switch (SDHC_DMA_TYPE(s->hostctl)) {
+ switch (SDHC_DMA_TYPE(s->hostctl1)) {
case SDHC_CTRL_SDMA:
if ((s->blkcnt == 1) || !(s->trnmod & SDHC_TRNS_MULTI)) {
sdhci_sdma_transfer_single_block(s);
@@ -898,7 +898,7 @@ static uint64_t sdhci_read(void *opaque, hwaddr offset,
unsigned size)
ret = s->prnsts;
break;
case SDHC_HOSTCTL:
- ret = s->hostctl | (s->pwrcon << 8) | (s->blkgap << 16) |
+ ret = s->hostctl1 | (s->pwrcon << 8) | (s->blkgap << 16) |
(s->wakcon << 24);
break;
case SDHC_CLKCON:
@@ -1016,7 +1016,7 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val,
unsigned size)
MASKED_WRITE(s->sdmasysad, mask, value);
/* Writing to last byte of sdmasysad might trigger transfer */
if (!(mask & 0xFF000000) && TRANSFERRING_DATA(s->prnsts) && s->blkcnt
&&
- s->blksize && SDHC_DMA_TYPE(s->hostctl) == SDHC_CTRL_SDMA) {
+ s->blksize && SDHC_DMA_TYPE(s->hostctl1) == SDHC_CTRL_SDMA) {
if (s->trnmod & SDHC_TRNS_MULTI) {
sdhci_sdma_transfer_multi_blocks(s);
} else {
@@ -1068,14 +1068,14 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val,
unsigned size)
if (!(mask & 0xFF0000)) {
sdhci_blkgap_write(s, value >> 16);
}
- MASKED_WRITE(s->hostctl, mask, value);
+ MASKED_WRITE(s->hostctl1, mask, value);
MASKED_WRITE(s->pwrcon, mask >> 8, value >> 8);
MASKED_WRITE(s->wakcon, mask >> 24, value >> 24);
if (!(s->prnsts & SDHC_CARD_PRESENT) || ((s->pwrcon >> 1) & 0x7) < 5 ||
!(s->capareg & (1 << (31 - ((s->pwrcon >> 1) & 0x7))))) {
s->pwrcon &= ~SDHC_POWER_ON;
}
- qemu_set_irq(s->access_led, s->hostctl & 1);
+ qemu_set_irq(s->access_led, s->hostctl1 & 1);
break;
case SDHC_CLKCON:
if (!(mask & 0xFF000000)) {
@@ -1285,7 +1285,7 @@ const VMStateDescription sdhci_vmstate = {
VMSTATE_UINT16(cmdreg, SDHCIState),
VMSTATE_UINT32_ARRAY(rspreg, SDHCIState, 4),
VMSTATE_UINT32(prnsts, SDHCIState),
- VMSTATE_UINT8(hostctl, SDHCIState),
+ VMSTATE_UINT8(hostctl1, SDHCIState),
VMSTATE_UINT8(pwrcon, SDHCIState),
VMSTATE_UINT8(blkgap, SDHCIState),
VMSTATE_UINT8(wakcon, SDHCIState),
--
2.15.1
- [Qemu-devel] [PATCH v4 02/25] sdhci: add basic Spec v1 capabilities, (continued)
- [Qemu-devel] [PATCH v4 02/25] sdhci: add basic Spec v1 capabilities, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 03/25] sdhci: add max-block-length capability (Spec v1), Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 05/25] sdhci: add DMA and 64-bit capabilities (Spec v2), Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 06/25] sdhci: default to Spec v2, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 07/25] sdhci: add a 'dma' shortcut property, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 09/25] sdhci: Fix 64-bit ADMA2, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 10/25] hw/arm/exynos4210: implement SDHCI Spec v2, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 11/25] hw/arm/xilinx_zynq: implement SDHCI Spec v2, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 13/25] sdhci: check Spec v2 capabilities qtest, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 12/25] sdhci: add qtest to check the SD Spec version, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 15/25] sdhci: rename the hostctl1 register,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v4 16/25] hw/arm/bcm2835_peripherals: implement SDHCI Spec v3, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 17/25] hw/arm/fsl-imx6: implement SDHCI Spec v3, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 18/25] hw/arm/xilinx_zynqmp: implement SDHCI Spec v3, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 19/25] sdhci: check Spec v3 capabilities qtest, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 20/25] sdhci: remove the deprecated 'capareg' property, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 22/25] sdhci: add a check_capab_baseclock() qtest, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 21/25] sdhci: add check_capab_readonly() qtest, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 23/25] sdhci: add a check_capab_sdma() qtest, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 24/25] sdhci: add a check_capab_v3() qtest, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 25/25] sdhci: add Spec v4.2 register definitions, Philippe Mathieu-Daudé, 2018/01/03