/*\r
- FreeRTOS V7.5.1 - Copyright (C) 2013 Real Time Engineers Ltd.\r
+ FreeRTOS V8.1.2 - 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
\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
\r
-/* Tasks should start with interrupts enabled and in Supervisor mode, therefore \r
+/* Tasks should start with interrupts enabled and in Supervisor mode, therefore\r
PSW is set with U and I set, and PM and IPL clear. */\r
-#define portINITIAL_PSW ( ( portSTACK_TYPE ) 0x00030000 )\r
+#define portINITIAL_PSW ( ( StackType_t ) 0x00030000 )\r
\r
/*-----------------------------------------------------------*/\r
\r
/* The following lines are to ensure vSoftwareInterruptEntry can be referenced,\r
and therefore installed in the vector table, when the FreeRTOS code is built\r
as a library. */\r
-extern portBASE_TYPE vSoftwareInterruptEntry;\r
-const portBASE_TYPE * p_vSoftwareInterruptEntry = &vSoftwareInterruptEntry;\r
+extern BaseType_t vSoftwareInterruptEntry;\r
+const BaseType_t * p_vSoftwareInterruptEntry = &vSoftwareInterruptEntry;\r
\r
/*-----------------------------------------------------------*/\r
\r
/*\r
* Function to start the first task executing - written in asm code as direct\r
- * access to registers is required. \r
+ * access to registers is required.\r
*/\r
static void prvStartFirstTask( void );\r
\r
\r
/*\r
* The entry point for the software interrupt handler. This is the function\r
- * that calls the inline asm function prvYieldHandler(). It is installed in \r
+ * that calls the inline asm function prvYieldHandler(). It is installed in\r
* the vector table, but the code that installs it is in prvYieldHandler rather\r
* than using a #pragma.\r
*/\r
\r
/*-----------------------------------------------------------*/\r
\r
-/* \r
- * See header file for description. \r
+/*\r
+ * See header file for description.\r
*/\r
-portSTACK_TYPE *pxPortInitialiseStack( portSTACK_TYPE *pxTopOfStack, pdTASK_CODE pxCode, void *pvParameters )\r
+StackType_t *pxPortInitialiseStack( StackType_t *pxTopOfStack, TaskFunction_t pxCode, void *pvParameters )\r
{\r
/* Offset to end up on 8 byte boundary. */\r
pxTopOfStack--;\r
pxTopOfStack--;\r
*pxTopOfStack = portINITIAL_PSW;\r
pxTopOfStack--;\r
- *pxTopOfStack = ( portSTACK_TYPE ) pxCode;\r
+ *pxTopOfStack = ( StackType_t ) pxCode;\r
\r
/* When debugging it can be useful if every register is set to a known\r
value. Otherwise code space can be saved by just setting the registers\r
pxTopOfStack -= 15;\r
}\r
#endif\r
- \r
- *pxTopOfStack = ( portSTACK_TYPE ) pvParameters; /* R1 */\r
- pxTopOfStack--; \r
+\r
+ *pxTopOfStack = ( StackType_t ) pvParameters; /* R1 */\r
+ pxTopOfStack--;\r
*pxTopOfStack = 0x12345678; /* Accumulator. */\r
pxTopOfStack--;\r
*pxTopOfStack = 0x87654321; /* Accumulator. */\r
}\r
/*-----------------------------------------------------------*/\r
\r
-portBASE_TYPE xPortStartScheduler( void )\r
+BaseType_t xPortStartScheduler( void )\r
{\r
extern void vApplicationSetupTimerInterrupt( void );\r
\r
if( pxCurrentTCB != NULL )\r
{\r
/* Call an application function to set up the timer that will generate the\r
- tick interrupt. This way the application can decide which peripheral to \r
+ tick interrupt. This way the application can decide which peripheral to\r
use. A demo application is provided to show a suitable example. */\r
vApplicationSetupTimerInterrupt();\r
\r
- /* Enable the software interrupt. */ \r
+ /* Enable the software interrupt. */\r
_IEN( _ICU_SWINT ) = 1;\r
- \r
+\r
/* Ensure the software interrupt is clear. */\r
_IR( _ICU_SWINT ) = 0;\r
- \r
+\r
/* Ensure the software interrupt is set to the kernel priority. */\r
_IPR( _ICU_SWINT ) = configKERNEL_INTERRUPT_PRIORITY;\r
- \r
+\r
/* Start the first task. */\r
prvStartFirstTask();\r
}\r
Just ensure the current stack is the user stack. */\r
SETPSW U\r
\r
- /* Obtain the location of the stack associated with which ever task \r
+ /* Obtain the location of the stack associated with which ever task\r
pxCurrentTCB is currently pointing to. */\r
MOV.L #_pxCurrentTCB, R15\r
MOV.L [R15], R15\r
MOV.L [R15], R0\r
\r
- /* Restore the registers from the stack of the task pointed to by \r
+ /* Restore the registers from the stack of the task pointed to by\r
pxCurrentTCB. */\r
POP R15\r
MVTACLO R15 /* Accumulator low 32 bits. */\r
SETPSW I\r
\r
/* Move the data that was automatically pushed onto the interrupt stack when\r
- the interrupt occurred from the interrupt stack to the user stack. \r
- \r
+ the interrupt occurred from the interrupt stack to the user stack.\r
+\r
R15 is saved before it is clobbered. */\r
PUSH.L R15\r
- \r
+\r
/* Read the user stack pointer. */\r
MVFC USP, R15\r
- \r
+\r
/* Move the address down to the data being moved. */\r
SUB #12, R15\r
MVTC R15, USP\r
- \r
+\r
/* Copy the data across. */\r
MOV.L [ R0 ], [ R15 ] ; R15\r
MOV.L 4[ R0 ], 4[ R15 ] ; PC\r
\r
/* Move the interrupt stack pointer to its new correct position. */\r
ADD #12, R0\r
- \r
+\r
/* All the rest of the registers are saved directly to the user stack. */\r
SETPSW U\r
\r
/* Save the rest of the general registers (R15 has been saved already). */\r
PUSHM R1-R14\r
- \r
+\r
/* Save the accumulator. */\r
MVFACHI R15\r
PUSH.L R15\r
MOV.L #_pxCurrentTCB, R15\r
MOV.L [ R15 ], R15\r
MOV.L R0, [ R15 ]\r
- \r
+\r
/* Ensure the interrupt mask is set to the syscall priority while the kernel\r
structures are being accessed. */\r
MVTIPL #configMAX_SYSCALL_INTERRUPT_PRIORITY\r
\r
void vPortEndScheduler( void )\r
{\r
- /* Not implemented as there is nothing to return to. */\r
- \r
+ /* Not implemented in ports where there is nothing to return to.\r
+ Artificially force an assert. */\r
+ configASSERT( pxCurrentTCB == NULL );\r
+\r
/* The following line is just to prevent the symbol getting optimised away. */\r
( void ) vTaskSwitchContext();\r
}\r
projects / freertos / blobdiff