OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

sof: protect macro parameters 

Make sure all macro parameters are protected with parentheses to avoid
unintended expansion issues

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
This commit is contained in:
Pierre-Louis Bossart 2017-11-08 17:46:10 -06:00 committed by Liam Girdwood
parent 69f3029c8a
commit df1de7a0a4
5 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/drivers/dw-dma.c
View File

@ -124,23 +124,23 @@
/* CTL_LO */
#define DW_CTLL_INT_EN (1 << 0)
#define DW_CTLL_DST_WIDTH(x) (x << 1)
#define DW_CTLL_SRC_WIDTH(x) (x << 4)
#define DW_CTLL_DST_WIDTH(x) ((x) << 1)
#define DW_CTLL_SRC_WIDTH(x) ((x) << 4)
#define DW_CTLL_DST_INC (0 << 7)
#define DW_CTLL_DST_DEC (1 << 7)
#define DW_CTLL_DST_FIX (2 << 7)
#define DW_CTLL_SRC_INC (0 << 9)
#define DW_CTLL_SRC_DEC (1 << 9)
#define DW_CTLL_SRC_FIX (2 << 9)
#define DW_CTLL_DST_MSIZE(x) (x << 11)
#define DW_CTLL_SRC_MSIZE(x) (x << 14)
#define DW_CTLL_FC(x) (x << 20)
#define DW_CTLL_DST_MSIZE(x) ((x) << 11)
#define DW_CTLL_SRC_MSIZE(x) ((x) << 14)
#define DW_CTLL_FC(x) ((x) << 20)
#define DW_CTLL_FC_M2M (0 << 20)
#define DW_CTLL_FC_M2P (1 << 20)
#define DW_CTLL_FC_P2M (2 << 20)
#define DW_CTLL_FC_P2P (3 << 20)
#define DW_CTLL_DMS(x) (x << 23)
#define DW_CTLL_SMS(x) (x << 25)
#define DW_CTLL_DMS(x) ((x) << 23)
#define DW_CTLL_SMS(x) ((x) << 25)
#define DW_CTLL_LLP_D_EN (1 << 27)
#define DW_CTLL_LLP_S_EN (1 << 28)
#define DW_CTLL_RELOAD_SRC (1 << 30)

10
src/include/reef/ssp.h
View File

@ -79,7 +79,7 @@ extern const struct dai_ops ssp_ops;
#define SSCR0_NCS (1 << 21)
#define SSCR0_RIM (1 << 22)
#define SSCR0_TIM (1 << 23)
#define SSCR0_FRDC(x) ((x - 1) << 24)
#define SSCR0_FRDC(x) (((x) - 1) << 24)
#define SSCR0_ACS (1 << 30)
#define SSCR0_MOD (1 << 31)
@ -140,14 +140,14 @@ extern const struct dai_ops ssp_ops;
#define SSCR3_I2S_CLK_MST (1 << 16)
/* SSCR4 bits */
#define SSCR4_FRM_CLOCKS(x) (x << 7)
#define SSCR4_FRM_CLOCKS(x) ((x) << 7)
/* SSCR5 bits */
#define SSCR5_FRM_ASRT_CLOCKS(x) ((x - 1) << 1)
#define SSCR5_FRM_ASRT_CLOCKS(x) (((x) - 1) << 1)
/* SFIFOTT bits */
#define SFIFOTT_TX(x) (x - 1)
#define SFIFOTT_RX(x) ((x - 1) << 16)
#define SFIFOTT_TX(x) ((x) - 1)
#define SFIFOTT_RX(x) (((x) - 1) << 16)
/* tracing */
#define trace_ssp(__e) trace_event(TRACE_CLASS_SSP, __e)

20
src/include/uapi/intel-ipc.h
View File

@ -58,20 +58,20 @@
/* Global Message - Generic */
#define IPC_INTEL_GLB_TYPE_SHIFT 24
#define IPC_INTEL_GLB_TYPE_MASK (0x1f << IPC_INTEL_GLB_TYPE_SHIFT)
#define IPC_INTEL_GLB_TYPE(x) (x << IPC_INTEL_GLB_TYPE_SHIFT)
#define IPC_INTEL_GLB_TYPE(x) ((x) << IPC_INTEL_GLB_TYPE_SHIFT)
/* Global Message - Reply */
#define IPC_INTEL_GLB_REPLY_SHIFT 0
#define IPC_INTEL_GLB_REPLY_MASK (0x1f << IPC_INTEL_GLB_REPLY_SHIFT)
#define IPC_INTEL_GLB_REPLY_TYPE(x) (x << IPC_INTEL_GLB_REPLY_TYPE_SHIFT)
#define IPC_INTEL_GLB_REPLY_TYPE(x) ((x) << IPC_INTEL_GLB_REPLY_TYPE_SHIFT)
/* Stream Message - Generic */
#define IPC_INTEL_STR_TYPE_SHIFT 20
#define IPC_INTEL_STR_TYPE_MASK (0xf << IPC_INTEL_STR_TYPE_SHIFT)
#define IPC_INTEL_STR_TYPE(x) (x << IPC_INTEL_STR_TYPE_SHIFT)
#define IPC_INTEL_STR_TYPE(x) ((x) << IPC_INTEL_STR_TYPE_SHIFT)
#define IPC_INTEL_STR_ID_SHIFT 16
#define IPC_INTEL_STR_ID_MASK (0xf << IPC_INTEL_STR_ID_SHIFT)
#define IPC_INTEL_STR_ID(x) (x << IPC_INTEL_STR_ID_SHIFT)
#define IPC_INTEL_STR_ID(x) ((x) << IPC_INTEL_STR_ID_SHIFT)
/* Stream Message - Reply */
#define IPC_INTEL_STR_REPLY_SHIFT 0
@ -80,10 +80,10 @@
/* Stream Stage Message - Generic */
#define IPC_INTEL_STG_TYPE_SHIFT 12
#define IPC_INTEL_STG_TYPE_MASK (0xf << IPC_INTEL_STG_TYPE_SHIFT)
#define IPC_INTEL_STG_TYPE(x) (x << IPC_INTEL_STG_TYPE_SHIFT)
#define IPC_INTEL_STG_TYPE(x) ((x) << IPC_INTEL_STG_TYPE_SHIFT)
#define IPC_INTEL_STG_ID_SHIFT 10
#define IPC_INTEL_STG_ID_MASK (0x3 << IPC_INTEL_STG_ID_SHIFT)
#define IPC_INTEL_STG_ID(x) (x << IPC_INTEL_STG_ID_SHIFT)
#define IPC_INTEL_STG_ID(x) ((x) << IPC_INTEL_STG_ID_SHIFT)
/* Stream Stage Message - Reply */
#define IPC_INTEL_STG_REPLY_SHIFT 0
@ -92,19 +92,19 @@
/* Debug Log Message - Generic */
#define IPC_INTEL_LOG_OP_SHIFT 20
#define IPC_INTEL_LOG_OP_MASK (0xf << IPC_INTEL_LOG_OP_SHIFT)
#define IPC_INTEL_LOG_OP_TYPE(x) (x << IPC_INTEL_LOG_OP_SHIFT)
#define IPC_INTEL_LOG_OP_TYPE(x) ((x) << IPC_INTEL_LOG_OP_SHIFT)
#define IPC_INTEL_LOG_ID_SHIFT 16
#define IPC_INTEL_LOG_ID_MASK (0xf << IPC_INTEL_LOG_ID_SHIFT)
#define IPC_INTEL_LOG_ID(x) (x << IPC_INTEL_LOG_ID_SHIFT)
#define IPC_INTEL_LOG_ID(x) ((x) << IPC_INTEL_LOG_ID_SHIFT)
/* Module Message */
#define IPC_INTEL_MODULE_OPERATION_SHIFT 20
#define IPC_INTEL_MODULE_OPERATION_MASK (0xf << IPC_INTEL_MODULE_OPERATION_SHIFT)
#define IPC_INTEL_MODULE_OPERATION(x) (x << IPC_INTEL_MODULE_OPERATION_SHIFT)
#define IPC_INTEL_MODULE_OPERATION(x) ((x) << IPC_INTEL_MODULE_OPERATION_SHIFT)
#define IPC_INTEL_MODULE_ID_SHIFT 16
#define IPC_INTEL_MODULE_ID_MASK (0xf << IPC_INTEL_MODULE_ID_SHIFT)
#define IPC_INTEL_MODULE_ID(x) (x << IPC_INTEL_MODULE_ID_SHIFT)
#define IPC_INTEL_MODULE_ID(x) ((x) << IPC_INTEL_MODULE_ID_SHIFT)
/* IPC message timeout (msecs) */
#define IPC_INTEL_TIMEOUT_MSECS 300

4
src/include/uapi/ipc.h
View File

@ -49,12 +49,12 @@
/* Global Message - Generic */
#define SOF_GLB_TYPE_SHIFT 28
#define SOF_GLB_TYPE_MASK (0xf << SOF_GLB_TYPE_SHIFT)
#define SOF_GLB_TYPE(x) (x << SOF_GLB_TYPE_SHIFT)
#define SOF_GLB_TYPE(x) ((x) << SOF_GLB_TYPE_SHIFT)
/* Command Message - Generic */
#define SOF_CMD_TYPE_SHIFT 16
#define SOF_CMD_TYPE_MASK (0xfff << SOF_CMD_TYPE_SHIFT)
#define SOF_CMD_TYPE(x) (x << SOF_CMD_TYPE_SHIFT)
#define SOF_CMD_TYPE(x) ((x) << SOF_CMD_TYPE_SHIFT)
/* Global Message Types */
#define SOF_IPC_GLB_REPLY SOF_GLB_TYPE(0x1U)

8
src/platform/baytrail/include/platform/dma.h
View File

@ -45,13 +45,13 @@
/* CTL_HI */
#define DW_CTLH_DONE 0x00020000
#define DW_CTLH_BLOCK_TS_MASK 0x0001ffff
#define DW_CTLH_CLASS(x) (x << 29)
#define DW_CTLH_WEIGHT(x) (x << 18)
#define DW_CTLH_CLASS(x) ((x) << 29)
#define DW_CTLH_WEIGHT(x) ((x) << 18)
/* CFG_LO */
#define DW_CFG_CH_DRAIN 0x400
/* CFG_HI */
#define DW_CFGH_SRC_PER(x) (x << 0)
#define DW_CFGH_DST_PER(x) (x << 4)
#define DW_CFGH_SRC_PER(x) ((x) << 0)
#define DW_CFGH_DST_PER(x) ((x) << 4)
/* FIFO Partition */
#define DW_FIFO_PARTITION
#define DW_FIFO_PART0_LO 0x0400