Skip to content

Commit 3f24cde

Browse files
Merge branch 'main' into armv8-1-m-add-pacbti-support
2 parents ef388c1 + a49c35b commit 3f24cde

File tree

50 files changed

+275
-6503
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+275
-6503
lines changed

.github/third_party_tools.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ team.
1111
| Tool | Website | Getting Started |
1212
|------|---------|-----------------|
1313
| Code Sonar | [Link](https://codesecure.com/our-products/codesonar/) | [Link](https://github.com/CodeSecure-SE/FreeRTOS-Kernel/blob/main/examples/codesonar/README.md) |
14-
| Coverity | [Link](https://www.synopsys.com/software-integrity/security-testing/static-analysis-sast.html) | [Link](../examples/coverity/README.md) |
14+
| Coverity | [Link](https://www.blackduck.com/static-analysis-tools-sast/coverity.html) | [Link](../examples/coverity/README.md) |

examples/coverity/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# MISRA Compliance for FreeRTOS-Kernel
22
FreeRTOS-Kernel is MISRA C:2012 compliant. This directory contains a project to
3-
run [Synopsys Coverity](https://www.synopsys.com/software-integrity/security-testing/static-analysis-sast.html)
3+
run [Synopsys Coverity](https://www.blackduck.com/static-analysis-tools-sast/coverity.html)
44
for checking MISRA compliance.
55

66
> **Note**

include/mpu_prototypes.h

Lines changed: 156 additions & 59 deletions
Large diffs are not rendered by default.

include/mpu_wrappers.h

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,18 @@
8585
/* Privileged only wrappers for Task APIs. These are needed so that
8686
* the application can use opaque handles maintained in mpu_wrappers.c
8787
* with all the APIs. */
88+
#if ( configUSE_MPU_WRAPPERS_V1 == 1 )
89+
90+
/* These are not needed in v2 because they do not take a task
91+
* handle and therefore, no lookup is needed. Needed in v1 because
92+
* these are available as system calls in v1. */
93+
#define vTaskGetRunTimeStatistics MPU_vTaskGetRunTimeStatistics
94+
#define vTaskListTasks MPU_vTaskListTasks
95+
#define vTaskSuspendAll MPU_vTaskSuspendAll
96+
#define xTaskCatchUpTicks MPU_xTaskCatchUpTicks
97+
#define xTaskResumeAll MPU_xTaskResumeAll
98+
#endif /* #if ( configUSE_MPU_WRAPPERS_V1 == 1 ) */
99+
88100
#define xTaskCreate MPU_xTaskCreate
89101
#define xTaskCreateStatic MPU_xTaskCreateStatic
90102
#define vTaskDelete MPU_vTaskDelete
@@ -165,11 +177,14 @@
165177
#define xTimerGetPeriod MPU_xTimerGetPeriod
166178
#define xTimerGetExpiryTime MPU_xTimerGetExpiryTime
167179

180+
#if ( configUSE_MPU_WRAPPERS_V1 == 0 )
181+
#define xTimerGetReloadMode MPU_xTimerGetReloadMode
182+
#endif /* #if ( configUSE_MPU_WRAPPERS_V1 == 0 ) */
183+
168184
/* Privileged only wrappers for Timer APIs. These are needed so that
169185
* the application can use opaque handles maintained in mpu_wrappers.c
170186
* with all the APIs. */
171187
#if ( configUSE_MPU_WRAPPERS_V1 == 0 )
172-
#define xTimerGetReloadMode MPU_xTimerGetReloadMode
173188
#define xTimerCreate MPU_xTimerCreate
174189
#define xTimerCreateStatic MPU_xTimerCreateStatic
175190
#define xTimerGetStaticBuffer MPU_xTimerGetStaticBuffer

include/portable.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,14 @@
8585
#define portARCH_NAME NULL
8686
#endif
8787

88+
#ifndef portBASE_TYPE_ENTER_CRITICAL
89+
#define portBASE_TYPE_ENTER_CRITICAL() taskENTER_CRITICAL()
90+
#endif
91+
92+
#ifndef portBASE_TYPE_EXIT_CRITICAL
93+
#define portBASE_TYPE_EXIT_CRITICAL() taskEXIT_CRITICAL()
94+
#endif
95+
8896
#ifndef configSTACK_DEPTH_TYPE
8997
#define configSTACK_DEPTH_TYPE StackType_t
9098
#endif

portable/ARMv8M/non_secure/portable/IAR/ARM_CM33/portmacro.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,6 @@
5757
#define portDONT_DISCARD __root
5858
/*-----------------------------------------------------------*/
5959

60-
#if ( configTOTAL_MPU_REGIONS == 16 )
61-
#error 16 MPU regions are not yet supported for this port.
62-
#endif
63-
/*-----------------------------------------------------------*/
64-
6560
/* ARMv8-M common port configurations. */
6661
#include "portmacrocommon.h"
6762
/*-----------------------------------------------------------*/

portable/ARMv8M/non_secure/portable/IAR/ARM_CM33_NTZ/portmacro.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,11 @@
6161
#include "portmacrocommon.h"
6262
/*-----------------------------------------------------------*/
6363

64-
#if ( configTOTAL_MPU_REGIONS == 16 )
65-
#error 16 MPU regions are not yet supported for this port.
66-
#endif
67-
6864
#ifndef configENABLE_MVE
6965
#define configENABLE_MVE 0
7066
#elif( configENABLE_MVE != 0 )
7167
#error configENABLE_MVE must be left undefined, or defined to 0 for the Cortex-M33.
7268
#endif
73-
7469
/*-----------------------------------------------------------*/
7570

7671
/**

portable/ARMv8M/non_secure/portable/IAR/ARM_CM35P/portmacro.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,6 @@
6161
#include "portmacrocommon.h"
6262
/*-----------------------------------------------------------*/
6363

64-
#if ( configTOTAL_MPU_REGIONS == 16 )
65-
#error 16 MPU regions are not yet supported for this port.
66-
#endif
67-
6864
#ifndef configENABLE_MVE
6965
#define configENABLE_MVE 0
7066
#elif( configENABLE_MVE != 0 )

portable/ARMv8M/non_secure/portable/IAR/ARM_CM55/portmacro.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,6 @@
6666
#include "portmacrocommon.h"
6767
/*-----------------------------------------------------------*/
6868

69-
#if ( configTOTAL_MPU_REGIONS == 16 )
70-
#error 16 MPU regions are not yet supported for this port.
71-
#endif
72-
/*-----------------------------------------------------------*/
73-
7469
/**
7570
* @brief Critical section management.
7671
*/

portable/ARMv8M/non_secure/portable/IAR/ARM_CM85/portmacro.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,6 @@
6666
#include "portmacrocommon.h"
6767
/*-----------------------------------------------------------*/
6868

69-
#if ( configTOTAL_MPU_REGIONS == 16 )
70-
#error 16 MPU regions are not yet supported for this port.
71-
#endif
72-
/*-----------------------------------------------------------*/
73-
7469
/**
7570
* @brief Critical section management.
7671
*/

0 commit comments

Comments
 (0)