/*\r
- FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.\r
+ FreeRTOS V8.2.2 - Copyright (C) 2015 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
+ >>! 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
\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
+ FOR A PARTICULAR PURPOSE. Full license text is available on 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
+ * FreeRTOS provides completely free yet professionally developed, *\r
+ * robust, strictly quality controlled, supported, and cross *\r
+ * platform software that is more than just the market leader, it *\r
+ * is the industry's de facto standard. *\r
* *\r
- * http://www.FreeRTOS.org/FAQHelp.html *\r
+ * Help yourself get started quickly while simultaneously helping *\r
+ * to support the FreeRTOS project by purchasing a FreeRTOS *\r
+ * tutorial book, reference manual, or both: *\r
+ * http://www.FreeRTOS.org/Documentation *\r
* *\r
***************************************************************************\r
\r
- http://www.FreeRTOS.org - Documentation, books, training, latest versions,\r
- license and Real Time Engineers Ltd. contact details.\r
+ http://www.FreeRTOS.org/FAQHelp.html - Having a problem? Start by reading\r
+ the FAQ page "My application does not run, what could be wrong?". Have you\r
+ defined configASSERT()?\r
+\r
+ http://www.FreeRTOS.org/support - In return for receiving this top quality\r
+ embedded software for free we request you assist our global community by\r
+ participating in the support forum.\r
+\r
+ http://www.FreeRTOS.org/training - Investing in training allows your team to\r
+ be as productive as possible as early as possible. Now you can receive\r
+ FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers\r
+ Ltd, and the world's leading authority on the world's leading RTOS.\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
+ http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.\r
+ Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.\r
+\r
+ http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High\r
+ Integrity Systems ltd. to sell under the OpenRTOS brand. Low cost OpenRTOS\r
+ licenses offer ticketed support, indemnification and commercial 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
1 tab == 4 spaces!\r
*/\r
\r
+/* Standard includes. */\r
+#include <stdio.h>\r
+\r
/* Scheduler includes. */\r
#include "FreeRTOS.h"\r
#include "task.h"\r
-#include <stdio.h>\r
\r
#ifdef __GNUC__\r
#include "mmsystem.h"\r
#pragma comment(lib, "winmm.lib")\r
#endif\r
\r
-#define portMAX_INTERRUPTS ( ( unsigned long ) sizeof( unsigned long ) * 8UL ) /* The number of bits in an unsigned long. */\r
-#define portNO_CRITICAL_NESTING ( ( unsigned long ) 0 )\r
+#define portMAX_INTERRUPTS ( ( uint32_t ) sizeof( uint32_t ) * 8UL ) /* The number of bits in an uint32_t. */\r
+#define portNO_CRITICAL_NESTING ( ( uint32_t ) 0 )\r
\r
/*\r
* Created as a high priority thread, this function uses a timer to simulate\r
* Interrupt handlers used by the kernel itself. These are executed from the\r
* simulated interrupt handler thread.\r
*/\r
-static unsigned long prvProcessYieldInterrupt( void );\r
-static unsigned long prvProcessTickInterrupt( void );\r
+static uint32_t prvProcessYieldInterrupt( void );\r
+static uint32_t prvProcessTickInterrupt( void );\r
\r
/*\r
* Called when the process exits to let Windows know the high timer resolution\r
\r
/* Simulated interrupts waiting to be processed. This is a bit mask where each\r
bit represents one interrupt, so a maximum of 32 interrupts can be simulated. */\r
-static volatile unsigned long ulPendingInterrupts = 0UL;\r
+static volatile uint32_t ulPendingInterrupts = 0UL;\r
\r
/* An event used to inform the simulated interrupt processing thread (a high\r
priority thread that simulated interrupt processing) that an interrupt is\r
initialisation is probably not critical in this simulated environment as the\r
simulated interrupt handlers do not get created until the FreeRTOS scheduler is\r
started anyway. */\r
-static unsigned long ulCriticalNesting = 9999UL;\r
+static uint32_t ulCriticalNesting = 9999UL;\r
\r
/* Handlers for all the simulated software interrupts. The first two positions\r
are used for the Yield and Tick interrupts so are handled slightly differently,\r
all the other interrupts can be user defined. */\r
-static unsigned long (*ulIsrHandler[ portMAX_INTERRUPTS ])( void ) = { 0 };\r
+static uint32_t (*ulIsrHandler[ portMAX_INTERRUPTS ])( void ) = { 0 };\r
\r
/* Pointer to the TCB of the currently executing task. */\r
extern void *pxCurrentTCB;\r
\r
/* Used to ensure nothing is processed during the startup sequence. */\r
-static portBASE_TYPE xPortRunning = pdFALSE;\r
+static BaseType_t xPortRunning = pdFALSE;\r
\r
/*-----------------------------------------------------------*/\r
\r
static DWORD WINAPI prvSimulatedPeripheralTimer( LPVOID lpParameter )\r
{\r
-portTickType xMinimumWindowsBlockTime;\r
+TickType_t xMinimumWindowsBlockTime;\r
TIMECAPS xTimeCaps;\r
\r
/* Set the timer resolution to the maximum possible. */\r
if( timeGetDevCaps( &xTimeCaps, sizeof( xTimeCaps ) ) == MMSYSERR_NOERROR )\r
{\r
- xMinimumWindowsBlockTime = ( portTickType ) xTimeCaps.wPeriodMin;\r
+ xMinimumWindowsBlockTime = ( TickType_t ) xTimeCaps.wPeriodMin;\r
timeBeginPeriod( xTimeCaps.wPeriodMin );\r
\r
/* Register an exit handler so the timeBeginPeriod() function can be\r
}\r
else\r
{\r
- xMinimumWindowsBlockTime = ( portTickType ) 20;\r
+ xMinimumWindowsBlockTime = ( TickType_t ) 20;\r
}\r
\r
/* Just to prevent compiler warnings. */\r
( void ) lpParameter;\r
\r
- for(;;)\r
+ for( ;; )\r
{\r
/* Wait until the timer expires and we can access the simulated interrupt\r
variables. *NOTE* this is not a 'real time' way of generating tick\r
time, not the time that Sleep() is called. It is done this way to\r
prevent overruns in this very non real time simulated/emulated\r
environment. */\r
- if( portTICK_RATE_MS < xMinimumWindowsBlockTime )\r
+ if( portTICK_PERIOD_MS < xMinimumWindowsBlockTime )\r
{\r
Sleep( xMinimumWindowsBlockTime );\r
}\r
else\r
{\r
- Sleep( portTICK_RATE_MS );\r
+ Sleep( portTICK_PERIOD_MS );\r
}\r
\r
configASSERT( xPortRunning );\r
}\r
/*-----------------------------------------------------------*/\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
xThreadState *pxThreadState = NULL;\r
-signed char *pcTopOfStack = ( char * ) pxTopOfStack;\r
+int8_t *pcTopOfStack = ( int8_t * ) pxTopOfStack;\r
\r
/* In this simulated case a stack is not initialised, but instead a thread\r
is created that will execute the task being created. The thread handles\r
SetThreadPriorityBoost( pxThreadState->pvThread, TRUE );\r
SetThreadPriority( pxThreadState->pvThread, THREAD_PRIORITY_IDLE );\r
\r
- return ( portSTACK_TYPE * ) pxThreadState;\r
+ return ( StackType_t * ) pxThreadState;\r
}\r
/*-----------------------------------------------------------*/\r
\r
-portBASE_TYPE xPortStartScheduler( void )\r
+BaseType_t xPortStartScheduler( void )\r
{\r
void *pvHandle;\r
-long lSuccess = pdPASS;\r
+int32_t lSuccess = pdPASS;\r
xThreadState *pxThreadState;\r
\r
/* Install the interrupt handlers used by the scheduler itself. */\r
tick interrupts. The priority is set below that of the simulated\r
interrupt handler so the interrupt event mutex is used for the\r
handshake / overrun protection. */\r
- pvHandle = CreateThread( NULL, 0, prvSimulatedPeripheralTimer, NULL, 0, NULL );\r
+ pvHandle = CreateThread( NULL, 0, prvSimulatedPeripheralTimer, NULL, CREATE_SUSPENDED, NULL );\r
if( pvHandle != NULL )\r
{\r
SetThreadPriority( pvHandle, THREAD_PRIORITY_BELOW_NORMAL );\r
SetThreadPriorityBoost( pvHandle, TRUE );\r
SetThreadAffinityMask( pvHandle, 0x01 );\r
+ ResumeThread( pvHandle );\r
}\r
\r
/* Start the highest priority task by obtaining its associated thread\r
state structure, in which is stored the thread handle. */\r
- pxThreadState = ( xThreadState * ) *( ( unsigned long * ) pxCurrentTCB );\r
+ pxThreadState = ( xThreadState * ) *( ( size_t * ) pxCurrentTCB );\r
ulCriticalNesting = portNO_CRITICAL_NESTING;\r
\r
/* Bump up the priority of the thread that is going to run, in the\r
}\r
/*-----------------------------------------------------------*/\r
\r
-static unsigned long prvProcessYieldInterrupt( void )\r
+static uint32_t prvProcessYieldInterrupt( void )\r
{\r
return pdTRUE;\r
}\r
/*-----------------------------------------------------------*/\r
\r
-static unsigned long prvProcessTickInterrupt( void )\r
+static uint32_t prvProcessTickInterrupt( void )\r
{\r
-unsigned long ulSwitchRequired;\r
+uint32_t ulSwitchRequired;\r
\r
/* Process the tick itself. */\r
configASSERT( xPortRunning );\r
- ulSwitchRequired = ( unsigned long ) xTaskIncrementTick();\r
+ ulSwitchRequired = ( uint32_t ) xTaskIncrementTick();\r
\r
return ulSwitchRequired;\r
}\r
\r
static void prvProcessSimulatedInterrupts( void )\r
{\r
-unsigned long ulSwitchRequired, i;\r
+uint32_t ulSwitchRequired, i;\r
xThreadState *pxThreadState;\r
void *pvObjectList[ 2 ];\r
+CONTEXT xContext;\r
\r
/* Going to block on the mutex that ensured exclusive access to the simulated\r
interrupt objects, and the event that signals that a simulated interrupt\r
if( pvOldCurrentTCB != pxCurrentTCB )\r
{\r
/* Suspend the old thread. */\r
- pxThreadState = ( xThreadState *) *( ( unsigned long * ) pvOldCurrentTCB );\r
+ pxThreadState = ( xThreadState *) *( ( size_t * ) pvOldCurrentTCB );\r
SuspendThread( pxThreadState->pvThread );\r
\r
+ /* Ensure the thread is actually suspended by performing a \r
+ synchronous operation that can only complete when the thread is \r
+ actually suspended. The below code asks for dummy register\r
+ data. */\r
+ xContext.ContextFlags = CONTEXT_INTEGER;\r
+ ( void ) GetThreadContext( pxThreadState->pvThread, &xContext );\r
+\r
/* Obtain the state of the task now selected to enter the\r
Running state. */\r
- pxThreadState = ( xThreadState * ) ( *( unsigned long *) pxCurrentTCB );\r
+ pxThreadState = ( xThreadState * ) ( *( size_t *) pxCurrentTCB );\r
ResumeThread( pxThreadState->pvThread );\r
}\r
}\r
void vPortDeleteThread( void *pvTaskToDelete )\r
{\r
xThreadState *pxThreadState;\r
-unsigned long ulErrorCode;\r
+uint32_t ulErrorCode;\r
\r
/* Remove compiler warnings if configASSERT() is not defined. */\r
( void ) ulErrorCode;\r
\r
/* Find the handle of the thread being deleted. */\r
- pxThreadState = ( xThreadState * ) ( *( unsigned long *) pvTaskToDelete );\r
+ pxThreadState = ( xThreadState * ) ( *( size_t *) pvTaskToDelete );\r
\r
/* Check that the thread is still valid, it might have been closed by\r
vPortCloseRunningThread() - which will be the case if the task associated\r
}\r
/*-----------------------------------------------------------*/\r
\r
-void vPortCloseRunningThread( void *pvTaskToDelete, volatile portBASE_TYPE *pxPendYield )\r
+void vPortCloseRunningThread( void *pvTaskToDelete, volatile BaseType_t *pxPendYield )\r
{\r
xThreadState *pxThreadState;\r
void *pvThread;\r
-unsigned long ulErrorCode;\r
+uint32_t ulErrorCode;\r
\r
/* Remove compiler warnings if configASSERT() is not defined. */\r
( void ) ulErrorCode;\r
\r
/* Find the handle of the thread being deleted. */\r
- pxThreadState = ( xThreadState * ) ( *( unsigned long *) pvTaskToDelete );\r
+ pxThreadState = ( xThreadState * ) ( *( size_t *) pvTaskToDelete );\r
pvThread = pxThreadState->pvThread;\r
\r
/* Raise the Windows priority of the thread to ensure the FreeRTOS scheduler\r
}\r
/*-----------------------------------------------------------*/\r
\r
-void vPortGenerateSimulatedInterrupt( unsigned long ulInterruptNumber )\r
+void vPortGenerateSimulatedInterrupt( uint32_t ulInterruptNumber )\r
{\r
configASSERT( xPortRunning );\r
\r
}\r
/*-----------------------------------------------------------*/\r
\r
-void vPortSetInterruptHandler( unsigned long ulInterruptNumber, unsigned long (*pvHandler)( void ) )\r
+void vPortSetInterruptHandler( uint32_t ulInterruptNumber, uint32_t (*pvHandler)( void ) )\r
{\r
if( ulInterruptNumber < portMAX_INTERRUPTS )\r
{\r
\r
void vPortExitCritical( void )\r
{\r
-long lMutexNeedsReleasing;\r
+int32_t lMutexNeedsReleasing;\r
\r
/* The interrupt event mutex should already be held by this thread as it was\r
obtained on entry to the critical section. */\r
projects / freertos / blobdiff