Skip to content

Commit b703a52

Browse files
committed
Fix rebase error
1 parent cdf32c7 commit b703a52

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

TESTS/mbed_drivers/timeout/timeout_tests.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ void test_sleep(void)
276276
timeout.detach();
277277
}
278278

279-
#if DEVICE_LOWPOWERTIMER
279+
#if DEVICE_LPTICKER
280280
/** Template for tests: timeout during deepsleep
281281
*
282282
* Test timeout during deepsleep

TESTS/mbedmicro-rtos-mbed/systimer/main.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#error [NOT_SUPPORTED] Tickless mode not supported for this target.
1818
#endif
1919

20-
#if !DEVICE_LOWPOWERTIMER
20+
#if !DEVICE_LPTICKER
2121
#error [NOT_SUPPORTED] Current SysTimer implementation requires lp ticker support.
2222
#endif
2323

@@ -208,7 +208,7 @@ void test_sleep(void)
208208
TEST_ASSERT_UINT64_WITHIN(DELAY_DELTA_US, DELAY_US, timer.read_high_resolution_us());
209209
}
210210

211-
#if DEVICE_LOWPOWERTIMER
211+
#if DEVICE_LPTICKER
212212
/** Test wake up from deepsleep
213213
*
214214
* Given a SysTimer with a tick scheduled in the future
@@ -260,7 +260,7 @@ Case cases[] = {
260260
Case("Schedule zero ticks", test_schedule_zero),
261261
Case("Handler called once", test_handler_called_once),
262262
Case("Wake up from sleep", test_sleep),
263-
#if DEVICE_LOWPOWERTIMER
263+
#if DEVICE_LPTICKER
264264
Case("Wake up from deep sleep", test_deepsleep),
265265
#endif
266266

features/unsupported/tests/utest/lp_ticker/lp_ticker.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
/* Low power timer test.
2222
*/
2323

24-
#if !DEVICE_LOWPOWERTIMER
24+
#if !DEVICE_LPTICKER
2525
#error This test unit requires low power to be defined for a target
2626
#endif
2727

rtos/TARGET_CORTEX/SysTimer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222
#include "rtos/TARGET_CORTEX/SysTimer.h"
2323

24-
#if DEVICE_LOWPOWERTIMER
24+
#if DEVICE_LPTICKER
2525

2626
#include "hal/lp_ticker_api.h"
2727
#include "rtx_core_cm.h"

rtos/TARGET_CORTEX/SysTimer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#ifndef MBED_SYS_TIMER_H
2323
#define MBED_SYS_TIMER_H
2424

25-
#if defined(DEVICE_LOWPOWERTIMER) || defined(DOXYGEN_ONLY)
25+
#if defined(DEVICE_LPTICKER) || defined(DOXYGEN_ONLY)
2626

2727
#include "platform/NonCopyable.h"
2828
#include "drivers/TimerEvent.h"

0 commit comments

Comments
 (0)