len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-04-20 05:21:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Final commit before tagging - cosmetic changes only.

Browse source
This commit is contained in:
Richard Barry 2015-08-12 16:45:24 +00:00
parent 3291f5a08d
commit 1b010fbaa7
8 changed files with 96 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/Include/trcBase.h
View file

@ -1,10 +1,10 @@
/******************************************************************************* /*******************************************************************************
* Tracealyzer v2.7.0 Recorder Library * Tracealyzer v2.7.7 Recorder Library
* Percepio AB, www.percepio.com * Percepio AB, www.percepio.com
* *
* trcBase.h * trcKernel.c
* *
* Core functionality of the Tracealyzer recorder library. * Functions used by trcKernelHooks.h for storing various kernel events.
* *
* Terms of Use * Terms of Use
* This software is copyright Percepio AB. The recorder library is free for * This software is copyright Percepio AB. The recorder library is free for
@ -33,7 +33,7 @@
* *
* Tabs are used for indent in this file (1 tab = 4 spaces) * Tabs are used for indent in this file (1 tab = 4 spaces)
* *
* Copyright Percepio AB, 2014. * Copyright Percepio AB, 2012-2015.
* www.percepio.com * www.percepio.com
******************************************************************************/ ******************************************************************************/

4
FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/Include/trcKernelHooks.h
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Tracealyzer v2.7.0 Recorder Library * Tracealyzer v2.7.7 Recorder Library
* Percepio AB, www.percepio.com * Percepio AB, www.percepio.com
* *
* trcKernelHooks.h * trcKernelHooks.h
@ -40,7 +40,7 @@
* damages, or the exclusion of implied warranties or limitations on how long an * 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. * implied warranty may last, so the above limitations may not apply to you.
* *
* Copyright Percepio AB, 2013. * Copyright Percepio AB, 2012-2015.
* www.percepio.com * www.percepio.com
******************************************************************************/ ******************************************************************************/

4
FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/Include/trcTypes.h
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Tracealyzer v2.7.0 Recorder Library * Tracealyzer v2.7.7 Recorder Library
* Percepio AB, www.percepio.com * Percepio AB, www.percepio.com
* *
* trcTypes.h * trcTypes.h
@ -33,7 +33,7 @@
* *
* Tabs are used for indent in this file (1 tab = 4 spaces) * Tabs are used for indent in this file (1 tab = 4 spaces)
* *
* Copyright Percepio AB, 2014. * Copyright Percepio AB, 2012-2015.
* www.percepio.com * www.percepio.com
******************************************************************************/ ******************************************************************************/

84
FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcBase.c
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Tracealyzer v2.7.0 Recorder Library * Tracealyzer v2.7.7 Recorder Library
* Percepio AB, www.percepio.com * Percepio AB, www.percepio.com
* *
* trcBase.c * trcBase.c
@ -33,11 +33,11 @@
* *
* Tabs are used for indent in this file (1 tab = 4 spaces) * Tabs are used for indent in this file (1 tab = 4 spaces)
* *
* Copyright Percepio AB, 2014. * Copyright Percepio AB, 2012-2015.
* www.percepio.com * www.percepio.com
******************************************************************************/ ******************************************************************************/
#include "trcBase.h" #include "trcBase.h"
#if (USE_TRACEALYZER_RECORDER == 1) #if (USE_TRACEALYZER_RECORDER == 1)
@ -48,7 +48,7 @@
******************************************************************************/ ******************************************************************************/
/* Tasks and kernel objects can be explicitly excluded from the trace to reduce /* Tasks and kernel objects can be explicitly excluded from the trace to reduce
buffer usage. This structure handles the exclude flags for all objects and tasks. buffer usage. This structure handles the exclude flags for all objects and tasks.
Note that slot 0 is not used, since not a valid handle. */ Note that slot 0 is not used, since not a valid handle. */
uint8_t excludedObjects[(TRACE_KERNEL_OBJECT_COUNT + TRACE_NCLASSES) / 8 + 1] = { 0 }; uint8_t excludedObjects[(TRACE_KERNEL_OBJECT_COUNT + TRACE_NCLASSES) / 8 + 1] = { 0 };
@ -58,43 +58,43 @@ This structure handle the exclude flags for all event codes */
uint8_t excludedEventCodes[NEventCodes / 8 + 1] = { 0 }; uint8_t excludedEventCodes[NEventCodes / 8 + 1] = { 0 };
/* A set of stacks that keeps track of available object handles for each class. /* A set of stacks that keeps track of available object handles for each class.
The stacks are empty initially, meaning that allocation of new handles will be The stacks are empty initially, meaning that allocation of new handles will be
based on a counter (for each object class). Any delete operation will based on a counter (for each object class). Any delete operation will
return the handle to the corresponding stack, for reuse on the next allocate.*/ return the handle to the corresponding stack, for reuse on the next allocate.*/
objectHandleStackType objectHandleStacks = { { 0 }, { 0 }, { 0 }, { 0 }, { 0 } }; objectHandleStackType objectHandleStacks = { { 0 }, { 0 }, { 0 }, { 0 }, { 0 } };
/* Initial HWTC_COUNT value, for detecting if the time-stamping source is /* Initial HWTC_COUNT value, for detecting if the time-stamping source is
enabled. If using the OS periodic timer for time-stamping, this might not enabled. If using the OS periodic timer for time-stamping, this might not
have been configured on the earliest events during the startup. */ have been configured on the earliest events during the startup. */
uint32_t init_hwtc_count; uint32_t init_hwtc_count;
/******************************************************************************* /*******************************************************************************
* RecorderData * RecorderData
* *
* The main data structure. This is the data read by the Tracealyzer tools, * The main data structure. This is the data read by the Tracealyzer tools,
* typically through a debugger RAM dump. The recorder uses the pointer * typically through a debugger RAM dump. The recorder uses the pointer
* RecorderDataPtr for accessing this, to allow for dynamic allocation. * RecorderDataPtr for accessing this, to allow for dynamic allocation.
* *
* On the NXP LPC17xx you may use the secondary RAM bank (AHB RAM) for this * On the NXP LPC17xx you may use the secondary RAM bank (AHB RAM) for this
* purpose. For instance, the LPC1766 has 32 KB AHB RAM which allows for * purpose. For instance, the LPC1766 has 32 KB AHB RAM which allows for
* allocating a buffer size of at least 7500 events without affecting the main * allocating a buffer size of at least 7500 events without affecting the main
* RAM. To place RecorderData in this RAM bank using IAR Embedded Workbench * RAM. To place RecorderData in this RAM bank using IAR Embedded Workbench
* for ARM, use this pragma right before the declaration: * for ARM, use this pragma right before the declaration:
* *
* #pragma location="AHB_RAM_MEMORY" * #pragma location="AHB_RAM_MEMORY"
* *
* This of course works for other hardware architectures with additional RAM * This of course works for other hardware architectures with additional RAM
* banks as well, just replace "AHB_RAM_MEMORY" with the section name from the * banks as well, just replace "AHB_RAM_MEMORY" with the section name from the
* linker .map file, or simply the desired address. * linker .map file, or simply the desired address.
* *
* For portability reasons, we don't add the pragma directly in trcBase.c, but * For portability reasons, we don't add the pragma directly in trcBase.c, but
* in a header file included below. To include this header, you need to enable * in a header file included below. To include this header, you need to enable
* USE_LINKER_PRAGMA, defined in trcConfig.h. * USE_LINKER_PRAGMA, defined in trcConfig.h.
* *
* If using GCC, you need to modify the declaration as follows: * If using GCC, you need to modify the declaration as follows:
* *
* RecorderDataType RecorderData __attribute__ ((section ("name"))) = ... * RecorderDataType RecorderData __attribute__ ((section ("name"))) = ...
* *
* Remember to replace "name" with the correct section name. * Remember to replace "name" with the correct section name.
******************************************************************************/ ******************************************************************************/
@ -113,9 +113,9 @@ RecorderDataType* RecorderDataPtr = NULL;
/* This version of the function dynamically allocates the trace data */ /* This version of the function dynamically allocates the trace data */
void prvTraceInitTraceData() void prvTraceInitTraceData()
{ {
init_hwtc_count = HWTC_COUNT; init_hwtc_count = HWTC_COUNT;
#if TRACE_DATA_ALLOCATION == TRACE_DATA_ALLOCATION_STATIC #if TRACE_DATA_ALLOCATION == TRACE_DATA_ALLOCATION_STATIC
RecorderDataPtr = &RecorderData; RecorderDataPtr = &RecorderData;
#elif TRACE_DATA_ALLOCATION == TRACE_DATA_ALLOCATION_DYNAMIC #elif TRACE_DATA_ALLOCATION == TRACE_DATA_ALLOCATION_DYNAMIC
@ -132,7 +132,7 @@ void prvTraceInitTraceData()
vTraceError("No recorder data structure allocated!"); vTraceError("No recorder data structure allocated!");
return; return;
} }
(void)memset(RecorderDataPtr, 0, sizeof(RecorderDataType)); (void)memset(RecorderDataPtr, 0, sizeof(RecorderDataType));
RecorderDataPtr->startmarker0 = 0x00; RecorderDataPtr->startmarker0 = 0x00;
@ -196,7 +196,7 @@ void prvTraceInitTraceData()
/* Fix the start markers of the trace data structure */ /* Fix the start markers of the trace data structure */
vInitStartMarkers(); vInitStartMarkers();
#ifdef PORT_SPECIFIC_INIT #ifdef PORT_SPECIFIC_INIT
PORT_SPECIFIC_INIT(); PORT_SPECIFIC_INIT();
#endif #endif
@ -242,15 +242,15 @@ void* xTraceNextFreeEventBufferSlot(void)
uint16_t uiIndexOfObject(objectHandleType objecthandle, uint8_t objectclass) uint16_t uiIndexOfObject(objectHandleType objecthandle, uint8_t objectclass)
{ {
TRACE_ASSERT(objectclass < TRACE_NCLASSES, TRACE_ASSERT(objectclass < TRACE_NCLASSES,
"uiIndexOfObject: Invalid value for objectclass", 0); "uiIndexOfObject: Invalid value for objectclass", 0);
TRACE_ASSERT(objecthandle > 0 && objecthandle <= RecorderDataPtr->ObjectPropertyTable.NumberOfObjectsPerClass[objectclass], TRACE_ASSERT(objecthandle > 0 && objecthandle <= RecorderDataPtr->ObjectPropertyTable.NumberOfObjectsPerClass[objectclass],
"uiIndexOfObject: Invalid value for objecthandle", 0); "uiIndexOfObject: Invalid value for objecthandle", 0);
if ((objectclass < TRACE_NCLASSES) && (objecthandle > 0) && if ((objectclass < TRACE_NCLASSES) && (objecthandle > 0) &&
(objecthandle <= RecorderDataPtr->ObjectPropertyTable.NumberOfObjectsPerClass[objectclass])) (objecthandle <= RecorderDataPtr->ObjectPropertyTable.NumberOfObjectsPerClass[objectclass]))
{ {
return (uint16_t)(RecorderDataPtr->ObjectPropertyTable.StartIndexOfClass[objectclass] + return (uint16_t)(RecorderDataPtr->ObjectPropertyTable.StartIndexOfClass[objectclass] +
(RecorderDataPtr->ObjectPropertyTable.TotalPropertyBytesPerClass[objectclass] * (objecthandle-1))); (RecorderDataPtr->ObjectPropertyTable.TotalPropertyBytesPerClass[objectclass] * (objecthandle-1)));
} }
@ -286,7 +286,7 @@ objectHandleType xTraceGetObjectHandle(traceObjectClass objectclass)
objectHandleType handle; objectHandleType handle;
static int indexOfHandle; static int indexOfHandle;
TRACE_ASSERT(objectclass < TRACE_NCLASSES, TRACE_ASSERT(objectclass < TRACE_NCLASSES,
"xTraceGetObjectHandle: Invalid value for objectclass", (objectHandleType)0); "xTraceGetObjectHandle: Invalid value for objectclass", (objectHandleType)0);
indexOfHandle = objectHandleStacks.indexOfNextAvailableHandle[objectclass]; indexOfHandle = objectHandleStacks.indexOfNextAvailableHandle[objectclass];
@ -335,9 +335,9 @@ void vTraceFreeObjectHandle(traceObjectClass objectclass, objectHandleType handl
{ {
int indexOfHandle; int indexOfHandle;
TRACE_ASSERT(objectclass < TRACE_NCLASSES, TRACE_ASSERT(objectclass < TRACE_NCLASSES,
"vTraceFreeObjectHandle: Invalid value for objectclass", ); "vTraceFreeObjectHandle: Invalid value for objectclass", );
TRACE_ASSERT(handle > 0 && handle <= RecorderDataPtr->ObjectPropertyTable.NumberOfObjectsPerClass[objectclass], TRACE_ASSERT(handle > 0 && handle <= RecorderDataPtr->ObjectPropertyTable.NumberOfObjectsPerClass[objectclass],
"vTraceFreeObjectHandle: Invalid value for handle", ); "vTraceFreeObjectHandle: Invalid value for handle", );
/* Check that there is room to push the handle on the stack */ /* Check that there is room to push the handle on the stack */
@ -421,10 +421,10 @@ traceLabel prvTraceOpenSymbol(const char* name, traceLabel userEventChannel)
uint8_t len; uint8_t len;
uint8_t crc; uint8_t crc;
TRACE_SR_ALLOC_CRITICAL_SECTION(); TRACE_SR_ALLOC_CRITICAL_SECTION();
len = 0; len = 0;
crc = 0; crc = 0;
TRACE_ASSERT(name != NULL, "prvTraceOpenSymbol: name == NULL", (traceLabel)0); TRACE_ASSERT(name != NULL, "prvTraceOpenSymbol: name == NULL", (traceLabel)0);
prvTraceGetChecksum(name, &crc, &len); prvTraceGetChecksum(name, &crc, &len);
@ -470,9 +470,9 @@ void vTraceError(const char* msg)
{ {
traceErrorMessage = (char*)msg; traceErrorMessage = (char*)msg;
(void)strncpy(RecorderDataPtr->systemInfo, traceErrorMessage, 80); (void)strncpy(RecorderDataPtr->systemInfo, traceErrorMessage, 80);
RecorderDataPtr->internalErrorOccured = 1; RecorderDataPtr->internalErrorOccured = 1;
} }
} }
/****************************************************************************** /******************************************************************************
@ -496,7 +496,7 @@ void prvCheckDataToBeOverwrittenForMultiEntryEvents(uint8_t nofEntriesToCheck)
unsigned int i = 0; unsigned int i = 0;
unsigned int e = 0; unsigned int e = 0;
TRACE_ASSERT(nofEntriesToCheck != 0, TRACE_ASSERT(nofEntriesToCheck != 0,
"prvCheckDataToBeOverwrittenForMultiEntryEvents: nofEntriesToCheck == 0", ); "prvCheckDataToBeOverwrittenForMultiEntryEvents: nofEntriesToCheck == 0", );
while (i < nofEntriesToCheck) while (i < nofEntriesToCheck)
@ -535,12 +535,12 @@ void prvCheckDataToBeOverwrittenForMultiEntryEvents(uint8_t nofEntriesToCheck)
* Updates the index of the event buffer. * Updates the index of the event buffer.
******************************************************************************/ ******************************************************************************/
void prvTraceUpdateCounters(void) void prvTraceUpdateCounters(void)
{ {
if (RecorderDataPtr->recorderActive == 0) if (RecorderDataPtr->recorderActive == 0)
{ {
return; return;
} }
RecorderDataPtr->numEvents++; RecorderDataPtr->numEvents++;
RecorderDataPtr->nextFreeIndex++; RecorderDataPtr->nextFreeIndex++;
@ -584,9 +584,9 @@ uint16_t prvTraceGetDTS(uint16_t param_maxDTS)
if (RecorderDataPtr->frequency == 0 && init_hwtc_count != HWTC_COUNT) if (RecorderDataPtr->frequency == 0 && init_hwtc_count != HWTC_COUNT)
{ {
/* If HWTC_PERIOD is mapped to the timer reload register, /* If HWTC_PERIOD is mapped to the timer reload register,
it might not be initialized before the scheduler has been started. it might not be initialized before the scheduler has been started.
We therefore store the frequency of the timer when the counter We therefore store the frequency of the timer when the counter
register has changed from its initial value. register has changed from its initial value.
(Note that this function is called also by vTraceStart and (Note that this function is called also by vTraceStart and
uiTraceStart, which might be called before the scheduler uiTraceStart, which might be called before the scheduler
has been started.) */ has been started.) */
@ -605,9 +605,9 @@ uint16_t prvTraceGetDTS(uint16_t param_maxDTS)
* If necessary, whole seconds are extracted using division while the rest * If necessary, whole seconds are extracted using division while the rest
* comes from the modulo operation. * comes from the modulo operation.
**************************************************************************/ **************************************************************************/
vTracePortGetTimeStamp(&timestamp); vTracePortGetTimeStamp(&timestamp);
/*************************************************************************** /***************************************************************************
* Since dts is unsigned the result will be correct even if timestamp has * Since dts is unsigned the result will be correct even if timestamp has
* wrapped around. * wrapped around.
@ -818,14 +818,14 @@ void prvTraceGetChecksum(const char *pname, uint8_t* pcrc, uint8_t* plength)
#if (USE_16BIT_OBJECT_HANDLES == 1) #if (USE_16BIT_OBJECT_HANDLES == 1)
void prvTraceStoreXID(objectHandleType handle); void prvTraceStoreXID(objectHandleType handle);
/****************************************************************************** /******************************************************************************
* prvTraceStoreXID * prvTraceStoreXID
* *
* Stores an XID (eXtended IDentifier) event. * Stores an XID (eXtended IDentifier) event.
* This is used if an object/task handle is larger than 255. * This is used if an object/task handle is larger than 255.
* The parameter "handle" is the full (16 bit) handle, assumed to be 256 or * The parameter "handle" is the full (16 bit) handle, assumed to be 256 or
* larger. Handles below 256 should not use this function. * larger. Handles below 256 should not use this function.
* *
* NOTE: this function MUST be called from within a critical section. * NOTE: this function MUST be called from within a critical section.
@ -844,7 +844,7 @@ void prvTraceStoreXID(objectHandleType handle)
xid->type = XID; xid->type = XID;
/* This function is (only) used when objectHandleType is 16 bit... */ /* This function is (only) used when objectHandleType is 16 bit... */
xid->xps_16 = handle; xid->xps_16 = handle;
prvTraceUpdateCounters(); prvTraceUpdateCounters();
} }
@ -853,11 +853,11 @@ void prvTraceStoreXID(objectHandleType handle)
unsigned char prvTraceGet8BitHandle(objectHandleType handle) unsigned char prvTraceGet8BitHandle(objectHandleType handle)
{ {
if (handle > 255) if (handle > 255)
{ {
prvTraceStoreXID(handle); prvTraceStoreXID(handle);
/* The full handle (16 bit) is stored in the XID event. /* The full handle (16 bit) is stored in the XID event.
This code (255) is used instead of zero (which is an error code).*/ This code (255) is used instead of zero (which is an error code).*/
return 255; return 255;
} }
return (unsigned char)(handle & 0xFF); return (unsigned char)(handle & 0xFF);
} }

77
FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcHardwarePort.c
View file

@ -1,40 +1,39 @@
/******************************************************************************* /*******************************************************************************
* Tracealyzer v2.7.0 Recorder Library * Tracealyzer v2.7.7 Recorder Library
* Percepio AB, www.percepio.com * Percepio AB, www.percepio.com
* *
* trcHardwarePort.c * trcBase.c
* *
* Contains together with trcHardwarePort.h all hardware portability issues of * Core functionality of the trace recorder library.
* the trace recorder library.
* *
* Terms of Use * Terms of Use
* This software is copyright Percepio AB. The recorder library is free for * This software is copyright Percepio AB. The recorder library is free for
* use together with Percepio products. You may distribute the recorder library * use together with Percepio products. You may distribute the recorder library
* in its original form, including modifications in trcPort.c and trcPort.h * in its original form, including modifications in trcHardwarePort.c/.h
* given that these modification are clearly marked as your own modifications * given that these modification are clearly marked as your own modifications
* and documented in the initial comment section of these source files. * and documented in the initial comment section of these source files.
* This software is the intellectual property of Percepio AB and may not be * This software is the intellectual property of Percepio AB and may not be
* sold or in other ways commercially redistributed without explicit written * sold or in other ways commercially redistributed without explicit written
* permission by Percepio AB. * permission by Percepio AB.
* *
* Disclaimer * Disclaimer
* The trace tool and recorder library is being delivered to you AS IS and * 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 * 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 * not and cannot warrant the performance or results you may obtain by using the
* software or documentation. Percepio AB make no warranties, express or * software or documentation. Percepio AB make no warranties, express or
* implied, as to noninfringement of third party rights, merchantability, or * implied, as to noninfringement of third party rights, merchantability, or
* fitness for any particular purpose. In no event will Percepio AB, its * fitness for any particular purpose. In no event will Percepio AB, its
* technology partners, or distributors be liable to you for any consequential, * technology partners, or distributors be liable to you for any consequential,
* incidental or special damages, including any lost profits or lost savings, * incidental or special damages, including any lost profits or lost savings,
* even if a representative of Percepio AB has been advised of the possibility * 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 * 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 * not allow the exclusion or limitation of incidental, consequential or special
* damages, or the exclusion of implied warranties or limitations on how long an * 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. * 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) * Tabs are used for indent in this file (1 tab = 4 spaces)
* *
* Copyright Percepio AB, 2014. * Copyright Percepio AB, 2012-2015.
* www.percepio.com * www.percepio.com
******************************************************************************/ ******************************************************************************/
@ -51,9 +50,9 @@ uint32_t last_timestamp = 0;
/******************************************************************************* /*******************************************************************************
* uiTraceTickCount * uiTraceTickCount
* *
* This variable is should be updated by the Kernel tick interrupt. This does * This variable is should be updated by the Kernel tick interrupt. This does
* not need to be modified when developing a new timer port. It is preferred to * not need to be modified when developing a new timer port. It is preferred to
* keep any timer port changes in the HWTC macro definitions, which typically * keep any timer port changes in the HWTC macro definitions, which typically
* give sufficient flexibility. * give sufficient flexibility.
******************************************************************************/ ******************************************************************************/
uint32_t uiTraceTickCount = 0; uint32_t uiTraceTickCount = 0;
@ -81,7 +80,7 @@ void prvTraceInitCortexM()
vTraceError("DWT_CYCCNT not supported by this chip!"); vTraceError("DWT_CYCCNT not supported by this chip!");
break; break;
} }
/* Reset the cycle counter */ /* Reset the cycle counter */
REG_DWT_CYCCNT = 0; REG_DWT_CYCCNT = 0;
@ -89,9 +88,9 @@ void prvTraceInitCortexM()
REG_DWT_CTRL |= DWT_CTRL_CYCCNTENA; REG_DWT_CTRL |= DWT_CTRL_CYCCNTENA;
}while(0); /* breaks above jump here */ }while(0); /* breaks above jump here */
if (RecorderDataPtr->frequency == 0) if (RecorderDataPtr->frequency == 0)
{ {
RecorderDataPtr->frequency = TRACE_CPU_CLOCK_HZ / HWTC_DIVISOR; RecorderDataPtr->frequency = TRACE_CPU_CLOCK_HZ / HWTC_DIVISOR;
} }
} }
@ -115,14 +114,14 @@ void vTracePortGetTimeStamp(uint32_t *pTimestamp)
static uint32_t last_hwtc_count = 0; static uint32_t last_hwtc_count = 0;
uint32_t traceTickCount = 0; uint32_t traceTickCount = 0;
uint32_t hwtc_count = 0; uint32_t hwtc_count = 0;
if (trace_disable_timestamp == 1) if (trace_disable_timestamp == 1)
{ {
if (pTimestamp) if (pTimestamp)
*pTimestamp = last_timestamp; *pTimestamp = last_timestamp;
return; return;
} }
/* Retrieve HWTC_COUNT only once since the same value should be used all throughout this function. */ /* Retrieve HWTC_COUNT only once since the same value should be used all throughout this function. */
#if (HWTC_COUNT_DIRECTION == DIRECTION_INCREMENTING) #if (HWTC_COUNT_DIRECTION == DIRECTION_INCREMENTING)
hwtc_count = HWTC_COUNT; hwtc_count = HWTC_COUNT;
@ -134,12 +133,12 @@ void vTracePortGetTimeStamp(uint32_t *pTimestamp)
#endif #endif
#if (SELECTED_PORT == PORT_Win32) #if (SELECTED_PORT == PORT_Win32)
/* The Win32 port uses ulGetRunTimeCounterValue for timestamping, which in turn /* The Win32 port uses ulGetRunTimeCounterValue for timestamping, which in turn
uses QueryPerformanceCounter. That function is not always reliable when used over uses QueryPerformanceCounter. That function is not always reliable when used over
multiple threads. We must therefore handle rare cases where the timestamp is less multiple threads. We must therefore handle rare cases where the timestamp is less
than the previous. In practice, the Win32 should "never" roll over since the than the previous. In practice, the Win32 should "never" roll over since the
performance counter is 64 bit wide. */ performance counter is 64 bit wide. */
if (last_hwtc_count > hwtc_count) if (last_hwtc_count > hwtc_count)
{ {
hwtc_count = last_hwtc_count; hwtc_count = last_hwtc_count;
@ -159,14 +158,14 @@ void vTracePortGetTimeStamp(uint32_t *pTimestamp)
traceTickCount = uiTraceTickCount; traceTickCount = uiTraceTickCount;
} }
/* Check for overflow. May occur if the update of uiTraceTickCount has been /* Check for overflow. May occur if the update of uiTraceTickCount has been
delayed due to disabled interrupts. */ delayed due to disabled interrupts. */
if (traceTickCount == last_traceTickCount && hwtc_count < last_hwtc_count) if (traceTickCount == last_traceTickCount && hwtc_count < last_hwtc_count)
{ {
/* A trace tick has occurred but not been executed by the kernel, so we compensate manually. */ /* A trace tick has occurred but not been executed by the kernel, so we compensate manually. */
traceTickCount++; traceTickCount++;
} }
/* Check if the return address is OK, then we perform the calculation. */ /* Check if the return address is OK, then we perform the calculation. */
if (pTimestamp) if (pTimestamp)
{ {
@ -174,10 +173,10 @@ void vTracePortGetTimeStamp(uint32_t *pTimestamp)
*pTimestamp = traceTickCount * (HWTC_PERIOD / HWTC_DIVISOR); *pTimestamp = traceTickCount * (HWTC_PERIOD / HWTC_DIVISOR);
/* Increase timestamp by (hwtc_count + "lost hardware ticks from scaling down period") / HWTC_DIVISOR. */ /* Increase timestamp by (hwtc_count + "lost hardware ticks from scaling down period") / HWTC_DIVISOR. */
*pTimestamp += (hwtc_count + traceTickCount * (HWTC_PERIOD % HWTC_DIVISOR)) / HWTC_DIVISOR; *pTimestamp += (hwtc_count + traceTickCount * (HWTC_PERIOD % HWTC_DIVISOR)) / HWTC_DIVISOR;
last_timestamp = *pTimestamp; last_timestamp = *pTimestamp;
} }
/* Store the previous values. */ /* Store the previous values. */
last_traceTickCount = traceTickCount; last_traceTickCount = traceTickCount;
last_hwtc_count = hwtc_count; last_hwtc_count = hwtc_count;

4
FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernelPort.c
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Tracealyzer v2.7.0 Recorder Library * Tracealyzer v2.7.7 Recorder Library
* Percepio AB, www.percepio.com * Percepio AB, www.percepio.com
* *
* trcKernelPort.c * trcKernelPort.c
@ -33,7 +33,7 @@
* *
* Tabs are used for indent in this file (1 tab = 4 spaces) * Tabs are used for indent in this file (1 tab = 4 spaces)
* *
* Copyright Percepio AB, 2014. * Copyright Percepio AB, 2012-2015.
* www.percepio.com * www.percepio.com
******************************************************************************/ ******************************************************************************/

2
FreeRTOS/Demo/Xilinx_FreeRTOS_BSP/repo/bsp/freertos822_xilinx_v1_0/data/freertos822_xilinx.tcl
View file

@ -435,7 +435,7 @@ proc generate {os_handle} {
puts $config_file "void FreeRTOS_SetupTickInterrupt( void );" puts $config_file "void FreeRTOS_SetupTickInterrupt( void );"
puts $config_file "#define configSETUP_TICK_INTERRUPT() FreeRTOS_SetupTickInterrupt()\n" puts $config_file "#define configSETUP_TICK_INTERRUPT() FreeRTOS_SetupTickInterrupt()\n"
puts $config_file "void FreeRTOS_ClearTickInterrupt( void );" puts $config_file "void FreeRTOS_ClearTickInterrupt( void );"
puts $config_file "#define portCLEAR_TICK_INTERRUPT() FreeRTOS_ClearTickInterrupt()\n" puts $config_file "#define configCLEAR_TICK_INTERRUPT() FreeRTOS_ClearTickInterrupt()\n"
} }
# end of if $proctype == "ps7_cortexa9" # end of if $proctype == "ps7_cortexa9"

9
FreeRTOS/Demo/Xilinx_FreeRTOS_BSP/repo/sw_apps/freertos_hello_world/src/freertos_hello_world.c
View file

@ -138,9 +138,8 @@ int main( void )
for more details. */ for more details. */
for( ;; ); for( ;; );
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
static void prvTxTask( void *pvParameters ) static void prvTxTask( void *pvParameters )
{ {
const TickType_t x500ms = pdMS_TO_TICKS( 500UL ); const TickType_t x500ms = pdMS_TO_TICKS( 500UL );
@ -156,10 +155,12 @@ uint32_t ulValueToSend = 0;
xQueueSend( xQueue, /* The queue being written to. */ xQueueSend( xQueue, /* The queue being written to. */
&ulValueToSend, /* The address of the data being sent. */ &ulValueToSend, /* The address of the data being sent. */
0UL ); /* The block time. */ 0UL ); /* The block time. */
ulValueToSend++;
} }
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
static void prvRxTask( void *pvParameters ) static void prvRxTask( void *pvParameters )
{ {
uint32_t ulValueReceived; uint32_t ulValueReceived;
@ -172,7 +173,7 @@ uint32_t ulValueReceived;
portMAX_DELAY ); /* Wait without a timeout for data. */ portMAX_DELAY ); /* Wait without a timeout for data. */
/* Print the received data. */ /* Print the received data. */
xil_printf( "Rx task received %u\r\n", ( unsigned int ) ulValueReceived ); xil_printf( "Rx task received %d\r\n", ( int ) ulValueReceived );
} }
} }