Fix C interface not compiling due to optional TLS.

dmitrykos · dmitrykos · commit 0e77669af6b3 · 2026-05-02T22:36:07.000+03:00
Cleanup examples more.
diff --git a/build/example/blinky/example.cpp b/build/example/blinky/example.cpp
@@ -7,7 +7,6 @@
  * License: MIT License, see LICENSE for a full text.
  */
 
-#include <stk_config.h>
 #include <stk.h>
 #include <sync/stk_sync_eventflags.h>
 #include "example.h"
@@ -52,7 +51,7 @@ class MyTask : public stk::Task<TASK_STACK_SIZE, _AccessMode>
     void Run() override
     {
         // we switch LEDs with 1s period
-        const stk::Timeout period = stk::GetTicksFromMs(1000);
+        const stk::Ticks period = stk::GetTicksFromMs(1000);
 
         // get a start of the timeline
         g_Timeline = stk::GetTicks();
diff --git a/build/example/blinky_c/example.c b/build/example/blinky_c/example.c
@@ -7,7 +7,6 @@
  * License: MIT License, see LICENSE for a full text.
  */
 
-#include <stk_config.h>
 #include <stk_c.h>
 #include <stk_c_time.h>
 #include <stk_c_memory.h>
diff --git a/build/example/blinky_fp/example.cpp b/build/example/blinky_fp/example.cpp
@@ -7,7 +7,6 @@
  * License: MIT License, see LICENSE for a full text.
  */
 
-#include <stk_config.h>
 #include <stk.h>
 #include "example.h"
 
diff --git a/build/example/blinky_mc/example.cpp b/build/example/blinky_mc/example.cpp
@@ -7,7 +7,6 @@
  * License: MIT License, see LICENSE for a full text.
  */
 
-#include <stk_config.h>
 #include <stk.h>
 #include "example.h"
 
diff --git a/build/example/blinky_swrr/example.cpp b/build/example/blinky_swrr/example.cpp
@@ -7,7 +7,6 @@
  * License: MIT License, see LICENSE for a full text.
  */
 
-#include <stk_config.h>
 #include <stk.h>
 #include "example.h"
 
diff --git a/build/example/critical_section/example.cpp b/build/example/critical_section/example.cpp
@@ -7,7 +7,6 @@
  * License: MIT License, see LICENSE for a full text.
  */
 
-#include <stk_config.h>
 #include <stk.h>
 #include "example.h"
 #ifdef _WIN32
diff --git a/build/example/hrt/example.cpp b/build/example/hrt/example.cpp
@@ -7,7 +7,6 @@
  * License: MIT License, see LICENSE for a full text.
  */
 
-#include <stk_config.h>
 #include <stk.h>
 #include <time/stk_time.h>
 #include "example.h"
diff --git a/build/example/once/example.cpp b/build/example/once/example.cpp
@@ -7,7 +7,6 @@
  * License: MIT License, see LICENSE for a full text.
  */
 
-#include <stk_config.h>
 #include <stk.h>
 #include "example.h"
 
diff --git a/build/example/project/msvc/tls/stk_config.h b/build/example/project/msvc/tls/stk_config.h
@@ -12,4 +12,7 @@
 
 #define _STK_ARCH_X86_WIN32
 
+// Use TLS.
+#define STK_TLS (1)
+
 #endif /* STK_CONFIG_H_ */
diff --git a/build/example/secure_task/example.cpp b/build/example/secure_task/example.cpp
@@ -7,7 +7,6 @@
  * License: MIT License, see LICENSE for a full text.
  */
 
-#include <stk_config.h>
 #include <stk.h>
 #include "example.h"
 
diff --git a/build/example/sleep/example.cpp b/build/example/sleep/example.cpp
@@ -7,7 +7,6 @@
  * License: MIT License, see LICENSE for a full text.
  */
 
-#include <stk_config.h>
 #include <stk.h>
 #include "example.h"
 
diff --git a/build/example/sync/example.cpp b/build/example/sync/example.cpp
@@ -14,7 +14,6 @@
 extern void STK_ASSERT_HANDLER(const char *err, const char *source, int32_t line);
 #endif
 
-#include <stk_config.h>
 #include <stk.h>
 #include <sync/stk_sync.h>
 #include "example.h"
diff --git a/build/example/sync_c/example.c b/build/example/sync_c/example.c
@@ -14,7 +14,6 @@
 extern void STK_ASSERT_IMPL(const char *err, const char *source, int32_t line);
 #endif
 
-#include <stk_config.h>
 #include <stk_c.h>
 #include "example.h"
 
diff --git a/build/example/timer/example.cpp b/build/example/timer/example.cpp
@@ -9,7 +9,6 @@
 
 //#define _STK_ASSERT_REDIRECT
 
-#include <stk_config.h>
 #include <stk.h>
 #include <time/stk_time.h>
 #include "example.h"
diff --git a/build/example/timer_c/example.c b/build/example/timer_c/example.c
@@ -11,9 +11,8 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#include <stk_config.h>
-#include "stk_c.h"
-#include "stk_c_time.h"
+#include <stk_c.h>
+#include <stk_c_time.h>
 #include "example.h"
 
 // ---------------------------------------------------------------------------
diff --git a/build/example/tls/example.cpp b/build/example/tls/example.cpp
@@ -7,7 +7,6 @@
  * License: MIT License, see LICENSE for a full text.
  */
 
-#include <stk_config.h>
 #include <stk.h>
 #include "example.h"
 
diff --git a/interop/c/include/stk_c.h b/interop/c/include/stk_c.h
@@ -15,6 +15,8 @@
 #include <stdbool.h>
 #include <assert.h>
 
+#include <stk_config.h>
+
 /*! \file     stk_c.h
     \brief    C language binding/interface for SuperTinyKernel RTOS.
 
diff --git a/interop/c/src/stk_c.cpp b/interop/c/src/stk_c.cpp
@@ -434,6 +434,7 @@ void        stk_yield(void)                    { stk::Yield(); }
 // -----------------------------------------------------------------------------
 // Thread-Local Storage (TLS) API
 // -----------------------------------------------------------------------------
+#if STK_TLS
 void *stk_tls_get(void)
 {
     return hw::GetTlsPtr<void *>();
@@ -443,6 +444,7 @@ void stk_tls_set(void *ptr)
 {
     hw::SetTlsPtr(ptr);
 }
+#endif
 
 // -----------------------------------------------------------------------------
 // Critical Section - Manual Enter/Exit
diff --git a/stk/src/arch/x86/win32/stk_arch_x86-win32.cpp b/stk/src/arch/x86/win32/stk_arch_x86-win32.cpp
@@ -176,11 +176,13 @@ static struct Context : public PlatformContext
         m_sleep_ticks  = 0;
     #endif
 
+    #if STK_TLS
         if ((m_tls = TlsAlloc()) == TLS_OUT_OF_INDEXES)
         {
             assert(false);
             return;
         }
+    #endif
 
         STK_X86_WIN32_CRITICAL_SECTION_INIT(&m_cs);
 
@@ -192,8 +194,10 @@ static struct Context : public PlatformContext
     */
     ~Context()
     {
+    #if STK_TLS
         if (m_tls != TLS_OUT_OF_INDEXES)
             TlsFree(m_tls);
+    #endif
 
         UnloadWindowsAPI();
     }
@@ -270,6 +274,7 @@ static struct Context : public PlatformContext
     Word GetCallerSP() const;
     TId GetTid() const;
     
+#if STK_TLS
     __stk_forceinline Word GetTls() 
     { 
         return hw::PtrToWord(TlsGetValue(m_tls)); 
@@ -279,6 +284,7 @@ static struct Context : public PlatformContext
     { 
         TlsSetValue(m_tls, hw::WordToPtr<void>(tp));
     }
+#endif
     
     __stk_forceinline void EnterCriticalSection()
     {
@@ -717,6 +723,7 @@ TId PlatformX86Win32::GetTid() const
     return GetContext().GetTid();
 }
 
+#if STK_TLS
 Word stk::hw::GetTls()
 {
     return GetContext().GetTls();
@@ -726,6 +733,7 @@ void stk::hw::SetTls(Word tp)
 {
     return GetContext().SetTls(tp);
 }
+#endif
 
 IKernelService *IKernelService::GetInstance()
 {
