Skip to content

Commit 23f2199

Browse files
committed
equeue: some refactoring to meet coding rules
1 parent 6406ab0 commit 23f2199

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

events/equeue/equeue_mbed.cpp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,35 +24,35 @@
2424
#include "mbed.h"
2525

2626
#if MBED_CONF_EVENTS_USE_LOWPOWER_TIMER_TICKER
27-
#define AliasTimer LowPowerTimer
28-
#define AliasTicker LowPowerTicker
29-
#define AliasTimeout LowPowerTimeout
27+
#define ALIAS_TIMER LowPowerTimer
28+
#define ALIAS_TICKER LowPowerTicker
29+
#define ALIAS_TIMEOUT LowPowerTimeout
3030
#else
31-
#define AliasTimer Timer
32-
#define AliasTicker Ticker
33-
#define AliasTimeout Timeout
31+
#define ALIAS_TIMER Timer
32+
#define ALIAS_TICKER Ticker
33+
#define ALIAS_TIMEOUT Timeout
3434
#endif
3535

3636
// Ticker operations
3737
static bool equeue_tick_inited = false;
3838
static volatile unsigned equeue_minutes = 0;
3939
static unsigned equeue_timer[
40-
(sizeof(AliasTimer)+sizeof(unsigned)-1)/sizeof(unsigned)];
40+
(sizeof(ALIAS_TIMER)+sizeof(unsigned)-1)/sizeof(unsigned)];
4141
static unsigned equeue_ticker[
42-
(sizeof(AliasTicker)+sizeof(unsigned)-1)/sizeof(unsigned)];
42+
(sizeof(ALIAS_TICKER)+sizeof(unsigned)-1)/sizeof(unsigned)];
4343

4444
static void equeue_tick_update() {
45-
equeue_minutes += reinterpret_cast<AliasTimer*>(equeue_timer)->read_ms();
46-
reinterpret_cast<AliasTimer*>(equeue_timer)->reset();
45+
equeue_minutes += reinterpret_cast<ALIAS_TIMER*>(equeue_timer)->read_ms();
46+
reinterpret_cast<ALIAS_TIMER*>(equeue_timer)->reset();
4747
}
4848

4949
static void equeue_tick_init() {
50-
MBED_STATIC_ASSERT(sizeof(equeue_timer) >= sizeof(AliasTimer),
50+
MBED_STATIC_ASSERT(sizeof(equeue_timer) >= sizeof(ALIAS_TIMER),
5151
"The equeue_timer buffer must fit the class Timer");
52-
MBED_STATIC_ASSERT(sizeof(equeue_ticker) >= sizeof(AliasTicker),
52+
MBED_STATIC_ASSERT(sizeof(equeue_ticker) >= sizeof(ALIAS_TICKER),
5353
"The equeue_ticker buffer must fit the class Ticker");
54-
AliasTimer *timer = new (equeue_timer) AliasTimer;
55-
AliasTicker *ticker = new (equeue_ticker) AliasTicker;
54+
ALIAS_TIMER *timer = new (equeue_timer) ALIAS_TIMER;
55+
ALIAS_TICKER *ticker = new (equeue_ticker) ALIAS_TICKER;
5656

5757
equeue_minutes = 0;
5858
timer->start();
@@ -71,7 +71,7 @@ unsigned equeue_tick() {
7171

7272
do {
7373
minutes = equeue_minutes;
74-
ms = reinterpret_cast<AliasTimer*>(equeue_timer)->read_ms();
74+
ms = reinterpret_cast<ALIAS_TIMER*>(equeue_timer)->read_ms();
7575
} while (minutes != equeue_minutes);
7676

7777
return minutes + ms;
@@ -141,7 +141,7 @@ static void equeue_sema_timeout(equeue_sema_t *s) {
141141

142142
bool equeue_sema_wait(equeue_sema_t *s, int ms) {
143143
int signal = 0;
144-
AliasTimeout timeout;
144+
ALIAS_TIMEOUT timeout;
145145
if (ms == 0) {
146146
return false;
147147
} else if (ms > 0) {

0 commit comments

Comments
 (0)