EMTime/libopencm3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Surround all macro parameters with ()

Browse Source 
Followup from c72f3d588a
This commit is contained in:
Karl Palsson
2015-10-15 01:03:18 +00:00
parent 8f06818f03
commit 2e25d678ba
10 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/libopencm3/stm32/tools.h
View File

@@ -25,23 +25,23 @@
*/
/* Get register content. */
#define GET_REG(REG) ((uint16_t) *REG)
#define GET_REG(REG) ((uint16_t) *(REG))
/* Set register content. */
#define SET_REG(REG, VAL) (*REG = (uint16_t)VAL)
#define SET_REG(REG, VAL) (*(REG) = (uint16_t)(VAL))
/* Clear register bit. */
#define CLR_REG_BIT(REG, BIT) SET_REG(REG, (~BIT))
#define CLR_REG_BIT(REG, BIT) SET_REG((REG), (~(BIT)))
/* Clear register bit masking out some bits that must not be touched. */
#define CLR_REG_BIT_MSK_AND_SET(REG, MSK, BIT, EXTRA_BITS) \
SET_REG(REG, (GET_REG(REG) & MSK & (~BIT)) | (EXTRA_BITS))
SET_REG((REG), (GET_REG((REG)) & (MSK) & (~(BIT))) | (EXTRA_BITS))
#define CLR_REG_BIT_MSK(REG, MSK, BIT) \
CLR_REG_BIT_MSK_AND_SET(REG, MSK, BIT, 0)
CLR_REG_BIT_MSK_AND_SET((REG), (MSK), (BIT), 0)
/* Get masked out bit value. */
#define GET_REG_BIT(REG, BIT) (GET_REG(REG) & BIT)
#define GET_REG_BIT(REG, BIT) (GET_REG(REG) & (BIT))
/*
* Set/reset a bit in a masked window by using toggle mechanism.
@@ -62,10 +62,10 @@ do { \
toggle_mask ^= bit_selector; \
} \
} \
SET_REG(REG, toggle_mask | (EXTRA_BITS)); \
SET_REG((REG), toggle_mask | (EXTRA_BITS)); \
} while (0)
#define TOG_SET_REG_BIT_MSK(REG, MSK, BIT) \
TOG_SET_REG_BIT_MSK_AND_SET(REG, MSK, BIT, 0)
TOG_SET_REG_BIT_MSK_AND_SET((REG), (MSK), (BIT), 0)
#endif