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

View File

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