mirror of https://github.com/ARMmbed/mbed-os.git
Fix rebase error
parent
ba963b4453
commit
a92ff94904
|
|
@ -276,7 +276,7 @@ void test_sleep(void)
|
|||
timeout.detach();
|
||||
}
|
||||
|
||||
#if DEVICE_LOWPOWERTIMER
|
||||
#if DEVICE_LPTICKER
|
||||
/** Template for tests: timeout during deepsleep
|
||||
*
|
||||
* Test timeout during deepsleep
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#error [NOT_SUPPORTED] Tickless mode not supported for this target.
|
||||
#endif
|
||||
|
||||
#if !DEVICE_LOWPOWERTIMER
|
||||
#if !DEVICE_LPTICKER
|
||||
#error [NOT_SUPPORTED] Current SysTimer implementation requires lp ticker support.
|
||||
#endif
|
||||
|
||||
|
|
@ -280,7 +280,7 @@ void test_sleep(void)
|
|||
TEST_ASSERT_UINT64_WITHIN(DELAY_DELTA_US, DELAY_US, timer.read_high_resolution_us());
|
||||
}
|
||||
|
||||
#if DEVICE_LOWPOWERTIMER
|
||||
#if DEVICE_LPTICKER
|
||||
/** Test wake up from deepsleep
|
||||
*
|
||||
* Given a SysTimer with a tick scheduled in the future
|
||||
|
|
@ -334,7 +334,7 @@ Case cases[] = {
|
|||
Case("Handler called once", test_handler_called_once),
|
||||
#if DEVICE_SLEEP
|
||||
Case("Wake up from sleep", test_sleep),
|
||||
#if DEVICE_LOWPOWERTIMER
|
||||
#if DEVICE_LPTICKER
|
||||
Case("Wake up from deep sleep", test_deepsleep),
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
/* Low power timer test.
|
||||
*/
|
||||
|
||||
#if !DEVICE_LOWPOWERTIMER
|
||||
#if !DEVICE_LPTICKER
|
||||
#error This test unit requires low power to be defined for a target
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
*/
|
||||
#include "rtos/TARGET_CORTEX/SysTimer.h"
|
||||
|
||||
#if DEVICE_LOWPOWERTIMER
|
||||
#if DEVICE_LPTICKER
|
||||
|
||||
#include "hal/lp_ticker_api.h"
|
||||
#include "mbed_critical.h"
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#ifndef MBED_SYS_TIMER_H
|
||||
#define MBED_SYS_TIMER_H
|
||||
|
||||
#if defined(DEVICE_LOWPOWERTIMER) || defined(DOXYGEN_ONLY)
|
||||
#if defined(DEVICE_LPTICKER) || defined(DOXYGEN_ONLY)
|
||||
|
||||
#include "platform/NonCopyable.h"
|
||||
#include "drivers/TimerEvent.h"
|
||||
|
|
|
|||
Loading…
Reference in New Issue