From 4eab550b3b19345d271b4a93d34374a0dae867da Mon Sep 17 00:00:00 2001 From: Tomasz Kramkowski Date: Tue, 28 Mar 2017 16:31:20 +0100 Subject: reg: cleanup regdefs --- reg/regdefs.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/reg/regdefs.h b/reg/regdefs.h index 802d7c0..10eeff9 100644 --- a/reg/regdefs.h +++ b/reg/regdefs.h @@ -12,18 +12,18 @@ #define REG_32_M(start, len) ((uint32_t)(BITS(len) << (start))) #define BV(b) (1 << (b)) -#define IS_BIT_SET(reg, bit) (!!((reg) & BV(bit))) -#define WAIT_BIT_UNSET(reg, bit) do { } while (IS_BIT_SET(reg, bit)) -#define WAIT_BIT_SET(reg, bit) do { } while (!IS_BIT_SET(reg, bit)) +#define BITS(n) (0xffffffff >> (32 - (n))) + +#define GET_BIT(reg, bit) (!!((reg) & BV(bit))) +#define GET_BITS(reg, offset) (((reg) & (offset ## _M)) >> (offset)) #define SET_BIT(reg, bit) ((reg) |= BV(bit)) #define UNSET_BIT(reg, bit) ((reg) &= ~BV(bit)) - -#define GET_BIT(reg, bit) !!((reg) & BV(bit)) -#define GET_BITS(reg, offset) (((reg) & (offset ## _M)) >> (offset)) +#define TOGGLE_BIT(reg, bit) ((reg) ^= BV(bit)) #define SET_MASKED(reg, mask, bits) ((reg) = ((reg) & ~(mask)) | ((bits) & (mask))) -#define BITS(n) (0xffffffff >> (32 - (n))) +#define WAIT_BIT_UNSET(reg, bit) do { } while (GET_BIT(reg, bit)) +#define WAIT_BIT_SET(reg, bit) do { } while (!GET_BIT(reg, bit)) #endif /* MK20DX256_REG_REGDEFS_H */ -- cgit v1.2.3-54-g00ecf