Merge bug fixes from Cadence

[freertos] / FreeRTOS / Source / portable / ThirdParty / XCC / Xtensa / port.c

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