]> git.sur5r.net Git - freertos/blobdiff - FreeRTOS/Source/portable/GCC/TriCore_1782/portmacro.h
***IMMINENT RELEASE NOTICE***
[freertos] / FreeRTOS / Source / portable / GCC / TriCore_1782 / portmacro.h
index 67fec8ef68cfb781acee47f6e4fef6623ca07210..1d49cf72e6e21dcd6cd5ed2cc94e60779e1e03bf 100644 (file)
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. \r
+    FreeRTOS V8.1.0 - Copyright (C) 2014 Real Time Engineers Ltd.\r
     All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
     the terms of the GNU General Public License (version 2) as published by the\r
     Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.\r
 \r
-    >>! NOTE: The modification to the GPL is included to allow you to distribute\r
-    >>! a combined work that includes FreeRTOS without being obliged to provide\r
-    >>! the source code for proprietary components outside of the FreeRTOS\r
-    >>! kernel.\r
+    >>!   NOTE: The modification to the GPL is included to allow you to     !<<\r
+    >>!   distribute a combined work that includes FreeRTOS without being   !<<\r
+    >>!   obliged to provide the source code for proprietary components     !<<\r
+    >>!   outside of the FreeRTOS kernel.                                   !<<\r
 \r
     FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY\r
     WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\r
@@ -90,21 +90,25 @@ extern "C" {
 #define portDOUBLE             double\r
 #define portLONG               long\r
 #define portSHORT              short\r
-#define portSTACK_TYPE unsigned long\r
+#define portSTACK_TYPE uint32_t\r
 #define portBASE_TYPE  long\r
 \r
+typedef portSTACK_TYPE StackType_t;\r
+typedef long BaseType_t;\r
+typedef unsigned long UBaseType_t;\r
+\r
 #if( configUSE_16_BIT_TICKS == 1 )\r
-       typedef unsigned portSHORT portTickType;\r
-       #define portMAX_DELAY ( portTickType ) 0xffff\r
+       typedef uint16_t TickType_t;\r
+       #define portMAX_DELAY ( TickType_t ) 0xffff\r
 #else\r
-       typedef unsigned portLONG portTickType;\r
-       #define portMAX_DELAY ( portTickType ) 0xffffffff\r
+       typedef uint32_t TickType_t;\r
+       #define portMAX_DELAY ( TickType_t ) 0xffffffffUL\r
 #endif\r
 /*---------------------------------------------------------------------------*/\r
 \r
 /* Architecture specifics. */\r
 #define portSTACK_GROWTH                                                       ( -1 )\r
-#define portTICK_RATE_MS                                                       ( ( portTickType ) 1000 / configTICK_RATE_HZ )\r
+#define portTICK_PERIOD_MS                                                     ( ( TickType_t ) 1000 / configTICK_RATE_HZ )\r
 #define portBYTE_ALIGNMENT                                                     4\r
 #define portNOP()                                                                      __asm volatile( " nop " )\r
 #define portCRITICAL_NESTING_IN_TCB                                    1\r
@@ -113,7 +117,7 @@ extern "C" {
 \r
 /*---------------------------------------------------------------------------*/\r
 \r
-typedef struct MPU_SETTINGS { unsigned long ulNotUsed; } xMPU_SETTINGS;\r
+typedef struct MPU_SETTINGS { uint32_t ulNotUsed; } xMPU_SETTINGS;\r
 \r
 /* Define away the instruction from the Restore Context Macro. */\r
 #define portPRIVILEGE_BIT                                                      0x0UL\r
@@ -127,8 +131,8 @@ extern void vTaskExitCritical( void );
 /*---------------------------------------------------------------------------*/\r
 \r
 /* CSA Manipulation. */\r
-#define portCSA_TO_ADDRESS( pCSA )                     ( ( unsigned long * )( ( ( ( pCSA ) & 0x000F0000 ) << 12 ) | ( ( ( pCSA ) & 0x0000FFFF ) << 6 ) ) )\r
-#define portADDRESS_TO_CSA( pAddress )         ( ( unsigned long )( ( ( ( (unsigned long)( pAddress ) ) & 0xF0000000 ) >> 12 ) | ( ( ( unsigned long )( pAddress ) & 0x003FFFC0 ) >> 6 ) ) )\r
+#define portCSA_TO_ADDRESS( pCSA )                     ( ( uint32_t * )( ( ( ( pCSA ) & 0x000F0000 ) << 12 ) | ( ( ( pCSA ) & 0x0000FFFF ) << 6 ) ) )\r
+#define portADDRESS_TO_CSA( pAddress )         ( ( uint32_t )( ( ( ( (uint32_t)( pAddress ) ) & 0xF0000000 ) >> 12 ) | ( ( ( uint32_t )( pAddress ) & 0x003FFFC0 ) >> 6 ) ) )\r
 /*---------------------------------------------------------------------------*/\r
 \r
 #define portYIELD()                                                            _syscall( 0 )\r
@@ -141,7 +145,7 @@ extern void vTaskExitCritical( void );
 \r
 /* Set ICR.CCPN to configMAX_SYSCALL_INTERRUPT_PRIORITY. */\r
 #define portDISABLE_INTERRUPTS()       {                                                                                                                                                                                                       \\r
-                                                                               unsigned long ulICR;                                                                                                                                                    \\r
+                                                                               uint32_t ulICR;                                                                                                                                                 \\r
                                                                                _disable();                                                                                                                                                                             \\r
                                                                                ulICR = _mfcr( $ICR );          /* Get current ICR value. */                                                                            \\r
                                                                                ulICR &= ~portCCPN_MASK;        /* Clear down mask bits. */                                                                                     \\r
@@ -153,7 +157,7 @@ extern void vTaskExitCritical( void );
 \r
 /* Clear ICR.CCPN to allow all interrupt priorities. */\r
 #define portENABLE_INTERRUPTS()                {                                                                                                                                       \\r
-                                                                               unsigned long ulICR;                                                                                    \\r
+                                                                               uint32_t ulICR;                                                                                 \\r
                                                                                _disable();                                                                                                             \\r
                                                                                ulICR = _mfcr( $ICR );          /* Get current ICR value. */            \\r
                                                                                ulICR &= ~portCCPN_MASK;        /* Clear down mask bits. */                     \\r
@@ -164,7 +168,7 @@ extern void vTaskExitCritical( void );
 \r
 /* Set ICR.CCPN to uxSavedMaskValue. */\r
 #define portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedMaskValue )  {                                                                                                                                                                               \\r
-                                                                                                                                       unsigned long ulICR;                                                                                                                            \\r
+                                                                                                                                       uint32_t ulICR;                                                                                                                         \\r
                                                                                                                                        _disable();                                                                                                                                                     \\r
                                                                                                                                        ulICR = _mfcr( $ICR );          /* Get current ICR value. */                                                    \\r
                                                                                                                                        ulICR &= ~portCCPN_MASK;        /* Clear down mask bits. */                                                             \\r
@@ -176,7 +180,7 @@ extern void vTaskExitCritical( void );
 \r
 \r
 /* Set ICR.CCPN to configMAX_SYSCALL_INTERRUPT_PRIORITY */\r
-extern unsigned long uxPortSetInterruptMaskFromISR( void );\r
+extern uint32_t uxPortSetInterruptMaskFromISR( void );\r
 #define portSET_INTERRUPT_MASK_FROM_ISR()      uxPortSetInterruptMaskFromISR()\r
 \r
 /* Pend a priority 1 interrupt, which will take care of the context switch. */\r
@@ -193,8 +197,8 @@ extern unsigned long uxPortSetInterruptMaskFromISR( void );
  * Port specific clean up macro required to free the CSAs that were consumed by\r
  * a task that has since been deleted.\r
  */\r
-void vPortReclaimCSA( unsigned long *pxTCB );\r
-#define portCLEAN_UP_TCB( pxTCB )              vPortReclaimCSA( ( unsigned long * ) ( pxTCB ) )\r
+void vPortReclaimCSA( uint32_t *pxTCB );\r
+#define portCLEAN_UP_TCB( pxTCB )              vPortReclaimCSA( ( uint32_t * ) ( pxTCB ) )\r
 \r
 #ifdef __cplusplus\r
 }\r