Minor synching - no functional changes.

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

5 files changed, 16 insertions, 16 deletions

diff --git a/FreeRTOS/Source/include/task.h b/FreeRTOS/Source/include/task.h
index 7f1f8badc..1a5136e8d 100644
--- a/FreeRTOS/Source/include/task.h
+++ b/FreeRTOS/Source/include/task.h
@@ -46,7 +46,7 @@ extern "C" {
 #define tskKERNEL_VERSION_NUMBER "V10.1.1"

 #define tskKERNEL_VERSION_MAJOR 10

 #define tskKERNEL_VERSION_MINOR 1

-#define tskKERNEL_VERSION_BUILD 0

+#define tskKERNEL_VERSION_BUILD 1

 

 /**

  * task. h

@@ -58,7 +58,7 @@ extern "C" {
  * \defgroup TaskHandle_t TaskHandle_t

  * \ingroup Tasks

  */

-struct tskTaskControlBlock; /* Using old naming convention so as not to break kernel aware debuggers. */

+struct tskTaskControlBlock; /* The old naming convention is used to prevent breaking kernel aware debuggers. */

 typedef struct tskTaskControlBlock* TaskHandle_t;

 

 /*

diff --git a/FreeRTOS/Source/include/timers.h b/FreeRTOS/Source/include/timers.h
index 0d7f5b9e7..3a44d49da 100644
--- a/FreeRTOS/Source/include/timers.h
+++ b/FreeRTOS/Source/include/timers.h
@@ -73,7 +73,7 @@ or interrupt version of the queue send function should be used. */
  * reference the subject timer in calls to other software timer API functions

  * (for example, xTimerStart(), xTimerReset(), etc.).

  */

-struct tmrTimerControl; /* Using old naming convention so as not to break kernel aware debuggers. */

+struct tmrTimerControl; /* The old naming convention is used to prevent breaking kernel aware debuggers. */

 typedef struct tmrTimerControl * TimerHandle_t;

 

 /*

diff --git a/FreeRTOS/Source/queue.c b/FreeRTOS/Source/queue.c
index bd0648b72..a3894fb93 100644
--- a/FreeRTOS/Source/queue.c
+++ b/FreeRTOS/Source/queue.c
@@ -94,7 +94,7 @@ zero. */
  * Items are queued by copy, not reference.  See the following link for the

  * rationale: https://www.freertos.org/Embedded-RTOS-Queues.html

  */

-typedef struct QueueDefinition /* Using old naming convention so as not to break kernel aware debuggers. */

+typedef struct QueueDefinition 		/* The old naming convention is used to prevent breaking kernel aware debuggers. */

 {

 	int8_t *pcHead;					/*< Points to the beginning of the queue storage area. */

 	int8_t *pcWriteTo;				/*< Points to the free next place in the storage area. */

diff --git a/FreeRTOS/Source/tasks.c b/FreeRTOS/Source/tasks.c
index a490ba15a..f6009fcc7 100644
--- a/FreeRTOS/Source/tasks.c
+++ b/FreeRTOS/Source/tasks.c
@@ -266,7 +266,7 @@ to its original value when it is released. */
  * and stores task state information, including a pointer to the task's context

  * (the task's run time environment, including register values)

  */

-typedef struct tskTaskControlBlock /* Using old naming convention so as not to break kernel aware debuggers. */

+typedef struct tskTaskControlBlock 			/* The old naming convention is used to prevent breaking kernel aware debuggers. */

 {

 	volatile StackType_t	*pxTopOfStack;	/*< Points to the location of the last item placed on the tasks stack.  THIS MUST BE THE FIRST MEMBER OF THE TCB STRUCT. */

 

@@ -350,10 +350,10 @@ typedef tskTCB TCB_t;
 which static variables must be declared volatile. */

 PRIVILEGED_DATA TCB_t * volatile pxCurrentTCB = NULL;

 

-/* Lists for ready and blocked tasks. --------------------*/

-/* Note xDelayedTaskList1 and xDelayedTaskList2 could be moved to be function

-scope - but doing so breaks kernel aware debuggers, and debug scenarios that

-require the static qualifier to be removed. */

+/* Lists for ready and blocked tasks. --------------------

+xDelayedTaskList1 and xDelayedTaskList2 could be move to function scople but

+doing so breaks some kernel aware debuggers and debuggers that rely on removing

+the static qualifier. */

 PRIVILEGED_DATA static List_t pxReadyTasksLists[ configMAX_PRIORITIES ];/*< Prioritised ready tasks. */

 PRIVILEGED_DATA static List_t xDelayedTaskList1;						/*< Delayed tasks. */

 PRIVILEGED_DATA static List_t xDelayedTaskList2;						/*< Delayed tasks (two lists are used - one for delays that have overflowed the current tick count. */

@@ -404,8 +404,8 @@ PRIVILEGED_DATA static volatile UBaseType_t uxSchedulerSuspended	= ( UBaseType_t
 

 #if ( configGENERATE_RUN_TIME_STATS == 1 )

 

-	/* Do not move to function scope as that breaks debug scenarios that

-	require the the static qualifier to be removed. */

+	/* Do not move these variables to function scope as doing so prevents the

+	code working with debuggers that need to remove the static qualifier. */

 	PRIVILEGED_DATA static uint32_t ulTaskSwitchedInTime = 0UL;	/*< Holds the value of a timer/counter the last time a task was switched in. */

 	PRIVILEGED_DATA static uint32_t ulTotalRunTime = 0UL;		/*< Holds the total amount of execution time as defined by the run time counter clock. */

 

diff --git a/FreeRTOS/Source/timers.c b/FreeRTOS/Source/timers.c
index 5ab04789e..4e24a297a 100644
--- a/FreeRTOS/Source/timers.c
+++ b/FreeRTOS/Source/timers.c
@@ -65,7 +65,7 @@ defining trmTIMER_SERVICE_TASK_NAME in FreeRTOSConfig.h. */
 #endif

 

 /* The definition of the timers themselves. */

-typedef struct tmrTimerControl /* Using old naming convention so as not to break kernel aware debuggers. */

+typedef struct tmrTimerControl /* The old naming convention is used to prevent breaking kernel aware debuggers. */

 {

 	const char				*pcTimerName;		/*<< Text name.  This is not used by the kernel, it is included simply to make debugging easier. */ /*lint !e971 Unqualified char types are allowed for strings and single characters only. */

 	ListItem_t				xTimerListItem;		/*<< Standard linked list item as used by all kernel features for event management. */

@@ -127,10 +127,10 @@ which static variables must be declared volatile. */
 

 /* The list in which active timers are stored.  Timers are referenced in expire

 time order, with the nearest expiry time at the front of the list.  Only the

-timer service task is allowed to access these lists.  NOTE:  xActiveTimerList1

-and xActiveTimerList2 could move to be function scope, however doing so breaks

-kernel aware debuggers, and debug scenarios that require the static qualifier

-to be removed. */

+timer service task is allowed to access these lists. 

+xActiveTimerList1 and xActiveTimerList2 could be at function scope but that

+breaks some kernel aware debuggers, and debuggers that reply on removing the

+static qualifier. */

 PRIVILEGED_DATA static List_t xActiveTimerList1;

 PRIVILEGED_DATA static List_t xActiveTimerList2;

 PRIVILEGED_DATA static List_t *pxCurrentTimerList;