len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-08-01 08:54:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge bug fixes from Cadence

Browse source
This commit is contained in:
Gaurav Aggarwal 2018-08-07 07:21:07 +00:00
parent f6cbf20019
commit 56dc0dd9b4
4 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
FreeRTOS/Source/portable/ThirdParty/XCC/Xtensa/port.c vendored
View file

@ -105,6 +105,8 @@ extern void _frxt_tick_timer_init(void);
/* Defined in xtensa_context.S */
extern void _xt_coproc_init(void);
/*-----------------------------------------------------------*/
/* We require the address of the pxCurrentTCB variable, but don't want to know
@ -120,7 +122,7 @@ unsigned port_interruptNesting = 0; // Interrupt nesting level
// User exception dispatcher when exiting
void _xt_user_exit(void);
/*
/*
* Stack initialization
*/
#if portUSING_MPU_WRAPPERS
@ -223,7 +225,7 @@ BaseType_t xPortStartScheduler( void )
BaseType_t xPortSysTickHandler( void )
{
BaseType_t ret;
unsigned interruptMask;
uint32_t interruptMask;
portbenchmarkIntLatency();
@ -258,4 +260,4 @@ void vPortStoreTaskMPUSettings( xMPU_SETTINGS *xMPUSettings, const struct xMEMOR
#endif
}
#endif
/*-----------------------------------------------------------*/

9
FreeRTOS/Source/portable/ThirdParty/XCC/Xtensa/portmacro.h vendored
View file

@ -99,7 +99,7 @@ extern "C" {
#define portDOUBLE double
#define portLONG int32_t
#define portSHORT int16_t
#define portSTACK_TYPE uint8_t
#define portSTACK_TYPE uint32_t
#define portBASE_TYPE int
typedef portSTACK_TYPE StackType_t;
@ -138,6 +138,7 @@ static inline unsigned portENTER_CRITICAL_NESTED() { unsigned state = XTOS_SET_I
// These FreeRTOS versions are similar to the nested versions above
#define portSET_INTERRUPT_MASK_FROM_ISR() portENTER_CRITICAL_NESTED()
#define portCLEAR_INTERRUPT_MASK_FROM_ISR(state) portEXIT_CRITICAL_NESTED(state)
/*-----------------------------------------------------------*/
/* Architecture specifics. */
@ -154,7 +155,11 @@ static inline unsigned portENTER_CRITICAL_NESTED() { unsigned state = XTOS_SET_I
void vPortYield( void );
void _frxt_setup_switch( void );
#define portYIELD() vPortYield()
#define portYIELD_FROM_ISR( x ) if( ( x ) != 0 ) { _frxt_setup_switch(); }
#define portYIELD_FROM_ISR( xHigherPriorityTaskWoken ) \
if ( ( xHigherPriorityTaskWoken ) != 0 ) { \
_frxt_setup_switch(); \
}
/*-----------------------------------------------------------*/
/* Task function macros as described on the FreeRTOS.org WEB site. */

4
FreeRTOS/Source/portable/ThirdParty/XCC/Xtensa/xtensa_rtos.h vendored
View file

@ -226,8 +226,8 @@ Xtensa Port Version.
*******************************************************************************/
#define XTENSA_PORT_VERSION 1.6
#define XTENSA_PORT_VERSION_STRING "1.6"
#define XTENSA_PORT_VERSION 1.7
#define XTENSA_PORT_VERSION_STRING "1.7"
#endif /* XTENSA_RTOS_H */