-#define EEFC_FCR_FCMD_M 0xff ///< Flash Command
-#define EEFC_FCR_FCMD(value) (EEFC_FCR_FCMD_M & (value))
-#define EEFC_FCR_FARG_S 8
-#define EEFC_FCR_FARG_M (0xffff << EEFC_FCR_FARG_S) ///< Flash Command Argument
-#define EEFC_FCR_FARG(value) (EEFC_FCR_FARG_M & ((value) << EEFC_FCR_FARG_S))
-#define EEFC_FCR_FKEY_S 24
-#define EEFC_FCR_FKEY_M (0xff << EEFC_FCR_FKEY_S) ///< Flash Writing Protection Key
-#define EEFC_FCR_FKEY(value) (EEFC_FCR_FKEY_M & ((value) << EEFC_FCR_FKEY_S))
+#define EEFC_FCR_FCMD_MASK 0xff ///< Flash Command
+#define EEFC_FCR_FCMD(value) (EEFC_FCR_FCMD_MASK & (value))
+#define EEFC_FCR_FARG_SHIFT 8
+#define EEFC_FCR_FARG_MASK (0xffff << EEFC_FCR_FARG_SHIFT) ///< Flash Command Argument
+#define EEFC_FCR_FARG(value) (EEFC_FCR_FARG_MASK & ((value) << EEFC_FCR_FARG_SHIFT))
+#define EEFC_FCR_FKEY_SHIFT 24
+#define EEFC_FCR_FKEY_MASK (0xff << EEFC_FCR_FKEY_SHIFT) ///< Flash Writing Protection Key
+#define EEFC_FCR_FKEY(value) (EEFC_FCR_FKEY_MASK & ((value) << EEFC_FCR_FKEY_SHIFT))