Set task handle in constructor of NimBLETaskData

Author: h2zero

src/NimBLEUtils.cpp

@@ -33,6 +33,26 @@ constexpr uint32_t TASK_BLOCK_BIT = (1 << CONFIG_NIMBLE_CPP_FREERTOS_TASK_BLOCK_
 
 static const char* LOG_TAG = "NimBLEUtils";
 
+/**
+ * @brief Constructor.
+ * @param [in] pInstance An instance of the class that is waiting.
+ * @param [in] flags General purpose flags for the caller.
+ * @param [in] buf A buffer for data.
+ */
+NimBLETaskData::NimBLETaskData(void* pInstance = nullptr, int flags = 0, void* buf = nullptr)
+    : m_pInstance(pInstance), m_flags(flags), m_pBuf(buf) {
+# if defined INC_FREERTOS_H
+    m_pHandle = xTaskGetCurrentTaskHandle();
+# else
+    m_pHandle = new ble_npl_sem;
+    if (ble_npl_sem_init(static_cast<ble_npl_sem*>(m_pHandle), 0) != BLE_NPL_OK) {
+        NIMBLE_LOGE(LOG_TAG, "Failed to create semaphore");
+        delete m_pHandle;
+        m_pHandle = nullptr;
+    }
+# endif
+}
+
 /**
  * @brief Blocks the calling task until released or timeout.
  * @param [in] taskData A pointer to the task data structure.
@@ -54,20 +74,13 @@ bool NimBLEUtils::taskWait(const NimBLETaskData& taskData, uint32_t timeout) {
         return true;
     }
 
-    taskData.m_pHandle = xTaskGetCurrentTaskHandle();
     return xTaskNotifyWait(0, TASK_BLOCK_BIT, nullptr, ticks) == pdTRUE;
 
 # else
-    ble_npl_sem     sem;
-    ble_npl_error_t err = ble_npl_sem_init(&sem, 0);
-    if (err != BLE_NPL_OK) {
-        NIMBLE_LOGE(LOG_TAG, "Failed to create semaphore");
-        return false;
-    }
-
-    taskData.m_pHandle = &sem;
-    err                = ble_npl_sem_pend(&sem, ticks);
-    ble_npl_sem_deinit(&sem);
+    ble_npl_sem*    sem = static_cast<ble_npl_sem*>(taskData.m_pHandle);
+    ble_npl_error_t err = ble_npl_sem_pend(sem, ticks);
+    ble_npl_sem_deinit(sem);
+    delete taskData.m_pHandle;
     taskData.m_pHandle = nullptr;
     return err == BLE_NPL_OK;
 # endif

src/NimBLEUtils.h

@@ -21,14 +21,7 @@ class NimBLEAddress;
  * All items are optional, the m_pHandle will be set in taskWait().
  */
 struct NimBLETaskData {
-    /**
-     * @brief Constructor.
-     * @param [in] pInstance An instance of the class that is waiting.
-     * @param [in] flags General purpose flags for the caller.
-     * @param [in] buf A buffer for data.
-     */
-    NimBLETaskData(void* pInstance = nullptr, int flags = 0, void* buf = nullptr)
-        : m_pInstance(pInstance), m_flags(flags), m_pBuf(buf) {}
+    NimBLETaskData(void* pInstance = nullptr, int flags = 0, void* buf = nullptr);
     void*       m_pInstance{nullptr};
     mutable int m_flags{0};
     void*       m_pBuf{nullptr};