mirror of
https://github.com/FreeRTOS/FreeRTOS-Kernel.git
synced 2025-12-07 13:45:00 -05:00
Merge branch 'main' into pass-core-id-to-critical-nesting-count-macros
This commit is contained in:
commit
406ebae2a2
24 changed files with 90 additions and 85 deletions
|
|
@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
|
|||
*/
|
||||
static void prvTaskExitError( void );
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
/**
|
||||
* @brief Extract MPU region's access permissions from the Region Base Address
|
||||
|
|
@ -409,7 +409,7 @@ static void prvTaskExitError( void );
|
|||
* @return uint32_t Access permissions.
|
||||
*/
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
||||
|
|
@ -871,7 +871,7 @@ static void prvTaskExitError( void )
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
|
||||
{
|
||||
|
|
@ -890,7 +890,7 @@ static void prvTaskExitError( void )
|
|||
return ulAccessPermissions;
|
||||
}
|
||||
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
|
|
|||
|
|
@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
|
|||
*/
|
||||
static void prvTaskExitError( void );
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
/**
|
||||
* @brief Extract MPU region's access permissions from the Region Base Address
|
||||
|
|
@ -409,7 +409,7 @@ static void prvTaskExitError( void );
|
|||
* @return uint32_t Access permissions.
|
||||
*/
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
||||
|
|
@ -871,7 +871,7 @@ static void prvTaskExitError( void )
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
|
||||
{
|
||||
|
|
@ -890,7 +890,7 @@ static void prvTaskExitError( void )
|
|||
return ulAccessPermissions;
|
||||
}
|
||||
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
|
|
|||
|
|
@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
|
|||
*/
|
||||
static void prvTaskExitError( void );
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
/**
|
||||
* @brief Extract MPU region's access permissions from the Region Base Address
|
||||
|
|
@ -409,7 +409,7 @@ static void prvTaskExitError( void );
|
|||
* @return uint32_t Access permissions.
|
||||
*/
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
||||
|
|
@ -871,7 +871,7 @@ static void prvTaskExitError( void )
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
|
||||
{
|
||||
|
|
@ -890,7 +890,7 @@ static void prvTaskExitError( void )
|
|||
return ulAccessPermissions;
|
||||
}
|
||||
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
|
|
|||
|
|
@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
|
|||
*/
|
||||
static void prvTaskExitError( void );
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
/**
|
||||
* @brief Extract MPU region's access permissions from the Region Base Address
|
||||
|
|
@ -409,7 +409,7 @@ static void prvTaskExitError( void );
|
|||
* @return uint32_t Access permissions.
|
||||
*/
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
||||
|
|
@ -871,7 +871,7 @@ static void prvTaskExitError( void )
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
|
||||
{
|
||||
|
|
@ -890,7 +890,7 @@ static void prvTaskExitError( void )
|
|||
return ulAccessPermissions;
|
||||
}
|
||||
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
|
|
|||
|
|
@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
|
|||
*/
|
||||
static void prvTaskExitError( void );
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
/**
|
||||
* @brief Extract MPU region's access permissions from the Region Base Address
|
||||
|
|
@ -409,7 +409,7 @@ static void prvTaskExitError( void );
|
|||
* @return uint32_t Access permissions.
|
||||
*/
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
||||
|
|
@ -871,7 +871,7 @@ static void prvTaskExitError( void )
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
|
||||
{
|
||||
|
|
@ -890,7 +890,7 @@ static void prvTaskExitError( void )
|
|||
return ulAccessPermissions;
|
||||
}
|
||||
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
|
|
|||
|
|
@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
|
|||
*/
|
||||
static void prvTaskExitError( void );
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
/**
|
||||
* @brief Extract MPU region's access permissions from the Region Base Address
|
||||
|
|
@ -409,7 +409,7 @@ static void prvTaskExitError( void );
|
|||
* @return uint32_t Access permissions.
|
||||
*/
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
||||
|
|
@ -871,7 +871,7 @@ static void prvTaskExitError( void )
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
|
||||
{
|
||||
|
|
@ -890,7 +890,7 @@ static void prvTaskExitError( void )
|
|||
return ulAccessPermissions;
|
||||
}
|
||||
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
|
|
|||
|
|
@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
|
|||
*/
|
||||
static void prvTaskExitError( void );
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
/**
|
||||
* @brief Extract MPU region's access permissions from the Region Base Address
|
||||
|
|
@ -409,7 +409,7 @@ static void prvTaskExitError( void );
|
|||
* @return uint32_t Access permissions.
|
||||
*/
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
||||
|
|
@ -871,7 +871,7 @@ static void prvTaskExitError( void )
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
|
||||
{
|
||||
|
|
@ -890,7 +890,7 @@ static void prvTaskExitError( void )
|
|||
return ulAccessPermissions;
|
||||
}
|
||||
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
|
|
|||
|
|
@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
|
|||
*/
|
||||
static void prvTaskExitError( void );
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
/**
|
||||
* @brief Extract MPU region's access permissions from the Region Base Address
|
||||
|
|
@ -409,7 +409,7 @@ static void prvTaskExitError( void );
|
|||
* @return uint32_t Access permissions.
|
||||
*/
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
||||
|
|
@ -871,7 +871,7 @@ static void prvTaskExitError( void )
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
|
||||
{
|
||||
|
|
@ -890,7 +890,7 @@ static void prvTaskExitError( void )
|
|||
return ulAccessPermissions;
|
||||
}
|
||||
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
|
|
|||
|
|
@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
|
|||
*/
|
||||
static void prvTaskExitError( void );
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
/**
|
||||
* @brief Extract MPU region's access permissions from the Region Base Address
|
||||
|
|
@ -409,7 +409,7 @@ static void prvTaskExitError( void );
|
|||
* @return uint32_t Access permissions.
|
||||
*/
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
||||
|
|
@ -871,7 +871,7 @@ static void prvTaskExitError( void )
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
|
||||
{
|
||||
|
|
@ -890,7 +890,7 @@ static void prvTaskExitError( void )
|
|||
return ulAccessPermissions;
|
||||
}
|
||||
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
|
|
|||
|
|
@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
|
|||
*/
|
||||
static void prvTaskExitError( void );
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
/**
|
||||
* @brief Extract MPU region's access permissions from the Region Base Address
|
||||
|
|
@ -409,7 +409,7 @@ static void prvTaskExitError( void );
|
|||
* @return uint32_t Access permissions.
|
||||
*/
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
||||
|
|
@ -871,7 +871,7 @@ static void prvTaskExitError( void )
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
|
||||
{
|
||||
|
|
@ -890,7 +890,7 @@ static void prvTaskExitError( void )
|
|||
return ulAccessPermissions;
|
||||
}
|
||||
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
|
|
|||
|
|
@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
|
|||
*/
|
||||
static void prvTaskExitError( void );
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
/**
|
||||
* @brief Extract MPU region's access permissions from the Region Base Address
|
||||
|
|
@ -409,7 +409,7 @@ static void prvTaskExitError( void );
|
|||
* @return uint32_t Access permissions.
|
||||
*/
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
||||
|
|
@ -871,7 +871,7 @@ static void prvTaskExitError( void )
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
|
||||
{
|
||||
|
|
@ -890,7 +890,7 @@ static void prvTaskExitError( void )
|
|||
return ulAccessPermissions;
|
||||
}
|
||||
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
|
|
|||
|
|
@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
|
|||
*/
|
||||
static void prvTaskExitError( void );
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
/**
|
||||
* @brief Extract MPU region's access permissions from the Region Base Address
|
||||
|
|
@ -409,7 +409,7 @@ static void prvTaskExitError( void );
|
|||
* @return uint32_t Access permissions.
|
||||
*/
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
||||
|
|
@ -871,7 +871,7 @@ static void prvTaskExitError( void )
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
|
||||
{
|
||||
|
|
@ -890,7 +890,7 @@ static void prvTaskExitError( void )
|
|||
return ulAccessPermissions;
|
||||
}
|
||||
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
|
|
|||
|
|
@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
|
|||
*/
|
||||
static void prvTaskExitError( void );
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
/**
|
||||
* @brief Extract MPU region's access permissions from the Region Base Address
|
||||
|
|
@ -409,7 +409,7 @@ static void prvTaskExitError( void );
|
|||
* @return uint32_t Access permissions.
|
||||
*/
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
||||
|
|
@ -871,7 +871,7 @@ static void prvTaskExitError( void )
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
|
||||
{
|
||||
|
|
@ -890,7 +890,7 @@ static void prvTaskExitError( void )
|
|||
return ulAccessPermissions;
|
||||
}
|
||||
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
|
|
|||
|
|
@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
|
|||
*/
|
||||
static void prvTaskExitError( void );
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
/**
|
||||
* @brief Extract MPU region's access permissions from the Region Base Address
|
||||
|
|
@ -409,7 +409,7 @@ static void prvTaskExitError( void );
|
|||
* @return uint32_t Access permissions.
|
||||
*/
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
||||
|
|
@ -871,7 +871,7 @@ static void prvTaskExitError( void )
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
|
||||
{
|
||||
|
|
@ -890,7 +890,7 @@ static void prvTaskExitError( void )
|
|||
return ulAccessPermissions;
|
||||
}
|
||||
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
|
|
|||
|
|
@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
|
|||
*/
|
||||
static void prvTaskExitError( void );
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
/**
|
||||
* @brief Extract MPU region's access permissions from the Region Base Address
|
||||
|
|
@ -409,7 +409,7 @@ static void prvTaskExitError( void );
|
|||
* @return uint32_t Access permissions.
|
||||
*/
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
||||
|
|
@ -871,7 +871,7 @@ static void prvTaskExitError( void )
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
|
||||
{
|
||||
|
|
@ -890,7 +890,7 @@ static void prvTaskExitError( void )
|
|||
return ulAccessPermissions;
|
||||
}
|
||||
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
|
|
|||
|
|
@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
|
|||
*/
|
||||
static void prvTaskExitError( void );
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
/**
|
||||
* @brief Extract MPU region's access permissions from the Region Base Address
|
||||
|
|
@ -409,7 +409,7 @@ static void prvTaskExitError( void );
|
|||
* @return uint32_t Access permissions.
|
||||
*/
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
||||
|
|
@ -871,7 +871,7 @@ static void prvTaskExitError( void )
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
|
||||
{
|
||||
|
|
@ -890,7 +890,7 @@ static void prvTaskExitError( void )
|
|||
return ulAccessPermissions;
|
||||
}
|
||||
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
|
|
|||
|
|
@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
|
|||
*/
|
||||
static void prvTaskExitError( void );
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
/**
|
||||
* @brief Extract MPU region's access permissions from the Region Base Address
|
||||
|
|
@ -409,7 +409,7 @@ static void prvTaskExitError( void );
|
|||
* @return uint32_t Access permissions.
|
||||
*/
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
||||
|
|
@ -871,7 +871,7 @@ static void prvTaskExitError( void )
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
|
||||
{
|
||||
|
|
@ -890,7 +890,7 @@ static void prvTaskExitError( void )
|
|||
return ulAccessPermissions;
|
||||
}
|
||||
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
|
|
|||
|
|
@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
|
|||
*/
|
||||
static void prvTaskExitError( void );
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
/**
|
||||
* @brief Extract MPU region's access permissions from the Region Base Address
|
||||
|
|
@ -409,7 +409,7 @@ static void prvTaskExitError( void );
|
|||
* @return uint32_t Access permissions.
|
||||
*/
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
||||
|
|
@ -871,7 +871,7 @@ static void prvTaskExitError( void )
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
|
||||
{
|
||||
|
|
@ -890,7 +890,7 @@ static void prvTaskExitError( void )
|
|||
return ulAccessPermissions;
|
||||
}
|
||||
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
|
|
|||
|
|
@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
|
|||
*/
|
||||
static void prvTaskExitError( void );
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
/**
|
||||
* @brief Extract MPU region's access permissions from the Region Base Address
|
||||
|
|
@ -409,7 +409,7 @@ static void prvTaskExitError( void );
|
|||
* @return uint32_t Access permissions.
|
||||
*/
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
||||
|
|
@ -871,7 +871,7 @@ static void prvTaskExitError( void )
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
|
||||
{
|
||||
|
|
@ -890,7 +890,7 @@ static void prvTaskExitError( void )
|
|||
return ulAccessPermissions;
|
||||
}
|
||||
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
|
|
|||
|
|
@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
|
|||
*/
|
||||
static void prvTaskExitError( void );
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
/**
|
||||
* @brief Extract MPU region's access permissions from the Region Base Address
|
||||
|
|
@ -409,7 +409,7 @@ static void prvTaskExitError( void );
|
|||
* @return uint32_t Access permissions.
|
||||
*/
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
||||
|
|
@ -871,7 +871,7 @@ static void prvTaskExitError( void )
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
|
||||
{
|
||||
|
|
@ -890,7 +890,7 @@ static void prvTaskExitError( void )
|
|||
return ulAccessPermissions;
|
||||
}
|
||||
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
|
|
|||
|
|
@ -398,7 +398,7 @@ typedef void ( * portISR_t )( void );
|
|||
*/
|
||||
static void prvTaskExitError( void );
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
/**
|
||||
* @brief Extract MPU region's access permissions from the Region Base Address
|
||||
|
|
@ -409,7 +409,7 @@ static void prvTaskExitError( void );
|
|||
* @return uint32_t Access permissions.
|
||||
*/
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
||||
|
|
@ -871,7 +871,7 @@ static void prvTaskExitError( void )
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
|
||||
|
||||
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
|
||||
{
|
||||
|
|
@ -890,7 +890,7 @@ static void prvTaskExitError( void )
|
|||
return ulAccessPermissions;
|
||||
}
|
||||
|
||||
#endif /* configENABLE_MPU */
|
||||
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configENABLE_MPU == 1 )
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ extern volatile BaseType_t xInsideInterrupt;
|
|||
|
||||
/* Simulated interrupts return pdFALSE if no context switch should be performed,
|
||||
* or a non-zero number if a context switch should be performed. */
|
||||
#define portYIELD_FROM_ISR( x ) ( void ) x
|
||||
#define portYIELD_FROM_ISR( x ) return x
|
||||
#define portEND_SWITCHING_ISR( x ) portYIELD_FROM_ISR( ( x ) )
|
||||
|
||||
void vPortCloseRunningThread( void * pvTaskToDelete,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue