/*\r
- FreeRTOS V8.0.0:rc1 - Copyright (C) 2014 Real Time Engineers Ltd.\r
+ FreeRTOS V9.0.0rc2 - Copyright (C) 2016 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
+ 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
#include "FreeRTOS.h"\r
#include "task.h"\r
#include "queue.h"\r
+#include "timers.h"\r
+#include "event_groups.h"\r
+#include "mpu_prototypes.h"\r
\r
#undef MPU_WRAPPERS_INCLUDED_FROM_API_FILE\r
\r
/* Set the privilege level to user mode if xRunningPrivileged is false. */\r
#define portRESET_PRIVILEGE( xRunningPrivileged ) if( xRunningPrivileged != pdTRUE ) __asm volatile ( " mrs r0, control \n orr r0, #1 \n msr control, r0" :::"r0" )\r
\r
+/* For strict compliance with the Cortex-M spec the task start address should\r
+have bit-0 clear, as it is loaded into the PC on exit from an ISR. */\r
+#define portSTART_ADDRESS_MASK ( ( StackType_t ) 0xfffffffeUL )\r
+\r
/* Each task maintains its own interrupt status in the critical nesting\r
variable. Note this is not saved as part of the task context as context\r
switches can only occur when uxCriticalNesting is zero. */\r
*/\r
static void prvSVCHandler( uint32_t *pulRegisters ) __attribute__(( noinline )) PRIVILEGED_FUNCTION;\r
\r
-/*\r
- * Prototypes for all the MPU wrappers.\r
- */\r
-BaseType_t MPU_xTaskGenericCreate( TaskFunction_t pvTaskCode, const char * const pcName, uint16_t usStackDepth, void *pvParameters, UBaseType_t uxPriority, TaskHandle_t *pxCreatedTask, StackType_t *puxStackBuffer, const MemoryRegion_t * const xRegions );\r
-void MPU_vTaskAllocateMPURegions( TaskHandle_t xTask, const MemoryRegion_t * const xRegions );\r
-void MPU_vTaskDelete( TaskHandle_t pxTaskToDelete );\r
-void MPU_vTaskDelayUntil( TickType_t * const pxPreviousWakeTime, TickType_t xTimeIncrement );\r
-void MPU_vTaskDelay( TickType_t xTicksToDelay );\r
-UBaseType_t MPU_uxTaskPriorityGet( TaskHandle_t pxTask );\r
-void MPU_vTaskPrioritySet( TaskHandle_t pxTask, UBaseType_t uxNewPriority );\r
-eTaskState MPU_eTaskGetState( TaskHandle_t pxTask );\r
-void MPU_vTaskSuspend( TaskHandle_t pxTaskToSuspend );\r
-BaseType_t MPU_xTaskIsTaskSuspended( TaskHandle_t xTask );\r
-void MPU_vTaskResume( TaskHandle_t pxTaskToResume );\r
-void MPU_vTaskSuspendAll( void );\r
-BaseType_t MPU_xTaskResumeAll( void );\r
-TickType_t MPU_xTaskGetTickCount( void );\r
-UBaseType_t MPU_uxTaskGetNumberOfTasks( void );\r
-void MPU_vTaskList( char *pcWriteBuffer );\r
-void MPU_vTaskGetRunTimeStats( char *pcWriteBuffer );\r
-void MPU_vTaskSetApplicationTaskTag( TaskHandle_t xTask, TaskHookFunction_t pxTagValue );\r
-TaskHookFunction_t MPU_xTaskGetApplicationTaskTag( TaskHandle_t xTask );\r
-BaseType_t MPU_xTaskCallApplicationTaskHook( TaskHandle_t xTask, void *pvParameter );\r
-UBaseType_t MPU_uxTaskGetStackHighWaterMark( TaskHandle_t xTask );\r
-TaskHandle_t MPU_xTaskGetCurrentTaskHandle( void );\r
-BaseType_t MPU_xTaskGetSchedulerState( void );\r
-TaskHandle_t MPU_xTaskGetIdleTaskHandle( void );\r
-UBaseType_t MPU_uxTaskGetSystemState( TaskStatus_t *pxTaskStatusArray, UBaseType_t uxArraySize, uint32_t *pulTotalRunTime );\r
-QueueHandle_t MPU_xQueueGenericCreate( UBaseType_t uxQueueLength, UBaseType_t uxItemSize, uint8_t ucQueueType );\r
-BaseType_t MPU_xQueueGenericSend( QueueHandle_t xQueue, const void * const pvItemToQueue, TickType_t xTicksToWait, BaseType_t xCopyPosition );\r
-BaseType_t MPU_xQueueGenericReset( QueueHandle_t pxQueue, BaseType_t xNewQueue );\r
-UBaseType_t MPU_uxQueueMessagesWaiting( const QueueHandle_t pxQueue );\r
-BaseType_t MPU_xQueueGenericReceive( QueueHandle_t pxQueue, void * const pvBuffer, TickType_t xTicksToWait, BaseType_t xJustPeeking );\r
-QueueHandle_t MPU_xQueueCreateMutex( void );\r
-QueueHandle_t MPU_xQueueCreateCountingSemaphore( UBaseType_t uxCountValue, UBaseType_t uxInitialCount );\r
-BaseType_t MPU_xQueueTakeMutexRecursive( QueueHandle_t xMutex, TickType_t xBlockTime );\r
-BaseType_t MPU_xQueueGiveMutexRecursive( QueueHandle_t xMutex );\r
-BaseType_t MPU_xQueueAltGenericSend( QueueHandle_t pxQueue, const void * const pvItemToQueue, TickType_t xTicksToWait, BaseType_t xCopyPosition );\r
-BaseType_t MPU_xQueueAltGenericReceive( QueueHandle_t pxQueue, void * const pvBuffer, TickType_t xTicksToWait, BaseType_t xJustPeeking );\r
-void MPU_vQueueAddToRegistry( QueueHandle_t xQueue, char *pcName );\r
-void MPU_vQueueDelete( QueueHandle_t xQueue );\r
-void *MPU_pvPortMalloc( size_t xSize );\r
-void MPU_vPortFree( void *pv );\r
-void MPU_vPortInitialiseBlocks( void );\r
-size_t MPU_xPortGetFreeHeapSize( void );\r
-QueueSetHandle_t MPU_xQueueCreateSet( UBaseType_t uxEventQueueLength );\r
-QueueSetMemberHandle_t MPU_xQueueSelectFromSet( QueueSetHandle_t xQueueSet, TickType_t xBlockTimeTicks );\r
-BaseType_t MPU_xQueueAddToSet( QueueSetMemberHandle_t xQueueOrSemaphore, QueueSetHandle_t xQueueSet );\r
-BaseType_t MPU_xQueueRemoveFromSet( QueueSetMemberHandle_t xQueueOrSemaphore, QueueSetHandle_t xQueueSet );\r
-BaseType_t MPU_xQueuePeekFromISR( QueueHandle_t xQueue, void * const pvBuffer );\r
-\r
/*-----------------------------------------------------------*/\r
\r
/*\r
pxTopOfStack--; /* Offset added to account for the way the MCU uses the stack on entry/exit of interrupts. */\r
*pxTopOfStack = portINITIAL_XPSR; /* xPSR */\r
pxTopOfStack--;\r
- *pxTopOfStack = ( StackType_t ) pxCode; /* PC */\r
+ *pxTopOfStack = ( ( StackType_t ) pxCode ) & portSTART_ADDRESS_MASK; /* PC */\r
pxTopOfStack--;\r
*pxTopOfStack = 0; /* LR */\r
pxTopOfStack -= 5; /* R12, R3, R2 and R1. */\r
" ldr r14, =0xfffffffd \n" /* Load exec return code. */\r
" bx r14 \n"\r
" \n"\r
- " .align 2 \n"\r
+ " .align 4 \n"\r
"pxCurrentTCBConst2: .word pxCurrentTCB \n"\r
);\r
}\r
" msr psp, r0 \n"\r
" bx r14 \n"\r
" \n"\r
- " .align 2 \n"\r
+ " .align 4 \n"\r
"pxCurrentTCBConst: .word pxCurrentTCB \n"\r
::"i"(configMAX_SYSCALL_INTERRUPT_PRIORITY)\r
);\r
if( *portMPU_TYPE == portEXPECTED_MPU_TYPE_VALUE )\r
{\r
/* First setup the entire flash for unprivileged read only access. */\r
- *portMPU_REGION_BASE_ADDRESS = ( ( uint32_t ) __FLASH_segment_start__ ) | /* Base address. */\r
+ *portMPU_REGION_BASE_ADDRESS = ( ( uint32_t ) __FLASH_segment_start__ ) | /* Base address. */\r
( portMPU_REGION_VALID ) |\r
( portUNPRIVILEGED_FLASH_REGION );\r
\r
/* Setup the first 16K for privileged only access (even though less\r
than 10K is actually being used). This is where the kernel code is\r
placed. */\r
- *portMPU_REGION_BASE_ADDRESS = ( ( uint32_t ) __FLASH_segment_start__ ) | /* Base address. */\r
+ *portMPU_REGION_BASE_ADDRESS = ( ( uint32_t ) __FLASH_segment_start__ ) | /* Base address. */\r
( portMPU_REGION_VALID ) |\r
( portPRIVILEGED_FLASH_REGION );\r
\r
}\r
/*-----------------------------------------------------------*/\r
\r
-void vPortStoreTaskMPUSettings( xMPU_SETTINGS *xMPUSettings, const struct xMEMORY_REGION * const xRegions, StackType_t *pxBottomOfStack, uint16_t usStackDepth )\r
+void vPortStoreTaskMPUSettings( xMPU_SETTINGS *xMPUSettings, const struct xMEMORY_REGION * const xRegions, StackType_t *pxBottomOfStack, uint32_t ulStackDepth )\r
{\r
extern uint32_t __SRAM_segment_start__[];\r
extern uint32_t __SRAM_segment_end__[];\r
if( xRegions == NULL )\r
{\r
/* No MPU regions are specified so allow access to all RAM. */\r
- xMPUSettings->xRegion[ 0 ].ulRegionBaseAddress =\r
+ xMPUSettings->xRegion[ 0 ].ulRegionBaseAddress =\r
( ( uint32_t ) __SRAM_segment_start__ ) | /* Base address. */\r
( portMPU_REGION_VALID ) |\r
( portSTACK_REGION );\r
which case the stack region parameters will be valid. At all other\r
times the stack parameters will not be valid and it is assumed that the\r
stack region has already been configured. */\r
- if( usStackDepth > 0 )\r
+ if( ulStackDepth > 0 )\r
{\r
/* Define the region that allows access to the stack. */\r
xMPUSettings->xRegion[ 0 ].ulRegionBaseAddress =\r
\r
xMPUSettings->xRegion[ 0 ].ulRegionAttribute =\r
( portMPU_REGION_READ_WRITE ) | /* Read and write. */\r
- ( prvGetMPURegionSizeSetting( ( uint32_t ) usStackDepth * ( uint32_t ) sizeof( StackType_t ) ) ) |\r
+ ( prvGetMPURegionSizeSetting( ulStackDepth * ( uint32_t ) sizeof( StackType_t ) ) ) |\r
( portMPU_REGION_CACHEABLE_BUFFERABLE ) |\r
( portMPU_REGION_ENABLE );\r
}\r
}\r
/*-----------------------------------------------------------*/\r
\r
-BaseType_t MPU_xTaskGenericCreate( TaskFunction_t pvTaskCode, const char * const pcName, uint16_t usStackDepth, void *pvParameters, UBaseType_t uxPriority, TaskHandle_t *pxCreatedTask, StackType_t *puxStackBuffer, const MemoryRegion_t * const xRegions )\r
+BaseType_t MPU_xTaskCreateRestricted( const TaskParameters_t * const pxTaskDefinition, TaskHandle_t *pxCreatedTask )\r
{\r
BaseType_t xReturn;\r
BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
- xReturn = xTaskGenericCreate( pvTaskCode, pcName, usStackDepth, pvParameters, uxPriority, pxCreatedTask, puxStackBuffer, xRegions );\r
+ xReturn = xTaskCreateRestricted( pxTaskDefinition, pxCreatedTask );\r
portRESET_PRIVILEGE( xRunningPrivileged );\r
return xReturn;\r
}\r
/*-----------------------------------------------------------*/\r
\r
+#if( configSUPPORT_DYNAMIC_ALLOCATION == 1 )\r
+ BaseType_t MPU_xTaskCreate( TaskFunction_t pvTaskCode, const char * const pcName, uint16_t usStackDepth, void *pvParameters, UBaseType_t uxPriority, TaskHandle_t *pxCreatedTask )\r
+ {\r
+ BaseType_t xReturn;\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ xReturn = xTaskCreate( pvTaskCode, pcName, usStackDepth, pvParameters, uxPriority, pxCreatedTask );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+ return xReturn;\r
+ }\r
+#endif /* configSUPPORT_DYNAMIC_ALLOCATION */\r
+/*-----------------------------------------------------------*/\r
+\r
+#if( configSUPPORT_STATIC_ALLOCATION == 1 )\r
+ TaskHandle_t MPU_xTaskCreateStatic( TaskFunction_t pxTaskCode, const char * const pcName, const uint32_t ulStackDepth, void * const pvParameters, UBaseType_t uxPriority, StackType_t * const puxStackBuffer, StaticTask_t * const pxTaskBuffer )\r
+ {\r
+ TaskHandle_t xReturn;\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ xReturn = xTaskCreateStatic( pxTaskCode, pcName, ulStackDepth, pvParameters, uxPriority, puxStackBuffer, pxTaskBuffer );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+ return xReturn;\r
+ }\r
+#endif /* configSUPPORT_STATIC_ALLOCATION */\r
+/*-----------------------------------------------------------*/\r
+\r
void MPU_vTaskAllocateMPURegions( TaskHandle_t xTask, const MemoryRegion_t * const xRegions )\r
{\r
BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
#if ( INCLUDE_vTaskDelete == 1 )\r
void MPU_vTaskDelete( TaskHandle_t pxTaskToDelete )\r
{\r
- BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
vTaskDelete( pxTaskToDelete );\r
- portRESET_PRIVILEGE( xRunningPrivileged );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
}\r
#endif\r
/*-----------------------------------------------------------*/\r
#if ( INCLUDE_vTaskDelayUntil == 1 )\r
void MPU_vTaskDelayUntil( TickType_t * const pxPreviousWakeTime, TickType_t xTimeIncrement )\r
{\r
- BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
vTaskDelayUntil( pxPreviousWakeTime, xTimeIncrement );\r
- portRESET_PRIVILEGE( xRunningPrivileged );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+ }\r
+#endif\r
+/*-----------------------------------------------------------*/\r
+\r
+#if ( INCLUDE_xTaskAbortDelay == 1 )\r
+ BaseType_t MPU_xTaskAbortDelay( TaskHandle_t xTask )\r
+ {\r
+ BaseType_t xReturn;\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ xReturn = xTaskAbortDelay( xTask );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+ return xReturn;\r
}\r
#endif\r
/*-----------------------------------------------------------*/\r
#if ( INCLUDE_vTaskDelay == 1 )\r
void MPU_vTaskDelay( TickType_t xTicksToDelay )\r
{\r
- BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
vTaskDelay( xTicksToDelay );\r
- portRESET_PRIVILEGE( xRunningPrivileged );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
}\r
#endif\r
/*-----------------------------------------------------------*/\r
UBaseType_t MPU_uxTaskPriorityGet( TaskHandle_t pxTask )\r
{\r
UBaseType_t uxReturn;\r
- BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
uxReturn = uxTaskPriorityGet( pxTask );\r
- portRESET_PRIVILEGE( xRunningPrivileged );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
return uxReturn;\r
}\r
#endif\r
#if ( INCLUDE_vTaskPrioritySet == 1 )\r
void MPU_vTaskPrioritySet( TaskHandle_t pxTask, UBaseType_t uxNewPriority )\r
{\r
- BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
vTaskPrioritySet( pxTask, uxNewPriority );\r
- portRESET_PRIVILEGE( xRunningPrivileged );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
}\r
#endif\r
/*-----------------------------------------------------------*/\r
#if ( INCLUDE_eTaskGetState == 1 )\r
eTaskState MPU_eTaskGetState( TaskHandle_t pxTask )\r
{\r
- BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
eTaskState eReturn;\r
\r
eReturn = eTaskGetState( pxTask );\r
- portRESET_PRIVILEGE( xRunningPrivileged );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
return eReturn;\r
}\r
#endif\r
/*-----------------------------------------------------------*/\r
\r
-#if ( INCLUDE_xTaskGetIdleTaskHandle == 1 )\r
- TaskHandle_t MPU_xTaskGetIdleTaskHandle( void )\r
+#if( configUSE_TRACE_FACILITY == 1 )\r
+ void MPU_vTaskGetInfo( TaskHandle_t xTask, TaskStatus_t *pxTaskStatus, BaseType_t xGetFreeStackSpace, eTaskState eState )\r
{\r
- TaskHandle_t xReturn;\r
- BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
- xReturn = xTaskGetIdleTaskHandle();\r
- portRESET_PRIVILEGE( xRunningPrivileged );\r
- return eReturn;\r
+ vTaskGetInfo( xTask, pxTaskStatus, xGetFreeStackSpace, eState );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
}\r
#endif\r
/*-----------------------------------------------------------*/\r
\r
-#if ( INCLUDE_vTaskSuspend == 1 )\r
- void MPU_vTaskSuspend( TaskHandle_t pxTaskToSuspend )\r
+#if ( INCLUDE_xTaskGetIdleTaskHandle == 1 )\r
+ TaskHandle_t MPU_xTaskGetIdleTaskHandle( void )\r
{\r
- BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+ TaskHandle_t xReturn;\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
- vTaskSuspend( pxTaskToSuspend );\r
- portRESET_PRIVILEGE( xRunningPrivileged );\r
+ xReturn = xTaskGetIdleTaskHandle();\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+ return xReturn;\r
}\r
#endif\r
/*-----------------------------------------------------------*/\r
\r
#if ( INCLUDE_vTaskSuspend == 1 )\r
- BaseType_t MPU_xTaskIsTaskSuspended( TaskHandle_t xTask )\r
+ void MPU_vTaskSuspend( TaskHandle_t pxTaskToSuspend )\r
{\r
- BaseType_t xReturn;\r
- BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
- xReturn = xTaskIsTaskSuspended( xTask );\r
- portRESET_PRIVILEGE( xRunningPrivileged );\r
- return xReturn;\r
+ vTaskSuspend( pxTaskToSuspend );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
}\r
#endif\r
/*-----------------------------------------------------------*/\r
#if ( INCLUDE_vTaskSuspend == 1 )\r
void MPU_vTaskResume( TaskHandle_t pxTaskToResume )\r
{\r
- BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
vTaskResume( pxTaskToResume );\r
- portRESET_PRIVILEGE( xRunningPrivileged );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
}\r
#endif\r
/*-----------------------------------------------------------*/\r
BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
vTaskSuspendAll();\r
- portRESET_PRIVILEGE( xRunningPrivileged );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
}\r
/*-----------------------------------------------------------*/\r
\r
BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
xReturn = xTaskResumeAll();\r
- portRESET_PRIVILEGE( xRunningPrivileged );\r
- return xReturn;\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+ return xReturn;\r
}\r
/*-----------------------------------------------------------*/\r
\r
BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
xReturn = xTaskGetTickCount();\r
- portRESET_PRIVILEGE( xRunningPrivileged );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
return xReturn;\r
}\r
/*-----------------------------------------------------------*/\r
BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
uxReturn = uxTaskGetNumberOfTasks();\r
- portRESET_PRIVILEGE( xRunningPrivileged );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
return uxReturn;\r
}\r
/*-----------------------------------------------------------*/\r
\r
+char * MPU_pcTaskGetName( TaskHandle_t xTaskToQuery )\r
+{\r
+char *pcReturn;\r
+BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ pcReturn = pcTaskGetName( xTaskToQuery );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+ return pcReturn;\r
+}\r
+/*-----------------------------------------------------------*/\r
+\r
+#if ( INCLUDE_xTaskGetHandle == 1 )\r
+ TaskHandle_t MPU_xTaskGetHandle( const char *pcNameToQuery )\r
+ {\r
+ TaskHandle_t xReturn;\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ xReturn = xTaskGetHandle( pcNameToQuery );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+ return xReturn;\r
+ }\r
+#endif\r
+/*-----------------------------------------------------------*/\r
+\r
#if ( configUSE_TRACE_FACILITY == 1 )\r
void MPU_vTaskList( char *pcWriteBuffer )\r
{\r
#if ( configGENERATE_RUN_TIME_STATS == 1 )\r
void MPU_vTaskGetRunTimeStats( char *pcWriteBuffer )\r
{\r
- BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
vTaskGetRunTimeStats( pcWriteBuffer );\r
- portRESET_PRIVILEGE( xRunningPrivileged );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
}\r
#endif\r
/*-----------------------------------------------------------*/\r
#if ( configUSE_APPLICATION_TASK_TAG == 1 )\r
void MPU_vTaskSetApplicationTaskTag( TaskHandle_t xTask, TaskHookFunction_t pxTagValue )\r
{\r
- BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
vTaskSetApplicationTaskTag( xTask, pxTagValue );\r
- portRESET_PRIVILEGE( xRunningPrivileged );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
}\r
#endif\r
/*-----------------------------------------------------------*/\r
TaskHookFunction_t MPU_xTaskGetApplicationTaskTag( TaskHandle_t xTask )\r
{\r
TaskHookFunction_t xReturn;\r
- BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
xReturn = xTaskGetApplicationTaskTag( xTask );\r
- portRESET_PRIVILEGE( xRunningPrivileged );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
return xReturn;\r
}\r
#endif\r
/*-----------------------------------------------------------*/\r
\r
+#if ( configNUM_THREAD_LOCAL_STORAGE_POINTERS != 0 )\r
+ void MPU_vTaskSetThreadLocalStoragePointer( TaskHandle_t xTaskToSet, BaseType_t xIndex, void *pvValue )\r
+ {\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ vTaskSetThreadLocalStoragePointer( xTaskToSet, xIndex, pvValue );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+ }\r
+#endif\r
+/*-----------------------------------------------------------*/\r
+\r
+#if ( configNUM_THREAD_LOCAL_STORAGE_POINTERS != 0 )\r
+ void *MPU_pvTaskGetThreadLocalStoragePointer( TaskHandle_t xTaskToQuery, BaseType_t xIndex )\r
+ {\r
+ void *pvReturn;\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ pvReturn = pvTaskGetThreadLocalStoragePointer( xTaskToQuery, xIndex );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+ return pvReturn;\r
+ }\r
+#endif\r
+/*-----------------------------------------------------------*/\r
+\r
#if ( configUSE_APPLICATION_TASK_TAG == 1 )\r
BaseType_t MPU_xTaskCallApplicationTaskHook( TaskHandle_t xTask, void *pvParameter )\r
{\r
BaseType_t xReturn;\r
- BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
xReturn = xTaskCallApplicationTaskHook( xTask, pvParameter );\r
- portRESET_PRIVILEGE( xRunningPrivileged );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
return xReturn;\r
}\r
#endif\r
\r
uxReturn = uxTaskGetSystemState( pxTaskStatusArray, uxArraySize, pulTotalRunTime );\r
portRESET_PRIVILEGE( xRunningPrivileged );\r
- return xReturn;\r
+ return uxReturn;\r
}\r
#endif\r
/*-----------------------------------------------------------*/\r
UBaseType_t MPU_uxTaskGetStackHighWaterMark( TaskHandle_t xTask )\r
{\r
UBaseType_t uxReturn;\r
- BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
uxReturn = uxTaskGetStackHighWaterMark( xTask );\r
- portRESET_PRIVILEGE( xRunningPrivileged );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
return uxReturn;\r
}\r
#endif\r
TaskHandle_t MPU_xTaskGetCurrentTaskHandle( void )\r
{\r
TaskHandle_t xReturn;\r
- BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
xReturn = xTaskGetCurrentTaskHandle();\r
- portRESET_PRIVILEGE( xRunningPrivileged );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
return xReturn;\r
}\r
#endif\r
BaseType_t MPU_xTaskGetSchedulerState( void )\r
{\r
BaseType_t xReturn;\r
- BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
xReturn = xTaskGetSchedulerState();\r
- portRESET_PRIVILEGE( xRunningPrivileged );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
return xReturn;\r
}\r
#endif\r
/*-----------------------------------------------------------*/\r
\r
-QueueHandle_t MPU_xQueueGenericCreate( UBaseType_t uxQueueLength, UBaseType_t uxItemSize, uint8_t ucQueueType )\r
+void MPU_vTaskSetTimeOutState( TimeOut_t * const pxTimeOut )\r
+{\r
+BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ vTaskSetTimeOutState( pxTimeOut );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+}\r
+/*-----------------------------------------------------------*/\r
+\r
+BaseType_t MPU_xTaskCheckForTimeOut( TimeOut_t * const pxTimeOut, TickType_t * const pxTicksToWait )\r
{\r
-QueueHandle_t xReturn;\r
+BaseType_t xReturn;\r
BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
- xReturn = xQueueGenericCreate( uxQueueLength, uxItemSize, ucQueueType );\r
+ xReturn = xTaskCheckForTimeOut( pxTimeOut, pxTicksToWait );\r
portRESET_PRIVILEGE( xRunningPrivileged );\r
return xReturn;\r
}\r
/*-----------------------------------------------------------*/\r
\r
+#if( configUSE_TASK_NOTIFICATIONS == 1 )\r
+ BaseType_t MPU_xTaskGenericNotify( TaskHandle_t xTaskToNotify, uint32_t ulValue, eNotifyAction eAction, uint32_t *pulPreviousNotificationValue )\r
+ {\r
+ BaseType_t xReturn;\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ xReturn = xTaskGenericNotify( xTaskToNotify, ulValue, eAction, pulPreviousNotificationValue );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+ return xReturn;\r
+ }\r
+#endif\r
+/*-----------------------------------------------------------*/\r
+\r
+#if( configUSE_TASK_NOTIFICATIONS == 1 )\r
+ BaseType_t MPU_xTaskNotifyWait( uint32_t ulBitsToClearOnEntry, uint32_t ulBitsToClearOnExit, uint32_t *pulNotificationValue, TickType_t xTicksToWait )\r
+ {\r
+ BaseType_t xReturn;\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ xReturn = xTaskNotifyWait( ulBitsToClearOnEntry, ulBitsToClearOnExit, pulNotificationValue, xTicksToWait );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+ return xReturn;\r
+ }\r
+#endif\r
+/*-----------------------------------------------------------*/\r
+\r
+#if( configUSE_TASK_NOTIFICATIONS == 1 )\r
+ uint32_t MPU_ulTaskNotifyTake( BaseType_t xClearCountOnExit, TickType_t xTicksToWait )\r
+ {\r
+ uint32_t ulReturn;\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ ulReturn = ulTaskNotifyTake( xClearCountOnExit, xTicksToWait );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+ return ulReturn;\r
+ }\r
+#endif\r
+/*-----------------------------------------------------------*/\r
+\r
+#if( configUSE_TASK_NOTIFICATIONS == 1 )\r
+ BaseType_t MPU_xTaskNotifyStateClear( TaskHandle_t xTask )\r
+ {\r
+ BaseType_t xReturn;\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ xReturn = xTaskNotifyStateClear( xTask );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+ return xReturn;\r
+ }\r
+#endif\r
+/*-----------------------------------------------------------*/\r
+ \r
+#if( configSUPPORT_DYNAMIC_ALLOCATION == 1 )\r
+ QueueHandle_t MPU_xQueueGenericCreate( UBaseType_t uxQueueLength, UBaseType_t uxItemSize, uint8_t ucQueueType )\r
+ {\r
+ QueueHandle_t xReturn;\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ xReturn = xQueueGenericCreate( uxQueueLength, uxItemSize, ucQueueType );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+ return xReturn;\r
+ }\r
+#endif\r
+/*-----------------------------------------------------------*/\r
+\r
+#if( configSUPPORT_STATIC_ALLOCATION == 1 )\r
+ QueueHandle_t MPU_xQueueGenericCreateStatic( const UBaseType_t uxQueueLength, const UBaseType_t uxItemSize, uint8_t *pucQueueStorage, StaticQueue_t *pxStaticQueue, const uint8_t ucQueueType )\r
+ {\r
+ QueueHandle_t xReturn;\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ xReturn = xQueueGenericCreateStatic( uxQueueLength, uxItemSize, pucQueueStorage, pxStaticQueue, ucQueueType );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+ return xReturn;\r
+ }\r
+#endif\r
+/*-----------------------------------------------------------*/\r
+\r
BaseType_t MPU_xQueueGenericReset( QueueHandle_t pxQueue, BaseType_t xNewQueue )\r
{\r
BaseType_t xReturn;\r
}\r
/*-----------------------------------------------------------*/\r
\r
+UBaseType_t MPU_uxQueueSpacesAvailable( const QueueHandle_t xQueue )\r
+{\r
+BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+UBaseType_t uxReturn;\r
+\r
+ uxReturn = uxQueueSpacesAvailable( xQueue );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+ return uxReturn;\r
+}\r
+/*-----------------------------------------------------------*/\r
+\r
BaseType_t MPU_xQueueGenericReceive( QueueHandle_t pxQueue, void * const pvBuffer, TickType_t xTicksToWait, BaseType_t xJustPeeking )\r
{\r
BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
}\r
/*-----------------------------------------------------------*/\r
\r
-#if ( configUSE_MUTEXES == 1 )\r
- QueueHandle_t MPU_xQueueCreateMutex( void )\r
+void* MPU_xQueueGetMutexHolder( QueueHandle_t xSemaphore )\r
+{\r
+BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+void * xReturn;\r
+\r
+ xReturn = ( void * ) xQueueGetMutexHolder( xSemaphore );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+ return xReturn;\r
+}\r
+/*-----------------------------------------------------------*/\r
+\r
+#if( ( configUSE_MUTEXES == 1 ) && ( configSUPPORT_DYNAMIC_ALLOCATION == 1 ) )\r
+ QueueHandle_t MPU_xQueueCreateMutex( const uint8_t ucQueueType )\r
{\r
- QueueHandle_t xReturn;\r
+ QueueHandle_t xReturn;\r
BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
- xReturn = xQueueCreateMutex( queueQUEUE_TYPE_MUTEX );\r
+ xReturn = xQueueCreateMutex( ucQueueType );\r
portRESET_PRIVILEGE( xRunningPrivileged );\r
return xReturn;\r
}\r
#endif\r
/*-----------------------------------------------------------*/\r
\r
-#if configUSE_COUNTING_SEMAPHORES == 1\r
+#if( ( configUSE_MUTEXES == 1 ) && ( configSUPPORT_STATIC_ALLOCATION == 1 ) )\r
+ QueueHandle_t MPU_xQueueCreateMutexStatic( const uint8_t ucQueueType, StaticQueue_t *pxStaticQueue )\r
+ {\r
+ QueueHandle_t xReturn;\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ xReturn = xQueueCreateMutexStatic( ucQueueType, pxStaticQueue );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+ return xReturn;\r
+ }\r
+#endif\r
+/*-----------------------------------------------------------*/\r
+\r
+#if( ( configUSE_COUNTING_SEMAPHORES == 1 ) && ( configSUPPORT_DYNAMIC_ALLOCATION == 1 ) )\r
QueueHandle_t MPU_xQueueCreateCountingSemaphore( UBaseType_t uxCountValue, UBaseType_t uxInitialCount )\r
{\r
- QueueHandle_t xReturn;\r
+ QueueHandle_t xReturn;\r
BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
xReturn = xQueueCreateCountingSemaphore( uxCountValue, uxInitialCount );\r
#endif\r
/*-----------------------------------------------------------*/\r
\r
+#if( ( configUSE_COUNTING_SEMAPHORES == 1 ) && ( configSUPPORT_STATIC_ALLOCATION == 1 ) )\r
+\r
+ QueueHandle_t MPU_xQueueCreateCountingSemaphoreStatic( const UBaseType_t uxMaxCount, const UBaseType_t uxInitialCount, StaticQueue_t *pxStaticQueue )\r
+ {\r
+ QueueHandle_t xReturn;\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ xReturn = xQueueCreateCountingSemaphoreStatic( uxMaxCount, uxInitialCount, pxStaticQueue );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+ return xReturn;\r
+ }\r
+#endif\r
+/*-----------------------------------------------------------*/\r
+\r
#if ( configUSE_MUTEXES == 1 )\r
BaseType_t MPU_xQueueTakeMutexRecursive( QueueHandle_t xMutex, TickType_t xBlockTime )\r
{\r
#endif\r
/*-----------------------------------------------------------*/\r
\r
-#if configUSE_ALTERNATIVE_API == 1\r
- BaseType_t MPU_xQueueAltGenericSend( QueueHandle_t pxQueue, const void * const pvItemToQueue, TickType_t xTicksToWait, BaseType_t xCopyPosition )\r
+#if configQUEUE_REGISTRY_SIZE > 0\r
+ void MPU_vQueueAddToRegistry( QueueHandle_t xQueue, const char *pcName )\r
{\r
- BaseType_t xReturn;\r
BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
- xReturn = BaseType_t xQueueAltGenericSend( pxQueue, pvItemToQueue, xTicksToWait, xCopyPosition );\r
+ vQueueAddToRegistry( xQueue, pcName );\r
+\r
portRESET_PRIVILEGE( xRunningPrivileged );\r
- return xReturn;\r
}\r
#endif\r
/*-----------------------------------------------------------*/\r
\r
-#if configUSE_ALTERNATIVE_API == 1\r
- BaseType_t MPU_xQueueAltGenericReceive( QueueHandle_t pxQueue, void * const pvBuffer, TickType_t xTicksToWait, BaseType_t xJustPeeking )\r
+#if configQUEUE_REGISTRY_SIZE > 0\r
+ void MPU_vQueueUnregisterQueue( QueueHandle_t xQueue )\r
{\r
- BaseType_t xReturn;\r
BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
- xReturn = xQueueAltGenericReceive( pxQueue, pvBuffer, xTicksToWait, xJustPeeking );\r
+ vQueueUnregisterQueue( xQueue );\r
+\r
portRESET_PRIVILEGE( xRunningPrivileged );\r
- return xReturn;\r
}\r
#endif\r
/*-----------------------------------------------------------*/\r
\r
#if configQUEUE_REGISTRY_SIZE > 0\r
- void MPU_vQueueAddToRegistry( QueueHandle_t xQueue, char *pcName )\r
+ const char *MPU_pcQueueGetName( QueueHandle_t xQueue )\r
{\r
BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+ const char *pcReturn;\r
\r
- vQueueAddToRegistry( xQueue, pcName );\r
+ pcReturn = pcQueueGetName( xQueue );\r
\r
portRESET_PRIVILEGE( xRunningPrivileged );\r
+ return pcReturn;\r
}\r
#endif\r
/*-----------------------------------------------------------*/\r
}\r
/*-----------------------------------------------------------*/\r
\r
-void *MPU_pvPortMalloc( size_t xSize )\r
+#if( configSUPPORT_DYNAMIC_ALLOCATION == 1 )\r
+\r
+ void *MPU_pvPortMalloc( size_t xSize )\r
+ {\r
+ void *pvReturn;\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ pvReturn = pvPortMalloc( xSize );\r
+\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+\r
+ return pvReturn;\r
+ }\r
+\r
+#endif /* configSUPPORT_DYNAMIC_ALLOCATION */\r
+/*-----------------------------------------------------------*/\r
+\r
+#if( configSUPPORT_DYNAMIC_ALLOCATION == 1 )\r
+\r
+ void MPU_vPortFree( void *pv )\r
+ {\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ vPortFree( pv );\r
+\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+ }\r
+\r
+#endif /* configSUPPORT_DYNAMIC_ALLOCATION */\r
+/*-----------------------------------------------------------*/\r
+\r
+void MPU_vPortInitialiseBlocks( void )\r
{\r
-void *pvReturn;\r
BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
- pvReturn = pvPortMalloc( xSize );\r
+ vPortInitialiseBlocks();\r
\r
portRESET_PRIVILEGE( xRunningPrivileged );\r
-\r
- return pvReturn;\r
}\r
/*-----------------------------------------------------------*/\r
\r
-void MPU_vPortFree( void *pv )\r
+size_t MPU_xPortGetFreeHeapSize( void )\r
{\r
+size_t xReturn;\r
BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
- vPortFree( pv );\r
+ xReturn = xPortGetFreeHeapSize();\r
\r
portRESET_PRIVILEGE( xRunningPrivileged );\r
+\r
+ return xReturn;\r
}\r
/*-----------------------------------------------------------*/\r
\r
-void MPU_vPortInitialiseBlocks( void )\r
+#if( ( configSUPPORT_DYNAMIC_ALLOCATION == 1 ) && ( configUSE_TIMERS == 1 ) )\r
+ TimerHandle_t MPU_xTimerCreate( const char * const pcTimerName, const TickType_t xTimerPeriodInTicks, const UBaseType_t uxAutoReload, void * const pvTimerID, TimerCallbackFunction_t pxCallbackFunction )\r
+ {\r
+ TimerHandle_t xReturn;\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ xReturn = xTimerCreate( pcTimerName, xTimerPeriodInTicks, uxAutoReload, pvTimerID, pxCallbackFunction );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+\r
+ return xReturn;\r
+ }\r
+#endif\r
+/*-----------------------------------------------------------*/\r
+\r
+#if( ( configSUPPORT_STATIC_ALLOCATION == 1 ) && ( configUSE_TIMERS == 1 ) )\r
+ TimerHandle_t MPU_xTimerCreateStatic( const char * const pcTimerName, const TickType_t xTimerPeriodInTicks, const UBaseType_t uxAutoReload, void * const pvTimerID, TimerCallbackFunction_t pxCallbackFunction, StaticTimer_t *pxTimerBuffer )\r
+ {\r
+ TimerHandle_t xReturn;\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ xReturn = xTimerCreateStatic( pcTimerName, xTimerPeriodInTicks, uxAutoReload, pvTimerID, pxCallbackFunction, pxTimerBuffer );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+\r
+ return xReturn;\r
+ }\r
+#endif\r
+/*-----------------------------------------------------------*/\r
+\r
+#if( configUSE_TIMERS == 1 )\r
+ void *MPU_pvTimerGetTimerID( const TimerHandle_t xTimer )\r
+ {\r
+ void * pvReturn;\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ pvReturn = pvTimerGetTimerID( xTimer );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+\r
+ return pvReturn;\r
+ }\r
+#endif\r
+/*-----------------------------------------------------------*/\r
+\r
+#if( configUSE_TIMERS == 1 )\r
+ void MPU_vTimerSetTimerID( TimerHandle_t xTimer, void *pvNewID )\r
+ {\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ vTimerSetTimerID( xTimer, pvNewID );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+ }\r
+#endif\r
+/*-----------------------------------------------------------*/\r
+\r
+#if( configUSE_TIMERS == 1 )\r
+ BaseType_t MPU_xTimerIsTimerActive( TimerHandle_t xTimer )\r
+ {\r
+ BaseType_t xReturn;\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ xReturn = xTimerIsTimerActive( xTimer );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+\r
+ return xReturn;\r
+ }\r
+#endif\r
+/*-----------------------------------------------------------*/\r
+\r
+#if( configUSE_TIMERS == 1 )\r
+ TaskHandle_t MPU_xTimerGetTimerDaemonTaskHandle( void )\r
+ {\r
+ TaskHandle_t xReturn;\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ xReturn = xTimerGetTimerDaemonTaskHandle();\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+\r
+ return xReturn;\r
+ }\r
+#endif\r
+/*-----------------------------------------------------------*/\r
+\r
+#if( ( INCLUDE_xTimerPendFunctionCall == 1 ) && ( configUSE_TIMERS == 1 ) )\r
+ BaseType_t MPU_xTimerPendFunctionCall( PendedFunction_t xFunctionToPend, void *pvParameter1, uint32_t ulParameter2, TickType_t xTicksToWait )\r
+ {\r
+ BaseType_t xReturn;\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ xReturn = xTimerPendFunctionCall( xFunctionToPend, pvParameter1, ulParameter2, xTicksToWait );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+\r
+ return xReturn;\r
+ }\r
+#endif\r
+/*-----------------------------------------------------------*/\r
+\r
+#if( configUSE_TIMERS == 1 )\r
+ const char * MPU_pcTimerGetName( TimerHandle_t xTimer )\r
+ {\r
+ const char * pcReturn;\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ pcReturn = pcTimerGetName( xTimer );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+\r
+ return pcReturn;\r
+ }\r
+#endif\r
+/*-----------------------------------------------------------*/\r
+\r
+#if( configUSE_TIMERS == 1 )\r
+ TickType_t MPU_xTimerGetPeriod( TimerHandle_t xTimer )\r
+ {\r
+ TickType_t xReturn;\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ xReturn = xTimerGetPeriod( xTimer );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+\r
+ return xReturn;\r
+ }\r
+#endif\r
+/*-----------------------------------------------------------*/\r
+\r
+#if( configUSE_TIMERS == 1 )\r
+ TickType_t MPU_xTimerGetExpiryTime( TimerHandle_t xTimer )\r
+ {\r
+ TickType_t xReturn;\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ xReturn = xTimerGetExpiryTime( xTimer );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+\r
+ return xReturn;\r
+ }\r
+#endif\r
+/*-----------------------------------------------------------*/\r
+\r
+#if( configUSE_TIMERS == 1 )\r
+ BaseType_t MPU_xTimerGenericCommand( TimerHandle_t xTimer, const BaseType_t xCommandID, const TickType_t xOptionalValue, BaseType_t * const pxHigherPriorityTaskWoken, const TickType_t xTicksToWait )\r
+ {\r
+ BaseType_t xReturn;\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ xReturn = xTimerGenericCommand( xTimer, xCommandID, xOptionalValue, pxHigherPriorityTaskWoken, xTicksToWait );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+\r
+ return xReturn;\r
+ }\r
+#endif\r
+/*-----------------------------------------------------------*/\r
+\r
+#if( configSUPPORT_DYNAMIC_ALLOCATION == 1 )\r
+ EventGroupHandle_t MPU_xEventGroupCreate( void )\r
+ {\r
+ EventGroupHandle_t xReturn;\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ xReturn = xEventGroupCreate();\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+\r
+ return xReturn;\r
+ }\r
+#endif\r
+/*-----------------------------------------------------------*/\r
+\r
+#if( configSUPPORT_STATIC_ALLOCATION == 1 )\r
+ EventGroupHandle_t MPU_xEventGroupCreateStatic( StaticEventGroup_t *pxEventGroupBuffer )\r
+ {\r
+ EventGroupHandle_t xReturn;\r
+ BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ xReturn = xEventGroupCreateStatic( pxEventGroupBuffer );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+\r
+ return xReturn;\r
+ }\r
+#endif\r
+/*-----------------------------------------------------------*/\r
+\r
+EventBits_t MPU_xEventGroupWaitBits( EventGroupHandle_t xEventGroup, const EventBits_t uxBitsToWaitFor, const BaseType_t xClearOnExit, const BaseType_t xWaitForAllBits, TickType_t xTicksToWait )\r
{\r
+EventBits_t xReturn;\r
BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
- vPortInitialiseBlocks();\r
+ xReturn = xEventGroupWaitBits( xEventGroup, uxBitsToWaitFor, xClearOnExit, xWaitForAllBits, xTicksToWait );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
\r
+ return xReturn;\r
+}\r
+/*-----------------------------------------------------------*/\r
+\r
+EventBits_t MPU_xEventGroupClearBits( EventGroupHandle_t xEventGroup, const EventBits_t uxBitsToClear )\r
+{\r
+EventBits_t xReturn;\r
+BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ xReturn = xEventGroupClearBits( xEventGroup, uxBitsToClear );\r
portRESET_PRIVILEGE( xRunningPrivileged );\r
+\r
+ return xReturn;\r
}\r
/*-----------------------------------------------------------*/\r
\r
-size_t MPU_xPortGetFreeHeapSize( void )\r
+EventBits_t MPU_xEventGroupSetBits( EventGroupHandle_t xEventGroup, const EventBits_t uxBitsToSet )\r
{\r
-size_t xReturn;\r
+EventBits_t xReturn;\r
BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
\r
- xReturn = xPortGetFreeHeapSize();\r
+ xReturn = xEventGroupSetBits( xEventGroup, uxBitsToSet );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
\r
+ return xReturn;\r
+}\r
+/*-----------------------------------------------------------*/\r
+\r
+EventBits_t MPU_xEventGroupSync( EventGroupHandle_t xEventGroup, const EventBits_t uxBitsToSet, const EventBits_t uxBitsToWaitFor, TickType_t xTicksToWait )\r
+{\r
+EventBits_t xReturn;\r
+BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ xReturn = xEventGroupSync( xEventGroup, uxBitsToSet, uxBitsToWaitFor, xTicksToWait );\r
portRESET_PRIVILEGE( xRunningPrivileged );\r
\r
return xReturn;\r
}\r
+/*-----------------------------------------------------------*/\r
+\r
+void MPU_vEventGroupDelete( EventGroupHandle_t xEventGroup )\r
+{\r
+BaseType_t xRunningPrivileged = prvRaisePrivilege();\r
+\r
+ vEventGroupDelete( xEventGroup );\r
+ portRESET_PRIVILEGE( xRunningPrivileged );\r
+}\r
+/*-----------------------------------------------------------*/\r
+\r
+\r
+\r
+\r
\r
/* Functions that the application writer wants to execute in privileged mode\r
can be defined in application_defined_privileged_functions.h. The functions\r
projects / freertos / blobdiff