From 153af86d70a9013662eb20498110da264c437519 Mon Sep 17 00:00:00 2001 From: Soren Ptak Date: Mon, 19 Feb 2024 11:56:05 -0500 Subject: [PATCH] Fix an incorrect operating mode word in the portASM.S file, slight formatting tweak, use checkout@v4 to account for new warnings --- .github/workflows/ci.yml | 2 +- .github/workflows/formatting.yml | 2 +- portable/GCC/ARM_CRx_MPU/portASM.S | 7 +++---- portable/GCC/ARM_CRx_MPU/portmacro.h | 11 +++-------- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5d5b65918..665f85ea5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: port-formatting: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Check Formatting of FreeRTOS-Kernel Files uses: FreeRTOS/CI-CD-Github-Actions/clang-formatting@main with: diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml index 14d41c9c0..2f369105a 100644 --- a/.github/workflows/formatting.yml +++ b/.github/workflows/formatting.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Apply Formatting Fix - id: check-formatting + id: check-formatting uses: FreeRTOS/CI-CD-Github-Actions/formatting-bot@main with: exclude-dirs: portable diff --git a/portable/GCC/ARM_CRx_MPU/portASM.S b/portable/GCC/ARM_CRx_MPU/portASM.S index d2e1f3bfd..5ebc8b2b0 100644 --- a/portable/GCC/ARM_CRx_MPU/portASM.S +++ b/portable/GCC/ARM_CRx_MPU/portASM.S @@ -182,7 +182,7 @@ .global vPortStartFirstTask .type vPortStartFirstTask, %function vPortStartFirstTask: - /** This function is called from Supervisor Mode to start the FreeRTOS-Kernel. + /** This function is called from System Mode to start the FreeRTOS-Kernel. * This is done by restoring the context of the first task. * Restoring the context of a task will allow interrupts. * This allows the FreeRTOS Scheduler Tick to start, and therefore @@ -194,9 +194,8 @@ vPortStartFirstTask: portRESTORE_CONTEXT /* ----------------------------------------------------------------------------------- */ -/* Handler for Supervisor Calls (SVCs) when using this FreeRTOS Port */ - -/* Upon entering here the LR, or R14, will hold the address of the following +/* Handler for Supervisor Calls (SVCs) when using this FreeRTOS Port + * Upon entering here the LR, or R14, will hold the address of the following * instruction. This then checks that instruction for the SVC # raised. * Checks: * 1. SVC is raised from the system call section (i.e. application is diff --git a/portable/GCC/ARM_CRx_MPU/portmacro.h b/portable/GCC/ARM_CRx_MPU/portmacro.h index e3e863d8a..7ef211904 100644 --- a/portable/GCC/ARM_CRx_MPU/portmacro.h +++ b/portable/GCC/ARM_CRx_MPU/portmacro.h @@ -36,11 +36,6 @@ * hardware and compiler. These settings should not be altered. */ -/** - * @brief APIs and Variables used to control the onboard MPU. - * @defgroup MPU Control - */ - #ifdef __cplusplus extern "C" { #endif @@ -81,7 +76,7 @@ extern "C" { "to use when an unprivileged task makes a FreeRTOS Kernel call. " #endif /* configSYSTEM_CALL_STACK_SIZE */ -/* ------------------------------ FreeRTOS Config Check ------------------------------ */ +/* ----------------------------------------------------------------------------------- */ #if( configUSE_PORT_OPTIMISED_TASK_SELECTION == 1 ) /* Check the configuration. */ @@ -465,8 +460,8 @@ BaseType_t xPortIsPrivileged( void ); * or not, this function can return a different value than xPortIsPrivileged. * * @return - * 0 If pxCurrentTCB's !( ulTaskFlags && portTASK_IS_PRIVILEGED_FLAG ) - * 1 If pxCurrentTCB's ( ulTaskFlags && portTASK_IS_PRIVILEGED_FLAG ) + * 0 If pxCurrentTCB's !( ulTaskFlags & portTASK_IS_PRIVILEGED_FLAG ) + * 1 If pxCurrentTCB's ( ulTaskFlags & portTASK_IS_PRIVILEGED_FLAG ) */ BaseType_t xPortIsTaskPrivileged( void );