ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

equeue: some refactoring to meet coding rules

pull/5328/head
Michael Kaplan 2017-10-30 13:56:11 +01:00
parent 6406ab05c6
commit 23f2199e47
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
events/equeue/equeue_mbed.cpp
View File

@ -24,35 +24,35 @@
#include "mbed.h"
#if MBED_CONF_EVENTS_USE_LOWPOWER_TIMER_TICKER
#define AliasTimer LowPowerTimer
#define AliasTicker LowPowerTicker
#define AliasTimeout LowPowerTimeout
#define ALIAS_TIMER LowPowerTimer
#define ALIAS_TICKER LowPowerTicker
#define ALIAS_TIMEOUT LowPowerTimeout
#else
#define AliasTimer Timer
#define AliasTicker Ticker
#define AliasTimeout Timeout
#define ALIAS_TIMER Timer
#define ALIAS_TICKER Ticker
#define ALIAS_TIMEOUT Timeout
#endif
// Ticker operations
static bool equeue_tick_inited = false;
static volatile unsigned equeue_minutes = 0;
static unsigned equeue_timer[
(sizeof(AliasTimer)+sizeof(unsigned)-1)/sizeof(unsigned)];
(sizeof(ALIAS_TIMER)+sizeof(unsigned)-1)/sizeof(unsigned)];
static unsigned equeue_ticker[
(sizeof(AliasTicker)+sizeof(unsigned)-1)/sizeof(unsigned)];
(sizeof(ALIAS_TICKER)+sizeof(unsigned)-1)/sizeof(unsigned)];
static void equeue_tick_update() {
equeue_minutes += reinterpret_cast<AliasTimer*>(equeue_timer)->read_ms();
reinterpret_cast<AliasTimer*>(equeue_timer)->reset();
equeue_minutes += reinterpret_cast<ALIAS_TIMER*>(equeue_timer)->read_ms();
reinterpret_cast<ALIAS_TIMER*>(equeue_timer)->reset();
}
static void equeue_tick_init() {
MBED_STATIC_ASSERT(sizeof(equeue_timer) >= sizeof(AliasTimer),
MBED_STATIC_ASSERT(sizeof(equeue_timer) >= sizeof(ALIAS_TIMER),
"The equeue_timer buffer must fit the class Timer");
MBED_STATIC_ASSERT(sizeof(equeue_ticker) >= sizeof(AliasTicker),
MBED_STATIC_ASSERT(sizeof(equeue_ticker) >= sizeof(ALIAS_TICKER),
"The equeue_ticker buffer must fit the class Ticker");
AliasTimer *timer = new (equeue_timer) AliasTimer;
AliasTicker *ticker = new (equeue_ticker) AliasTicker;
ALIAS_TIMER *timer = new (equeue_timer) ALIAS_TIMER;
ALIAS_TICKER *ticker = new (equeue_ticker) ALIAS_TICKER;
equeue_minutes = 0;
timer->start();
@ -71,7 +71,7 @@ unsigned equeue_tick() {
do {
minutes = equeue_minutes;
ms = reinterpret_cast<AliasTimer*>(equeue_timer)->read_ms();
ms = reinterpret_cast<ALIAS_TIMER*>(equeue_timer)->read_ms();
} while (minutes != equeue_minutes);
return minutes + ms;
@ -141,7 +141,7 @@ static void equeue_sema_timeout(equeue_sema_t *s) {
bool equeue_sema_wait(equeue_sema_t *s, int ms) {
int signal = 0;
AliasTimeout timeout;
ALIAS_TIMEOUT timeout;
if (ms == 0) {
return false;
} else if (ms > 0) {