len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-04-20 21:41:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Modify the GCC/AVR port to make use of the xTaskIncrementTick return value.

Browse source 
Add pre-processor directives in the dsPIC and PIC24 port layers that allows both port files to be included in the same project.
This commit is contained in:
Richard Barry 2013-06-11 20:15:15 +00:00
parent 3aad6381e1
commit 2fd431e971
5 changed files with 33 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
FreeRTOS/Source/portable/IAR/ATMega323/portmacro.h
View file

@ -104,6 +104,7 @@ extern "C" {
#define portSHORT int #define portSHORT int
#define portSTACK_TYPE unsigned portCHAR #define portSTACK_TYPE unsigned portCHAR
#define portBASE_TYPE portCHAR #define portBASE_TYPE portCHAR
#define portPOINTER_SIZE_TYPE unsigned short
#if( configUSE_16_BIT_TICKS == 1 ) #if( configUSE_16_BIT_TICKS == 1 )
typedef unsigned portSHORT portTickType; typedef unsigned portSHORT portTickType;

3
FreeRTOS/Source/portable/IAR/ATMega323/portmacro.s90
View file

@ -244,7 +244,10 @@ vPortYield:
vPortYieldFromTick: vPortYieldFromTick:
portSAVE_CONTEXT ; Save the context of the current task. portSAVE_CONTEXT ; Save the context of the current task.
call xTaskIncrementTick ; Call the timer tick function. call xTaskIncrementTick ; Call the timer tick function.
tst r16
breq SkipTaskSwitch
call vTaskSwitchContext ; Call the scheduler. call vTaskSwitchContext ; Call the scheduler.
SkipTaskSwitch:
portRESTORE_CONTEXT ; Restore the context of whichever task the ... portRESTORE_CONTEXT ; Restore the context of whichever task the ...
ret ; ... scheduler decided should run. ret ; ... scheduler decided should run.

2
FreeRTOS/Source/portable/MPLAB/PIC24_dsPIC/port.c
View file

@ -157,7 +157,7 @@ unsigned portBASE_TYPE uxCriticalNesting = 0xef;
#endif /* __HAS_EDS__ */ #endif /* __HAS_EDS__ */
#endif /* MPLAB_PIC24_PORT */ #endif /* MPLAB_PIC24_PORT */
#if defined( __dsPIC30F__ ) || defined ( __dsPIC33E__ ) || defined( __dsPIC33F__ ) #if defined( __dsPIC30F__ ) || defined( __dsPIC33F__ )
#define portRESTORE_CONTEXT() \ #define portRESTORE_CONTEXT() \
asm volatile( "MOV _pxCurrentTCB, W0 \n" /* Restore the stack pointer for the task. */ \ asm volatile( "MOV _pxCurrentTCB, W0 \n" /* Restore the stack pointer for the task. */ \

4
FreeRTOS/Source/portable/MPLAB/PIC24_dsPIC/portasm_PIC24.S
View file

@ -72,6 +72,8 @@
mission critical applications that require provable dependability. mission critical applications that require provable dependability.
*/ */
#if defined( __PIC24E__ ) || defined ( __PIC24F__ ) || defined( __PIC24FK__ ) || defined( __PIC24H__ )
.global _vPortYield .global _vPortYield
.extern _vTaskSwitchContext .extern _vTaskSwitchContext
.extern uxCriticalNesting .extern uxCriticalNesting
@ -133,3 +135,5 @@ _vPortYield:
return return
.end .end
#endif /* defined( __PIC24E__ ) || defined ( __PIC24F__ ) || defined( __PIC24FK__ ) || defined( __PIC24H__ ) */

5
FreeRTOS/Source/portable/MPLAB/PIC24_dsPIC/portasm_dsPIC.S
View file

@ -72,6 +72,8 @@
mission critical applications that require provable dependability. mission critical applications that require provable dependability.
*/ */
#if defined( __dsPIC30F__ ) || defined( __dsPIC33F__ )
.global _vPortYield .global _vPortYield
.extern _vTaskSwitchContext .extern _vTaskSwitchContext
.extern uxCriticalNesting .extern uxCriticalNesting
@ -146,3 +148,6 @@ _vPortYield:
return return
.end .end
#endif /* defined( __dsPIC30F__ ) || defined( __dsPIC33F__ ) */