From: rtel <rtel@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Tue, 28 Aug 2018 18:10:42 +0000 (+0000)
Subject: Minor updates to fix issues with the Segger kernel aware plug since V10.1.0.
X-Git-Tag: V10.1.1~8
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2091000be7495933cc96653d323c909565858e77;p=freertos

Minor updates to fix issues with the Segger kernel aware plug since V10.1.0.

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

diff --git a/FreeRTOS/Source/include/queue.h b/FreeRTOS/Source/include/queue.h
index 05ae2c1f9..ef735893c 100644
--- a/FreeRTOS/Source/include/queue.h
+++ b/FreeRTOS/Source/include/queue.h
@@ -44,7 +44,7 @@ extern "C" {
  * returns an QueueHandle_t variable that can then be used as a parameter to
  * xQueueSend(), xQueueReceive(), etc.
  */
-struct QueueDefinition;
+struct QueueDefinition; /* Using old naming convention so as not to break kernel aware debuggers. */
 typedef struct QueueDefinition * QueueHandle_t;
 
 /**
diff --git a/FreeRTOS/Source/include/task.h b/FreeRTOS/Source/include/task.h
index 2493c13aa..2e93f792f 100644
--- a/FreeRTOS/Source/include/task.h
+++ b/FreeRTOS/Source/include/task.h
@@ -58,8 +58,8 @@ extern "C" {
  * \defgroup TaskHandle_t TaskHandle_t
  * \ingroup Tasks
  */
-struct TaskControlBlock_t;
-typedef struct TaskControlBlock_t* TaskHandle_t;
+struct tskTaskControlBlock;
+typedef struct tskTaskControlBlock* TaskHandle_t;
 
 /*
  * Defines the prototype to which the application task hook function must
diff --git a/FreeRTOS/Source/tasks.c b/FreeRTOS/Source/tasks.c
index 5d47418c0..242dd360d 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 TaskControlBlock_t
+typedef struct tskTaskControlBlock
 {
 	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. */