Skip to content

Commit

Permalink
Fix an incorrect operating mode word in the portASM.S file, slight fo…
Browse files Browse the repository at this point in the history
…rmatting tweak, use checkout@v4 to account for new warnings
  • Loading branch information
Skptak committed Feb 19, 2024
1 parent bfb4378 commit 153af86
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 3 additions & 4 deletions portable/GCC/ARM_CRx_MPU/portASM.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
11 changes: 3 additions & 8 deletions portable/GCC/ARM_CRx_MPU/portmacro.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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. */
Expand Down Expand Up @@ -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 );

Expand Down

0 comments on commit 153af86

Please sign in to comment.