CloudEdge/FreeRTOS-Kernel
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove compiler warnings from the trace recorder code.

Browse Source
This commit is contained in:
Richard Barry 2013-06-05 15:25:26 +00:00
parent 6438027bb9
commit 6330e06975
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernelPort.h → FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/Include/trcKernelPort.h
View File

@ -99,7 +99,7 @@
/* Includes */ /* Includes */
#include "trcTypes.h" #include "trcTypes.h"
#include "trcConfig.h" #include "trcConfig.h"
#include "trcKernelHooks.h" #include "trcHooks.h"
#include "trcHardwarePort.h" #include "trcHardwarePort.h"
#include "trcBase.h" #include "trcBase.h"
#include "trcKernel.h" #include "trcKernel.h"
@ -374,7 +374,7 @@ void* prvTraceGetCurrentTaskHandle(void);
/* Called on each OS tick. Will call uiPortGetTimestamp to make sure it is called at least once every OS tick. */ /* Called on each OS tick. Will call uiPortGetTimestamp to make sure it is called at least once every OS tick. */
#undef traceTASK_INCREMENT_TICK #undef traceTASK_INCREMENT_TICK
#define traceTASK_INCREMENT_TICK( xTickCount ) \ #define traceTASK_INCREMENT_TICK( xTickCount ) \
if (uxSchedulerSuspended == ( unsigned portBASE_TYPE ) pdTRUE || uxMissedTicks == 0) { trcKERNEL_HOOKS_INCREMENT_TICK(); } \ if (uxSchedulerSuspended == ( unsigned portBASE_TYPE ) pdTRUE || uxPendedTicks == 0) { trcKERNEL_HOOKS_INCREMENT_TICK(); } \
if (uxSchedulerSuspended == ( unsigned portBASE_TYPE ) pdFALSE) { trcKERNEL_HOOKS_NEW_TIME(DIV_NEW_TIME, xTickCount + 1); } if (uxSchedulerSuspended == ( unsigned portBASE_TYPE ) pdFALSE) { trcKERNEL_HOOKS_NEW_TIME(DIV_NEW_TIME, xTickCount + 1); }
/* Called on each task-switch */ /* Called on each task-switch */

4
FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernel.c
View File

@ -136,7 +136,7 @@ void vTraceStoreKernelCall(uint32_t ecode, traceObjectClass objectClass, uint32_
if (nISRactive || !inExcludedTask) if (nISRactive || !inExcludedTask)
{ {
/* Check if the referenced object or the event code is excluded */ /* Check if the referenced object or the event code is excluded */
if (!uiTraceIsObjectExcluded(objectClass, objectNumber) && !TRACE_GET_EVENT_CODE_FLAG_ISEXCLUDED(ecode)) if (!uiTraceIsObjectExcluded(objectClass, (objectHandleType)objectNumber) && !TRACE_GET_EVENT_CODE_FLAG_ISEXCLUDED(ecode))
{ {
trcCRITICAL_SECTION_BEGIN(); trcCRITICAL_SECTION_BEGIN();
dts1 = (uint16_t)prvTraceGetDTS(0xFFFF); dts1 = (uint16_t)prvTraceGetDTS(0xFFFF);
@ -193,7 +193,7 @@ void vTraceStoreKernelCallWithParam(uint32_t evtcode,
} }
/* Check if the referenced object or the event code is excluded */ /* Check if the referenced object or the event code is excluded */
if (!uiTraceIsObjectExcluded(objectClass, objectNumber) && !TRACE_GET_EVENT_CODE_FLAG_ISEXCLUDED(evtcode)) if (!uiTraceIsObjectExcluded(objectClass, (objectHandleType)objectNumber) && !TRACE_GET_EVENT_CODE_FLAG_ISEXCLUDED(evtcode))
{ {
trcCRITICAL_SECTION_BEGIN(); trcCRITICAL_SECTION_BEGIN();
dts2 = (uint8_t)prvTraceGetDTS(0xFF); dts2 = (uint8_t)prvTraceGetDTS(0xFF);

4
FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcUser.c
View File

@ -1101,7 +1101,7 @@ void vTracePrintF_Helper(traceLabel eventLabel, const char* formatStr, va_list v
events that would be partially overwritten. If so, they must be "killed" events that would be partially overwritten. If so, they must be "killed"
by replacing the user event and following data with NULL events (i.e., by replacing the user event and following data with NULL events (i.e.,
using a memset to zero).*/ using a memset to zero).*/
prvCheckDataToBeOverwrittenForMultiEntryEvents(noOfSlots); prvCheckDataToBeOverwrittenForMultiEntryEvents((uint8_t)noOfSlots);
#endif #endif
/* Copy the local buffer to the main buffer */ /* Copy the local buffer to the main buffer */
(void)memcpy(& RecorderDataPtr->eventData[RecorderDataPtr->nextFreeIndex * 4], (void)memcpy(& RecorderDataPtr->eventData[RecorderDataPtr->nextFreeIndex * 4],
@ -1112,7 +1112,7 @@ void vTracePrintF_Helper(traceLabel eventLabel, const char* formatStr, va_list v
main USER_EVENT entry (Note: important that this is after the memcpy, main USER_EVENT entry (Note: important that this is after the memcpy,
but within the critical section!)*/ but within the critical section!)*/
RecorderDataPtr->eventData[RecorderDataPtr->nextFreeIndex * 4] = RecorderDataPtr->eventData[RecorderDataPtr->nextFreeIndex * 4] =
(uint8_t) USER_EVENT + noOfSlots - 1; (uint8_t) ( USER_EVENT + noOfSlots - 1 );
/* Update the main buffer event index (already checked that it fits in /* Update the main buffer event index (already checked that it fits in
the buffer, so no need to check for wrapping)*/ the buffer, so no need to check for wrapping)*/