From: richardbarry <richardbarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Sat, 28 Oct 2006 09:47:41 +0000 (+0000)
Subject: Ensure previous modification does not prevent compilation when INCLUDE_vTaskSuspend... 
X-Git-Tag: V4.1.3~6
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f2773d740c8762725a3c6531f726848f4ef84241;p=freertos

Ensure previous modification does not prevent compilation when INCLUDE_vTaskSuspend is set to false.

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

diff --git a/Source/tasks.c b/Source/tasks.c
index 9b722bf75..3b6990355 100644
--- a/Source/tasks.c
+++ b/Source/tasks.c
@@ -1429,32 +1429,56 @@ portTickType xTimeToWake;
 	exclusive access to the ready lists as the scheduler is locked. */
 	vListRemove( ( xListItem * ) &( pxCurrentTCB->xGenericListItem ) );
 
-	if( xTicksToWait == portMAX_DELAY )
-	{
-		/* Add ourselves to the suspended task list instead of a delayed task
-		list to ensure we are not woken by a timing event.  We will block
-		indefinitely. */
-		vListInsertEnd( ( xList * ) &xSuspendedTaskList, ( xListItem * ) &( pxCurrentTCB->xGenericListItem ) );
-	}
-	else
-	{
-		/* Calculate the time at which the task should be woken if the event does
-		not occur.  This may overflow but this doesn't matter. */
-		xTimeToWake = xTickCount + xTicksToWait;
-	
-		listSET_LIST_ITEM_VALUE( &( pxCurrentTCB->xGenericListItem ), xTimeToWake );
-	
-		if( xTimeToWake < xTickCount )
+
+	#if ( INCLUDE_vTaskSuspend == 1 )
+	{			 
+		if( xTicksToWait == portMAX_DELAY )
 		{
-			/* Wake time has overflowed.  Place this item in the overflow list. */
-			vListInsert( ( xList * ) pxOverflowDelayedTaskList, ( xListItem * ) &( pxCurrentTCB->xGenericListItem ) );
+			/* Add ourselves to the suspended task list instead of a delayed task
+			list to ensure we are not woken by a timing event.  We will block
+			indefinitely. */
+			vListInsertEnd( ( xList * ) &xSuspendedTaskList, ( xListItem * ) &( pxCurrentTCB->xGenericListItem ) );
 		}
 		else
 		{
-			/* The wake time has not overflowed, so we can use the current block list. */
-			vListInsert( ( xList * ) pxDelayedTaskList, ( xListItem * ) &( pxCurrentTCB->xGenericListItem ) );
+			/* Calculate the time at which the task should be woken if the event does
+			not occur.  This may overflow but this doesn't matter. */
+			xTimeToWake = xTickCount + xTicksToWait;
+		
+			listSET_LIST_ITEM_VALUE( &( pxCurrentTCB->xGenericListItem ), xTimeToWake );
+		
+			if( xTimeToWake < xTickCount )
+			{
+				/* Wake time has overflowed.  Place this item in the overflow list. */
+				vListInsert( ( xList * ) pxOverflowDelayedTaskList, ( xListItem * ) &( pxCurrentTCB->xGenericListItem ) );
+			}
+			else
+			{
+				/* The wake time has not overflowed, so we can use the current block list. */
+				vListInsert( ( xList * ) pxDelayedTaskList, ( xListItem * ) &( pxCurrentTCB->xGenericListItem ) );
+			}
 		}
 	}
+	#else
+	{
+			/* Calculate the time at which the task should be woken if the event does
+			not occur.  This may overflow but this doesn't matter. */
+			xTimeToWake = xTickCount + xTicksToWait;
+		
+			listSET_LIST_ITEM_VALUE( &( pxCurrentTCB->xGenericListItem ), xTimeToWake );
+		
+			if( xTimeToWake < xTickCount )
+			{
+				/* Wake time has overflowed.  Place this item in the overflow list. */
+				vListInsert( ( xList * ) pxOverflowDelayedTaskList, ( xListItem * ) &( pxCurrentTCB->xGenericListItem ) );
+			}
+			else
+			{
+				/* The wake time has not overflowed, so we can use the current block list. */
+				vListInsert( ( xList * ) pxDelayedTaskList, ( xListItem * ) &( pxCurrentTCB->xGenericListItem ) );
+			}
+	}
+	#endif
 }
 /*-----------------------------------------------------------*/