Message ID | 20210123104016.17485-15-bmeng.cn@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | hw/riscv: sifive_u: Add missing SPI support | expand |
On 1/23/21 11:40 AM, Bin Meng wrote: > From: Bin Meng <bin.meng@windriver.com> > > QEMU coding convention prefers spaces over tabs. > > Signed-off-by: Bin Meng <bin.meng@windriver.com> > Reviewed-by: Alistair Francis <alistair.francis@wdc.com> > > --- > > Changes in v2: > - Correct the "coding" typo in the commit message > > include/hw/sd/sd.h | 42 +++++++++++++++++++++--------------------- > 1 file changed, 21 insertions(+), 21 deletions(-) > > diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h > index 59d108d453..05ef9b73e5 100644 > --- a/include/hw/sd/sd.h > +++ b/include/hw/sd/sd.h > @@ -33,27 +33,27 @@ > #include "hw/qdev-core.h" > #include "qom/object.h" > > -#define OUT_OF_RANGE (1 << 31) > -#define ADDRESS_ERROR (1 << 30) > -#define BLOCK_LEN_ERROR (1 << 29) > -#define ERASE_SEQ_ERROR (1 << 28) > -#define ERASE_PARAM (1 << 27) > -#define WP_VIOLATION (1 << 26) > -#define CARD_IS_LOCKED (1 << 25) > -#define LOCK_UNLOCK_FAILED (1 << 24) > -#define COM_CRC_ERROR (1 << 23) > -#define ILLEGAL_COMMAND (1 << 22) > -#define CARD_ECC_FAILED (1 << 21) > -#define CC_ERROR (1 << 20) > -#define SD_ERROR (1 << 19) > -#define CID_CSD_OVERWRITE (1 << 16) > -#define WP_ERASE_SKIP (1 << 15) > -#define CARD_ECC_DISABLED (1 << 14) > -#define ERASE_RESET (1 << 13) > -#define CURRENT_STATE (7 << 9) > -#define READY_FOR_DATA (1 << 8) > -#define APP_CMD (1 << 5) > -#define AKE_SEQ_ERROR (1 << 3) > +#define OUT_OF_RANGE (1 << 31) > +#define ADDRESS_ERROR (1 << 30) > +#define BLOCK_LEN_ERROR (1 << 29) > +#define ERASE_SEQ_ERROR (1 << 28) > +#define ERASE_PARAM (1 << 27) > +#define WP_VIOLATION (1 << 26) > +#define CARD_IS_LOCKED (1 << 25) > +#define LOCK_UNLOCK_FAILED (1 << 24) > +#define COM_CRC_ERROR (1 << 23) > +#define ILLEGAL_COMMAND (1 << 22) > +#define CARD_ECC_FAILED (1 << 21) > +#define CC_ERROR (1 << 20) > +#define SD_ERROR (1 << 19) > +#define CID_CSD_OVERWRITE (1 << 16) > +#define WP_ERASE_SKIP (1 << 15) > +#define CARD_ECC_DISABLED (1 << 14) > +#define ERASE_RESET (1 << 13) > +#define CURRENT_STATE (7 << 9) > +#define READY_FOR_DATA (1 << 8) > +#define APP_CMD (1 << 5) > +#define AKE_SEQ_ERROR (1 << 3) The plan was to use the REGISTERFIELD definitions we already have in sd.c and simply remove these: FIELD(CSR, AKE_SEQ_ERROR, 3, 1) FIELD(CSR, APP_CMD, 5, 1) FIELD(CSR, FX_EVENT, 6, 1) FIELD(CSR, READY_FOR_DATA, 8, 1) FIELD(CSR, CURRENT_STATE, 9, 4) FIELD(CSR, ERASE_RESET, 13, 1) FIELD(CSR, CARD_ECC_DISABLED, 14, 1) FIELD(CSR, WP_ERASE_SKIP, 15, 1) FIELD(CSR, CSD_OVERWRITE, 16, 1) FIELD(CSR, DEFERRED_RESPONSE, 17, 1) FIELD(CSR, ERROR, 19, 1) FIELD(CSR, CC_ERROR, 20, 1) FIELD(CSR, CARD_ECC_FAILED, 21, 1) FIELD(CSR, ILLEGAL_COMMAND, 22, 1) FIELD(CSR, COM_CRC_ERROR, 23, 1) FIELD(CSR, LOCK_UNLOCK_FAILED, 24, 1) FIELD(CSR, CARD_IS_LOCKED, 25, 1) FIELD(CSR, WP_VIOLATION, 26, 1) FIELD(CSR, ERASE_PARAM, 27, 1) FIELD(CSR, ERASE_SEQ_ERROR, 28, 1) FIELD(CSR, BLOCK_LEN_ERROR, 29, 1) FIELD(CSR, ADDRESS_ERROR, 30, 1) FIELD(CSR, OUT_OF_RANGE, 31, 1) Anyway, we never got there... Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h index 59d108d453..05ef9b73e5 100644 --- a/include/hw/sd/sd.h +++ b/include/hw/sd/sd.h @@ -33,27 +33,27 @@ #include "hw/qdev-core.h" #include "qom/object.h" -#define OUT_OF_RANGE (1 << 31) -#define ADDRESS_ERROR (1 << 30) -#define BLOCK_LEN_ERROR (1 << 29) -#define ERASE_SEQ_ERROR (1 << 28) -#define ERASE_PARAM (1 << 27) -#define WP_VIOLATION (1 << 26) -#define CARD_IS_LOCKED (1 << 25) -#define LOCK_UNLOCK_FAILED (1 << 24) -#define COM_CRC_ERROR (1 << 23) -#define ILLEGAL_COMMAND (1 << 22) -#define CARD_ECC_FAILED (1 << 21) -#define CC_ERROR (1 << 20) -#define SD_ERROR (1 << 19) -#define CID_CSD_OVERWRITE (1 << 16) -#define WP_ERASE_SKIP (1 << 15) -#define CARD_ECC_DISABLED (1 << 14) -#define ERASE_RESET (1 << 13) -#define CURRENT_STATE (7 << 9) -#define READY_FOR_DATA (1 << 8) -#define APP_CMD (1 << 5) -#define AKE_SEQ_ERROR (1 << 3) +#define OUT_OF_RANGE (1 << 31) +#define ADDRESS_ERROR (1 << 30) +#define BLOCK_LEN_ERROR (1 << 29) +#define ERASE_SEQ_ERROR (1 << 28) +#define ERASE_PARAM (1 << 27) +#define WP_VIOLATION (1 << 26) +#define CARD_IS_LOCKED (1 << 25) +#define LOCK_UNLOCK_FAILED (1 << 24) +#define COM_CRC_ERROR (1 << 23) +#define ILLEGAL_COMMAND (1 << 22) +#define CARD_ECC_FAILED (1 << 21) +#define CC_ERROR (1 << 20) +#define SD_ERROR (1 << 19) +#define CID_CSD_OVERWRITE (1 << 16) +#define WP_ERASE_SKIP (1 << 15) +#define CARD_ECC_DISABLED (1 << 14) +#define ERASE_RESET (1 << 13) +#define CURRENT_STATE (7 << 9) +#define READY_FOR_DATA (1 << 8) +#define APP_CMD (1 << 5) +#define AKE_SEQ_ERROR (1 << 3) enum SDPhySpecificationVersion { SD_PHY_SPECv1_10_VERS = 1,