Index: App/Common.h
===================================================================
diff -u -r40a959e1341c8964f872df462ac3a2d874e3b0b3 -r6c8c486d26306662402945537c5acaea2709d85b
--- App/Common.h	(.../Common.h)	(revision 40a959e1341c8964f872df462ac3a2d874e3b0b3)
+++ App/Common.h	(.../Common.h)	(revision 6c8c486d26306662402945537c5acaea2709d85b)
@@ -23,7 +23,7 @@
 
 #ifndef _VECTORCAST_
     #define RM46_EVAL_BOARD_TARGET      1
-    #define SIMULATE_UI                 1
+//    #define SIMULATE_UI                 1
 #endif
 
 // ********** public definitions **********
@@ -69,20 +69,20 @@
 #define MASK_OFF_LSB                    0xFF00
 #define MASK_OFF_MSW                    0x0000FFFF
 #define MASK_OFF_LSW                    0xFFFF0000
-#define SHIFT_BITS_IN_BYTE              8
-#define SHIFT_BITS_IN_WORD              16
+#define SHIFT_8_BITS_FOR_BYTE_SHIFT     8
+#define SHIFT_16_BITS_FOR_WORD_SHIFT    16
 
 #define CAP(v,u)                        ((v) > (u) ? (u) : (v))
 #define RANGE(v,l,u)                    ((v) > (u) ? (u) : ((v) < (l) ? (l) : (v)))
 #define INC_WRAP(v,l,u)                 ((v) == (u) ? (l) : ((v)+1))
 #define MAX(a,b)                        ((a) < (b) ? (b) : (a))
 #define MIN(a,b)                        ((a) > (b) ? (b) : (a))
 #define GET_LSB_OF_WORD(w)              ((U08)((w) & MASK_OFF_MSB))
-#define GET_MSB_OF_WORD(w)              ((U08)(((w) >> SHIFT_BITS_IN_BYTE) & MASK_OFF_MSB))
+#define GET_MSB_OF_WORD(w)              ((U08)(((w) >> SHIFT_8_BITS_FOR_BYTE_SHIFT) & MASK_OFF_MSB))
 #define GET_LSW_OF_LONG(l)              ((U16)((l) & MASK_OFF_MSW))
-#define GET_MSW_OF_LONG(l)              ((U16)(((l) >> SHIFT_BITS_IN_WORD) & MASK_OFF_MSW))
-#define MAKE_WORD_OF_BYTES(h,l)         ((((U16)(h) << SHIFT_BITS_IN_BYTE) & MASK_OFF_LSB) | ((U16)(l) & MASK_OFF_MSB))
-#define MAKE_LONG_OF_WORDS(h,l)         ((((U32)(h) << SHIFT_BITS_IN_WORD) & MASK_OFF_LSW) | ((U32)(l) & MASK_OFF_MSW))
+#define GET_MSW_OF_LONG(l)              ((U16)(((l) >> SHIFT_16_BITS_FOR_WORD_SHIFT) & MASK_OFF_MSW))
+#define MAKE_WORD_OF_BYTES(h,l)         ((((U16)(h) << SHIFT_8_BITS_FOR_BYTE_SHIFT) & MASK_OFF_LSB) | ((U16)(l) & MASK_OFF_MSB))
+#define MAKE_LONG_OF_WORDS(h,l)         ((((U32)(h) << SHIFT_16_BITS_FOR_WORD_SHIFT) & MASK_OFF_LSW) | ((U32)(l) & MASK_OFF_MSW))
 
 // **** Script Support Definitions ****