Merge branch 'master' into kernel_uncrustify

2025-09-12 09:07:46 -04:00 · 2020-08-17 15:01:31 -07:00 · 2020-08-17 15:01:31 -07:00 · 25f34203e7
commit 25f34203e7
parent 0944a52817 8c77117c32
53 changed files with 10322 additions and 10369 deletions
--- a/portable/CCS/ARM_CM3/port.c
+++ b/portable/CCS/ARM_CM3/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /*-----------------------------------------------------------
--- a/portable/CCS/ARM_CM4F/port.c
+++ b/portable/CCS/ARM_CM4F/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /*-----------------------------------------------------------
--- a/portable/Common/mpu_wrappers.c
+++ b/portable/Common/mpu_wrappers.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /*
--- a/portable/GCC/ARM_CM0/port.c
+++ b/portable/GCC/ARM_CM0/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /*-----------------------------------------------------------
--- a/portable/GCC/ARM_CM23/non_secure/port.c
+++ b/portable/GCC/ARM_CM23/non_secure/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /* Defining MPU_WRAPPERS_INCLUDED_FROM_API_FILE prevents task.h from redefining
--- a/portable/GCC/ARM_CM23_NTZ/non_secure/port.c
+++ b/portable/GCC/ARM_CM23_NTZ/non_secure/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /* Defining MPU_WRAPPERS_INCLUDED_FROM_API_FILE prevents task.h from redefining
--- a/portable/GCC/ARM_CM3/port.c
+++ b/portable/GCC/ARM_CM3/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /*-----------------------------------------------------------
--- a/portable/GCC/ARM_CM33/non_secure/port.c
+++ b/portable/GCC/ARM_CM33/non_secure/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /* Defining MPU_WRAPPERS_INCLUDED_FROM_API_FILE prevents task.h from redefining
--- a/portable/GCC/ARM_CM33_NTZ/non_secure/port.c
+++ b/portable/GCC/ARM_CM33_NTZ/non_secure/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /* Defining MPU_WRAPPERS_INCLUDED_FROM_API_FILE prevents task.h from redefining
--- a/portable/GCC/ARM_CM3_MPU/port.c
+++ b/portable/GCC/ARM_CM3_MPU/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /*-----------------------------------------------------------
--- a/portable/GCC/ARM_CM4F/port.c
+++ b/portable/GCC/ARM_CM4F/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /*-----------------------------------------------------------
--- a/portable/GCC/ARM_CM4_MPU/port.c
+++ b/portable/GCC/ARM_CM4_MPU/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /*-----------------------------------------------------------
--- a/portable/GCC/ARM_CM4_MPU/portmacro.h
+++ b/portable/GCC/ARM_CM4_MPU/portmacro.h
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */


--- a/portable/GCC/ARM_CM7/r0p1/port.c
+++ b/portable/GCC/ARM_CM7/r0p1/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /*-----------------------------------------------------------
--- a/portable/GCC/ARM_CR5/port.c
+++ b/portable/GCC/ARM_CR5/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /* Standard includes. */
--- a/portable/GCC/AVR_AVRDx/port.c
+++ b/portable/GCC/AVR_AVRDx/port.c
@ -23,7 +23,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 #include <stdlib.h>
--- a/portable/GCC/AVR_AVRDx/portmacro.h
+++ b/portable/GCC/AVR_AVRDx/portmacro.h
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 #ifndef PORTMACRO_H
--- a/portable/GCC/AVR_Mega0/port.c
+++ b/portable/GCC/AVR_Mega0/port.c
@ -23,7 +23,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 #include <stdlib.h>
--- a/portable/GCC/AVR_Mega0/portmacro.h
+++ b/portable/GCC/AVR_Mega0/portmacro.h
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 #ifndef PORTMACRO_H
--- a/portable/IAR/ARM_CM0/port.c
+++ b/portable/IAR/ARM_CM0/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /*-----------------------------------------------------------
--- a/portable/IAR/ARM_CM23/non_secure/port.c
+++ b/portable/IAR/ARM_CM23/non_secure/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /* Defining MPU_WRAPPERS_INCLUDED_FROM_API_FILE prevents task.h from redefining
--- a/portable/IAR/ARM_CM23_NTZ/non_secure/port.c
+++ b/portable/IAR/ARM_CM23_NTZ/non_secure/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /* Defining MPU_WRAPPERS_INCLUDED_FROM_API_FILE prevents task.h from redefining
--- a/portable/IAR/ARM_CM3/port.c
+++ b/portable/IAR/ARM_CM3/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /*-----------------------------------------------------------
--- a/portable/IAR/ARM_CM33/non_secure/port.c
+++ b/portable/IAR/ARM_CM33/non_secure/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /* Defining MPU_WRAPPERS_INCLUDED_FROM_API_FILE prevents task.h from redefining
--- a/portable/IAR/ARM_CM33_NTZ/non_secure/port.c
+++ b/portable/IAR/ARM_CM33_NTZ/non_secure/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /* Defining MPU_WRAPPERS_INCLUDED_FROM_API_FILE prevents task.h from redefining
--- a/portable/IAR/ARM_CM4F/port.c
+++ b/portable/IAR/ARM_CM4F/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /*-----------------------------------------------------------
--- a/portable/IAR/ARM_CM4F_MPU/port.c
+++ b/portable/IAR/ARM_CM4F_MPU/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /*-----------------------------------------------------------
--- a/portable/IAR/ARM_CM4F_MPU/portmacro.h
+++ b/portable/IAR/ARM_CM4F_MPU/portmacro.h
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */


--- a/portable/IAR/ARM_CM7/r0p1/port.c
+++ b/portable/IAR/ARM_CM7/r0p1/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /*-----------------------------------------------------------
--- a/portable/IAR/AVR_AVRDx/port.c
+++ b/portable/IAR/AVR_AVRDx/port.c
@ -23,7 +23,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 #include <stdlib.h>
@ -118,6 +117,7 @@ StackType_t * pxPortInitialiseStack( StackType_t * pxTopOfStack,
     *  portSAVE_CONTEXT places the flags on the stack immediately after r0
     *  to ensure the interrupts get disabled as soon as possible, and so ensuring
     *  the stack use is minimal should a context switch interrupt occur. */
+
    *pxTopOfStack = ( StackType_t ) 0x00; /* R0 */
    pxTopOfStack--;
    *pxTopOfStack = portFLAGS_INT_ENABLED;
--- a/portable/IAR/AVR_AVRDx/portmacro.h
+++ b/portable/IAR/AVR_AVRDx/portmacro.h
@ -23,7 +23,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 #ifndef PORTMACRO_H
--- a/portable/IAR/AVR_AVRDx/portmacro.s90
+++ b/portable/IAR/AVR_AVRDx/portmacro.s90
@ -22,7 +22,6 @@
 ; * http://www.FreeRTOS.org
 ; * http://aws.amazon.com/freertos
 ; *
-; * 1 tab == 4 spaces!
 ; */

 #include "porthardware.h"
--- a/portable/IAR/AVR_Mega0/port.c
+++ b/portable/IAR/AVR_Mega0/port.c
@ -23,7 +23,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 #include <stdlib.h>
@ -118,6 +117,7 @@ StackType_t * pxPortInitialiseStack( StackType_t * pxTopOfStack,
     *  portSAVE_CONTEXT places the flags on the stack immediately after r0
     *  to ensure the interrupts get disabled as soon as possible, and so ensuring
     *  the stack use is minimal should a context switch interrupt occur. */
+
    *pxTopOfStack = ( StackType_t ) 0x00; /* R0 */
    pxTopOfStack--;
    *pxTopOfStack = portFLAGS_INT_ENABLED;
--- a/portable/IAR/AVR_Mega0/portmacro.h
+++ b/portable/IAR/AVR_Mega0/portmacro.h
@ -23,7 +23,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 #ifndef PORTMACRO_H
--- a/portable/MemMang/heap_4.c
+++ b/portable/MemMang/heap_4.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /*
--- a/portable/MikroC/ARM_CM4F/port.c
+++ b/portable/MikroC/ARM_CM4F/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /*-----------------------------------------------------------
--- a/portable/RVDS/ARM_CM0/port.c
+++ b/portable/RVDS/ARM_CM0/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /*-----------------------------------------------------------
--- a/portable/RVDS/ARM_CM3/port.c
+++ b/portable/RVDS/ARM_CM3/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /*-----------------------------------------------------------
--- a/portable/RVDS/ARM_CM4F/port.c
+++ b/portable/RVDS/ARM_CM4F/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /*-----------------------------------------------------------
--- a/portable/RVDS/ARM_CM4_MPU/port.c
+++ b/portable/RVDS/ARM_CM4_MPU/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /*-----------------------------------------------------------
--- a/portable/RVDS/ARM_CM4_MPU/portmacro.h
+++ b/portable/RVDS/ARM_CM4_MPU/portmacro.h
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */


--- a/portable/RVDS/ARM_CM7/r0p1/port.c
+++ b/portable/RVDS/ARM_CM7/r0p1/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /*-----------------------------------------------------------
--- a/portable/Tasking/ARM_CM4F/port.c
+++ b/portable/Tasking/ARM_CM4F/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /*-----------------------------------------------------------
--- a/portable/ThirdParty/GCC/ARC_EM_HS/freertos_tls.c
+++ b/portable/ThirdParty/GCC/ARC_EM_HS/freertos_tls.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 #if defined( __MW__ )
--- a/portable/ThirdParty/GCC/ARC_EM_HS/port.c
+++ b/portable/ThirdParty/GCC/ARC_EM_HS/port.c
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 /*
--- a/portable/ThirdParty/GCC/ARC_EM_HS/portmacro.h
+++ b/portable/ThirdParty/GCC/ARC_EM_HS/portmacro.h
@ -22,7 +22,6 @@
 * http://www.FreeRTOS.org
 * http://aws.amazon.com/freertos
 *
- * 1 tab == 4 spaces!
 */

 #ifndef PORTMACRO_H
--- a/portable/ThirdParty/GCC/Xtensa_ESP32/include/portmacro.h
+++ b/portable/ThirdParty/GCC/Xtensa_ESP32/include/portmacro.h
@ -34,7 +34,6 @@
 *  FOR A PARTICULAR PURPOSE.  Full license text is available from the following
 *  link: http://www.freertos.org/a00114.html
 *
- *  1 tab == 4 spaces!
 *
 ***************************************************************************
 *                                                                       *
@ -60,7 +59,6 @@
 *  engineered and independently SIL3 certified version for use in safety and
 *  mission critical applications that require provable dependability.
 *
- *  1 tab == 4 spaces!
 */

 #ifndef PORTMACRO_H
--- a/portable/ThirdParty/GCC/Xtensa_ESP32/port.c
+++ b/portable/ThirdParty/GCC/Xtensa_ESP32/port.c
@ -64,7 +64,6 @@
 *  engineered and independently SIL3 certified version for use in safety and
 *  mission critical applications that require provable dependability.
 *
- *  1 tab == 4 spaces!
 */

 /*******************************************************************************