diff options
Diffstat (limited to 'c/src/lib/libbsp')
-rw-r--r-- | c/src/lib/libbsp/shared/ChangeLog | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/shared/include/utility.h | 41 |
2 files changed, 29 insertions, 16 deletions
diff --git a/c/src/lib/libbsp/shared/ChangeLog b/c/src/lib/libbsp/shared/ChangeLog index 76f61281a4..290070a275 100644 --- a/c/src/lib/libbsp/shared/ChangeLog +++ b/c/src/lib/libbsp/shared/ChangeLog @@ -1,3 +1,7 @@ +2008-09-30 Sebastian Huber <sebastian.huber@embedded-brains.de> + + * include/utility.h: Renamed various macros. + 2008-09-30 Ralf Corsepius <ralf.corsepius@rtems.org> * clockdrv_shell.c: Empty file. Add warning to not use this file. diff --git a/c/src/lib/libbsp/shared/include/utility.h b/c/src/lib/libbsp/shared/include/utility.h index caba9a2976..8f9d26be67 100644 --- a/c/src/lib/libbsp/shared/include/utility.h +++ b/c/src/lib/libbsp/shared/include/utility.h @@ -23,29 +23,38 @@ extern "C" { #endif /* __cplusplus */ -#define GET_REG_FIELD( reg, mask, shift) \ - (((reg) & (mask)) >> (shift)) +#define GET_FIELD( val, mask, shift) \ + (((val) & (mask)) >> (shift)) -#define SET_REG_FIELD( reg, val, mask, shift) \ - (((reg) & ~(mask)) | (((val) << (shift)) & (mask))) +#define SET_FIELD( val, field, mask, shift) \ + (((val) & ~(mask)) | (((field) << (shift)) & (mask))) -#define REG_FLAG_IS_SET( reg, flag) \ - (((reg) & (flag)) != 0) +#define CLEAR_FIELD( val, mask) \ + ((val) & ~(mask)) -#define REG_FLAG_IS_CLEARED( reg, flag) \ - (((reg) & (flag)) == 0) +#define IS_FLAG_SET( val, flag) \ + (((val) & (flag)) != 0) -#define SET_REG_FLAG( reg, flag) \ - ((reg) | (flag)) +#define IS_FLAG_CLEARED( val, flag) \ + (((val) & (flag)) == 0) -#define CLEAR_REG_FLAG( reg, flag) \ - ((reg) & ~(flag)) +#define ARE_FLAGS_SET( val, flags) \ + (((val) & (flags)) == (flags)) -#define SET_REG_FLAGS( reg, flags, mask) \ - (((reg) & ~(mask)) | (flags)) +#define ARE_FLAGS_CLEARED( val, flags) \ + (((val) & (flags)) == 0) -#define CLEAR_REG_FLAGS( reg, flags) \ - ((reg) & ~(flags)) +#define SET_FLAG( val, flag) \ + ((val) | (flag)) + +#define CLEAR_FLAG( val, flag) \ + ((val) & ~(flag)) + +#define SET_FLAGS( val, flags) \ + ((val) | (flags)) + +#define CLEAR_FLAGS( val, flags) \ + ((val) & ~(flags)) #ifdef __cplusplus } |