PR feedback

Author: KenVanHoeylandt

Devices/lilygo-tdeck/Source/Init.cpp

@@ -3,6 +3,7 @@
 #include "devices/TrackballDevice.h"
 
 #include <Tactility/hal/gps/GpsConfiguration.h>
+#include <Tactility/kernel/Kernel.h>
 #include <Tactility/kernel/SystemEvents.h>
 #include <Tactility/Logger.h>
 #include <Tactility/LogMessages.h>
@@ -31,7 +32,7 @@ static bool powerOn() {
     }
 
     // Avoids crash when no SD card is inserted. It's unknown why, but likely is related to power draw.
-    vTaskDelay(100);
+    tt::kernel::delayMillis(100);
 
     return true;
 }

TactilityKernel/Include/Tactility/concurrent/Dispatcher.h

@@ -39,6 +39,7 @@ error_t dispatcher_dispatch_timed(DispatcherHandle_t dispatcher, void* callbackC
  *
  * @param[in] callbackContext the data to pass to the function upon execution
  * @param[in] callback the function to execute elsewhere
+ * @retval ERROR_RESOURCE when failing to set event
  * @retval ERROR_TIMEOUT unlikely to occur unless there's an issue with the internal mutex
  * @retval ERROR_INVALID_STATE when the dispatcher is in the process of shutting down
  * @retval ERROR_NONE

TactilityKernel/Include/Tactility/concurrent/Mutex.h

@@ -44,9 +44,9 @@ inline static bool mutex_try_lock_timed(struct Mutex* mutex, TickType_t timeout)
 
 inline static bool mutex_is_locked(struct Mutex* mutex) {
     if (xPortInIsrContext() == pdTRUE) {
-        return xSemaphoreGetMutexHolder(mutex->handle) != NULL;
-    } else {
         return xSemaphoreGetMutexHolderFromISR(mutex->handle) != NULL;
+    } else {
+        return xSemaphoreGetMutexHolder(mutex->handle) != NULL;
     }
 }
 

TactilityKernel/Include/Tactility/concurrent/RecursiveMutex.h

@@ -32,9 +32,9 @@ inline static void recursive_mutex_lock(struct RecursiveMutex* mutex) {
 
 inline static bool recursive_mutex_is_locked(struct RecursiveMutex* mutex) {
     if (xPortInIsrContext() == pdTRUE) {
-        return xSemaphoreGetMutexHolder(mutex->handle) != NULL;
-    } else {
         return xSemaphoreGetMutexHolderFromISR(mutex->handle) != NULL;
+    } else {
+        return xSemaphoreGetMutexHolder(mutex->handle) != NULL;
     }
 }
 

TactilityKernel/Source/Driver.cpp

@@ -57,12 +57,11 @@ static DriverLedger& get_ledger() {
 #define driver_lock(driver) mutex_lock(&driver_internal_data(driver)->mutex);
 #define driver_unlock(driver) mutex_unlock(&driver_internal_data(driver)->mutex);
 
-static error_t driver_add(Driver* driver) {
+static void driver_add(Driver* driver) {
     LOG_I(TAG, "add %s", driver->name);
     ledger.lock();
     ledger.drivers.push_back(driver);
     ledger.unlock();
-    return ERROR_NONE;
 }
 
 static error_t driver_remove(Driver* driver) {
@@ -98,7 +97,10 @@ error_t driver_destruct(Driver* driver) {
         return ERROR_INVALID_STATE;
     }
 
-    driver_remove(driver);
+    if (driver_remove(driver) != ERROR_NONE) {
+        LOG_W(TAG, "Failed to remove driver from ledger: %s", driver->name);
+    }
+
     delete driver_internal_data(driver);
     driver->internal.data = nullptr;
     return ERROR_NONE;

TactilityKernel/Source/concurrent/EventGroup.cpp

@@ -67,11 +67,11 @@ error_t event_group_wait(
         : ((inFlags & result_flags) == 0U); // await any
 
     if (invalid_flags) {
-        if (timeout > 0U) { // assume time-out
+        const uint32_t matched = inFlags & result_flags;
+        if (matched == 0U) {
             return ERROR_TIMEOUT;
-        } else {
-            return ERROR_RESOURCE;
         }
+        return ERROR_RESOURCE;
     }
 
     if (outFlags != nullptr) {