From 99bbe105eb8720e265ad50b3497aa0c98d737396 Mon Sep 17 00:00:00 2001
From: Ken Van Hoeylandt <git@kenvanhoeylandt.net>
Date: Wed, 21 Jan 2026 00:15:26 +0100
Subject: [PATCH] Fixes

---
 .../devicetree-compiler/source/generator.py       |  2 +-
 Drivers/drivers-esp/source/Esp32Gpio.cpp          |  4 ++--
 Drivers/drivers-esp/source/Esp32I2c.cpp           |  4 ++--
 core/source/Bus.cpp                               |  1 -
 core/source/Driver.cpp                            | 15 +++++++--------
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/Buildscripts/devicetree-compiler/source/generator.py b/Buildscripts/devicetree-compiler/source/generator.py
index f35480b1..d071fa3a 100644
--- a/Buildscripts/devicetree-compiler/source/generator.py
+++ b/Buildscripts/devicetree-compiler/source/generator.py
@@ -178,7 +178,7 @@ def generate_devicetree_c(filename: str, items: list[object], bindings: list[Bin
         file.write("\n")
 
         file.write(dedent('''\
-        #define TAG "devicetree"
+        #define TAG LOG_TAG(devicetree)
         
         static int init_builtin_device(struct Device* device, const char* compatible, struct Device* parent_device) {
             struct Driver* driver = driver_find(compatible);
diff --git a/Drivers/drivers-esp/source/Esp32Gpio.cpp b/Drivers/drivers-esp/source/Esp32Gpio.cpp
index db2dd33b..273f0875 100644
--- a/Drivers/drivers-esp/source/Esp32Gpio.cpp
+++ b/Drivers/drivers-esp/source/Esp32Gpio.cpp
@@ -1,12 +1,12 @@
 #include <driver/gpio.h>
-#include <esp_log.h>
 
 #include <Tactility/Driver.h>
 #include <Tactility/drivers/Esp32Gpio.h>
 #include <Tactility/drivers/GpioController.h>
 #include <Tactility/drivers/Gpio.h>
+#include <Tactility/Log.h>
 
-#define TAG "esp32_gpio"
+#define TAG LOG_TAG(esp32_gpio)
 
 #define GET_CONFIG(device) ((struct Esp32GpioConfig*)device->internal.driver_data)
 
diff --git a/Drivers/drivers-esp/source/Esp32I2c.cpp b/Drivers/drivers-esp/source/Esp32I2c.cpp
index b742e780..8063531e 100644
--- a/Drivers/drivers-esp/source/Esp32I2c.cpp
+++ b/Drivers/drivers-esp/source/Esp32I2c.cpp
@@ -1,11 +1,11 @@
-#include <esp_log.h>
 #include <driver/i2c.h>
 
 #include <Tactility/Driver.h>
 #include <Tactility/drivers/Esp32I2c.h>
 #include <Tactility/drivers/I2cController.h>
+#include <Tactility/Log.h>
 
-#define TAG "esp32_i2c"
+#define TAG LOG_TAG(esp32_i2c)
 
 struct InternalData {
     Mutex mutex {};
diff --git a/core/source/Bus.cpp b/core/source/Bus.cpp
index a6f04321..ee45aa0a 100644
--- a/core/source/Bus.cpp
+++ b/core/source/Bus.cpp
@@ -1,7 +1,6 @@
 #include <algorithm>
 #include <cstring>
 #include <vector>
-#include <sys/errno.h>
 
 #include <Tactility/concurrent/Mutex.h>
 #include <Tactility/Bus.h>
diff --git a/core/source/Driver.cpp b/core/source/Driver.cpp
index 30666705..1f2a4798 100644
--- a/core/source/Driver.cpp
+++ b/core/source/Driver.cpp
@@ -6,6 +6,8 @@
 #include <Tactility/Error.h>
 #include <Tactility/Log.h>
 
+#define TAG LOG_TAG(driver)
+
 struct DriverInternalData {
     Mutex mutex {};
     int use_count = 0;
@@ -34,8 +36,6 @@ struct DriverLedger {
 
 static DriverLedger ledger;
 
-#define TAG "driver"
-
 #define ledger_lock() mutex_lock(&ledger.mutex);
 #define ledger_unlock() mutex_unlock(&ledger.mutex);
 
@@ -43,7 +43,6 @@ static DriverLedger ledger;
 #define driver_lock(driver) mutex_lock(&driver_internal_data(driver)->mutex);
 #define driver_unlock(driver) mutex_unlock(&driver_internal_data(driver)->mutex);
 
-
 static void driver_add(Driver* dev) {
     LOG_I(TAG, "add %s", dev->name);
     ledger_lock();
@@ -85,18 +84,18 @@ int driver_destruct(Driver* driver) {
     return 0;
 }
 
-Driver* driver_find(const char* name) {
+Driver* driver_find(const char* compatible) {
     ledger_lock();
-    const auto it = std::ranges::find_if(ledger.drivers, [name](Driver* driver) {
+    const auto it = std::ranges::find_if(ledger.drivers, [compatible](Driver* driver) {
         const char** current_compatible = driver->compatible;
         assert(current_compatible != nullptr);
         while (*current_compatible != nullptr) {
-            if (strcmp(name, *current_compatible) == 0) {
-                return 0;
+            if (strcmp(compatible, *current_compatible) == 0) {
+                return true;
             }
             current_compatible++;
         }
-        return -1;
+        return false;
     });
     auto* driver = (it != ledger.drivers.end()) ? *it : nullptr;
     ledger_unlock();