Improved inclusion of platform.h. Improved initialization in queueClear.

This commit is contained in:
Martin Budden 2016-02-07 19:00:47 +00:00 committed by borisbstyle
parent 01a19cdc04
commit c80b8cd718
1 changed files with 2 additions and 5 deletions

View File

@ -22,12 +22,9 @@
#include <string.h>
#ifdef UNIT_TEST
// cannot include platform.h in UNIT_TEST build, since if included the build #defines (eg MAG, GPS, etc)
// are set differently to test code
typedef enum {TEST_IRQ = 0 } IRQn_Type;
#else
#include "platform.h"
#endif
#include "platform.h"
#include "scheduler.h"
#include "debug.h"
@ -61,7 +58,7 @@ static cfTask_t* taskQueueArray[TASK_COUNT + 1]; // extra item for NULL pointer
#endif
STATIC_UNIT_TESTED void queueClear(void)
{
memset(taskQueueArray, 0, sizeof(cfTask_t) * (TASK_COUNT + 1));
memset(taskQueueArray, 0, sizeof(taskQueueArray));
taskQueuePos = 0;
taskQueueSize = 0;
}