Renamed various macros.

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.

c/src/lib/libbsp/shared/include/utility.h

@@ -23,29 +23,38 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#define GET_REG_FIELD( reg, mask, shift) \
+#define GET_FIELD( val, mask, shift) \
-  (((reg) & (mask)) >> (shift))
+  (((val) & (mask)) >> (shift))
 
-#define SET_REG_FIELD( reg, val, mask, shift) \
+#define SET_FIELD( val, field, mask, shift) \
-  (((reg) & ~(mask)) | (((val) << (shift)) & (mask)))
+  (((val) & ~(mask)) | (((field) << (shift)) & (mask)))
 
-#define REG_FLAG_IS_SET( reg, flag) \
+#define CLEAR_FIELD( val, mask) \
-  (((reg) & (flag)) != 0)
+  ((val) & ~(mask))
 
-#define REG_FLAG_IS_CLEARED( reg, flag) \
+#define IS_FLAG_SET( val, flag) \
-  (((reg) & (flag)) == 0)
+  (((val) & (flag)) != 0)
 
-#define SET_REG_FLAG( reg, flag) \
+#define IS_FLAG_CLEARED( val, flag) \
-  ((reg) | (flag))
+  (((val) & (flag)) == 0)
 
-#define CLEAR_REG_FLAG( reg, flag) \
+#define ARE_FLAGS_SET( val, flags) \
-  ((reg) & ~(flag))
+  (((val) & (flags)) == (flags))
 
-#define SET_REG_FLAGS( reg, flags, mask) \
+#define ARE_FLAGS_CLEARED( val, flags) \
-  (((reg) & ~(mask)) | (flags))
+  (((val) & (flags)) == 0)
 
-#define CLEAR_REG_FLAGS( reg, flags) \
+#define SET_FLAG( val, flag) \
-  ((reg) & ~(flags))
+  ((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
 }