Update version number ready for release.

[freertos] / FreeRTOS / Source / portable / MPLAB / PIC32MZ / portmacro.h

diff --git a/FreeRTOS/Source/portable/MPLAB/PIC32MZ/portmacro.h b/FreeRTOS/Source/portable/MPLAB/PIC32MZ/portmacro.h
index cd4ca19279bf17419246ef76dee4aa002cb0c65a..6209de68454dac91603f6986448341ae5d2708a7 100644 (file)
--- a/FreeRTOS/Source/portable/MPLAB/PIC32MZ/portmacro.h
+++ b/FreeRTOS/Source/portable/MPLAB/PIC32MZ/portmacro.h
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.\r
+    FreeRTOS V8.0.1 - 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
@@ -24,10 +24,10 @@
     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
@@ -89,27 +89,31 @@ 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 long portTickType;\r
-       #define portMAX_DELAY ( portTickType ) 0xffffffffUL\r
+       typedef uint32_t TickType_t;\r
+       #define portMAX_DELAY ( TickType_t ) 0xffffffffUL\r
 #endif\r
 /*-----------------------------------------------------------*/\r
 \r
 /* Hardware specifics. */\r
 #define portBYTE_ALIGNMENT                     8\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
 /*-----------------------------------------------------------*/\r
 \r
 /* Critical section management. */\r
 #define portIPL_SHIFT                          ( 10UL )\r
-/* Don't straddle the CEE bit.  Interrupts calling FreeRTOS functions should \r
+/* Don't straddle the CEE bit.  Interrupts calling FreeRTOS functions should\r
 never have higher IPL bits set anyway. */\r
 #define portALL_IPL_BITS                       ( 0x7FUL << portIPL_SHIFT )\r
 #define portSW0_BIT                                    ( 0x01 << 8 )\r
@@ -125,7 +129,7 @@ ensure API function and interrupt entry is as fast and as simple as possible. */
 #ifdef configASSERT\r
        #define portDISABLE_INTERRUPTS()                                                                                        \\r
        {                                                                                                                                                       \\r
-       unsigned long ulStatus;                                                                                                         \\r
+       uint32_t ulStatus;                                                                                                              \\r
                                                                                                                                                                \\r
                /* Mask interrupts at and below the kernel interrupt priority. */               \\r
                ulStatus = _CP0_GET_STATUS();                                                                                   \\r
@@ -140,7 +144,7 @@ ensure API function and interrupt entry is as fast and as simple as possible. */
 #else /* configASSERT */\r
        #define portDISABLE_INTERRUPTS()                                                                                \\r
        {                                                                                                                                               \\r
-       unsigned long ulStatus;                                                                                                 \\r
+       uint32_t ulStatus;                                                                                                      \\r
                                                                                                                                                        \\r
                /* Mask interrupts at and below the kernel interrupt priority. */       \\r
                ulStatus = _CP0_GET_STATUS();                                                                           \\r
@@ -151,7 +155,7 @@ ensure API function and interrupt entry is as fast and as simple as possible. */
 \r
 #define portENABLE_INTERRUPTS()                                                                                        \\r
 {                                                                                                                                              \\r
-unsigned long ulStatus;                                                                                                        \\r
+uint32_t ulStatus;                                                                                                     \\r
                                                                                                                                                \\r
        /* Unmask all interrupts. */                                                                            \\r
        ulStatus = _CP0_GET_STATUS();                                                                           \\r
@@ -166,8 +170,8 @@ extern void vTaskExitCritical( void );
 #define portENTER_CRITICAL()           vTaskEnterCritical()\r
 #define portEXIT_CRITICAL()                    vTaskExitCritical()\r
 \r
-extern unsigned portBASE_TYPE uxPortSetInterruptMaskFromISR();\r
-extern void vPortClearInterruptMaskFromISR( unsigned portBASE_TYPE );\r
+extern UBaseType_t uxPortSetInterruptMaskFromISR();\r
+extern void vPortClearInterruptMaskFromISR( UBaseType_t );\r
 #define portSET_INTERRUPT_MASK_FROM_ISR() uxPortSetInterruptMaskFromISR()\r
 #define portCLEAR_INTERRUPT_MASK_FROM_ISR( uxSavedStatusRegister ) vPortClearInterruptMaskFromISR( uxSavedStatusRegister )\r
 \r
@@ -194,7 +198,7 @@ extern void vPortClearInterruptMaskFromISR( unsigned portBASE_TYPE );
 \r
 #define portYIELD()                                                            \\r
 {                                                                                              \\r
-unsigned long ulCause;                                                 \\r
+uint32_t ulCause;                                                      \\r
                                                                                                \\r
        /* Trigger software interrupt. */                       \\r
        ulCause = _CP0_GET_CAUSE();                                     \\r