]> git.sur5r.net Git - freertos/blobdiff - FreeRTOS/Source/portable/GCC/AVR32_UC3/portmacro.h
Roll up the minor changes checked into svn since V10.0.0 into new V10.0.1 ready for...
[freertos] / FreeRTOS / Source / portable / GCC / AVR32_UC3 / portmacro.h
index dfb54a68e13fb3199508ecc4a6d1b1f4a3dba26f..325ebacae9da5a2afc32c9f88ffb9f706bf4c833 100644 (file)
  *****************************************************************************/\r
 \r
 /*\r
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. \r
-    All rights reserved\r
-\r
-    VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
-\r
-    ***************************************************************************\r
-     *                                                                       *\r
-     *    FreeRTOS provides completely free yet professionally developed,    *\r
-     *    robust, strictly quality controlled, supported, and cross          *\r
-     *    platform software that has become a de facto standard.             *\r
-     *                                                                       *\r
-     *    Help yourself get started quickly and support the FreeRTOS         *\r
-     *    project by purchasing a FreeRTOS tutorial book, reference          *\r
-     *    manual, or both from: http://www.FreeRTOS.org/Documentation        *\r
-     *                                                                       *\r
-     *    Thank you!                                                         *\r
-     *                                                                       *\r
-    ***************************************************************************\r
-\r
-    This file is part of the FreeRTOS distribution.\r
-\r
-    FreeRTOS is free software; you can redistribute it and/or modify it under\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
-\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
-    FOR A PARTICULAR PURPOSE.  Full license text is available from the following\r
-    link: http://www.freertos.org/a00114.html\r
-\r
-    1 tab == 4 spaces!\r
-\r
-    ***************************************************************************\r
-     *                                                                       *\r
-     *    Having a problem?  Start by reading the FAQ "My application does   *\r
-     *    not run, what could be wrong?"                                     *\r
-     *                                                                       *\r
-     *    http://www.FreeRTOS.org/FAQHelp.html                               *\r
-     *                                                                       *\r
-    ***************************************************************************\r
-\r
-    http://www.FreeRTOS.org - Documentation, books, training, latest versions,\r
-    license and Real Time Engineers Ltd. contact details.\r
-\r
-    http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r
-    including FreeRTOS+Trace - an indispensable productivity tool, a DOS\r
-    compatible FAT file system, and our tiny thread aware UDP/IP stack.\r
-\r
-    http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High\r
-    Integrity Systems to sell under the OpenRTOS brand.  Low cost OpenRTOS\r
-    licenses offer ticketed support, indemnification and middleware.\r
-\r
-    http://www.SafeRTOS.com - High Integrity Systems also provide a safety\r
-    engineered and independently SIL3 certified version for use in safety and\r
-    mission critical applications that require provable dependability.\r
-\r
-    1 tab == 4 spaces!\r
-*/\r
+ * FreeRTOS Kernel V10.0.1\r
+ * Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.\r
+ *\r
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of\r
+ * this software and associated documentation files (the "Software"), to deal in\r
+ * the Software without restriction, including without limitation the rights to\r
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of\r
+ * the Software, and to permit persons to whom the Software is furnished to do so,\r
+ * subject to the following conditions:\r
+ *\r
+ * The above copyright notice and this permission notice shall be included in all\r
+ * copies or substantial portions of the Software.\r
+ *\r
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS\r
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR\r
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER\r
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
+ *\r
+ * http://www.FreeRTOS.org\r
+ * http://aws.amazon.com/freertos\r
+ *\r
+ * 1 tab == 4 spaces!\r
+ */\r
 \r
 \r
 #ifndef PORTMACRO_H\r
@@ -105,27 +67,31 @@ extern "C" {
 #define portDOUBLE      double\r
 #define portLONG        long\r
 #define portSHORT       short\r
-#define portSTACK_TYPE  unsigned portLONG\r
-#define portBASE_TYPE   portLONG\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
-#define TASK_DELAY_MS(x)   ( (x)        /portTICK_RATE_MS )\r
-#define TASK_DELAY_S(x)    ( (x)*1000   /portTICK_RATE_MS )\r
-#define TASK_DELAY_MIN(x)  ( (x)*60*1000/portTICK_RATE_MS )\r
+#define TASK_DELAY_MS(x)   ( (x)        /portTICK_PERIOD_MS )\r
+#define TASK_DELAY_S(x)    ( (x)*1000   /portTICK_PERIOD_MS )\r
+#define TASK_DELAY_MIN(x)  ( (x)*60*1000/portTICK_PERIOD_MS )\r
 \r
 #define configTICK_TC_IRQ             ATPASTE2(AVR32_TC_IRQ, configTICK_TC_CHANNEL)\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
 /*-----------------------------------------------------------*/\r
@@ -193,7 +159,7 @@ extern void *pvPortRealloc( void *pv, size_t xSize );
  */\r
 #define portRESTORE_CONTEXT()                                                                                                                  \\r
 {                                                                                                                                                                              \\r
-  extern volatile unsigned portLONG ulCriticalNesting;                                                                 \\r
+  extern volatile uint32_t ulCriticalNesting;                                                                  \\r
   extern volatile void *volatile pxCurrentTCB;                                                                                 \\r
                                                                                                                                                                                \\r
   __asm__ __volatile__ (                                                                                                                               \\r
@@ -299,7 +265,7 @@ extern void *pvPortRealloc( void *pv, size_t xSize );
  */\r
 #define portSAVE_CONTEXT_OS_INT()                                                                                                                                      \\r
 {                                                                                                                                                                                                      \\r
-  extern volatile unsigned portLONG ulCriticalNesting;                                                                                         \\r
+  extern volatile uint32_t ulCriticalNesting;                                                                                          \\r
   extern volatile void *volatile pxCurrentTCB;                                                                                                         \\r
                                                                                                                                                                                                        \\r
   /* When we come here */                                                                                                                                                      \\r
@@ -351,7 +317,7 @@ extern void *pvPortRealloc( void *pv, size_t xSize );
  */\r
 #define portRESTORE_CONTEXT_OS_INT()                                                                                                                           \\r
 {                                                                                                                                                                                                      \\r
-  extern volatile unsigned portLONG ulCriticalNesting;                                                                                         \\r
+  extern volatile uint32_t ulCriticalNesting;                                                                                          \\r
   extern volatile void *volatile pxCurrentTCB;                                                                                                         \\r
                                                                                                                                                                                                        \\r
   /* Check if INT0 or higher were being handled (case where the OS tick interrupted another */         \\r
@@ -417,7 +383,7 @@ extern void *pvPortRealloc( void *pv, size_t xSize );
  */\r
 #define portSAVE_CONTEXT_SCALL()                                                                                                                       \\r
 {                                                                                                                                                                                      \\r
-  extern volatile unsigned portLONG ulCriticalNesting;                                                                         \\r
+  extern volatile uint32_t ulCriticalNesting;                                                                          \\r
   extern volatile void *volatile pxCurrentTCB;                                                                                         \\r
                                                                                                                                                                                        \\r
   /* Warning: the stack layout after SCALL doesn't match the one after an interrupt. */                \\r
@@ -484,7 +450,7 @@ extern void *pvPortRealloc( void *pv, size_t xSize );
  */\r
 #define portRESTORE_CONTEXT_SCALL()                                                                                                                    \\r
 {                                                                                                                                                                                      \\r
-  extern volatile unsigned portLONG ulCriticalNesting;                                                                         \\r
+  extern volatile uint32_t ulCriticalNesting;                                                                          \\r
   extern volatile void *volatile pxCurrentTCB;                                                                                         \\r
                                                                                                                                                                                        \\r
   /* Restore all registers */                                                                                                                          \\r
@@ -576,7 +542,7 @@ extern void *pvPortRealloc( void *pv, size_t xSize );
  */\r
 #define portENTER_SWITCHING_ISR()                                                                                                                      \\r
 {                                                                                                                                                                                      \\r
-  extern volatile unsigned portLONG ulCriticalNesting;                                                                         \\r
+  extern volatile uint32_t ulCriticalNesting;                                                                          \\r
   extern volatile void *volatile pxCurrentTCB;                                                                                         \\r
                                                                                                                                                                                        \\r
   /* When we come here */                                                                                                                                      \\r
@@ -624,7 +590,7 @@ extern void *pvPortRealloc( void *pv, size_t xSize );
  */\r
 #define portEXIT_SWITCHING_ISR()                                                                                                                       \\r
 {                                                                                                                                                                                      \\r
-  extern volatile unsigned portLONG ulCriticalNesting;                                                                         \\r
+  extern volatile uint32_t ulCriticalNesting;                                                                          \\r
   extern volatile void *volatile pxCurrentTCB;                                                                                         \\r
                                                                                                                                                                                        \\r
   __asm__ __volatile__ (                                                                                                                                       \\r