Style: Revert uncrustify for portable directories (#122)

* Style: revert uncrustify portable directories

* Style: Uncrustify Some Portable files

Co-authored-by: Alfred Gedeon <gedeonag@amazon.com>
This commit is contained in:
alfred gedeon 2020-08-17 10:51:02 -07:00 committed by GitHub
parent a6da1cd0ce
commit 86653e2a1f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
273 changed files with 64802 additions and 65931 deletions

View file

@ -26,19 +26,19 @@
*/
/*
* Changes from V3.2.1
+ CallReturn Depth increased from 8 to 10 levels to accomodate wizC/fedC V12.
+
+ Changes from V3.2.0
+ TBLPTRU is now initialised to zero during the initial stack creation of a new task. This solves
+ an error on devices with more than 64kB ROM.
+
+ Changes from V3.0.0
+ ucCriticalNesting is now initialised to 0x7F to prevent interrupts from being
+ handled before the scheduler is started.
+
+ Changes from V3.0.1
*/
Changes from V3.2.1
+ CallReturn Depth increased from 8 to 10 levels to accomodate wizC/fedC V12.
Changes from V3.2.0
+ TBLPTRU is now initialised to zero during the initial stack creation of a new task. This solves
an error on devices with more than 64kB ROM.
Changes from V3.0.0
+ ucCriticalNesting is now initialised to 0x7F to prevent interrupts from being
handled before the scheduler is started.
Changes from V3.0.1
*/
/* Scheduler include files. */
#include <FreeRTOS.h>
@ -77,17 +77,17 @@ extern volatile TCB_t * volatile pxCurrentTCB;
* 16 bytes: Free space on stack
*/
#if _ROMSIZE > 0x8000
#define portSTACK_FSR_BYTES ( 15 )
#define portSTACK_CALLRETURN_ENTRY_SIZE ( 3 )
#define portSTACK_FSR_BYTES ( 15 )
#define portSTACK_CALLRETURN_ENTRY_SIZE ( 3 )
#else
#define portSTACK_FSR_BYTES ( 13 )
#define portSTACK_CALLRETURN_ENTRY_SIZE ( 2 )
#define portSTACK_FSR_BYTES ( 13 )
#define portSTACK_CALLRETURN_ENTRY_SIZE ( 2 )
#endif
#define portSTACK_MINIMAL_CALLRETURN_DEPTH ( 10 )
#define portSTACK_OTHER_BYTES ( 20 )
#define portSTACK_MINIMAL_CALLRETURN_DEPTH ( 10 )
#define portSTACK_OTHER_BYTES ( 20 )
uint16_t usCalcMinStackSize = 0;
uint16_t usCalcMinStackSize = 0;
/*-----------------------------------------------------------*/
@ -105,156 +105,154 @@ register uint8_t ucCriticalNesting = 0x7F;
* Initialise the stack of a new task.
* See portSAVE_CONTEXT macro for description.
*/
StackType_t * pxPortInitialiseStack( StackType_t * pxTopOfStack,
TaskFunction_t pxCode,
void * pvParameters )
StackType_t *pxPortInitialiseStack( StackType_t *pxTopOfStack, TaskFunction_t pxCode, void *pvParameters )
{
uint8_t ucScratch;
uint8_t ucScratch;
/*
* Get the size of the RAMarea in page 0 used by the compiler
* We do this here already to avoid W-register conflicts.
*/
_Pragma("asm")
movlw OVERHEADPAGE0-LOCOPTSIZE+MAXLOCOPTSIZE
movwf PRODL,ACCESS ; PRODL is used as temp register
_Pragma("asmend")
ucScratch = PRODL;
/*
* Get the size of the RAMarea in page 0 used by the compiler
* We do this here already to avoid W-register conflicts.
*/
_Pragma( "asm" )
movlw OVERHEADPAGE0 - LOCOPTSIZE + MAXLOCOPTSIZE
movwf PRODL, ACCESS;
PRODL is used as temp register _Pragma( "asmend" )
ucScratch = PRODL;
/*
* Place a few bytes of known values on the bottom of the stack.
* This is just useful for debugging.
*/
// *pxTopOfStack-- = 0x11;
// *pxTopOfStack-- = 0x22;
// *pxTopOfStack-- = 0x33;
/*
* Place a few bytes of known values on the bottom of the stack.
* This is just useful for debugging.
*/
/* *pxTopOfStack-- = 0x11; */
/* *pxTopOfStack-- = 0x22; */
/* *pxTopOfStack-- = 0x33; */
/*
* Simulate how the stack would look after a call to vPortYield()
* generated by the compiler.
*/
/*
* Simulate how the stack would look after a call to vPortYield()
* generated by the compiler.
*/
/*
* First store the function parameters. This is where the task expects
* to find them when it starts running.
*/
*pxTopOfStack-- = ( StackType_t ) ( (( uint16_t ) pvParameters >> 8) & 0x00ff );
*pxTopOfStack-- = ( StackType_t ) ( ( uint16_t ) pvParameters & 0x00ff );
/*
* First store the function parameters. This is where the task expects
* to find them when it starts running.
*/
*pxTopOfStack-- = ( StackType_t ) ( ( ( uint16_t ) pvParameters >> 8 ) & 0x00ff );
*pxTopOfStack-- = ( StackType_t ) ( ( uint16_t ) pvParameters & 0x00ff );
/*
* Next are all the registers that form part of the task context.
*/
*pxTopOfStack-- = ( StackType_t ) 0x11; /* STATUS. */
*pxTopOfStack-- = ( StackType_t ) 0x22; /* WREG. */
*pxTopOfStack-- = ( StackType_t ) 0x33; /* BSR. */
*pxTopOfStack-- = ( StackType_t ) 0x44; /* PRODH. */
*pxTopOfStack-- = ( StackType_t ) 0x55; /* PRODL. */
*pxTopOfStack-- = ( StackType_t ) 0x66; /* FSR0H. */
*pxTopOfStack-- = ( StackType_t ) 0x77; /* FSR0L. */
*pxTopOfStack-- = ( StackType_t ) 0x88; /* FSR1H. */
*pxTopOfStack-- = ( StackType_t ) 0x99; /* FSR1L. */
*pxTopOfStack-- = ( StackType_t ) 0xAA; /* TABLAT. */
#if _ROMSIZE > 0x8000
*pxTopOfStack-- = ( StackType_t ) 0x00; /* TBLPTRU. */
#endif
*pxTopOfStack-- = ( StackType_t ) 0xCC; /* TBLPTRH. */
*pxTopOfStack-- = ( StackType_t ) 0xDD; /* TBLPTRL. */
#if _ROMSIZE > 0x8000
*pxTopOfStack-- = ( StackType_t ) 0xEE; /* PCLATU. */
#endif
*pxTopOfStack-- = ( StackType_t ) 0xFF; /* PCLATH. */
/*
* Next are all the registers that form part of the task context.
*/
*pxTopOfStack-- = ( StackType_t ) 0x11; /* STATUS. */
*pxTopOfStack-- = ( StackType_t ) 0x22; /* WREG. */
*pxTopOfStack-- = ( StackType_t ) 0x33; /* BSR. */
*pxTopOfStack-- = ( StackType_t ) 0x44; /* PRODH. */
*pxTopOfStack-- = ( StackType_t ) 0x55; /* PRODL. */
*pxTopOfStack-- = ( StackType_t ) 0x66; /* FSR0H. */
*pxTopOfStack-- = ( StackType_t ) 0x77; /* FSR0L. */
*pxTopOfStack-- = ( StackType_t ) 0x88; /* FSR1H. */
*pxTopOfStack-- = ( StackType_t ) 0x99; /* FSR1L. */
*pxTopOfStack-- = ( StackType_t ) 0xAA; /* TABLAT. */
#if _ROMSIZE > 0x8000
*pxTopOfStack-- = ( StackType_t ) 0x00; /* TBLPTRU. */
#endif
*pxTopOfStack-- = ( StackType_t ) 0xCC; /* TBLPTRH. */
*pxTopOfStack-- = ( StackType_t ) 0xDD; /* TBLPTRL. */
#if _ROMSIZE > 0x8000
*pxTopOfStack-- = ( StackType_t ) 0xEE; /* PCLATU. */
#endif
*pxTopOfStack-- = ( StackType_t ) 0xFF; /* PCLATH. */
/*
* Next the compiler's scratchspace.
*/
while(ucScratch-- > 0)
{
*pxTopOfStack-- = ( StackType_t ) 0;
}
/*
* Next the compiler's scratchspace.
*/
while( ucScratch-- > 0 )
{
*pxTopOfStack-- = ( StackType_t ) 0;
}
/*
* The only function return address so far is the address of the task entry.
* The order is TOSU/TOSH/TOSL. For devices > 64kB, TOSU is put on the
* stack, too. TOSU is always written as zero here because wizC does not allow
* functionpointers to point above 64kB in ROM.
*/
#if _ROMSIZE > 0x8000
*pxTopOfStack-- = ( StackType_t ) 0;
#endif
*pxTopOfStack-- = ( StackType_t ) ( ( ( uint16_t ) pxCode >> 8 ) & 0x00ff );
*pxTopOfStack-- = ( StackType_t ) ( ( uint16_t ) pxCode & 0x00ff );
/*
* The only function return address so far is the address of the task entry.
* The order is TOSU/TOSH/TOSL. For devices > 64kB, TOSU is put on the
* stack, too. TOSU is always written as zero here because wizC does not allow
* functionpointers to point above 64kB in ROM.
*/
#if _ROMSIZE > 0x8000
*pxTopOfStack-- = ( StackType_t ) 0;
#endif
*pxTopOfStack-- = ( StackType_t ) ( ( ( uint16_t ) pxCode >> 8 ) & 0x00ff );
*pxTopOfStack-- = ( StackType_t ) ( ( uint16_t ) pxCode & 0x00ff );
/*
* Store the number of return addresses on the hardware stack.
* So far only the address of the task entry point.
*/
*pxTopOfStack-- = ( StackType_t ) 1;
/*
* Store the number of return addresses on the hardware stack.
* So far only the address of the task entry point.
*/
*pxTopOfStack-- = ( StackType_t ) 1;
/*
* The code generated by wizC does not maintain separate
* stack and frame pointers. Therefore the portENTER_CRITICAL macro cannot
* use the stack as per other ports. Instead a variable is used to keep
* track of the critical section nesting. This variable has to be stored
* as part of the task context and is initially set to zero.
*/
*pxTopOfStack-- = ( StackType_t ) portNO_CRITICAL_SECTION_NESTING;
/*
* The code generated by wizC does not maintain separate
* stack and frame pointers. Therefore the portENTER_CRITICAL macro cannot
* use the stack as per other ports. Instead a variable is used to keep
* track of the critical section nesting. This variable has to be stored
* as part of the task context and is initially set to zero.
*/
*pxTopOfStack-- = ( StackType_t ) portNO_CRITICAL_SECTION_NESTING;
return pxTopOfStack;
return pxTopOfStack;
}
/*-----------------------------------------------------------*/
uint16_t usPortCALCULATE_MINIMAL_STACK_SIZE( void )
{
/*
* Fetch the size of compiler's scratchspace.
*/
_Pragma( "asm" )
movlw OVERHEADPAGE0 - LOCOPTSIZE + MAXLOCOPTSIZE
movlb usCalcMinStackSize >> 8
movwf usCalcMinStackSize, BANKED _Pragma( "asmend" )
/*
* Fetch the size of compiler's scratchspace.
*/
_Pragma("asm")
movlw OVERHEADPAGE0-LOCOPTSIZE+MAXLOCOPTSIZE
movlb usCalcMinStackSize>>8
movwf usCalcMinStackSize,BANKED
_Pragma("asmend")
/*
* Add minimum needed stackspace
*/
usCalcMinStackSize += ( portSTACK_FSR_BYTES )
+ ( portSTACK_MINIMAL_CALLRETURN_DEPTH * portSTACK_CALLRETURN_ENTRY_SIZE )
+ ( portSTACK_OTHER_BYTES );
/*
* Add minimum needed stackspace
*/
usCalcMinStackSize += ( portSTACK_FSR_BYTES )
+ ( portSTACK_MINIMAL_CALLRETURN_DEPTH * portSTACK_CALLRETURN_ENTRY_SIZE )
+ ( portSTACK_OTHER_BYTES );
return( usCalcMinStackSize );
return(usCalcMinStackSize);
}
/*-----------------------------------------------------------*/
BaseType_t xPortStartScheduler( void )
{
extern void portSetupTick( void );
extern void portSetupTick( void );
/*
* Setup a timer for the tick ISR for the preemptive scheduler.
*/
portSetupTick();
/*
* Setup a timer for the tick ISR for the preemptive scheduler.
*/
portSetupTick();
/*
* Restore the context of the first task to run.
*/
portRESTORE_CONTEXT();
/*
* Restore the context of the first task to run.
*/
portRESTORE_CONTEXT();
/*
* This point should never be reached during execution.
*/
return pdTRUE;
/*
* This point should never be reached during execution.
*/
return pdTRUE;
}
/*-----------------------------------------------------------*/
void vPortEndScheduler( void )
{
/*
* It is unlikely that the scheduler for the PIC port will get stopped
* once running. When called a reset is done which is probably the
* most valid action.
*/
_Pragma( asmline reset );
/*
* It is unlikely that the scheduler for the PIC port will get stopped
* once running. When called a reset is done which is probably the
* most valid action.
*/
_Pragma(asmline reset);
}
/*-----------------------------------------------------------*/
@ -266,54 +264,54 @@ void vPortEndScheduler( void )
*/
void vPortYield( void )
{
/*
* Save the context of the current task.
*/
portSAVE_CONTEXT( portINTERRUPTS_UNCHANGED );
/*
* Save the context of the current task.
*/
portSAVE_CONTEXT( portINTERRUPTS_UNCHANGED );
/*
* Switch to the highest priority task that is ready to run.
*/
vTaskSwitchContext();
/*
* Switch to the highest priority task that is ready to run.
*/
vTaskSwitchContext();
/*
* Start executing the task we have just switched to.
*/
portRESTORE_CONTEXT();
/*
* Start executing the task we have just switched to.
*/
portRESTORE_CONTEXT();
}
/*-----------------------------------------------------------*/
#if ( configSUPPORT_DYNAMIC_ALLOCATION == 1 )
#if( configSUPPORT_DYNAMIC_ALLOCATION == 1 )
void * pvPortMalloc( uint16_t usWantedSize )
{
void * pvReturn;
void *pvPortMalloc( uint16_t usWantedSize )
{
void *pvReturn;
vTaskSuspendAll();
{
pvReturn = malloc( ( malloc_t ) usWantedSize );
}
xTaskResumeAll();
vTaskSuspendAll();
{
pvReturn = malloc( ( malloc_t ) usWantedSize );
}
xTaskResumeAll();
return pvReturn;
}
return pvReturn;
}
#endif /* configSUPPORT_STATIC_ALLOCATION */
/*-----------------------------------------------------------*/
#if ( configSUPPORT_DYNAMIC_ALLOCATION == 1 )
#if( configSUPPORT_DYNAMIC_ALLOCATION == 1 )
void vPortFree( void * pv )
{
if( pv )
{
vTaskSuspendAll();
{
free( pv );
}
xTaskResumeAll();
}
}
void vPortFree( void *pv )
{
if( pv )
{
vTaskSuspendAll();
{
free( pv );
}
xTaskResumeAll();
}
}
#endif /* configSUPPORT_DYNAMIC_ALLOCATION */
#endif /* configSUPPORT_DYNAMIC_ALLOCATION */