mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-21 09:17:29 +00:00
beb268ff25
I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
39 lines
547 B
C++
39 lines
547 B
C++
#include "Lock.h"
|
|
#include "configuration.h"
|
|
#include <cassert>
|
|
|
|
namespace concurrency
|
|
{
|
|
|
|
#ifdef HAS_FREE_RTOS
|
|
Lock::Lock() : handle(xSemaphoreCreateBinary())
|
|
{
|
|
assert(handle);
|
|
if (xSemaphoreGive(handle) == false) {
|
|
abort();
|
|
}
|
|
}
|
|
|
|
void Lock::lock()
|
|
{
|
|
if (xSemaphoreTake(handle, portMAX_DELAY) == false) {
|
|
abort();
|
|
}
|
|
}
|
|
|
|
void Lock::unlock()
|
|
{
|
|
if (xSemaphoreGive(handle) == false) {
|
|
abort();
|
|
}
|
|
}
|
|
#else
|
|
Lock::Lock() {}
|
|
|
|
void Lock::lock() {}
|
|
|
|
void Lock::unlock() {}
|
|
#endif
|
|
|
|
} // namespace concurrency
|