Skip to content

Commit b40b9e3

Browse files
chinglee-iotarchiguptcpluesspluessaggarg
authored
Smp dev compelete merge main 20230424 (#78)
* Fix array-bounds compiler warning on gcc11+ in list.h (FreeRTOS#580) listGET_OWNER_OF_NEXT_ENTRY computes `( pxConstList )->pxIndex->pxNext` after verifying that `( pxConstList )->pxIndex` points to `xListEnd`, which due to being a MiniListItem_t, can be shorter than a ListItem_t. Thus, `( pxConstList )->pxIndex` is a `ListItem_t *` that extends past the end of the `List_t` whose `xListEnd` it points to. This is fixed by accessing `pxNext` through a `MiniListItem_t` instead. * move the prototype for vApplicationIdleHook to task.h. (FreeRTOS#600) Co-authored-by: pluess <[email protected]> Co-authored-by: Gaurav-Aggarwal-AWS <[email protected]> * Update equal priority task preemption (FreeRTOS#603) * vTaskResume and vTaskPrioritySet don't preempt equal priority task * Update vTaskResumeAll not to preempt task with equal priority * Fix in xTaskResumeFromISR * Update FreeRTOS/FreeRTOS build checks (FreeRTOS#613) This is needed to be compatible with the refactoring done in this PR - FreeRTOS/FreeRTOS#889 Signed-off-by: Gaurav Aggarwal <[email protected]> Signed-off-by: Gaurav Aggarwal <[email protected]> * Add ulTaskGetRunTimeCounter and ulTaskGetRunTimePercent (FreeRTOS#611) Allow ulTaskGetIdleRunTimeCounter and ulTaskGetIdleRunTimePercent to be used whenever configGENERATE_RUN_TIME_STATS is enabled, as this is the only requirement for these functions to work. * Fix some CMake documentation typos (FreeRTOS#616) The quick start instructions for CMake mention the "master" git branch which has been replaced by "main" in the current repo. The main CMakeLists.txt documents how to integrate a custom port. Fix a typo in the suggested CMake code. * Added support of 64bit events. (FreeRTOS#597) * Added support of 64bit even Signed-off-by: Cervenka Dusan <[email protected]> * Added missing brackets Signed-off-by: Cervenka Dusan <[email protected]> * Made proper name for tick macro. Signed-off-by: Cervenka Dusan <[email protected]> * Improved macro evaluation Signed-off-by: Cervenka Dusan <[email protected]> * Fixed missed port files + documentation Signed-off-by: Cervenka Dusan <[email protected]> * Changes made on PR Signed-off-by: Cervenka Dusan <[email protected]> * Fix macro definition. Signed-off-by: Cervenka Dusan <[email protected]> * Formatted code with uncrustify Signed-off-by: Cervenka Dusan <[email protected]> --------- Signed-off-by: Cervenka Dusan <[email protected]> * Introduce portMEMORY_BARRIER for Microblaze port. (FreeRTOS#621) The introduction of `portMEMORY_BARRIER` will ensure the places in the kernel use a barrier will work. For example, `xTaskResumeAll` has a memory barrier to ensure its correctness when compiled with optimization enabled. Without the barrier `xTaskResumeAll` can fail (e.g. start reading and writing to address 0 and/or infinite looping) when `xPendingReadyList` contains more than one task to restore. In `xTaskResumeAll` the compiler chooses to cache the `pxTCB` the first time through the loop for use in every subsequent loop. This is incorrect as the removal of `pxTCB->xEventListItem` will actually change the value of `pxTCB` if it was read again at the top of the loop. The barrier forces the compiler to read `pxTCB` again at the top of the loop. The compiler is operating correctly. The removal `pxTCB->xEventListItem` executes on a `List_t *` and `ListItem_t *`. This means that the compiler can assume that any `MiniListItem_t` values are unchanged by the loop (i.e. "strict-aliasing"). This allows the compiler to cache `pxTCB` as it is obtained via a `MiniListItem_t`. This is incorrect in this case because it is possible for a `ListItem_t *` to actually alias a `MiniListItem_t`. This is technically a "violation of aliasing rules" so we use the the barrier to disable the strict-aliasing optimization in this loop. * Do not call exit() on MSVC Port when calling vPortEndScheduler (FreeRTOS#624) * make port exitable * correctly set xPortRunning to False * add suggestions from Review Co-authored-by: Gaurav-Aggarwal-AWS <[email protected]> * add suggestions from Review Co-authored-by: Gaurav-Aggarwal-AWS <[email protected]> --------- Co-authored-by: Gaurav-Aggarwal-AWS <[email protected]> * Update PR template to include checkbox for Unit Test related changes (FreeRTOS#627) * Fix build failure introduced in PR FreeRTOS#597 (FreeRTOS#629) The PR FreeRTOS#597 introduced a new config option configTICK_TYPE_WIDTH_IN_BITS which can be defined to one of the following: * TICK_TYPE_WIDTH_16_BITS - Tick type is 16 bit wide. * TICK_TYPE_WIDTH_32_BITS - Tick type is 32 bit wide. * TICK_TYPE_WIDTH_64_BITS - Tick type is 64 bit wide. Earlier we supported 16 and 32 bit width for tick type which was controlled using the config option configUSE_16_BIT_TICKS. The PR tried to maintain backward compatibility by honoring configUSE_16_BIT_TICKS. The backward compatibility did not work as expected though, as the macro configTICK_TYPE_WIDTH_IN_BITS was used before it was defined. This PR addresses it by ensuring that the macro configTICK_TYPE_WIDTH_IN_BITS is defined before it is used. Testing 1. configUSE_16_BIT_TICKS is defined to 0. Source (function xTaskIncrementTick in tasks.c): ``` const TickType_t xConstTickCount = xTickCount + ( TickType_t ) 1; ``` Assembly: ``` 109e: 4b50 ldr r3, [pc, FreeRTOS#320] ; (11e0 <xTaskIncrementTick+0x150>) 10a0: f8d3 4134 ldr.w r4, [r3, FreeRTOS#308] ; 0x134 10a4: 3401 adds r4, #1 10a6: f8c3 4134 str.w r4, [r3, FreeRTOS#308] ; 0x134 ``` It is clear from assembly that the tick type is 32 bit. 2. configUSE_16_BIT_TICKS is defined to 1. Source (function xTaskIncrementTick in tasks.c): ``` const TickType_t xConstTickCount = xTickCount + ( TickType_t ) 1; ``` Assembly: ``` 10e2: 4b53 ldr r3, [pc, FreeRTOS#332] ; (1230 <xTaskIncrementTick+0x15c>) 10e4: f8b3 4134 ldrh.w r4, [r3, FreeRTOS#308] ; 0x134 10e8: b2a4 uxth r4, r4 10ea: 3401 adds r4, #1 10ec: b2a4 uxth r4, r4 10ee: f8a3 4134 strh.w r4, [r3, FreeRTOS#308] ; 0x134 ``` It is clear from assembly that the tick type is 16 bit. 3. configTICK_TYPE_WIDTH_IN_BITS is defined to TICK_TYPE_WIDTH_16_BITS. Source (function xTaskIncrementTick in tasks.c): ``` const TickType_t xConstTickCount = xTickCount + ( TickType_t ) 1; ``` Assembly: ``` 10e2: 4b53 ldr r3, [pc, FreeRTOS#332] ; (1230 <xTaskIncrementTick+0x15c>) 10e4: f8b3 4134 ldrh.w r4, [r3, FreeRTOS#308] ; 0x134 10e8: b2a4 uxth r4, r4 10ea: 3401 adds r4, #1 10ec: b2a4 uxth r4, r4 10ee: f8a3 4134 strh.w r4, [r3, FreeRTOS#308] ; 0x134 ``` It is clear from assembly that the tick type is 16 bit. 4. configTICK_TYPE_WIDTH_IN_BITS is defined to TICK_TYPE_WIDTH_32_BITS. Source (function xTaskIncrementTick in tasks.c): ``` const TickType_t xConstTickCount = xTickCount + ( TickType_t ) 1; ``` Assembly: ``` 109e: 4b50 ldr r3, [pc, FreeRTOS#320] ; (11e0 <xTaskIncrementTick+0x150>) 10a0: f8d3 4134 ldr.w r4, [r3, FreeRTOS#308] ; 0x134 10a4: 3401 adds r4, #1 10a6: f8c3 4134 str.w r4, [r3, FreeRTOS#308] ; 0x134 ``` It is clear from assembly that the tick type is 32 bit. 5. configTICK_TYPE_WIDTH_IN_BITS is defined to TICK_TYPE_WIDTH_64_BITS. ``` #error configTICK_TYPE_WIDTH_IN_BITS set to unsupported tick type width. ``` The testing was done for GCC/ARM_CM3 port which does not support 64 bit tick type. 6. Neither configUSE_16_BIT_TICKS nor configTICK_TYPE_WIDTH_IN_BITS defined. ``` #error Missing definition: One of configUSE_16_BIT_TICKS and configTICK_TYPE_WIDTH_IN_BITS must be defined in FreeRTOSConfig.h. See the Configuration section of the FreeRTOS API documentation for details. ``` 7. Both configUSE_16_BIT_TICKS and configTICK_TYPE_WIDTH_IN_BITS defined. ``` #error Only one of configUSE_16_BIT_TICKS and configTICK_TYPE_WIDTH_IN_BITS must be defined in FreeRTOSConfig.h. See the Configuration section of the FreeRTOS API documentation for details. ``` Related issue - FreeRTOS#628 Signed-off-by: Gaurav Aggarwal <[email protected]> * Feature/fixing clang gnu compiler warnings (FreeRTOS#620) * Adding in ability to support a library for freertos_config and a custom freertos_kernel_port (FreeRTOS#558) * Using single name definition for libraries everywhere. (FreeRTOS#558) * Supporting backwards compatibility with FREERTOS_CONFIG_FILE_DIRECTORY (FreeRTOS#571) * Removing compiler warnings for GNU and Clang. (FreeRTOS#571) * Added in documentation on how to consume from a main project. Added default PORT selection for native POSIX and MINGW platforms. * Only adding freertos_config if it exists. Removing auto generation of it from a FREERTOS_CONFIG_FILE_DIRECTORY. * Fixing clang and gnu compiler warnings. * Adding in project information and how to compile for GNU/clang * Fixing compiler issue with unused variable - no need to declare variable. * Adding in compile warnings for linux builds that kernel is okay with using. * Fixing more extra-semi-stmt clang warnings. * Moving definition of hooks into header files if features are enabled. * Fixing formatting with uncrustify. * Fixing merge conflicts with main merge. * Fixing compiler errors due to merge issues and formatting. * Fixing Line feeds. * Adding 'portNORETURN' into portmacros.h. Other Updates based on PR request * Further clean-up of clang and clang-tidy issues. * Removing compiler specific pragmas from common c files. * Fixing missing lexicon entry and uncrustify formatting changes. * Resolving merge issue multiple defnitions of proto for prvIdleTask * Fixing formatting issues that are not covered by uncrustify. Use clang-tidy instead if you want this level of control. * More uncrustify formatting issues. * Fixing extra bracket in #if statement. --------- Co-authored-by: Gaurav-Aggarwal-AWS <[email protected]> * POSIX port fixes (FreeRTOS#626) * Fix types in POSIX port Use TaskFunction_t and StackType_t as other ports do. * Fix portTICK_RATE_MICROSECONDS in POSIX port --------- Co-authored-by: Jacques GUILLOU <[email protected]> Co-authored-by: Gaurav-Aggarwal-AWS <[email protected]> * Cortex-M35P: Add Cortex-M35P port (FreeRTOS#631) * Cortex-M35P: Add Cortex-M35P port The Cortex-M35P support added to kernel. The port hasn't been validated yet with TF-M. Hence TF-M support is not included in this port. Signed-off-by: Devaraj Ranganna <[email protected]> * Add portNORETURN to the newly added portmacro.h Signed-off-by: Gaurav Aggarwal <[email protected]> --------- Signed-off-by: Devaraj Ranganna <[email protected]> Signed-off-by: Gaurav Aggarwal <[email protected]> Co-authored-by: Gaurav-Aggarwal-AWS <[email protected]> Co-authored-by: Gaurav Aggarwal <[email protected]> Co-authored-by: kar-rahul-aws <[email protected]> * Introduced Github Status Badge for Unit Tests (FreeRTOS#634) * Introduced Github Status Badge for Unit Tests * Github status badge to point to latest run * Github status badge UT points to latest results * Fixed URL for Github Status badge --------- Co-authored-by: kar-rahul-aws <[email protected]> * Remove C99 requirement from CMake file (FreeRTOS#633) * Remove C99 requirement from CMake file The kernel source is C89 compliant and does not need C99. Signed-off-by: Gaurav Aggarwal <[email protected]> * Explicitly set C89 requirement for kernel Signed-off-by: Gaurav Aggarwal <[email protected]> --------- Signed-off-by: Gaurav Aggarwal <[email protected]> * Add Thread Local Storage (TLS) support using Picolibc functions (FreeRTOS#343) * Pass top of stack to configINIT_TLS_BLOCK Picolibc wants to allocate the per-task TLS block within the stack segment, so it will need to modify the top of stack value. Pass the pxTopOfStack variable to make this explicit. Signed-off-by: Keith Packard <[email protected]> * Move newlib-specific definitions to separate file This reduces the clutter in FreeRTOS.h caused by having newlib-specific macros present there. Signed-off-by: Keith Packard <[email protected]> * Make TLS code depend only on configUSE_C_RUNTIME_TLS_SUPPORT Remove reference to configUSE_NEWLIB_REENTRANT as that only works when using newlib. configUSE_C_RUNTIME_TLS_SUPPORT is always set when configUSE_NEWLIB_REENTRANT is set, so using both was redundant in that case. Signed-off-by: Keith Packard <[email protected]> * portable-ARC: Adapt ARC support to use generalized TLS support With generalized thread local storage (TLS) support present in the core, the two ARC ports need to have the changes to the TCB mirrored to them. Signed-off-by: Keith Packard <[email protected]> * Add Thread Local Storage (TLS) support using Picolibc functions This patch provides definitions of the general TLS support macros in terms of the Picolibc TLS support functions. Picolibc is normally configured to use TLS internally for all variables that are intended to be task-local, so these changes are necessary for picolibc to work correctly with FreeRTOS. The picolibc helper functions rely on elements within the linker script to arrange the TLS data in memory and define some symbols. Applications wanting to use this mechanism will need changes in their linker script when migrating to picolibc. Signed-off-by: Keith Packard <[email protected]> --------- Signed-off-by: Keith Packard <[email protected]> Co-authored-by: Keith Packard <[email protected]> Co-authored-by: Gaurav-Aggarwal-AWS <[email protected]> * Interrupt priority assert improvements for CM3/4/7 (FreeRTOS#602) * Interrupt priority assert improvements for CM3/4/7 In the ARM_CM3, ARM_CM4, and ARM_CM7 ports, change the assertion that `configMAX_SYSCALL_INTERRUPT_PRIORITY` is nonzero to account for the number of priority bits implemented by the hardware. Change these ports to also use the lowest priority for PendSV and SysTick, ignoring `configKERNEL_INTERRUPT_PRIORITY`. * Remove not needed configKERNEL_INTERRUPT_PRIORITY define Signed-off-by: Gaurav Aggarwal <[email protected]> --------- Signed-off-by: Gaurav Aggarwal <[email protected]> Co-authored-by: Gaurav-Aggarwal-AWS <[email protected]> Co-authored-by: Gaurav Aggarwal <[email protected]> * Introduced code coverage status badge (FreeRTOS#635) * Introduced code coverage status badge * Trying to fix the URL checker issue * Fix URL check Signed-off-by: Gaurav Aggarwal <[email protected]> --------- Signed-off-by: Gaurav Aggarwal <[email protected]> Co-authored-by: Gaurav Aggarwal <[email protected]> Co-authored-by: Gaurav-Aggarwal-AWS <[email protected]> * added portPOINTER_SIZE_TYPE and SIZE_MAX definition to PIC24/dsPIC port (FreeRTOS#636) * added portPOINTER_SIZE_TYPE definition to PIC24/dsPIC port * Added SIZE_MAX definition to PIC24/dsPIC33 * Fix TLS and stack alignment when using picolibc (FreeRTOS#637) Both the TLS block and stack must be correctly aligned when using picolibc. The architecture stack alignment is represented by the portBYTE_ALIGNMENT_MASK and the TLS block alignment is provided by the Picolibc _tls_align() inline function for Picolibc version 1.8 and above. For older versions of Picolibc, we'll assume that the TLS block requires the same alignment as the stack. For downward growing stacks, this requires aligning the start of the TLS block to the maximum of the stack alignment and the TLS alignment. With this, both the TLS block and stack will now be correctly aligned. For upward growing stacks, the two areas must be aligned independently; the TLS block is aligned from the start of the stack, then the tls space is allocated, and then the stack is aligned above that. It's probably useful to know here that the linker ensures that variables within the TLS block are assigned offsets that match their alignment requirements. If the TLS block itself is correctly aligned, then everything within will also be. I have only tested the downward growing stack branch of this patch. Signed-off-by: Keith Packard <[email protected]> Co-authored-by: Keith Packard <[email protected]> Co-authored-by: Gaurav-Aggarwal-AWS <[email protected]> * Enable building the GCC Cortex-R5 port without an FPU (FreeRTOS#586) * Ensure configUSE_TASK_FPU_SUPPORT option is set correctly If one does enable the FPU of the Cortex-R5 processor, then the GCC compiler will define the macro __ARM_FP. This can be used to ensure, that the configUSE_TASK_FPU_SUPPORT is set accordingly. * Enable the implementation of vPortTaskUsesFPU only if configUSE_TASK_FPU_SUPPORT is set to 1 * Remove error case in pxPortInitialiseStack The case of configUSE_TASK_FPU_SUPPORT is 0 is now handled * Enable access to FPU registers only if FPU is enabled * Make minor formating changes * Format ARM Cortex-R5 port * Address review comments from @ChristosZosi * Minor code review suggestions Signed-off-by: Gaurav Aggarwal <[email protected]> --------- Signed-off-by: Gaurav Aggarwal <[email protected]> Co-authored-by: Christos Zosimidis <[email protected]> Co-authored-by: Gaurav-Aggarwal-AWS <[email protected]> Co-authored-by: Gaurav Aggarwal <[email protected]> * Fix freertos_kernel cmake property, Posix Port (FreeRTOS#640) * Fix freertos_kernel cmake property, Posix Port * Moves the `set_property()` call below the target definition in top level CMakeLists file * Corrects billion value from `ULL` suffix (not C90 compliant) to `UL` suffix with cast to uint64_t * Add blank line to CMakeLists.txt * Add missing FreeRTOS+ defines * Run kernel demos and unit tests for PR changes (FreeRTOS#645) * Run kernel demos and unit tests for PR changes Kernel demos check builds multiple demos from FreeRTOS/FreeRTOS and unit tests check runs unit tests in FreeRTOS/FreeRTOS. Both of these checks currently use main branch of FreeRTOS-Kernel. This commits updates these checks to use the changes in the PR. Signed-off-by: Gaurav Aggarwal <[email protected]> * Do not specify PR SHA explicitly as that is default Signed-off-by: Gaurav Aggarwal <[email protected]> * Remove explicit PR SHA from kernel checks Signed-off-by: Gaurav Aggarwal <[email protected]> --------- Signed-off-by: Gaurav Aggarwal <[email protected]> * Add functions to get the buffers of statically created objects (FreeRTOS#641) Added various ...GetStaticBuffer() functions to get the buffers of statically created objects. --------- Co-authored-by: Paul Bartell <[email protected]> Co-authored-by: Nikhil Kamath <[email protected]> Co-authored-by: Gaurav Aggarwal <[email protected]> * Cortex-M Assert when NVIC implements 8 PRIO bits (FreeRTOS#639) * Cortex-M Assert when NVIC implements 8 PRIO bits * Fix CM3 ports * Fix ARM_CM3_MPU * Fix ARM CM3 * Fix ARM_CM4_MPU * Fix ARM_CM4 * Fix GCC ARM_CM7 * Fix IAR ARM ports * Uncrustify changes * Fix MikroC_ARM_CM4F port * Fix MikroC_ARM_CM4F port-(2) * Fix RVDS ARM ports * Revert changes for Tasking/ARM_CM4F port * Revert changes for Tasking/ARM_CM4F port-(2) * Update port.c Fix GCC/ARM_CM4F port * Update port.c * update GCC\ARM_CM4F port * update port.c * Assert to check configMAX_SYSCALL_INTERRUPT_PRIORITY is set to higher priority * Fix merge error: remove duplicate code * Fix typos --------- Co-authored-by: Gaurav-Aggarwal-AWS <[email protected]> Co-authored-by: Ubuntu <[email protected]> * Remove C90 requirement from CMakeLists (FreeRTOS#649) This is needed as it is breaking projects - https://forums.freertos.org/t/freertos-gcc-cmake/16984 We will re-evaluate and accordingly add this later. Signed-off-by: Gaurav Aggarwal <[email protected]> * Only add alignment padding when needed (FreeRTOS#650) Heap 4 and Heap 5 add some padding to ensure that the allocated blocks are always aligned to portBYTE_ALIGNMENT bytes. The code until now was adding padding always even if the resulting block was already aligned. This commits updates the code to only add padding if the resulting block is not aligned. Signed-off-by: Gaurav Aggarwal <[email protected]> * add a missing comma (FreeRTOS#651) * fix conversion warning (FreeRTOS#658) FreeRTOS-Kernel/portable/GCC/ARM_CM4F/port.c:399:41: error: conversion from 'uint32_t' {aka 'long unsigned int'} to 'uint8_t' {aka 'unsigned char'} may change value [-Werror=conversion] Signed-off-by: Vo Trung Chi <[email protected]> * ARMv7M: Adjust implemented priority bit assertions (FreeRTOS#665) Adjust assertions related to the CMSIS __NVIC_PRIO_BITS and FreeRTOS configPRIO_BITS configuration macros such that these macros specify the minimum number of implemented priority bits supported by a config build rather than the exact number of implemented priority bits. Related to Qemu issue FreeRTOS#1122 * Format portmacro.h in arm CM0 ports * portable/ARM_CM0: Add xPortIsInsideInterrupt Add missing xPortIsInsideInterrupt function to Cortex-M0 port. --------- Signed-off-by: Gaurav Aggarwal <[email protected]> Signed-off-by: Cervenka Dusan <[email protected]> Signed-off-by: Devaraj Ranganna <[email protected]> Signed-off-by: Keith Packard <[email protected]> Signed-off-by: Vo Trung Chi <[email protected]> Co-authored-by: Archit Gupta <[email protected]> Co-authored-by: tcpluess <[email protected]> Co-authored-by: pluess <[email protected]> Co-authored-by: Gaurav-Aggarwal-AWS <[email protected]> Co-authored-by: Chris Copeland <[email protected]> Co-authored-by: David J. Fiddes <[email protected]> Co-authored-by: Dusan Cervenka <[email protected]> Co-authored-by: bbain <[email protected]> Co-authored-by: Ju1He1 <[email protected]> Co-authored-by: Aniruddha Kanhere <[email protected]> Co-authored-by: phelter <[email protected]> Co-authored-by: jacky309 <[email protected]> Co-authored-by: Jacques GUILLOU <[email protected]> Co-authored-by: Devaraj Ranganna <[email protected]> Co-authored-by: Gaurav Aggarwal <[email protected]> Co-authored-by: kar-rahul-aws <[email protected]> Co-authored-by: Nikhil Kamath <[email protected]> Co-authored-by: Keith Packard <[email protected]> Co-authored-by: Keith Packard <[email protected]> Co-authored-by: Joseph Julicher <[email protected]> Co-authored-by: Paul Bartell <[email protected]> Co-authored-by: Christos Zosimidis <[email protected]> Co-authored-by: Kody Stribrny <[email protected]> Co-authored-by: Holden <holden-zenithaerotech.com> Co-authored-by: Darian <[email protected]> Co-authored-by: Ubuntu <[email protected]> Co-authored-by: Nicolas <[email protected]> Co-authored-by: Vo Trung Chi <[email protected]>
1 parent 87c9c23 commit b40b9e3

File tree

19 files changed

+475
-301
lines changed

19 files changed

+475
-301
lines changed

‎portable/CCS/ARM_CM3/port.c

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -287,19 +287,23 @@ BaseType_t xPortStartScheduler( void )
287287

288288
#ifdef __NVIC_PRIO_BITS
289289
{
290-
/* Check the CMSIS configuration that defines the number of
291-
* priority bits matches the number of priority bits actually queried
292-
* from the hardware. */
293-
configASSERT( ulImplementedPrioBits == __NVIC_PRIO_BITS );
290+
/*
291+
* Check that the number of implemented priority bits queried from
292+
* hardware is at least as many as specified in the CMSIS
293+
* __NVIC_PRIO_BITS configuration macro.
294+
*/
295+
configASSERT( ulImplementedPrioBits >= __NVIC_PRIO_BITS );
294296
}
295297
#endif
296298

297299
#ifdef configPRIO_BITS
298300
{
299-
/* Check the FreeRTOS configuration that defines the number of
300-
* priority bits matches the number of priority bits actually queried
301-
* from the hardware. */
302-
configASSERT( ulImplementedPrioBits == configPRIO_BITS );
301+
/*
302+
* Check that the number of implemented priority bits queried from
303+
* hardware is at least as many as specified in the FreeRTOS
304+
* configPRIO_BITS configuration macro.
305+
*/
306+
configASSERT( ulImplementedPrioBits >= configPRIO_BITS );
303307
}
304308
#endif
305309

‎portable/CCS/ARM_CM4F/port.c

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -306,19 +306,23 @@ BaseType_t xPortStartScheduler( void )
306306

307307
#ifdef __NVIC_PRIO_BITS
308308
{
309-
/* Check the CMSIS configuration that defines the number of
310-
* priority bits matches the number of priority bits actually queried
311-
* from the hardware. */
312-
configASSERT( ulImplementedPrioBits == __NVIC_PRIO_BITS );
309+
/*
310+
* Check that the number of implemented priority bits queried from
311+
* hardware is at least as many as specified in the CMSIS
312+
* __NVIC_PRIO_BITS configuration macro.
313+
*/
314+
configASSERT( ulImplementedPrioBits >= __NVIC_PRIO_BITS );
313315
}
314316
#endif
315317

316318
#ifdef configPRIO_BITS
317319
{
318-
/* Check the FreeRTOS configuration that defines the number of
319-
* priority bits matches the number of priority bits actually queried
320-
* from the hardware. */
321-
configASSERT( ulImplementedPrioBits == configPRIO_BITS );
320+
/*
321+
* Check that the number of implemented priority bits queried from
322+
* hardware is at least as many as specified in the FreeRTOS
323+
* configPRIO_BITS configuration macro.
324+
*/
325+
configASSERT( ulImplementedPrioBits >= configPRIO_BITS );
322326
}
323327
#endif
324328

‎portable/GCC/ARM_CM0/portmacro.h

Lines changed: 97 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,13 @@
2828

2929

3030
#ifndef PORTMACRO_H
31-
#define PORTMACRO_H
31+
#define PORTMACRO_H
3232

33-
#ifdef __cplusplus
34-
extern "C" {
35-
#endif
33+
/* *INDENT-OFF* */
34+
#ifdef __cplusplus
35+
extern "C" {
36+
#endif
37+
/* *INDENT-ON* */
3638

3739
/*-----------------------------------------------------------
3840
* Port specific definitions.
@@ -45,84 +47,120 @@
4547
*/
4648

4749
/* Type definitions. */
48-
#define portCHAR char
49-
#define portFLOAT float
50-
#define portDOUBLE double
51-
#define portLONG long
52-
#define portSHORT short
53-
#define portSTACK_TYPE uint32_t
54-
#define portBASE_TYPE long
55-
56-
typedef portSTACK_TYPE StackType_t;
57-
typedef long BaseType_t;
58-
typedef unsigned long UBaseType_t;
59-
60-
#if ( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_16_BITS )
61-
typedef uint16_t TickType_t;
62-
#define portMAX_DELAY ( TickType_t ) 0xffff
63-
#elif ( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_32_BITS )
64-
typedef uint32_t TickType_t;
65-
#define portMAX_DELAY ( TickType_t ) 0xffffffffUL
50+
#define portCHAR char
51+
#define portFLOAT float
52+
#define portDOUBLE double
53+
#define portLONG long
54+
#define portSHORT short
55+
#define portSTACK_TYPE uint32_t
56+
#define portBASE_TYPE long
57+
58+
typedef portSTACK_TYPE StackType_t;
59+
typedef long BaseType_t;
60+
typedef unsigned long UBaseType_t;
61+
62+
#if ( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_16_BITS )
63+
typedef uint16_t TickType_t;
64+
#define portMAX_DELAY ( TickType_t ) 0xffff
65+
#elif ( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_32_BITS )
66+
typedef uint32_t TickType_t;
67+
#define portMAX_DELAY ( TickType_t ) 0xffffffffUL
6668

6769
/* 32-bit tick type on a 32-bit architecture, so reads of the tick count do
6870
* not need to be guarded with a critical section. */
69-
#define portTICK_TYPE_IS_ATOMIC 1
70-
#else
71-
#error configTICK_TYPE_WIDTH_IN_BITS set to unsupported tick type width.
72-
#endif
71+
#define portTICK_TYPE_IS_ATOMIC 1
72+
#else
73+
#error configTICK_TYPE_WIDTH_IN_BITS set to unsupported tick type width.
74+
#endif
7375
/*-----------------------------------------------------------*/
7476

7577
/* Architecture specifics. */
76-
#define portSTACK_GROWTH ( -1 )
77-
#define portTICK_PERIOD_MS ( ( TickType_t ) 1000 / configTICK_RATE_HZ )
78-
#define portBYTE_ALIGNMENT 8
79-
#define portDONT_DISCARD __attribute__( ( used ) )
80-
#define portNORETURN __attribute__( ( noreturn ) )
78+
#define portSTACK_GROWTH ( -1 )
79+
#define portTICK_PERIOD_MS ( ( TickType_t ) 1000 / configTICK_RATE_HZ )
80+
#define portBYTE_ALIGNMENT 8
81+
#define portDONT_DISCARD __attribute__( ( used ) )
82+
#define portNORETURN __attribute__( ( noreturn ) )
8183
/*-----------------------------------------------------------*/
8284

8385

8486
/* Scheduler utilities. */
85-
extern void vPortYield( void );
86-
#define portNVIC_INT_CTRL_REG ( *( ( volatile uint32_t * ) 0xe000ed04 ) )
87-
#define portNVIC_PENDSVSET_BIT ( 1UL << 28UL )
88-
#define portYIELD() vPortYield()
89-
#define portEND_SWITCHING_ISR( xSwitchRequired ) do { if( xSwitchRequired ) portNVIC_INT_CTRL_REG = portNVIC_PENDSVSET_BIT; } while( 0 )
90-
#define portYIELD_FROM_ISR( x ) portEND_SWITCHING_ISR( x )
87+
extern void vPortYield( void );
88+
#define portNVIC_INT_CTRL_REG ( *( ( volatile uint32_t * ) 0xe000ed04 ) )
89+
#define portNVIC_PENDSVSET_BIT ( 1UL << 28UL )
90+
#define portYIELD() vPortYield()
91+
#define portEND_SWITCHING_ISR( xSwitchRequired ) \
92+
do { if( xSwitchRequired ) portNVIC_INT_CTRL_REG = portNVIC_PENDSVSET_BIT; } \
93+
while( 0 )
94+
#define portYIELD_FROM_ISR( x ) portEND_SWITCHING_ISR( x )
9195
/*-----------------------------------------------------------*/
9296

9397

9498
/* Critical section management. */
95-
extern void vPortEnterCritical( void );
96-
extern void vPortExitCritical( void );
97-
extern uint32_t ulSetInterruptMaskFromISR( void ) __attribute__( ( naked ) );
98-
extern void vClearInterruptMaskFromISR( uint32_t ulMask ) __attribute__( ( naked ) );
99-
100-
#define portSET_INTERRUPT_MASK_FROM_ISR() ulSetInterruptMaskFromISR()
101-
#define portCLEAR_INTERRUPT_MASK_FROM_ISR( x ) vClearInterruptMaskFromISR( x )
102-
#define portDISABLE_INTERRUPTS() __asm volatile ( " cpsid i " ::: "memory" )
103-
#define portENABLE_INTERRUPTS() __asm volatile ( " cpsie i " ::: "memory" )
104-
#define portENTER_CRITICAL() vPortEnterCritical()
105-
#define portEXIT_CRITICAL() vPortExitCritical()
99+
extern void vPortEnterCritical( void );
100+
extern void vPortExitCritical( void );
101+
extern uint32_t ulSetInterruptMaskFromISR( void ) __attribute__( ( naked ) );
102+
extern void vClearInterruptMaskFromISR( uint32_t ulMask ) __attribute__( ( naked ) );
103+
104+
#define portSET_INTERRUPT_MASK_FROM_ISR() ulSetInterruptMaskFromISR()
105+
#define portCLEAR_INTERRUPT_MASK_FROM_ISR( x ) vClearInterruptMaskFromISR( x )
106+
#define portDISABLE_INTERRUPTS() __asm volatile ( " cpsid i " ::: "memory" )
107+
#define portENABLE_INTERRUPTS() __asm volatile ( " cpsie i " ::: "memory" )
108+
#define portENTER_CRITICAL() vPortEnterCritical()
109+
#define portEXIT_CRITICAL() vPortExitCritical()
106110

107111
/*-----------------------------------------------------------*/
108112

109113
/* Tickless idle/low power functionality. */
110-
#ifndef portSUPPRESS_TICKS_AND_SLEEP
111-
extern void vPortSuppressTicksAndSleep( TickType_t xExpectedIdleTime );
112-
#define portSUPPRESS_TICKS_AND_SLEEP( xExpectedIdleTime ) vPortSuppressTicksAndSleep( xExpectedIdleTime )
113-
#endif
114+
#ifndef portSUPPRESS_TICKS_AND_SLEEP
115+
extern void vPortSuppressTicksAndSleep( TickType_t xExpectedIdleTime );
116+
#define portSUPPRESS_TICKS_AND_SLEEP( xExpectedIdleTime ) vPortSuppressTicksAndSleep( xExpectedIdleTime )
117+
#endif
114118
/*-----------------------------------------------------------*/
115119

116120
/* Task function macros as described on the FreeRTOS.org WEB site. */
117-
#define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void * pvParameters )
118-
#define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void * pvParameters )
121+
#define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void * pvParameters )
122+
#define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void * pvParameters )
119123

120-
#define portNOP()
124+
#define portNOP()
121125

122-
#define portMEMORY_BARRIER() __asm volatile ( "" ::: "memory" )
126+
#define portMEMORY_BARRIER() __asm volatile ( "" ::: "memory" )
123127

124-
#ifdef __cplusplus
125-
}
126-
#endif
128+
129+
#define portINLINE __inline
130+
131+
#ifndef portFORCE_INLINE
132+
#define portFORCE_INLINE inline __attribute__( ( always_inline ) )
133+
#endif
134+
135+
/*-----------------------------------------------------------*/
136+
137+
portFORCE_INLINE static BaseType_t xPortIsInsideInterrupt( void )
138+
{
139+
uint32_t ulCurrentInterrupt;
140+
BaseType_t xReturn;
141+
142+
/* Obtain the number of the currently executing interrupt. */
143+
__asm volatile ( "mrs %0, ipsr" : "=r" ( ulCurrentInterrupt )::"memory" );
144+
145+
if( ulCurrentInterrupt == 0 )
146+
{
147+
xReturn = pdFALSE;
148+
}
149+
else
150+
{
151+
xReturn = pdTRUE;
152+
}
153+
154+
return xReturn;
155+
}
156+
157+
/*-----------------------------------------------------------*/
158+
159+
160+
/* *INDENT-OFF* */
161+
#ifdef __cplusplus
162+
}
163+
#endif
164+
/* *INDENT-ON* */
127165

128166
#endif /* PORTMACRO_H */

‎portable/GCC/ARM_CM3/port.c

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -330,19 +330,23 @@ BaseType_t xPortStartScheduler( void )
330330

331331
#ifdef __NVIC_PRIO_BITS
332332
{
333-
/* Check the CMSIS configuration that defines the number of
334-
* priority bits matches the number of priority bits actually queried
335-
* from the hardware. */
336-
configASSERT( ulImplementedPrioBits == __NVIC_PRIO_BITS );
333+
/*
334+
* Check that the number of implemented priority bits queried from
335+
* hardware is at least as many as specified in the CMSIS
336+
* __NVIC_PRIO_BITS configuration macro.
337+
*/
338+
configASSERT( ulImplementedPrioBits >= __NVIC_PRIO_BITS );
337339
}
338340
#endif
339341

340342
#ifdef configPRIO_BITS
341343
{
342-
/* Check the FreeRTOS configuration that defines the number of
343-
* priority bits matches the number of priority bits actually queried
344-
* from the hardware. */
345-
configASSERT( ulImplementedPrioBits == configPRIO_BITS );
344+
/*
345+
* Check that the number of implemented priority bits queried from
346+
* hardware is at least as many as specified in the FreeRTOS
347+
* configPRIO_BITS configuration macro.
348+
*/
349+
configASSERT( ulImplementedPrioBits >= configPRIO_BITS );
346350
}
347351
#endif
348352

‎portable/GCC/ARM_CM3_MPU/port.c

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -452,21 +452,25 @@ BaseType_t xPortStartScheduler( void )
452452
}
453453

454454
#ifdef __NVIC_PRIO_BITS
455-
{
456-
/* Check the CMSIS configuration that defines the number of
457-
* priority bits matches the number of priority bits actually queried
458-
* from the hardware. */
459-
configASSERT( ulImplementedPrioBits == __NVIC_PRIO_BITS );
460-
}
455+
{
456+
/*
457+
* Check that the number of implemented priority bits queried from
458+
* hardware is at least as many as specified in the CMSIS
459+
* __NVIC_PRIO_BITS configuration macro.
460+
*/
461+
configASSERT( ulImplementedPrioBits >= __NVIC_PRIO_BITS );
462+
}
461463
#endif
462464

463465
#ifdef configPRIO_BITS
464-
{
465-
/* Check the FreeRTOS configuration that defines the number of
466-
* priority bits matches the number of priority bits actually queried
467-
* from the hardware. */
468-
configASSERT( ulImplementedPrioBits == configPRIO_BITS );
469-
}
466+
{
467+
/*
468+
* Check that the number of implemented priority bits queried from
469+
* hardware is at least as many as specified in the FreeRTOS
470+
* configPRIO_BITS configuration macro.
471+
*/
472+
configASSERT( ulImplementedPrioBits >= configPRIO_BITS );
473+
}
470474
#endif
471475

472476
/* Shift the priority group value back to its position within the AIRCR

‎portable/GCC/ARM_CM4F/port.c

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -373,19 +373,23 @@ BaseType_t xPortStartScheduler( void )
373373

374374
#ifdef __NVIC_PRIO_BITS
375375
{
376-
/* Check the CMSIS configuration that defines the number of
377-
* priority bits matches the number of priority bits actually queried
378-
* from the hardware. */
379-
configASSERT( ulImplementedPrioBits == __NVIC_PRIO_BITS );
376+
/*
377+
* Check that the number of implemented priority bits queried from
378+
* hardware is at least as many as specified in the CMSIS
379+
* __NVIC_PRIO_BITS configuration macro.
380+
*/
381+
configASSERT( ulImplementedPrioBits >= __NVIC_PRIO_BITS );
380382
}
381383
#endif
382384

383385
#ifdef configPRIO_BITS
384386
{
385-
/* Check the FreeRTOS configuration that defines the number of
386-
* priority bits matches the number of priority bits actually queried
387-
* from the hardware. */
388-
configASSERT( ulImplementedPrioBits == configPRIO_BITS );
387+
/*
388+
* Check that the number of implemented priority bits queried from
389+
* hardware is at least as many as specified in the FreeRTOS
390+
* configPRIO_BITS configuration macro.
391+
*/
392+
configASSERT( ulImplementedPrioBits >= configPRIO_BITS );
389393
}
390394
#endif
391395

‎portable/GCC/ARM_CM4_MPU/port.c

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -495,21 +495,25 @@ BaseType_t xPortStartScheduler( void )
495495
}
496496

497497
#ifdef __NVIC_PRIO_BITS
498-
{
499-
/* Check the CMSIS configuration that defines the number of
500-
* priority bits matches the number of priority bits actually queried
501-
* from the hardware. */
502-
configASSERT( ulImplementedPrioBits == __NVIC_PRIO_BITS );
503-
}
498+
{
499+
/*
500+
* Check that the number of implemented priority bits queried
501+
* from hardware is at least as many as specified in the
502+
* CMSIS __NVIC_PRIO_BITS configuration macro.
503+
*/
504+
configASSERT( ulImplementedPrioBits >= __NVIC_PRIO_BITS );
505+
}
504506
#endif
505507

506508
#ifdef configPRIO_BITS
507-
{
508-
/* Check the FreeRTOS configuration that defines the number of
509-
* priority bits matches the number of priority bits actually queried
510-
* from the hardware. */
511-
configASSERT( ulImplementedPrioBits == configPRIO_BITS );
512-
}
509+
{
510+
/*
511+
* Check that the number of implemented priority bits queried
512+
* from hardware is at least as many as specified in the
513+
* FreeRTOS configPRIO_BITS configuration macro.
514+
*/
515+
configASSERT( ulImplementedPrioBits >= configPRIO_BITS );
516+
}
513517
#endif
514518

515519
/* Shift the priority group value back to its position within the AIRCR

0 commit comments

Comments
 (0)