mirror of
https://github.com/FreeRTOS/FreeRTOS-Kernel.git
synced 2025-09-01 20:03:50 -04:00
Revert Portable/WizC Formatting (#888)
* Revert formatting on WizC ports * Fix spelling mistakes --------- Co-authored-by: Rahul Kar <118818625+kar-rahul-aws@users.noreply.github.com> Co-authored-by: Gaurav-Aggarwal-AWS <33462878+aggarg@users.noreply.github.com>
This commit is contained in:
Soren Ptak
GitHub
parent
b3febb7416
commit
cb196ddbb1
5 changed files with 396 additions and 401 deletions
|
|
@ -27,19 +27,19 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* Changes from V3.2.1
|
||||
+ CallReturn Depth increased from 8 to 10 levels to accommodate 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 accommodate 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>
|
||||
|
|
@ -78,17 +78,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;
|
||||
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
|
|
@ -106,20 +106,16 @@ 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
|
||||
movlw OVERHEADPAGE0-LOCOPTSIZE+MAXLOCOPTSIZE
|
||||
movwf PRODL,ACCESS ; PRODL is used as temp register
|
||||
_Pragma("asmend")
|
||||
ucScratch = PRODL;
|
||||
|
||||
|
|
@ -127,9 +123,9 @@ StackType_t * pxPortInitialiseStack( StackType_t * pxTopOfStack,
|
|||
* 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; */
|
||||
// *pxTopOfStack-- = 0x11;
|
||||
// *pxTopOfStack-- = 0x22;
|
||||
// *pxTopOfStack-- = 0x33;
|
||||
|
||||
/*
|
||||
* Simulate how the stack would look after a call to vPortYield()
|
||||
|
|
@ -140,36 +136,36 @@ StackType_t * pxPortInitialiseStack( StackType_t * pxTopOfStack,
|
|||
* 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 );
|
||||
*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. */
|
||||
*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 )
|
||||
while(ucScratch-- > 0)
|
||||
{
|
||||
*pxTopOfStack-- = ( StackType_t ) 0;
|
||||
}
|
||||
|
|
@ -180,11 +176,11 @@ StackType_t * pxPortInitialiseStack( StackType_t * pxTopOfStack,
|
|||
* 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
|
||||
#if _ROMSIZE > 0x8000
|
||||
*pxTopOfStack-- = ( StackType_t ) 0;
|
||||
#endif
|
||||
*pxTopOfStack-- = ( StackType_t ) ( ( ( uint16_t ) pxCode >> 8 ) & 0x00ff );
|
||||
*pxTopOfStack-- = ( StackType_t ) ( ( uint16_t ) pxCode & 0x00ff );
|
||||
*pxTopOfStack-- = ( StackType_t ) ( ( uint16_t ) pxCode & 0x00ff );
|
||||
|
||||
/*
|
||||
* Store the number of return addresses on the hardware stack.
|
||||
|
|
@ -211,19 +207,19 @@ 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
|
||||
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 );
|
||||
usCalcMinStackSize += ( portSTACK_FSR_BYTES )
|
||||
+ ( portSTACK_MINIMAL_CALLRETURN_DEPTH * portSTACK_CALLRETURN_ENTRY_SIZE )
|
||||
+ ( portSTACK_OTHER_BYTES );
|
||||
|
||||
return( usCalcMinStackSize );
|
||||
return(usCalcMinStackSize);
|
||||
}
|
||||
|
||||
/*-----------------------------------------------------------*/
|
||||
|
|
@ -286,11 +282,11 @@ void vPortYield( void )
|
|||
}
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configSUPPORT_DYNAMIC_ALLOCATION == 1 )
|
||||
#if( configSUPPORT_DYNAMIC_ALLOCATION == 1 )
|
||||
|
||||
void * pvPortMalloc( uint16_t usWantedSize )
|
||||
void *pvPortMalloc( uint16_t usWantedSize )
|
||||
{
|
||||
void * pvReturn;
|
||||
void *pvReturn;
|
||||
|
||||
vTaskSuspendAll();
|
||||
{
|
||||
|
|
@ -305,9 +301,9 @@ void vPortYield( void )
|
|||
|
||||
/*-----------------------------------------------------------*/
|
||||
|
||||
#if ( configSUPPORT_DYNAMIC_ALLOCATION == 1 )
|
||||
#if( configSUPPORT_DYNAMIC_ALLOCATION == 1 )
|
||||
|
||||
void vPortFree( void * pv )
|
||||
void vPortFree( void *pv )
|
||||
{
|
||||
if( pv )
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue