Add "is inside interrupt" function to MPU ports.

[freertos] / FreeRTOS / Source / portable / GCC / ARM_CM33 / non_secure / portmacro.h

diff --git a/FreeRTOS/Source/portable/GCC/ARM_CM33/non_secure/portmacro.h b/FreeRTOS/Source/portable/GCC/ARM_CM33/non_secure/portmacro.h
index 3ab4ff7002ad5616621d76a2d7e7a1cf6fdd8750..5ac934cd80d88d107619796d4e75665eec56b36b 100644 (file)
--- a/FreeRTOS/Source/portable/GCC/ARM_CM33/non_secure/portmacro.h
+++ b/FreeRTOS/Source/portable/GCC/ARM_CM33/non_secure/portmacro.h
@@ -1,5 +1,5 @@
 /*\r
- * FreeRTOS Kernel V10.2.0\r
+ * FreeRTOS Kernel V10.2.1\r
  * Copyright (C) 2019 Amazon.com, Inc. or its affiliates.  All Rights Reserved.\r
  *\r
  * Permission is hereby granted, free of charge, to any person obtaining a copy of\r
@@ -97,22 +97,25 @@ typedef unsigned long                                                                               UBaseType_t;
        #define portFORCE_INLINE                                                                inline __attribute__(( always_inline ))\r
 #endif\r
 #define portHAS_STACK_OVERFLOW_CHECKING                                                1\r
+#define portDONT_DISCARD                                                                       __attribute__(( used ))\r
 /*-----------------------------------------------------------*/\r
 \r
 /**\r
  * @brief Extern declarations.\r
  */\r
+extern BaseType_t xPortIsInsideInterrupt( void );\r
+\r
 extern void vPortYield( void ) /* PRIVILEGED_FUNCTION */;\r
 \r
 extern void vPortEnterCritical( void ) /* PRIVILEGED_FUNCTION */;\r
 extern void vPortExitCritical( void ) /* PRIVILEGED_FUNCTION */;\r
 \r
-extern uint32_t ulSetInterruptMaskFromISR( void ) /* __attribute__(( naked )) PRIVILEGED_FUNCTION */;\r
-extern void vClearInterruptMaskFromISR( uint32_t ulMask ) /* __attribute__(( naked )) PRIVILEGED_FUNCTION */;\r
+extern uint32_t ulSetInterruptMask( void ) /* __attribute__(( naked )) PRIVILEGED_FUNCTION */;\r
+extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) PRIVILEGED_FUNCTION */;\r
 \r
 #if( configENABLE_TRUSTZONE == 1 )\r
-       extern void vPortAllocateSecureContext( uint32_t ulSecureStackSize );\r
-       extern void vPortFreeSecureContext( uint32_t *pulTCB ) /* PRIVILEGED_FUNCTION */;\r
+       extern void vPortAllocateSecureContext( uint32_t ulSecureStackSize ); /* __attribute__ (( naked )) */\r
+       extern void vPortFreeSecureContext( uint32_t *pulTCB ) /* __attribute__ (( naked )) PRIVILEGED_FUNCTION */;\r
 #endif /* configENABLE_TRUSTZONE */\r
 \r
 #if( configENABLE_MPU == 1 )\r
@@ -135,18 +138,14 @@ extern void vClearInterruptMaskFromISR( uint32_t ulMask ) /* __attribute__(( nak
 /* MPU regions. */\r
 #define portPRIVILEGED_FLASH_REGION                                                    ( 0UL )\r
 #define portUNPRIVILEGED_FLASH_REGION                                          ( 1UL )\r
-#define portPRIVILEGED_RAM_REGION                                                      ( 2UL )\r
-#define portUNPRIVILEGED_DEVICE_REGION                                         ( 3UL )\r
+#define portUNPRIVILEGED_SYSCALLS_REGION                                       ( 2UL )\r
+#define portPRIVILEGED_RAM_REGION                                                      ( 3UL )\r
 #define portSTACK_REGION                                                                       ( 4UL )\r
 #define portFIRST_CONFIGURABLE_REGION                                          ( 5UL )\r
 #define portLAST_CONFIGURABLE_REGION                                           ( 7UL )\r
 #define portNUM_CONFIGURABLE_REGIONS                                           ( ( portLAST_CONFIGURABLE_REGION - portFIRST_CONFIGURABLE_REGION ) + 1 )\r
 #define portTOTAL_NUM_REGIONS                                                          ( portNUM_CONFIGURABLE_REGIONS + 1 ) /* Plus one to make space for the stack region. */\r
 \r
-/* Devices Region. */\r
-#define portDEVICE_REGION_START_ADDRESS                                                ( 0x50000000 )\r
-#define portDEVICE_REGION_END_ADDRESS                                          ( 0x5FFFFFFF )\r
-\r
 /* Device memory attributes used in MPU_MAIR registers.\r
  *\r
  * 8-bit values encoded as follows:\r
@@ -220,10 +219,10 @@ typedef struct MPU_SETTINGS
 /**\r
  * @brief Critical section management.\r
  */\r
-#define portSET_INTERRUPT_MASK_FROM_ISR()                                      ulSetInterruptMaskFromISR()\r
-#define portCLEAR_INTERRUPT_MASK_FROM_ISR(x)                           vClearInterruptMaskFromISR( x )\r
-#define portDISABLE_INTERRUPTS()                                                       __asm volatile ( " cpsid i " ::: "memory" )\r
-#define portENABLE_INTERRUPTS()                                                                __asm volatile ( " cpsie i " ::: "memory" )\r
+#define portSET_INTERRUPT_MASK_FROM_ISR()                                      ulSetInterruptMask()\r
+#define portCLEAR_INTERRUPT_MASK_FROM_ISR( x )                         vClearInterruptMask( x )\r
+#define portDISABLE_INTERRUPTS()                                                       ulSetInterruptMask()\r
+#define portENABLE_INTERRUPTS()                                                                vClearInterruptMask( 0 )\r
 #define portENTER_CRITICAL()                                                           vPortEnterCritical()\r
 #define portEXIT_CRITICAL()                                                                    vPortExitCritical()\r
 /*-----------------------------------------------------------*/\r
@@ -289,7 +288,11 @@ typedef struct MPU_SETTINGS
 #endif /* configENABLE_MPU */\r
 /*-----------------------------------------------------------*/\r
 \r
+/**\r
+ * @brief Barriers.\r
+ */\r
 #define portMEMORY_BARRIER() __asm volatile( "" ::: "memory" )\r
+/*-----------------------------------------------------------*/\r
 \r
 #ifdef __cplusplus\r
 }\r