len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-12-11 06:05:18 -05:00
Code Issues Projects Releases Packages Wiki Activity

Change to make the .clang-format file work with V14 of clang-format. Moving the comment for PRIVILEGED_FUNCTION to the front to help with formatting, also makes more sense when looking at the func imo

Browse source
This commit is contained in:
Soren Ptak 2024-01-02 12:58:46 -05:00
parent b701a46312
commit b2c406c3a3
2 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
portable/GCC/ARM_CRx_MPU/.clang-format
View file

@ -97,7 +97,7 @@ SpacesInCStyleCastParentheses: true
SpacesInParentheses: true SpacesInParentheses: true
SpacesInSquareBrackets: true SpacesInSquareBrackets: true
TabWidth: 4 TabWidth: 4
LineEnding: LF UseCRLF: false
UseTab: Never UseTab: Never
... ...

38
portable/GCC/ARM_CRx_MPU/port.c
View file

@ -91,13 +91,13 @@ PRIVILEGED_DATA volatile uint32_t ulICCEOIR = configEOI_ADDRESS;
* @ingroup Task Context * @ingroup Task Context
* @note pxTopOfStack must be a region of memory that is a valid MPU region size. * @note pxTopOfStack must be a region of memory that is a valid MPU region size.
*/ */
StackType_t * pxPortInitialiseStack( /* PRIVILEGED_FUNCTION */ StackType_t * pxPortInitialiseStack(
StackType_t * pxTopOfStack, StackType_t * pxTopOfStack,
TaskFunction_t pxCode, TaskFunction_t pxCode,
void * pvParameters, void * pvParameters,
BaseType_t xRunPrivileged, BaseType_t xRunPrivileged,
xMPU_SETTINGS * xMPUSettings xMPU_SETTINGS * xMPUSettings
) /* PRIVILEGED_FUNCTION */ )
{ {
/** Setup the initial context of the task. The context is set exactly as /** Setup the initial context of the task. The context is set exactly as
* expected by the portRESTORE_CONTEXT() macro. */ * expected by the portRESTORE_CONTEXT() macro. */
@ -260,8 +260,9 @@ PRIVILEGED_FUNCTION static uint32_t prvGetMPURegionSizeSetting(
uint32_t ulActualSizeInBytes uint32_t ulActualSizeInBytes
); );
static uint32_t prvGetMPURegionSizeSetting( uint32_t ulActualSizeInBytes ) /* PRIVILEGED_FUNCTION /* PRIVILEGED_FUNCTION */ static uint32_t prvGetMPURegionSizeSetting(
*/ uint32_t ulActualSizeInBytes
)
{ {
uint32_t ulRegionSize, ulReturnValue = 4U; uint32_t ulRegionSize, ulReturnValue = 4U;
@ -299,12 +300,12 @@ static uint32_t prvGetMPURegionSizeSetting( uint32_t ulActualSizeInBytes ) /* PR
* @note pxBottomOfStack must be aligned to a region size of length ulStackDepth. * @note pxBottomOfStack must be aligned to a region size of length ulStackDepth.
* @note ulStackDepth must be a power of 2 larger than 32 bytes. * @note ulStackDepth must be a power of 2 larger than 32 bytes.
*/ */
void vPortStoreTaskMPUSettings( /* PRIVILEGED_FUNCTION */ void vPortStoreTaskMPUSettings(
xMPU_SETTINGS * xMPUSettings, xMPU_SETTINGS * xMPUSettings,
const struct xMEMORY_REGION * const xRegions, const struct xMEMORY_REGION * const xRegions,
StackType_t * pxBottomOfStack, StackType_t * pxBottomOfStack,
uint32_t ulStackDepth uint32_t ulStackDepth
) /* PRIVILEGED_FUNCTION */ )
{ {
#if defined( __ARMCC_VERSION ) #if defined( __ARMCC_VERSION )
@ -561,12 +562,11 @@ PRIVILEGED_FUNCTION static BaseType_t prvTaskCanAccessRegion(
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
BaseType_t xPortIsAuthorizedToAccessBuffer( /* PRIVILEGED_FUNCTION */ BaseType_t xPortIsAuthorizedToAccessBuffer(
const void * pvBuffer, const void * pvBuffer,
uint32_t ulBufferLength, uint32_t ulBufferLength,
uint32_t ulAccessRequested uint32_t ulAccessRequested
) /* PRIVILEGED_FUNCTION */ )
{ {
BaseType_t xAccessGranted; BaseType_t xAccessGranted;
@ -622,7 +622,7 @@ BaseType_t xPortIsAuthorizedToAccessBuffer(
* pdFALSE if the task was not created as a privileged task. * pdFALSE if the task was not created as a privileged task.
* *
*/ */
BaseType_t xPortIsTaskPrivileged( void ) /* PRIVILEGED_FUNCTION */ /* PRIVILEGED_FUNCTION */ BaseType_t xPortIsTaskPrivileged( void )
{ {
BaseType_t xTaskIsPrivileged = pdFALSE; BaseType_t xTaskIsPrivileged = pdFALSE;
@ -673,8 +673,9 @@ BaseType_t xPortStartScheduler( void )
#if( configENABLE_ACCESS_CONTROL_LIST == 1 ) #if( configENABLE_ACCESS_CONTROL_LIST == 1 )
BaseType_t xPortIsAuthorizedToAccessKernelObject( int32_t lInternalIndexOfKernelObject /* PRIVILEGED_FUNCTION */ BaseType_t xPortIsAuthorizedToAccessKernelObject(
) /* PRIVILEGED_FUNCTION */ int32_t lInternalIndexOfKernelObject
)
{ {
uint32_t ulAccessControlListEntryIndex, ulAccessControlListEntryBit; uint32_t ulAccessControlListEntryIndex, ulAccessControlListEntryBit;
BaseType_t xAccessGranted = pdFALSE; BaseType_t xAccessGranted = pdFALSE;
@ -715,10 +716,10 @@ BaseType_t xPortIsAuthorizedToAccessKernelObject( int32_t lInternalIndexOfKernel
return xAccessGranted; return xAccessGranted;
} }
void vPortGrantAccessToKernelObject( /* PRIVILEGED_FUNCTION */ void vPortGrantAccessToKernelObject(
TaskHandle_t xInternalTaskHandle, TaskHandle_t xInternalTaskHandle,
int32_t lInternalIndexOfKernelObject int32_t lInternalIndexOfKernelObject
) /* PRIVILEGED_FUNCTION */ )
{ {
uint32_t ulAccessControlListEntryIndex, ulAccessControlListEntryBit; uint32_t ulAccessControlListEntryIndex, ulAccessControlListEntryBit;
xMPU_SETTINGS * xTaskMpuSettings; xMPU_SETTINGS * xTaskMpuSettings;
@ -734,10 +735,10 @@ void vPortGrantAccessToKernelObject(
[ ulAccessControlListEntryIndex ] |= ( 1U << ulAccessControlListEntryBit ); [ ulAccessControlListEntryIndex ] |= ( 1U << ulAccessControlListEntryBit );
} }
void vPortRevokeAccessToKernelObject( /* PRIVILEGED_FUNCTION */ void vPortRevokeAccessToKernelObject(
TaskHandle_t xInternalTaskHandle, TaskHandle_t xInternalTaskHandle,
int32_t lInternalIndexOfKernelObject int32_t lInternalIndexOfKernelObject
) /* PRIVILEGED_FUNCTION */ )
{ {
uint32_t ulAccessControlListEntryIndex, ulAccessControlListEntryBit; uint32_t ulAccessControlListEntryIndex, ulAccessControlListEntryBit;
xMPU_SETTINGS * xTaskMpuSettings; xMPU_SETTINGS * xTaskMpuSettings;
@ -756,8 +757,9 @@ void vPortRevokeAccessToKernelObject(
#else #else
BaseType_t xPortIsAuthorizedToAccessKernelObject( int32_t lInternalIndexOfKernelObject /* PRIVILEGED_FUNCTION */ BaseType_t xPortIsAuthorizedToAccessKernelObject(
) /* PRIVILEGED_FUNCTION */ int32_t lInternalIndexOfKernelObject
)
{ {
( void ) lInternalIndexOfKernelObject; ( void ) lInternalIndexOfKernelObject;