Commit 24bddf9d authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Peter Maydell
Browse files

sdhci: move MASK_TRNMOD with other SDHC_TRN* defines in "sd-internal.h" 



Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarAlistair Francis <alistair.francis@xilinx.com>
Message-id: 20180115182436.2066-10-f4bug@amsat.org
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 8be487d8

hw/sd/sdhci-internal.h

+1 −0
Original line number Diff line number Diff line
@@ -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

hw/sd/sdhci.c

+1 −2
Original line number Diff line number Diff line
@@ -99,7 +99,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)
@@ -1026,7 +1025,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 */