PR feedback

Author: KenVanHoeylandt

TactilityFreeRtos/Include/Tactility/Dispatcher.h

@@ -87,7 +87,7 @@ class Dispatcher final {
     }
 
     /**
-     * Consume 1 or more dispatched function (if any) until the queue is empty.
+     * Consume 1 or more dispatched functions (if any) until the queue is empty.
      * @warning The timeout is only the wait time before consuming the message! It is not a limit to the total execution time when calling this method.
      * @param[in] timeout the ticks to wait for a message
      * @return the amount of messages that were consumed

TactilityFreeRtos/Include/Tactility/EventGroup.h

@@ -70,10 +70,10 @@ class EventGroup final {
                 return false;
             }
             portYIELD_FROM_ISR(pdTRUE);
-            return true;
         } else {
-            return xEventGroupClearBits(handle.get(), flags) == pdTRUE;
+            xEventGroupClearBits(handle.get(), flags);
         }
+        return true;
     }
 
     /**

TactilityKernel/Include/Tactility/concurrent/Dispatcher.h

@@ -5,8 +5,6 @@
 */
 #pragma once
 
-#include <stdbool.h>
-
 #include <Tactility/Error.h>
 #include <Tactility/FreeRTOS/FreeRTOS.h>
 
@@ -17,7 +15,7 @@ extern "C" {
 typedef void (*DispatcherCallback)(void* context);
 typedef void* DispatcherHandle_t;
 
-DispatcherHandle_t dispatcher_alloc();
+DispatcherHandle_t dispatcher_alloc(void);
 
 void dispatcher_free(DispatcherHandle_t dispatcher);
 
@@ -49,7 +47,7 @@ static inline error_t dispatcher_dispatch(DispatcherHandle_t dispatcher, void* c
 }
 
 /**
- * Consume 1 or more dispatched function (if any) until the queue is empty.
+ * Consume 1 or more dispatched functions (if any) until the queue is empty.
  *
  * @warning The timeout is only the wait time before consuming the message! It is not a limit to the total execution time when calling this method.
  *
@@ -62,7 +60,7 @@ static inline error_t dispatcher_dispatch(DispatcherHandle_t dispatcher, void* c
 error_t dispatcher_consume_timed(DispatcherHandle_t dispatcher, TickType_t timeout);
 
 /**
- * Consume 1 or more dispatched function (if any) until the queue is empty.
+ * Consume 1 or more dispatched functions (if any) until the queue is empty.
  *
  * @warning The timeout is only the wait time before consuming the message! It is not a limit to the total execution time when calling this method.
  *

TactilityKernel/Source/Driver.cpp

@@ -15,6 +15,7 @@
 struct DriverInternalData {
     Mutex mutex { 0 };
     int use_count = 0;
+    bool destroying = false;
 
     DriverInternalData() {
         mutex_construct(&mutex);
@@ -92,10 +93,13 @@ error_t driver_construct(Driver* driver) {
 }
 
 error_t driver_destruct(Driver* driver) {
-    // Check if in use
-    if (driver_internal_data(driver)->use_count != 0) {
+    driver_lock(driver);
+    if (driver_internal_data(driver)->use_count != 0 || driver_internal_data(driver)->destroying) {
+        driver_unlock(driver);
         return ERROR_INVALID_STATE;
     }
+    driver_internal_data(driver)->destroying = true;
+    driver_unlock(driver);
 
     if (driver_remove(driver) != ERROR_NONE) {
         LOG_W(TAG, "Failed to remove driver from ledger: %s", driver->name);
@@ -137,7 +141,7 @@ error_t driver_bind(Driver* driver, Device* device) {
     driver_lock(driver);
 
     error_t error = ERROR_NONE;
-    if (!device_is_added(device)) {
+    if (driver_internal_data(driver)->destroying || !device_is_added(device)) {
         error = ERROR_INVALID_STATE;
         goto error;
     }
@@ -164,15 +168,15 @@ error_t driver_bind(Driver* driver, Device* device) {
 error_t driver_unbind(Driver* driver, Device* device) {
     driver_lock(driver);
 
-    error_t err = ERROR_NONE;
-    if (!device_is_added(device)) {
-        err = ERROR_INVALID_STATE;
+    error_t error = ERROR_NONE;
+    if (driver_internal_data(driver)->destroying || !device_is_added(device)) {
+        error = ERROR_INVALID_STATE;
         goto error;
     }
 
     if (driver->stopDevice != nullptr) {
-        err = driver->stopDevice(device);
-        if (err != ERROR_NONE) {
+        error = driver->stopDevice(device);
+        if (error != ERROR_NONE) {
             goto error;
         }
     }
@@ -187,7 +191,7 @@ error_t driver_unbind(Driver* driver, Device* device) {
 error:
 
     driver_unlock(driver);
-    return err;
+    return error;
 }
 
 } // extern "C"

TactilityKernel/Source/concurrent/Dispatcher.cpp

@@ -42,7 +42,7 @@ struct DispatcherData {
 
 extern "C" {
 
-DispatcherHandle_t dispatcher_alloc() {
+DispatcherHandle_t dispatcher_alloc(void) {
     return new DispatcherData();
 }
 

TactilityKernel/Source/concurrent/EventGroup.cpp

@@ -27,9 +27,7 @@ error_t event_group_clear(EventGroupHandle_t eventGroup, uint32_t flags) {
         }
         portYIELD_FROM_ISR(pdTRUE);
     } else {
-        if (xEventGroupClearBits(eventGroup, flags) == pdFAIL) {
-            return ERROR_RESOURCE;
-        }
+        xEventGroupClearBits(eventGroup, flags);
     }
     return ERROR_NONE;
 }