Fixed makefile switches

git-svn-id: https://svn.vbchaos.nl/svn/hsb/trunk@285 05563f52-14a8-4384-a975-3d1654cca0fa
This commit is contained in:
mmi
2017-11-21 13:29:55 +00:00
parent ff01d92ea8
commit c7c1699e12
6 changed files with 29 additions and 24 deletions

View File

@@ -70,9 +70,13 @@
// Function declarations
// -----------------------------------------------------------------------------
#if defined(ENABLE_LOGGING)
static void composeLogQueueItem(struct LogQueueItem* logQueueItem, const char* fileName, const char* functionName,
int lineNumber, LogType logType, const char* context);
#endif
#if defined(ENABLE_LOGGING)
static void loggerTask(void* parameters);
#endif
// -----------------------------------------------------------------------------
// Function definitions
@@ -82,7 +86,7 @@ static void loggerTask(void* parameters);
ErrorStatus Logger_construct(struct Logger* self, struct IODevice* const device, int taskPriority, uint16_t stackSize)
{
ErrorStatus returnValue = SUCCESS;
#if defined(ENABLE_LOGGING)
if (!self->initialized)
{
self->loggingDevice = device;
@@ -114,6 +118,7 @@ ErrorStatus Logger_construct(struct Logger* self, struct IODevice* const device,
}
}
#endif
return returnValue;
}
@@ -196,6 +201,7 @@ void Logger_logISR(struct Logger* self, const char* fileName, const char* functi
}
#if defined(ENABLE_LOGGING)
static void composeLogQueueItem(struct LogQueueItem* logQueueItem, const char* fileName, const char* functionName,
int lineNumber, LogType logType, const char* context)
{
@@ -230,7 +236,9 @@ static void composeLogQueueItem(struct LogQueueItem* logQueueItem, const char* f
logQueueItem->functionName[functionNameSize - 1] = '\0';
}
}
#endif
#if defined(ENABLE_LOGGING)
static void loggerTask(void* parameters)
{
struct Logger* self = (struct Logger*)parameters;
@@ -297,3 +305,4 @@ static void loggerTask(void* parameters)
vTaskDelete(self->taskHandle);
}
#endif