mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NimBLE, rename installed to NimBLEDevice_initialized, fix sys_memcpy_swap() warning

This commit is contained in:
Jörg Schüler-Maroldt 2020-04-25 00:37:40 +02:00
parent 9ed8e7c254
commit 24eff9108b
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libesp32/NimBLE-Arduino/src/NimBLEDevice.cpp
View File

@ -39,7 +39,7 @@ static const char* LOG_TAG = "NimBLEDevice";
/**
* Singletons for the NimBLEDevice.
*/
bool initialized = false;
bool NimBLEDevice_initialized = false;
NimBLEScan* NimBLEDevice::m_pScan = nullptr;
NimBLEServer* NimBLEDevice::m_pServer = nullptr;
uint32_t NimBLEDevice::m_passkey = 123456;
@ -409,8 +409,8 @@ void NimBLEDevice::stopAdvertising() {
* @param deviceName The device name of the device.
*/
/* STATIC */ void NimBLEDevice::init(std::string deviceName) {
if(!initialized){
initialized = true; // Set the initialization flag to ensure we are only initialized once.
if(!NimBLEDevice_initialized){
NimBLEDevice_initialized = true; // Set the initialization flag to ensure we are only initialized once.
int rc=0;
esp_err_t errRc = ESP_OK;
@ -476,7 +476,7 @@ void NimBLEDevice::stopAdvertising() {
NIMBLE_LOGE(LOG_TAG, "esp_nimble_hci_and_controller_deinit() failed with error: %d", ret);
}
initialized = false;
NimBLEDevice_initialized = false;
}
} // deinit
@ -485,7 +485,7 @@ void NimBLEDevice::stopAdvertising() {
* @brief Check if the initialization is complete.
*/
bool NimBLEDevice::getInitialized() {
return initialized;
return NimBLEDevice_initialized;
} // getInitialized

7
libesp32/NimBLE-Arduino/src/mesh/glue.h
View File

@ -330,8 +330,11 @@ static inline void net_buf_simple_restore(struct os_mbuf *buf,
buf->om_len = state->len;
}
static inline void sys_memcpy_swap(void *dst, const void *src, size_t length)
static inline void sys_memcpy_swap(void *destination, const void *source, size_t length)
{
u8_t *dst = destination;
const u8_t *src = source;
__ASSERT(((src < dst && (src + length) <= dst) ||
(src > dst && (dst + length) <= src)),
"Source and destination buffers must not overlap");
@ -339,7 +342,7 @@ static inline void sys_memcpy_swap(void *dst, const void *src, size_t length)
src += length - 1;
for (; length > 0; length--) {
*((u8_t *)dst++) = *((u8_t *)src--);
*dst++ = *src--;
}
}