ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use scheduler provided by shim layer in Harness.

Niklas Hauser 2016-04-05 16:59:05 +01:00 committed by Martin Kojtal
parent 336bffaf05
commit d5cb178700
2 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
frameworks\utest/source/harness.cpp
View File

@ -18,28 +18,6 @@
#include "utest/harness.h" #include "utest/harness.h"
#include <stdlib.h> #include <stdlib.h>
#include "core-util/CriticalSectionLock.h"
#ifndef YOTTA_CFG_UTEST_USE_CUSTOM_SCHEDULER
#include "minar/minar.h"
static void *utest_minar_post(const utest_v1_harness_callback_t callback, const uint32_t delay_ms)
{
void *handle = minar::Scheduler::postCallback(callback).delay(minar::milliseconds(delay_ms)).getHandle();
return handle;
}
static int32_t utest_minar_cancel(void *handle)
{
int32_t ret = minar::Scheduler::cancelCallback(handle);
return ret;
}
static const utest_v1_scheduler_t utest_minar_scheduler =
{
utest_minar_post,
utest_minar_cancel
};
#endif
using namespace utest::v1; using namespace utest::v1;
@ -71,11 +49,7 @@ namespace
location_t location = LOCATION_UNKNOWN; location_t location = LOCATION_UNKNOWN;
#ifndef YOTTA_CFG_UTEST_USE_CUSTOM_SCHEDULER utest_v1_scheduler_t scheduler = utest_v1_scheduler;
utest_v1_scheduler_t scheduler = utest_minar_scheduler;
#else
utest_v1_scheduler_t scheduler = {NULL, NULL};
#endif
} }
static void die() { static void die() {

2
frameworks\utest/utest/types.h
View File

@ -22,7 +22,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include "compiler-polyfill/attributes.h" #include "shim.h"
namespace utest { namespace utest {
namespace v1 { namespace v1 {