Skip to content

Commit 153af86

Browse files
committed
Fix an incorrect operating mode word in the portASM.S file, slight formatting tweak, use checkout@v4 to account for new warnings
1 parent bfb4378 commit 153af86

File tree

4 files changed

+8
-14
lines changed

4 files changed

+8
-14
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
port-formatting:
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2222
- name: Check Formatting of FreeRTOS-Kernel Files
2323
uses: FreeRTOS/CI-CD-Github-Actions/clang-formatting@main
2424
with:

.github/workflows/formatting.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-20.04
2020
steps:
2121
- name: Apply Formatting Fix
22-
id: check-formatting
22+
id: check-formatting
2323
uses: FreeRTOS/CI-CD-Github-Actions/formatting-bot@main
2424
with:
2525
exclude-dirs: portable

portable/GCC/ARM_CRx_MPU/portASM.S

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
.global vPortStartFirstTask
183183
.type vPortStartFirstTask, %function
184184
vPortStartFirstTask:
185-
/** This function is called from Supervisor Mode to start the FreeRTOS-Kernel.
185+
/** This function is called from System Mode to start the FreeRTOS-Kernel.
186186
* This is done by restoring the context of the first task.
187187
* Restoring the context of a task will allow interrupts.
188188
* This allows the FreeRTOS Scheduler Tick to start, and therefore
@@ -194,9 +194,8 @@ vPortStartFirstTask:
194194
portRESTORE_CONTEXT
195195

196196
/* ----------------------------------------------------------------------------------- */
197-
/* Handler for Supervisor Calls (SVCs) when using this FreeRTOS Port */
198-
199-
/* Upon entering here the LR, or R14, will hold the address of the following
197+
/* Handler for Supervisor Calls (SVCs) when using this FreeRTOS Port
198+
* Upon entering here the LR, or R14, will hold the address of the following
200199
* instruction. This then checks that instruction for the SVC # raised.
201200
* Checks:
202201
* 1. SVC is raised from the system call section (i.e. application is

portable/GCC/ARM_CRx_MPU/portmacro.h

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@
3636
* hardware and compiler. These settings should not be altered.
3737
*/
3838

39-
/**
40-
* @brief APIs and Variables used to control the onboard MPU.
41-
* @defgroup MPU Control
42-
*/
43-
4439
#ifdef __cplusplus
4540
extern "C" {
4641
#endif
@@ -81,7 +76,7 @@ extern "C" {
8176
"to use when an unprivileged task makes a FreeRTOS Kernel call. "
8277
#endif /* configSYSTEM_CALL_STACK_SIZE */
8378

84-
/* ------------------------------ FreeRTOS Config Check ------------------------------ */
79+
/* ----------------------------------------------------------------------------------- */
8580

8681
#if( configUSE_PORT_OPTIMISED_TASK_SELECTION == 1 )
8782
/* Check the configuration. */
@@ -465,8 +460,8 @@ BaseType_t xPortIsPrivileged( void );
465460
* or not, this function can return a different value than xPortIsPrivileged.
466461
*
467462
* @return
468-
* 0 If pxCurrentTCB's !( ulTaskFlags && portTASK_IS_PRIVILEGED_FLAG )
469-
* 1 If pxCurrentTCB's ( ulTaskFlags && portTASK_IS_PRIVILEGED_FLAG )
463+
* 0 If pxCurrentTCB's !( ulTaskFlags & portTASK_IS_PRIVILEGED_FLAG )
464+
* 1 If pxCurrentTCB's ( ulTaskFlags & portTASK_IS_PRIVILEGED_FLAG )
470465
*/
471466
BaseType_t xPortIsTaskPrivileged( void );
472467

0 commit comments

Comments
 (0)