Diff: targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_flash.c

Revision:

169:e3b6fe271b81

Parent:

154:37f96f9d4de2

--- a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_flash.c	Thu Jul 06 15:42:05 2017 +0100
+++ b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_flash.c	Wed Jul 19 17:31:21 2017 +0100
@@ -402,7 +402,7 @@
  * @endcode
  * Note2: The binary code is generated by IAR 7.70.1
  */
-const static uint16_t s_flashRunCommandFunctionCode[] = {
+static const uint16_t s_flashRunCommandFunctionCode[] = {
     0x2180, /* MOVS  R1, #128 ; 0x80 */
     0x7001, /* STRB  R1, [R0] */
     /* @4: */
@@ -432,7 +432,7 @@
  * @endcode
  * Note2: The binary code is generated by IAR 7.70.1
  */
-const static uint16_t s_flashCommonBitOperationFunctionCode[] = {
+static const uint16_t s_flashCommonBitOperationFunctionCode[] = {
     0xb510, /* PUSH  {R4, LR} */
     0x2900, /* CMP   R1, #0 */
     0xd005, /* BEQ.N @12 */
@@ -2734,11 +2734,12 @@
     __DSB();
 #endif /* FLASH_DRIVER_IS_FLASH_RESIDENT */
 }
+#if (defined(__GNUC__))
+/* #pragma GCC pop_options */
+#else
 #if (defined(__CC_ARM))
 #pragma pop
 #endif
-#if (defined(__GNUC__))
-/* #pragma GCC pop_options */
 #endif
 
 #if FLASH_DRIVER_IS_FLASH_RESIDENT