/*\r
- FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. \r
+ FreeRTOS V8.1.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
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
\r
/*\r
Changes from V3.2.3\r
- \r
+\r
+ Modified portENTER_SWITCHING_ISR() to allow use with GCC V4.0.1.\r
\r
Changes from V3.2.4\r
\r
- + Removed the use of the %0 parameter within the assembler macros and \r
+ + Removed the use of the %0 parameter within the assembler macros and\r
replaced them with hard coded registers. This will ensure the\r
assembler does not select the link register as the temp register as\r
was occasionally happening previously.\r
Changes from V4.5.0\r
\r
+ Removed the portENTER_SWITCHING_ISR() and portEXIT_SWITCHING_ISR() macros\r
- and replaced them with portYIELD_FROM_ISR() macro. Application code \r
+ and replaced them with portYIELD_FROM_ISR() macro. Application code\r
should now make use of the portSAVE_CONTEXT() and portRESTORE_CONTEXT()\r
macros as per the V4.5.1 demo code.\r
*/\r
#endif\r
\r
/*-----------------------------------------------------------\r
- * Port specific definitions. \r
+ * Port specific definitions.\r
*\r
* The settings in this file configure FreeRTOS correctly for the\r
* given hardware and compiler.\r
#define portDOUBLE double\r
#define portLONG long\r
#define portSHORT short\r
-#define portSTACK_TYPE unsigned portLONG\r
+#define portSTACK_TYPE uint32_t\r
#define portBASE_TYPE portLONG\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
\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 8\r
-#define portNOP() asm volatile ( "NOP" );\r
-/*-----------------------------------------------------------*/ \r
+#define portNOP() __asm volatile ( "NOP" );\r
+/*-----------------------------------------------------------*/\r
\r
\r
/* Scheduler utilities. */\r
#define portRESTORE_CONTEXT() \\r
{ \\r
extern volatile void * volatile pxCurrentTCB; \\r
-extern volatile unsigned portLONG ulCriticalNesting; \\r
+extern volatile uint32_t ulCriticalNesting; \\r
\\r
/* Set the LR to the task stack. */ \\r
- asm volatile ( \\r
+ __asm volatile ( \\r
"LDR R0, =pxCurrentTCB \n\t" \\r
"LDR R0, [R0] \n\t" \\r
"LDR LR, [R0] \n\t" \\r
#define portSAVE_CONTEXT() \\r
{ \\r
extern volatile void * volatile pxCurrentTCB; \\r
-extern volatile unsigned portLONG ulCriticalNesting; \\r
+extern volatile uint32_t ulCriticalNesting; \\r
\\r
/* Push R0 as we are going to use the register. */ \\r
- asm volatile ( \\r
+ __asm volatile ( \\r
"STMDB SP!, {R0} \n\t" \\r
\\r
/* Set R0 to point to the task stack pointer. */ \\r
\r
\r
#define portYIELD_FROM_ISR() vTaskSwitchContext()\r
-#define portYIELD() asm volatile ( "SWI 0" )\r
+#define portYIELD() __asm volatile ( "SWI 0" )\r
/*-----------------------------------------------------------*/\r
\r
\r
\r
/*\r
* The interrupt management utilities can only be called from ARM mode. When\r
- * THUMB_INTERWORK is defined the utilities are defined as functions in \r
- * portISR.c to ensure a switch to ARM mode. When THUMB_INTERWORK is not \r
+ * THUMB_INTERWORK is defined the utilities are defined as functions in\r
+ * portISR.c to ensure a switch to ARM mode. When THUMB_INTERWORK is not\r
* defined then the utilities are defined as macros here - as per other ports.\r
*/\r
\r
\r
#define portDISABLE_INTERRUPTS() vPortDisableInterruptsFromThumb()\r
#define portENABLE_INTERRUPTS() vPortEnableInterruptsFromThumb()\r
- \r
+\r
#else\r
\r
#define portDISABLE_INTERRUPTS() \\r
- asm volatile ( \\r
+ __asm volatile ( \\r
"STMDB SP!, {R0} \n\t" /* Push R0. */ \\r
"MRS R0, CPSR \n\t" /* Get CPSR. */ \\r
"ORR R0, R0, #0xC0 \n\t" /* Disable IRQ, FIQ. */ \\r
"MSR CPSR, R0 \n\t" /* Write back modified value. */ \\r
"LDMIA SP!, {R0} " ) /* Pop R0. */\r
- \r
+\r
#define portENABLE_INTERRUPTS() \\r
- asm volatile ( \\r
+ __asm volatile ( \\r
"STMDB SP!, {R0} \n\t" /* Push R0. */ \\r
"MRS R0, CPSR \n\t" /* Get CPSR. */ \\r
"BIC R0, R0, #0xC0 \n\t" /* Enable IRQ, FIQ. */ \\r
projects / freertos / blobdiff