/*\r
- FreeRTOS V7.5.3 - Copyright (C) 2013 Real Time Engineers Ltd. \r
+ FreeRTOS V8.0.0 - 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
/* A few bytes might be lost to byte aligning the heap start address. */\r
#define configADJUSTED_HEAP_SIZE ( configTOTAL_HEAP_SIZE - portBYTE_ALIGNMENT )\r
\r
-/* \r
+/*\r
* Initialises the heap structures before their first use.\r
*/\r
static void prvHeapInit( void );\r
\r
/* Allocate the memory for the heap. */\r
-static unsigned char ucHeap[ configTOTAL_HEAP_SIZE ];\r
+static uint8_t ucHeap[ configTOTAL_HEAP_SIZE ];\r
\r
/* Define the linked list structure. This is used to link free blocks in order\r
of their size. */\r
{\r
struct A_BLOCK_LINK *pxNextFreeBlock; /*<< The next free block in the list. */\r
size_t xBlockSize; /*<< The size of the free block. */\r
-} xBlockLink;\r
+} BlockLink_t;\r
\r
\r
-static const unsigned short heapSTRUCT_SIZE = ( ( sizeof ( xBlockLink ) + ( portBYTE_ALIGNMENT - 1 ) ) & ~portBYTE_ALIGNMENT_MASK );\r
+static const uint16_t heapSTRUCT_SIZE = ( ( sizeof ( BlockLink_t ) + ( portBYTE_ALIGNMENT - 1 ) ) & ~portBYTE_ALIGNMENT_MASK );\r
#define heapMINIMUM_BLOCK_SIZE ( ( size_t ) ( heapSTRUCT_SIZE * 2 ) )\r
\r
/* Create a couple of list links to mark the start and end of the list. */\r
-static xBlockLink xStart, xEnd;\r
+static BlockLink_t xStart, xEnd;\r
\r
/* Keeps track of the number of free bytes remaining, but says nothing about\r
fragmentation. */\r
*/\r
#define prvInsertBlockIntoFreeList( pxBlockToInsert ) \\r
{ \\r
-xBlockLink *pxIterator; \\r
+BlockLink_t *pxIterator; \\r
size_t xBlockSize; \\r
\\r
xBlockSize = pxBlockToInsert->xBlockSize; \\r
\r
void *pvPortMalloc( size_t xWantedSize )\r
{\r
-xBlockLink *pxBlock, *pxPreviousBlock, *pxNewBlockLink;\r
-static portBASE_TYPE xHeapHasBeenInitialised = pdFALSE;\r
+BlockLink_t *pxBlock, *pxPreviousBlock, *pxNewBlockLink;\r
+static BaseType_t xHeapHasBeenInitialised = pdFALSE;\r
void *pvReturn = NULL;\r
\r
vTaskSuspendAll();\r
xHeapHasBeenInitialised = pdTRUE;\r
}\r
\r
- /* The wanted size is increased so it can contain a xBlockLink\r
+ /* The wanted size is increased so it can contain a BlockLink_t\r
structure in addition to the requested amount of bytes. */\r
if( xWantedSize > 0 )\r
{\r
/* If we found the end marker then a block of adequate size was not found. */\r
if( pxBlock != &xEnd )\r
{\r
- /* Return the memory space - jumping over the xBlockLink structure\r
+ /* Return the memory space - jumping over the BlockLink_t structure\r
at its start. */\r
- pvReturn = ( void * ) ( ( ( unsigned char * ) pxPreviousBlock->pxNextFreeBlock ) + heapSTRUCT_SIZE );\r
+ pvReturn = ( void * ) ( ( ( uint8_t * ) pxPreviousBlock->pxNextFreeBlock ) + heapSTRUCT_SIZE );\r
\r
/* This block is being returned for use so must be taken out of the\r
list of free blocks. */\r
/* This block is to be split into two. Create a new block\r
following the number of bytes requested. The void cast is\r
used to prevent byte alignment warnings from the compiler. */\r
- pxNewBlockLink = ( void * ) ( ( ( unsigned char * ) pxBlock ) + xWantedSize );\r
+ pxNewBlockLink = ( void * ) ( ( ( uint8_t * ) pxBlock ) + xWantedSize );\r
\r
/* Calculate the sizes of two blocks split from the single\r
block. */\r
xFreeBytesRemaining -= pxBlock->xBlockSize;\r
}\r
}\r
- \r
+\r
traceMALLOC( pvReturn, xWantedSize );\r
}\r
- xTaskResumeAll();\r
+ ( void ) xTaskResumeAll();\r
\r
#if( configUSE_MALLOC_FAILED_HOOK == 1 )\r
{\r
\r
void vPortFree( void *pv )\r
{\r
-unsigned char *puc = ( unsigned char * ) pv;\r
-xBlockLink *pxLink;\r
+uint8_t *puc = ( uint8_t * ) pv;\r
+BlockLink_t *pxLink;\r
\r
if( pv != NULL )\r
{\r
- /* The memory being freed will have an xBlockLink structure immediately\r
+ /* The memory being freed will have an BlockLink_t structure immediately\r
before it. */\r
puc -= heapSTRUCT_SIZE;\r
\r
- /* This unexpected casting is to keep some compilers from issuing \r
+ /* This unexpected casting is to keep some compilers from issuing\r
byte alignment warnings. */\r
pxLink = ( void * ) puc;\r
\r
vTaskSuspendAll();\r
{\r
/* Add this block to the list of free blocks. */\r
- prvInsertBlockIntoFreeList( ( ( xBlockLink * ) pxLink ) );\r
+ prvInsertBlockIntoFreeList( ( ( BlockLink_t * ) pxLink ) );\r
xFreeBytesRemaining += pxLink->xBlockSize;\r
traceFREE( pv, pxLink->xBlockSize );\r
}\r
- xTaskResumeAll();\r
+ ( void ) xTaskResumeAll();\r
}\r
}\r
/*-----------------------------------------------------------*/\r
\r
static void prvHeapInit( void )\r
{\r
-xBlockLink *pxFirstFreeBlock;\r
-unsigned char *pucAlignedHeap;\r
+BlockLink_t *pxFirstFreeBlock;\r
+uint8_t *pucAlignedHeap;\r
\r
/* Ensure the heap starts on a correctly aligned boundary. */\r
- pucAlignedHeap = ( unsigned char * ) ( ( ( portPOINTER_SIZE_TYPE ) &ucHeap[ portBYTE_ALIGNMENT ] ) & ( ( portPOINTER_SIZE_TYPE ) ~portBYTE_ALIGNMENT_MASK ) );\r
+ pucAlignedHeap = ( uint8_t * ) ( ( ( portPOINTER_SIZE_TYPE ) &ucHeap[ portBYTE_ALIGNMENT ] ) & ( ( portPOINTER_SIZE_TYPE ) ~portBYTE_ALIGNMENT_MASK ) );\r
\r
/* xStart is used to hold a pointer to the first item in the list of free\r
blocks. The void cast is used to prevent compiler warnings. */\r