- Rework the StaticAllocation.c common demo file to reflect the changes to the static allocation object create functions from the previous check-in.

- Correct various typos in comments.
- Add xTimerGetPeriod() function (feature request).


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

2 files changed, 28 insertions, 28 deletions

diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/Include/trcKernelHooks.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/Include/trcKernelHooks.h
index 7b94a106f..03145b8e6 100644
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/Include/trcKernelHooks.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/Include/trcKernelHooks.h
@@ -187,7 +187,7 @@
 #undef trcKERNEL_HOOKS_TASK_RESUME

 #define trcKERNEL_HOOKS_TASK_RESUME(SERVICE, pxTCB) \

 	vTraceStoreKernelCall(SERVICE, TRACE_CLASS_TASK, TRACE_GET_TASK_NUMBER(pxTCB));

-	

+

 #undef trcKERNEL_HOOKS_TIMER_EVENT

 #define trcKERNEL_HOOKS_TIMER_EVENT(SERVICE, pxTimer) \

 	vTraceStoreKernelCall(SERVICE, TRACE_CLASS_TIMER, TRACE_GET_TIMER_NUMBER(pxTimer));

diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernelPort.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernelPort.c
index 38251c40e..722e55341 100644
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernelPort.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernelPort.c
@@ -5,30 +5,30 @@
  * trcKernelPort.c

  *

  * Kernel-specific functionality for FreeRTOS, used by the recorder library.

- * 

+ *

  * Terms of Use

  * This software is copyright Percepio AB. The recorder library is free for

  * use together with Percepio products. You may distribute the recorder library

  * in its original form, including modifications in trcHardwarePort.c/.h

  * given that these modification are clearly marked as your own modifications

- * and documented in the initial comment section of these source files. 

- * This software is the intellectual property of Percepio AB and may not be 

- * sold or in other ways commercially redistributed without explicit written 

+ * and documented in the initial comment section of these source files.

+ * This software is the intellectual property of Percepio AB and may not be

+ * sold or in other ways commercially redistributed without explicit written

  * permission by Percepio AB.

  *

- * Disclaimer 

- * The trace tool and recorder library is being delivered to you AS IS and 

- * Percepio AB makes no warranty as to its use or performance. Percepio AB does 

- * not and cannot warrant the performance or results you may obtain by using the 

- * software or documentation. Percepio AB make no warranties, express or 

- * implied, as to noninfringement of third party rights, merchantability, or 

- * fitness for any particular purpose. In no event will Percepio AB, its 

- * technology partners, or distributors be liable to you for any consequential, 

- * incidental or special damages, including any lost profits or lost savings, 

- * even if a representative of Percepio AB has been advised of the possibility 

- * of such damages, or for any claim by any third party. Some jurisdictions do 

- * not allow the exclusion or limitation of incidental, consequential or special 

- * damages, or the exclusion of implied warranties or limitations on how long an 

+ * Disclaimer

+ * The trace tool and recorder library is being delivered to you AS IS and

+ * Percepio AB makes no warranty as to its use or performance. Percepio AB does

+ * not and cannot warrant the performance or results you may obtain by using the

+ * software or documentation. Percepio AB make no warranties, express or

+ * implied, as to noninfringement of third party rights, merchantability, or

+ * fitness for any particular purpose. In no event will Percepio AB, its

+ * technology partners, or distributors be liable to you for any consequential,

+ * incidental or special damages, including any lost profits or lost savings,

+ * even if a representative of Percepio AB has been advised of the possibility

+ * of such damages, or for any claim by any third party. Some jurisdictions do

+ * not allow the exclusion or limitation of incidental, consequential or special

+ * damages, or the exclusion of implied warranties or limitations on how long an

  * implied warranty may last, so the above limitations may not apply to you.

  *

  * Tabs are used for indent in this file (1 tab = 4 spaces)

@@ -45,7 +45,7 @@
 

 #include "task.h"

 

-/* For classes implemented as FreeRTOS Queues: 

+/* For classes implemented as FreeRTOS Queues:

 This translates queue.type to the corresponding trace object class. */

 traceObjectClass TraceObjectClassTable[5] = {

 	TRACE_CLASS_QUEUE,

@@ -119,14 +119,14 @@ void vTraceInitObjectPropertyTable()
 	RecorderDataPtr->ObjectPropertyTable.NumberOfObjectsPerClass[3] = NTask;

 	RecorderDataPtr->ObjectPropertyTable.NumberOfObjectsPerClass[4] = NISR;

 	RecorderDataPtr->ObjectPropertyTable.NumberOfObjectsPerClass[5] = NTimer;

-	RecorderDataPtr->ObjectPropertyTable.NumberOfObjectsPerClass[6] = NEventGroup;	

+	RecorderDataPtr->ObjectPropertyTable.NumberOfObjectsPerClass[6] = NEventGroup;

 	RecorderDataPtr->ObjectPropertyTable.NameLengthPerClass[0] = NameLenQueue;

 	RecorderDataPtr->ObjectPropertyTable.NameLengthPerClass[1] = NameLenSemaphore;

 	RecorderDataPtr->ObjectPropertyTable.NameLengthPerClass[2] = NameLenMutex;

 	RecorderDataPtr->ObjectPropertyTable.NameLengthPerClass[3] = NameLenTask;

 	RecorderDataPtr->ObjectPropertyTable.NameLengthPerClass[4] = NameLenISR;

 	RecorderDataPtr->ObjectPropertyTable.NameLengthPerClass[5] = NameLenTimer;

-	RecorderDataPtr->ObjectPropertyTable.NameLengthPerClass[6] = NameLenEventGroup;	

+	RecorderDataPtr->ObjectPropertyTable.NameLengthPerClass[6] = NameLenEventGroup;

 	RecorderDataPtr->ObjectPropertyTable.TotalPropertyBytesPerClass[0] = PropertyTableSizeQueue;

 	RecorderDataPtr->ObjectPropertyTable.TotalPropertyBytesPerClass[1] = PropertyTableSizeSemaphore;

 	RecorderDataPtr->ObjectPropertyTable.TotalPropertyBytesPerClass[2] = PropertyTableSizeMutex;

@@ -163,7 +163,7 @@ void vTraceInitObjectHandleStack()
 	objectHandleStacks.highestIndexOfClass[5] = NQueue + NSemaphore + NMutex + NTask + NISR + NTimer - 1;

 	objectHandleStacks.highestIndexOfClass[6] = NQueue + NSemaphore + NMutex + NTask + NISR + NTimer + NEventGroup - 1;

 }

-	

+

 /* Returns the "Not enough handles" error message for this object class */

 const char* pszTraceGetErrorNotEnoughHandles(traceObjectClass objectclass)

 {

@@ -182,7 +182,7 @@ const char* pszTraceGetErrorNotEnoughHandles(traceObjectClass objectclass)
 	case TRACE_CLASS_TIMER:

 		return "Not enough TIMER handles - increase NTimer in trcConfig.h";

 	case TRACE_CLASS_EVENTGROUP:

-		return "Not enough EVENTGROUP handles - increase NEventGroup in trcConfig.h";		

+		return "Not enough EVENTGROUP handles - increase NEventGroup in trcConfig.h";

 	default:

 		return "pszTraceGetErrorHandles: Invalid objectclass!";

 	}

@@ -193,7 +193,7 @@ uint8_t uiTraceIsObjectExcluded(traceObjectClass objectclass, objectHandleType h
 {

 	TRACE_ASSERT(objectclass < TRACE_NCLASSES, "prvTraceIsObjectExcluded: objectclass >= TRACE_NCLASSES", 1);

 	TRACE_ASSERT(handle <= RecorderDataPtr->ObjectPropertyTable.NumberOfObjectsPerClass[objectclass], "uiTraceIsObjectExcluded: Invalid value for handle", 1);

-	

+

 	switch(objectclass)

 	{

 	case TRACE_CLASS_TASK:

@@ -205,13 +205,13 @@ uint8_t uiTraceIsObjectExcluded(traceObjectClass objectclass, objectHandleType h
 	case TRACE_CLASS_QUEUE:

 		return TRACE_GET_QUEUE_FLAG_ISEXCLUDED(handle);

 	case TRACE_CLASS_TIMER:

-		return TRACE_GET_TIMER_FLAG_ISEXCLUDED(handle);		

+		return TRACE_GET_TIMER_FLAG_ISEXCLUDED(handle);

 	case TRACE_CLASS_EVENTGROUP:

-		return TRACE_GET_EVENTGROUP_FLAG_ISEXCLUDED(handle);				

+		return TRACE_GET_EVENTGROUP_FLAG_ISEXCLUDED(handle);

 	}

-	

+

 	vTraceError("Invalid object class ID in uiTraceIsObjectExcluded!");

-	

+

 	/* Must never reach */

 	return 1;

 }