Still a work in progress. Checking in for backup only.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@959 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/Source/include/FreeRTOS.h b/Source/include/FreeRTOS.h
index 2216767fb296a9448d328ed82623b5654c1496d4..d7609f365d20fd7a9638daeefc1c34b51edfa50e 100644 (file)
--- a/Source/include/FreeRTOS.h
+++ b/Source/include/FreeRTOS.h
@@ -409,7 +409,7 @@ typedef portBASE_TYPE (*pdTASK_HOOK_CODE)( void * );
 #endif\r
 \r
 #ifndef pvPortMallocAligned\r
-       #define pvPortMallocAligned( xSize, pvBuffer ) pvPortMalloc( xSize ); ( void ) pvBuffer\r
+       #define pvPortMallocAligned( x, puxStackBuffer ) ( ( puxStackBuffer == NULL ) ? ( pvPortMalloc( x ) ) : ( puxStackBuffer ) )\r
 #endif\r
 \r
 #ifndef vPortFreeAligned\r

diff --git a/Source/tasks.c b/Source/tasks.c
index 75816f39313915e06cf6c55a49ed7fabe1e75770..3ca53b1046344f41f4042e787e380f6593259621 100644 (file)
--- a/Source/tasks.c
+++ b/Source/tasks.c
@@ -72,8 +72,6 @@ task.h is included from an application file. */
  */\r
 #define tskIDLE_STACK_SIZE     configMINIMAL_STACK_SIZE\r
 \r
-#define tskIDLE_PRIORITY                       ( ( unsigned portBASE_TYPE ) 0 )\r
-\r
 /*\r
  * Task control block.  A task control block (TCB) is allocated to each task,\r
  * and stores the context of the task.\r