[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 16/17] sdhci: use deposit64() on admasysaddr
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v4 16/17] sdhci: use deposit64() on admasysaddr |
Date: |
Wed, 3 Jan 2018 08:01:25 -0300 |
This makes the code slightly safer, and easier to review.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
---
hw/sd/sdhci.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 25a3ee5ef6..97129e178e 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -1118,12 +1118,10 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val,
unsigned size)
MASKED_WRITE(s->admaerr, mask, value);
break;
case SDHC_ADMASYSADDR:
- s->admasysaddr = (s->admasysaddr & (0xFFFFFFFF00000000ULL |
- (uint64_t)mask)) | (uint64_t)value;
+ s->admasysaddr = deposit64(s->admasysaddr, 0, 32, value);
break;
case SDHC_ADMASYSADDR + 4:
- s->admasysaddr = (s->admasysaddr & (0x00000000FFFFFFFFULL |
- ((uint64_t)mask << 32))) | ((uint64_t)value << 32);
+ s->admasysaddr = deposit64(s->admasysaddr, 32, 32, value);
break;
case SDHC_FEAER:
s->acmd12errsts |= value;
--
2.15.1
- [Qemu-devel] [PATCH v4 06/17] sdhci: refactor common sysbus/pci realize() into sdhci_realizefn(), (continued)
- [Qemu-devel] [PATCH v4 06/17] sdhci: refactor common sysbus/pci realize() into sdhci_realizefn(), Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 08/17] sdhci: use qemu_log_mask(UNIMP) instead of fprintf(), Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 09/17] sdhci: convert the DPRINT() calls into trace events, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 10/17] sdhci: add a GPIO for the 'access control' LED, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 11/17] sdhci: move MASK_TRNMOD with other SDHC_TRN* defines in "sd-internal.h", Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 12/17] sdhci: use FIELD_DP32() macro for the WRITE_PROTECT flag, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 13/17] sdhci: rename the SDHC_CAPAB register, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 14/17] sdhci: fix CAPAB/MAXCURR registers, both are 64bit and read-only, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 15/17] sdhci: Implement write method of ACMD12ERRSTS register, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 16/17] sdhci: use deposit64() on admasysaddr,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v4 17/17] sdhci: add a "dma-memory" property, Philippe Mathieu-Daudé, 2018/01/03
- Re: [Qemu-devel] [PATCH v4 00/17] SDHCI: housekeeping, no-reply, 2018/01/03