Skip to content

Commit 6e9f04b

Browse files
committed
Rename DEVICE_LOWPOWERTIMER to DEVICE_LPTICKER
That's to match DEVICE_USTICKER.
1 parent f55f9d3 commit 6e9f04b

File tree

30 files changed

+106
-95
lines changed

30 files changed

+106
-95
lines changed

Diff for: TESTS/mbed_drivers/lp_ticker/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "unity/unity.h"
2020

2121

22-
#if !DEVICE_LOWPOWERTIMER
22+
#if !DEVICE_LPTICKER
2323
#error [NOT_SUPPORTED] Low power ticker not supported for this target
2424
#endif
2525

Diff for: TESTS/mbed_drivers/lp_timeout/main.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
#if !DEVICE_LOWPOWERTIMER
18-
#error [NOT_SUPPORTED] Low power timer not supported for this target
17+
#if !DEVICE_LPTICKER
18+
#error [NOT_SUPPORTED] Low power timer not supported for this target
1919
#endif
2020

2121
#include "mbed.h"

Diff for: TESTS/mbed_drivers/lp_timer/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "rtos.h"
2323
#include "hal/us_ticker_api.h"
2424

25-
#if !DEVICE_LOWPOWERTIMER
25+
#if !DEVICE_LPTICKER
2626
#error [NOT_SUPPORTED] test not supported
2727
#endif
2828

Diff for: TESTS/mbed_hal/lp_ticker/main.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
#include "lp_ticker_api_tests.h"
2222
#include "hal/lp_ticker_api.h"
2323

24-
#if !DEVICE_LOWPOWERTIMER
25-
#error [NOT_SUPPORTED] test not supported
24+
#if !DEVICE_LPTICKER
25+
#error [NOT_SUPPORTED] Low power timer not supported for this target
2626
#endif
2727

2828
using namespace utest::v1;

Diff for: TESTS/mbed_hal/lp_us_tickers/main.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ void ticker_event_handler_stub(const ticker_data_t * const ticker)
7373
if (ticker == get_us_ticker_data()) {
7474
us_ticker_clear_interrupt();
7575
} else {
76-
#if DEVICE_LOWPOWERTIMER
76+
#if DEVICE_LPTICKER
7777
lp_ticker_clear_interrupt();
7878
#endif
7979
}
@@ -411,7 +411,7 @@ utest::v1::status_t hf_ticker_setup(const Case *const source, const size_t index
411411
return greentea_case_setup_handler(source, index_of_case);
412412
}
413413

414-
#if DEVICE_LOWPOWERTIMER
414+
#if DEVICE_LPTICKER
415415
utest::v1::status_t lp_ticker_setup(const Case *const source, const size_t index_of_case)
416416
{
417417
intf = get_lp_ticker_data()->interface;
@@ -444,7 +444,7 @@ Case cases[] = {
444444
Case("hf ticker overflow test", hf_ticker_setup, ticker_overflow_test),
445445
Case("hf ticker increment test", hf_ticker_setup, ticker_increment_test),
446446
Case("hf ticker speed test", hf_ticker_setup, ticker_speed_test),
447-
#if DEVICE_LOWPOWERTIMER
447+
#if DEVICE_LPTICKER
448448
Case("lp ticker init is safe to call repeatedly", lp_ticker_setup, ticker_init_test),
449449
Case("lp ticker info test", lp_ticker_setup, ticker_info_test),
450450
Case("lp ticker interrupt test", lp_ticker_setup, ticker_interrupt_test),

Diff for: TESTS/mbed_hal/lp_us_tickers_freq/main.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void ticker_event_handler_stub(const ticker_data_t * const ticker)
5151
if (ticker == get_us_ticker_data()) {
5252
us_ticker_clear_interrupt();
5353
} else {
54-
#if DEVICE_LOWPOWERTIMER
54+
#if DEVICE_LPTICKER
5555
lp_ticker_clear_interrupt();
5656
#endif
5757
}
@@ -111,7 +111,7 @@ utest::v1::status_t hf_ticker_case_setup_handler_t(const Case * const source, co
111111
return greentea_case_setup_handler(source, index_of_case);
112112
}
113113

114-
#if DEVICE_LOWPOWERTIMER
114+
#if DEVICE_LPTICKER
115115
utest::v1::status_t lp_ticker_case_setup_handler_t(const Case * const source, const size_t index_of_case)
116116
{
117117
intf = get_lp_ticker_data()->interface;
@@ -130,7 +130,7 @@ utest::v1::status_t ticker_case_teardown_handler_t(const Case * const source, co
130130
Case cases[] = {
131131
Case("hf ticker frequency test", hf_ticker_case_setup_handler_t, ticker_frequency_test,
132132
ticker_case_teardown_handler_t),
133-
#if DEVICE_LOWPOWERTIMER
133+
#if DEVICE_LPTICKER
134134
Case("lp ticker frequency test", lp_ticker_case_setup_handler_t, ticker_frequency_test,
135135
ticker_case_teardown_handler_t),
136136
#endif

Diff for: doxyfile_options

+1-1
Original file line numberDiff line numberDiff line change
@@ -2079,7 +2079,7 @@ PREDEFINED = DOXYGEN_ONLY \
20792079
DEVICE_I2C_ASYNCH \
20802080
DEVICE_INTERRUPTIN \
20812081
DEVICE_ITM \
2082-
DEVICE_LOWPOWERTIMER \
2082+
DEVICE_LPTICKER \
20832083
DEVICE_PORTIN \
20842084
DEVICE_PORTINOUT \
20852085
DEVICE_PORTOUT \

Diff for: doxygen_options.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"SEARCH_INCLUDES": "YES",
77
"INCLUDE_PATH": "",
88
"INCLUDE_FILE_PATTERNS": "",
9-
"PREDEFINED": "DOXYGEN_ONLY DEVICE_ANALOGIN DEVICE_ANALOGOUT DEVICE_CAN DEVICE_CRC DEVICE_ETHERNET DEVICE_EMAC DEVICE_FLASH DEVICE_I2C DEVICE_I2CSLAVE DEVICE_I2C_ASYNCH DEVICE_INTERRUPTIN DEVICE_ITM DEVICE_LOWPOWERTIMER DEVICE_PORTIN DEVICE_PORTINOUT DEVICE_PORTOUT DEVICE_PWMOUT DEVICE_RTC DEVICE_TRNG DEVICE_SERIAL DEVICE_SERIAL_ASYNCH DEVICE_SERIAL_FC DEVICE_SLEEP DEVICE_SPI DEVICE_SPI_ASYNCH DEVICE_SPISLAVE DEVICE_STORAGE \"MBED_DEPRECATED_SINCE(f, g)=\" \"MBED_ENABLE_IF_CALLBACK_COMPATIBLE(F, M)=\" \"MBED_DEPRECATED(s)=\"",
9+
"PREDEFINED": "DOXYGEN_ONLY DEVICE_ANALOGIN DEVICE_ANALOGOUT DEVICE_CAN DEVICE_CRC DEVICE_ETHERNET DEVICE_EMAC DEVICE_FLASH DEVICE_I2C DEVICE_I2CSLAVE DEVICE_I2C_ASYNCH DEVICE_INTERRUPTIN DEVICE_ITM DEVICE_LPTICKER DEVICE_PORTIN DEVICE_PORTINOUT DEVICE_PORTOUT DEVICE_PWMOUT DEVICE_RTC DEVICE_TRNG DEVICE_SERIAL DEVICE_SERIAL_ASYNCH DEVICE_SERIAL_FC DEVICE_SLEEP DEVICE_SPI DEVICE_SPI_ASYNCH DEVICE_SPISLAVE DEVICE_STORAGE \"MBED_DEPRECATED_SINCE(f, g)=\" \"MBED_ENABLE_IF_CALLBACK_COMPATIBLE(F, M)=\" \"MBED_DEPRECATED(s)=\"",
1010
"EXPAND_AS_DEFINED": "",
1111
"SKIP_FUNCTION_MACROS": "NO",
1212
"STRIP_CODE_COMMENTS": "NO",

Diff for: drivers/LowPowerTicker.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "drivers/Ticker.h"
2121
#include "platform/NonCopyable.h"
2222

23-
#if defined (DEVICE_LOWPOWERTIMER) || defined(DOXYGEN_ONLY)
23+
#if defined (DEVICE_LPTICKER) || defined(DOXYGEN_ONLY)
2424

2525
#include "hal/lp_ticker_api.h"
2626

Diff for: drivers/LowPowerTimeout.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#include "platform/platform.h"
2020

21-
#if defined (DEVICE_LOWPOWERTIMER) || defined(DOXYGEN_ONLY)
21+
#if defined (DEVICE_LPTICKER) || defined(DOXYGEN_ONLY)
2222

2323
#include "hal/lp_ticker_api.h"
2424
#include "drivers/LowPowerTicker.h"

Diff for: drivers/LowPowerTimer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "drivers/Timer.h"
2121
#include "platform/NonCopyable.h"
2222

23-
#if defined (DEVICE_LOWPOWERTIMER) || defined(DOXYGEN_ONLY)
23+
#if defined (DEVICE_LPTICKER) || defined(DOXYGEN_ONLY)
2424

2525
#include "hal/lp_ticker_api.h"
2626

Diff for: drivers/Ticker.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class Ticker : public TimerEvent, private NonCopyable<Ticker> {
7171

7272
// When low power ticker is in use, then do not disable deep-sleep.
7373
Ticker(const ticker_data_t *data) : TimerEvent(data), _function(0), _lock_deepsleep(true) {
74-
#if DEVICE_LOWPOWERTIMER
74+
#if DEVICE_LPTICKER
7575
_lock_deepsleep = (data != get_lp_ticker_data());
7676
#endif
7777
}

Diff for: drivers/Timer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Timer::Timer() : _running(), _start(), _time(), _ticker_data(get_us_ticker_data(
2727

2828
Timer::Timer(const ticker_data_t *data) : _running(), _start(), _time(), _ticker_data(data), _lock_deepsleep(true) {
2929
reset();
30-
#if DEVICE_LOWPOWERTIMER
30+
#if DEVICE_LPTICKER
3131
_lock_deepsleep = (data != get_lp_ticker_data());
3232
#endif
3333
}

Diff for: hal/lp_ticker_api.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include "device.h"
2323

24-
#if DEVICE_LOWPOWERTIMER
24+
#if DEVICE_LPTICKER
2525

2626
#include "hal/ticker_api.h"
2727

Diff for: hal/mbed_lp_ticker_api.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
#include "hal/lp_ticker_api.h"
1717

18-
#if DEVICE_LOWPOWERTIMER
18+
#if DEVICE_LPTICKER
1919

2020
void lp_ticker_set_interrupt_wrapper(timestamp_t timestamp);
2121

Diff for: targets/TARGET_ARM_SSG/TARGET_BEETLE/lp_ticker.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ static uint32_t lp_ticker_overflows_delta = 0;
3030
/* lp_ticker Overflow limit */
3131
static uint32_t lp_ticker_overflow_limit = 0;
3232

33-
#if DEVICE_LOWPOWERTIMER
33+
#if DEVICE_LPTICKER
3434
/**
3535
* Interrupt Handler
3636
*/

Diff for: targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/api/lp_ticker.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
#if DEVICE_LOWPOWERTIMER
17+
#if DEVICE_LPTICKER
1818

1919
#include "lp_ticker_api.h"
2020
#include "fsl_rtc.h"
@@ -241,4 +241,4 @@ void lp_ticker_clear_interrupt(void)
241241
lptmr_schedule = 0;
242242
}
243243

244-
#endif /* DEVICE_LOWPOWERTIMER */
244+
#endif /* DEVICE_LPTICKER */

Diff for: targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/lp_ticker.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
#include "lp_ticker_api.h"
1717

18-
#if DEVICE_LOWPOWERTIMER
18+
#if DEVICE_LPTICKER
1919

2020
#include "common_rtc.h"
2121
#include "mbed_critical.h"
@@ -60,4 +60,4 @@ void lp_ticker_clear_interrupt(void)
6060
nrf_rtc_event_clear(COMMON_RTC_INSTANCE, LP_TICKER_EVENT);
6161
}
6262

63-
#endif // DEVICE_LOWPOWERTIMER
63+
#endif // DEVICE_LPTICKER

Diff for: targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/us_ticker.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ void COMMON_RTC_IRQ_HANDLER(void)
8181
us_ticker_irq_handler();
8282
}
8383

84-
#if DEVICE_LOWPOWERTIMER
84+
#if DEVICE_LPTICKER
8585
if (m_common_sw_irq_flag & LP_TICKER_SW_IRQ_MASK) {
8686
m_common_sw_irq_flag &= ~LP_TICKER_SW_IRQ_MASK;
8787
lp_ticker_irq_handler();
@@ -133,7 +133,7 @@ void common_rtc_init(void)
133133
#if defined(TARGET_MCU_NRF51822)
134134
nrf_rtc_event_clear(COMMON_RTC_INSTANCE, OS_TICK_EVENT);
135135
#endif
136-
#if DEVICE_LOWPOWERTIMER
136+
#if DEVICE_LPTICKER
137137
nrf_rtc_event_clear(COMMON_RTC_INSTANCE, LP_TICKER_EVENT);
138138
#endif
139139
nrf_rtc_event_clear(COMMON_RTC_INSTANCE, NRF_RTC_EVENT_OVERFLOW);
@@ -142,7 +142,7 @@ void common_rtc_init(void)
142142
// events will be enabled or disabled as needed (such approach is more
143143
// energy efficient).
144144
nrf_rtc_int_enable(COMMON_RTC_INSTANCE,
145-
#if DEVICE_LOWPOWERTIMER
145+
#if DEVICE_LPTICKER
146146
LP_TICKER_INT_MASK |
147147
#endif
148148
US_TICKER_INT_MASK |
@@ -156,7 +156,7 @@ void common_rtc_init(void)
156156
#if defined(TARGET_MCU_NRF51822)
157157
OS_TICK_INT_MASK |
158158
#endif
159-
#if DEVICE_LOWPOWERTIMER
159+
#if DEVICE_LPTICKER
160160
LP_TICKER_INT_MASK |
161161
#endif
162162
US_TICKER_INT_MASK);

Diff for: targets/TARGET_NUVOTON/TARGET_M451/lp_ticker.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include "lp_ticker_api.h"
1818

19-
#if DEVICE_LOWPOWERTIMER
19+
#if DEVICE_LPTICKER
2020

2121
#include "sleep_api.h"
2222
#include "mbed_wait_api.h"

Diff for: targets/TARGET_NUVOTON/TARGET_M480/lp_ticker.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include "lp_ticker_api.h"
1818

19-
#if DEVICE_LOWPOWERTIMER
19+
#if DEVICE_LPTICKER
2020

2121
#include "sleep_api.h"
2222
#include "mbed_wait_api.h"

Diff for: targets/TARGET_NUVOTON/TARGET_NANO100/lp_ticker.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include "lp_ticker_api.h"
1818

19-
#if DEVICE_LOWPOWERTIMER
19+
#if DEVICE_LPTICKER
2020

2121
#include "sleep_api.h"
2222
#include "mbed_wait_api.h"

Diff for: targets/TARGET_NUVOTON/TARGET_NUC472/lp_ticker.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include "lp_ticker_api.h"
1818

19-
#if DEVICE_LOWPOWERTIMER
19+
#if DEVICE_LPTICKER
2020

2121
#include "sleep_api.h"
2222
#include "mbed_wait_api.h"

Diff for: targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_IMX/lp_ticker.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
#if DEVICE_LOWPOWERTIMER
17+
#if DEVICE_LPTICKER
1818

1919
#include "lp_ticker_api.h"
2020
#include "fsl_snvs_hp.h"
@@ -131,4 +131,4 @@ void lp_ticker_clear_interrupt(void)
131131
GPT_ClearStatusFlags(GPT2, kGPT_OutputCompare1Flag);
132132
}
133133

134-
#endif /* DEVICE_LOWPOWERTIMER */
134+
#endif /* DEVICE_LPTICKER */

Diff for: targets/TARGET_ONSEMI/TARGET_NCS36510/ncs36510_lp_ticker_api.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
* $Rev: $
88
* $Date: $
99
******************************************************************************
10-
* Copyright 2016 Semiconductor Components Industries LLC (d/b/a ON Semiconductor).
10+
* Copyright 2016 Semiconductor Components Industries LLC (d/b/a ON Semiconductor).
1111
* All rights reserved. This software and/or documentation is licensed by ON Semiconductor
1212
* under limited terms and conditions. The terms and conditions pertaining to the software
1313
* and/or documentation are available at http://www.onsemi.com/site/pdf/ONSEMI_T&C.pdf
14-
* (ON Semiconductor Standard Terms and Conditions of Sale, Section 8 Software) and
14+
* (ON Semiconductor Standard Terms and Conditions of Sale, Section 8 Software) and
1515
* if applicable the software license agreement. Do not use this software and/or
1616
* documentation unless you have carefully read and you agree to the limited terms and
1717
* conditions. By using this software and/or documentation, you agree to the limited
@@ -32,7 +32,7 @@
3232
*/
3333

3434
#include "device.h"
35-
#if DEVICE_LOWPOWERTIMER
35+
#if DEVICE_LPTICKER
3636

3737
#include "cmsis_nvic.h"
3838
#include "lp_ticker_api.h"
@@ -79,4 +79,4 @@ void lp_ticker_clear_interrupt(void)
7979
fRtcClearInterrupt();
8080
}
8181

82-
#endif /* DEVICE_LOWPOWERTIMER */
82+
#endif /* DEVICE_LPTICKER */

Diff for: targets/TARGET_STM/lp_ticker.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
*******************************************************************************
2929
*/
3030

31-
#if DEVICE_LOWPOWERTIMER
31+
#if DEVICE_LPTICKER
3232

3333
#include "rtc_api_hal.h"
3434

35-
#if MBED_CONF_TARGET_LOWPOWERTIMER_LPTIM
35+
#if MBED_CONF_TARGET_LPTICKER_LPTIM
3636

3737
LPTIM_HandleTypeDef LptimHandle;
3838

@@ -283,7 +283,7 @@ void lp_ticker_clear_interrupt(void)
283283
__HAL_LPTIM_CLEAR_FLAG(&LptimHandle, LPTIM_FLAG_CMPM);
284284
}
285285

286-
#else /* MBED_CONF_TARGET_LOWPOWERTIMER_LPTIM */
286+
#else /* MBED_CONF_TARGET_LPTICKER_LPTIM */
287287

288288
void lp_ticker_init(void)
289289
{
@@ -319,6 +319,6 @@ void lp_ticker_clear_interrupt(void)
319319
NVIC_ClearPendingIRQ(RTC_WKUP_IRQn);
320320
}
321321

322-
#endif /* MBED_CONF_TARGET_LOWPOWERTIMER_LPTIM */
322+
#endif /* MBED_CONF_TARGET_LPTICKER_LPTIM */
323323

324-
#endif /* DEVICE_LOWPOWERTIMER */
324+
#endif /* DEVICE_LPTICKER */

0 commit comments

Comments
 (0)