Skip to content

Commit 4c4d78c

Browse files
committed
SysTimer should be buildable without lpticker
Tickless from us ticker is possible since b32b996 Use us ticker for tickless on devs with wrapper therefore tickless's SysTimer should be buildable even without lpticker enabled.
1 parent 8e44a75 commit 4c4d78c

File tree

2 files changed

+4
-14
lines changed

2 files changed

+4
-14
lines changed

rtos/TARGET_CORTEX/SysTimer.cpp

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

24-
#if DEVICE_LPTICKER
24+
#if MBED_TICKLESS
2525

26-
#include "hal/lp_ticker_api.h"
2726
#include "mbed_critical.h"
2827
#include "mbed_assert.h"
2928
#if defined(TARGET_CORTEX_A)
@@ -57,14 +56,6 @@ extern "C" IRQn_ID_t mbed_get_a9_tick_irqn(void);
5756
namespace rtos {
5857
namespace internal {
5958

60-
SysTimer::SysTimer() :
61-
TimerEvent(get_lp_ticker_data()), _time_us(0), _tick(0)
62-
{
63-
_time_us = ticker_read_us(_ticker_data);
64-
_suspend_time_passed = true;
65-
_suspended = false;
66-
}
67-
6859
SysTimer::SysTimer(const ticker_data_t *data) :
6960
TimerEvent(data), _time_us(0), _tick(0)
7061
{

rtos/TARGET_CORTEX/SysTimer.h

Lines changed: 3 additions & 4 deletions
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 DEVICE_LPTICKER || defined(DOXYGEN_ONLY)
25+
#if MBED_TICKLESS || defined(DOXYGEN_ONLY)
2626

2727
#include "platform/NonCopyable.h"
2828
#include "drivers/TimerEvent.h"
@@ -48,7 +48,6 @@ namespace internal {
4848
class SysTimer: private mbed::TimerEvent, private mbed::NonCopyable<SysTimer> {
4949
public:
5050

51-
SysTimer();
5251
SysTimer(const ticker_data_t *data);
5352
virtual ~SysTimer();
5453

@@ -119,8 +118,8 @@ class SysTimer: private mbed::TimerEvent, private mbed::NonCopyable<SysTimer> {
119118
static void _set_irq_pending();
120119
us_timestamp_t _time_us;
121120
uint64_t _tick;
122-
bool _suspend_time_passed;
123-
bool _suspended;
121+
bool _suspend_time_passed = true;
122+
bool _suspended = false;
124123
};
125124

126125
/**

0 commit comments

Comments
 (0)