From 827f5034d502b94a45a6ebf913e7702b9eea41a4 Mon Sep 17 00:00:00 2001 From: Ken Van Hoeylandt Date: Sun, 1 Feb 2026 02:01:23 +0100 Subject: [PATCH] Fix module dependencies --- Tests/Tactility/CMakeLists.txt | 1 - Tests/Tactility/Main.cpp | 12 ++++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Tests/Tactility/CMakeLists.txt b/Tests/Tactility/CMakeLists.txt index 818ba286..9a070b7c 100644 --- a/Tests/Tactility/CMakeLists.txt +++ b/Tests/Tactility/CMakeLists.txt @@ -23,6 +23,5 @@ target_link_libraries(TactilityTests PRIVATE hal-device-module lvgl-module lvgl - Simulator SDL2::SDL2-static SDL2-static ) diff --git a/Tests/Tactility/Main.cpp b/Tests/Tactility/Main.cpp index b31ff550..9177303d 100644 --- a/Tests/Tactility/Main.cpp +++ b/Tests/Tactility/Main.cpp @@ -7,7 +7,6 @@ #include #include - typedef struct { int argc; char** argv; @@ -17,8 +16,6 @@ typedef struct { extern "C" { // From the relevant platform extern struct Module platform_module; -// From the relevant device -extern struct Module device_module; } struct ModuleParent tactility_tests_module_parent { @@ -36,7 +33,7 @@ void test_task(void* parameter) { // overrides context.setOption("no-breaks", true); // don't break in the debugger when assertions fail - check(kernel_init(&platform_module, &device_module, nullptr) == ERROR_NONE); + check(kernel_init(&platform_module, nullptr, nullptr) == ERROR_NONE); // HAL compatibility module: it creates kernel driver wrappers for tt::hal::Device check(module_parent_construct(&tactility_tests_module_parent) == ERROR_NONE); check(module_set_parent(&hal_device_module, &tactility_tests_module_parent) == ERROR_NONE); @@ -70,3 +67,10 @@ int main(int argc, char** argv) { return data.result; } + +extern "C" { +// Required for FreeRTOS +void vAssertCalled(unsigned long line, const char* const file) { + __assert_fail("assert failed", file, line, ""); +} +}