Minor synching - no functional changes.

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

diff --git a/FreeRTOS/Source/include/task.h b/FreeRTOS/Source/include/task.h
index 7f1f8badcba349a2627d7007279ce358c490fb29..1a5136e8dea69c39524c8b95a193bd6bd972eb97 100644 (file)
--- 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"\r
 #define tskKERNEL_VERSION_MAJOR 10\r
 #define tskKERNEL_VERSION_MINOR 1\r
-#define tskKERNEL_VERSION_BUILD 0\r
+#define tskKERNEL_VERSION_BUILD 1\r
 \r
 /**\r
  * task. h\r
@@ -58,7 +58,7 @@ extern "C" {
  * \defgroup TaskHandle_t TaskHandle_t\r
  * \ingroup Tasks\r
  */\r
-struct tskTaskControlBlock; /* Using old naming convention so as not to break kernel aware debuggers. */\r
+struct tskTaskControlBlock; /* The old naming convention is used to prevent breaking kernel aware debuggers. */\r
 typedef struct tskTaskControlBlock* TaskHandle_t;\r
 \r
 /*\r

diff --git a/FreeRTOS/Source/include/timers.h b/FreeRTOS/Source/include/timers.h
index 0d7f5b9e7d1032e427c341460f4f02853f0abdb2..3a44d49da4a572ed1205508e2b3998bd22801038 100644 (file)
--- 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\r
  * (for example, xTimerStart(), xTimerReset(), etc.).\r
  */\r
-struct tmrTimerControl; /* Using old naming convention so as not to break kernel aware debuggers. */\r
+struct tmrTimerControl; /* The old naming convention is used to prevent breaking kernel aware debuggers. */\r
 typedef struct tmrTimerControl * TimerHandle_t;\r
 \r
 /*\r

diff --git a/FreeRTOS/Source/queue.c b/FreeRTOS/Source/queue.c
index bd0648b722b9c5f1d2fff9dfd0a728a29dd1ad08..a3894fb931bc9b82fc9be9da276c81c3a7f20456 100644 (file)
--- 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\r
  * rationale: https://www.freertos.org/Embedded-RTOS-Queues.html\r
  */\r
-typedef struct QueueDefinition /* Using old naming convention so as not to break kernel aware debuggers. */\r
+typedef struct QueueDefinition                 /* The old naming convention is used to prevent breaking kernel aware debuggers. */\r
 {\r
        int8_t *pcHead;                                 /*< Points to the beginning of the queue storage area. */\r
        int8_t *pcWriteTo;                              /*< Points to the free next place in the storage area. */\r

diff --git a/FreeRTOS/Source/tasks.c b/FreeRTOS/Source/tasks.c
index a490ba15ab812dbe611423d7c9bb4187d45dba42..f6009fcc757500359fafc286a440e3915e98c259 100644 (file)
--- 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\r
  * (the task's run time environment, including register values)\r
  */\r
-typedef struct tskTaskControlBlock /* Using old naming convention so as not to break kernel aware debuggers. */\r
+typedef struct tskTaskControlBlock                     /* The old naming convention is used to prevent breaking kernel aware debuggers. */\r
 {\r
        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. */\r
 \r
@@ -350,10 +350,10 @@ typedef tskTCB TCB_t;
 which static variables must be declared volatile. */\r
 PRIVILEGED_DATA TCB_t * volatile pxCurrentTCB = NULL;\r
 \r
-/* Lists for ready and blocked tasks. --------------------*/\r
-/* Note xDelayedTaskList1 and xDelayedTaskList2 could be moved to be function\r
-scope - but doing so breaks kernel aware debuggers, and debug scenarios that\r
-require the static qualifier to be removed. */\r
+/* Lists for ready and blocked tasks. --------------------\r
+xDelayedTaskList1 and xDelayedTaskList2 could be move to function scople but\r
+doing so breaks some kernel aware debuggers and debuggers that rely on removing\r
+the static qualifier. */\r
 PRIVILEGED_DATA static List_t pxReadyTasksLists[ configMAX_PRIORITIES ];/*< Prioritised ready tasks. */\r
 PRIVILEGED_DATA static List_t xDelayedTaskList1;                                               /*< Delayed tasks. */\r
 PRIVILEGED_DATA static List_t xDelayedTaskList2;                                               /*< Delayed tasks (two lists are used - one for delays that have overflowed the current tick count. */\r
@@ -404,8 +404,8 @@ PRIVILEGED_DATA static volatile UBaseType_t uxSchedulerSuspended    = ( UBaseType_t
 \r
 #if ( configGENERATE_RUN_TIME_STATS == 1 )\r
 \r
-       /* Do not move to function scope as that breaks debug scenarios that\r
-       require the the static qualifier to be removed. */\r
+       /* Do not move these variables to function scope as doing so prevents the\r
+       code working with debuggers that need to remove the static qualifier. */\r
        PRIVILEGED_DATA static uint32_t ulTaskSwitchedInTime = 0UL;     /*< Holds the value of a timer/counter the last time a task was switched in. */\r
        PRIVILEGED_DATA static uint32_t ulTotalRunTime = 0UL;           /*< Holds the total amount of execution time as defined by the run time counter clock. */\r
 \r

diff --git a/FreeRTOS/Source/timers.c b/FreeRTOS/Source/timers.c
index 5ab04789eaa443228a2b42b70657e405ea52f907..4e24a297adbcf3871176f5a25f148e3af8eefb2f 100644 (file)
--- a/FreeRTOS/Source/timers.c
+++ b/FreeRTOS/Source/timers.c
@@ -65,7 +65,7 @@ defining trmTIMER_SERVICE_TASK_NAME in FreeRTOSConfig.h. */
 #endif\r
 \r
 /* The definition of the timers themselves. */\r
-typedef struct tmrTimerControl /* Using old naming convention so as not to break kernel aware debuggers. */\r
+typedef struct tmrTimerControl /* The old naming convention is used to prevent breaking kernel aware debuggers. */\r
 {\r
        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. */\r
        ListItem_t                              xTimerListItem;         /*<< Standard linked list item as used by all kernel features for event management. */\r
@@ -127,10 +127,10 @@ which static variables must be declared volatile. */
 \r
 /* The list in which active timers are stored.  Timers are referenced in expire\r
 time order, with the nearest expiry time at the front of the list.  Only the\r
-timer service task is allowed to access these lists.  NOTE:  xActiveTimerList1\r
-and xActiveTimerList2 could move to be function scope, however doing so breaks\r
-kernel aware debuggers, and debug scenarios that require the static qualifier\r
-to be removed. */\r
+timer service task is allowed to access these lists. \r
+xActiveTimerList1 and xActiveTimerList2 could be at function scope but that\r
+breaks some kernel aware debuggers, and debuggers that reply on removing the\r
+static qualifier. */\r
 PRIVILEGED_DATA static List_t xActiveTimerList1;\r
 PRIVILEGED_DATA static List_t xActiveTimerList2;\r
 PRIVILEGED_DATA static List_t *pxCurrentTimerList;\r