From d04c2fa7539ee6df1c3e7aeedce01dffab729ea7 Mon Sep 17 00:00:00 2001 From: Richard Barry Date: Tue, 16 Jul 2013 12:23:25 +0000 Subject: [PATCH] Correct compiler warnings in trace recorder code. --- FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernel.c | 2 +- FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcUser.c | 1 + .../Source/FreeRTOS-Plus-UDP/include/FreeRTOS_Sockets.h | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernel.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernel.c index 78334daa3..0b1770867 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernel.c +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcKernel.c @@ -128,7 +128,7 @@ void vTraceStoreLowPower(uint32_t flag) lp = (LPEvent*)xTraceNextFreeEventBufferSlot(); if (lp != NULL) { - lp->type = LOW_POWER_BEGIN + flag; /* BEGIN or END depending on flag */ + lp->type = LOW_POWER_BEGIN + ( uint8_t ) flag; /* BEGIN or END depending on flag */ lp->dts = dts; prvTraceUpdateCounters(); diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcUser.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcUser.c index 6cf8c1f9c..74dc8079e 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcUser.c +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-Trace/trcUser.c @@ -208,6 +208,7 @@ char* xTraceGetLastError(void) ******************************************************************************/ void vTraceClearError(int resetErrorMessage) { + ( void ) resetErrorMessage; traceErrorMessage = NULL; RecorderDataPtr->internalErrorOccured = 0; } diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_Sockets.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_Sockets.h index 519735094..0ae6fa909 100644 --- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_Sockets.h +++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/include/FreeRTOS_Sockets.h @@ -52,8 +52,10 @@ #error FreeRTOS.h must be included before FreeRTOS_Sockets.h. #endif -#ifndef TASK_H - #error The FreeRTOS header file task.h must be included before FreeRTOS_Sockets.h. +#ifndef INC_TASK_H + #ifndef TASK_H /* For compatibility with older FreeRTOS versions. */ + #error The FreeRTOS header file task.h must be included before FreeRTOS_Sockets.h. + #endif #endif /* Assigned to an xSocket_t variable when the socket is not valid, probably