fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

STM32 driver: Space optimized SystemClock constructor

Browse Source
This commit is contained in:
Pavel Kirienko 2014-04-10 21:23:57 +04:00
parent 1c741016bf
commit 01328da9eb
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libuavcan_drivers/stm32/driver/include/uavcan_stm32/clock.hpp
View File

@ -59,8 +59,6 @@ class SystemClock : public uavcan::ISystemClock, uavcan::Noncopyable
{
SystemClock() { }
static SystemClock self;
virtual uavcan::MonotonicTime getMonotonic() const { return clock::getMonotonic(); }
virtual uavcan::UtcTime getUtc() const { return clock::getUtc(); }
virtual void adjustUtc(uavcan::UtcDuration adjustment) { clock::adjustUtc(adjustment); }

14
libuavcan_drivers/stm32/driver/src/uc_stm32_clock.cpp
View File

@ -217,16 +217,24 @@ uavcan::uint32_t getUtcAjdustmentJumpCount()
} // namespace clock
SystemClock SystemClock::self;
SystemClock& SystemClock::instance()
{
MutexLocker mlocker(clock::mutex);
static union SystemClockStorage
{
uavcan::uint8_t buffer[sizeof(SystemClock)];
long long _aligner_1;
long double _aligner_2;
} storage;
SystemClock* const ptr = reinterpret_cast<SystemClock*>(storage.buffer);
if (!clock::initialized)
{
clock::init();
new (ptr) SystemClock();
}
return self;
return *ptr;
}
} // namespace uavcan_stm32