Support for ThreadX and NetX Duo

Author: dgarske

Makefile

@@ -115,7 +115,7 @@ topic.
 | `DEBUG` | | Compiler debugging flag to use (default `-ggdb`) |
 | `OPTIM` | | The optimizer flag to use (default `-O3`) |
 | `HOST` | | The target host tuple, for cross-compilation (default unset, i.e. native targeting) |
-| `RUNTIME` | | The target runtime ecosystem -- default unset, `FreeRTOS-lwIP` and `Linux-lwIP` are recognized |
+| `RUNTIME` | | The target runtime ecosystem -- default unset, `FreeRTOS-lwIP`, `Linux-lwIP` and `ThreadX-NetXDuo` are recognized |
 | `C_WARNFLAGS` | | The warning flags to use (overriding the generally applicable defaults) |
 | `STATIC` | | Build statically linked unit tests |
 | `STRIPPED` | | Strip binaries of debugging symbols |

README.md

@@ -0,0 +1,17 @@
+cls
+make ^
+    CC=d:/mingw/rx/4.8.2a/bin/gcc ^
+    STATIC=1 ^
+    OPTIM=-O2 ^
+    RUNTIME=ThreadX-NetXDuo ^
+    THREADX_TOP=../../../bsp/xlogic/rx72n/ ^
+    NEED_THREADX_TYPES=1 ^
+    THREADX_TYPES_TOP=../../../bsp/src/common ^
+    NETXDUO_TOP=../../../bsp/src/ethernet ^
+    EXTRA_CFLAGS="-Bd:/mingw/rx/4.8.2a/bin -gstabs -g3 -std=gnu99 -mbig-endian-data -fno-leading-underscore -ftabstop=4 -fno-common -fno-use-linker-plugin -fno-leading-underscore -fstrict-volatile-bitfields -D_REENT_SMALL" ^
+    C_WARNFLAGS="-Wdeclaration-after-statement -Wmissing-prototypes -Wnested-externs -Wredundant-decls -Wshadow -Wstrict-prototypes -Wundef -Wno-format -Wno-main -Wno-maybe-uninitialized -Wno-parentheses -Wno-strict-aliasing" ^
+    V=1
+
+REM d:/mingw/rx/4.8.2a/bin/gcc -Bd:/mingw/rx/4.8.2a/bin
+REM d:/mingw/rx/4.8.2a/bin/objcopy.exe -I elf32-rx-be-ns
+REM d:/mingw/rx/4.8.2a/bin/ld -Ld:/mingw/rx/4.8.2a/lib --warn-common --oformat=elf32-rx-be

build.bat

@@ -22,15 +22,15 @@
 
 #define WOLFSENTRY_SOURCE_ID WOLFSENTRY_SOURCE_ID_ROUTES_C
 
-#include "wolfsentry_internal.h"
-
 #ifndef WOLFSENTRY_NO_ALLOCA
 #include <alloca.h>
 #endif
 
 #ifdef WOLFSENTRY_LWIP
 #include <lwip/inet.h>
 #include <lwip/sockets.h>
+#elif defined(WOLFSENTRY_NETXDUO)
+#include "nxd_bsd.h"
 #else
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -40,6 +40,8 @@
 #include <netdb.h>
 #endif
 
+#include "wolfsentry_internal.h"
+
 static inline int cmp_addrs_prefixful(
     const byte *left_addr,
     int left_addr_len,

src/routes.c

@@ -812,8 +812,10 @@ WOLFSENTRY_API wolfsentry_errcode_t wolfsentry_init_thread_context(struct wolfse
          * the held lock can be safely locked recursively from within the
          * interrupt context.
          */
-        if (thread_context->id == (wolfsentry_thread_id_t)((uintptr_t)WOLFSENTRY_THREAD_NO_ID - 0xffffff))
-            WOLFSENTRY_ATOMIC_INCREMENT(fallback_thread_id_counter, 0xffffff);
+        if (thread_context->id == (wolfsentry_thread_id_t)((uintptr_t)WOLFSENTRY_THREAD_NO_ID - 0xffffff)) {
+            (void)WOLFSENTRY_ATOMIC_INCREMENT(fallback_thread_id_counter, 0xffffff);
+        }
+        (void)fallback_thread_id_counter;
         WOLFSENTRY_SUCCESS_RETURN(USED_FALLBACK);
     } else
         WOLFSENTRY_RETURN_OK;
@@ -1509,6 +1511,73 @@ static int freertos_sem_destroy( sem_t * sem )
 
 #define sem_destroy freertos_sem_destroy
 
+#elif defined(THREADX)
+
+    #ifndef ETIMEDOUT
+        #define ETIMEDOUT       110 /* Connection timed out */
+    #endif
+
+    #define sem_init threadx_sem_init
+    static int threadx_sem_init( sem_t * sem,
+                int pshared,
+                unsigned value )
+    {
+        (void)pshared;
+        if (tx_semaphore_create(sem, NULL, value) != TX_SUCCESS) {
+            errno = EINVAL;
+            WOLFSENTRY_RETURN_VALUE(-1);
+        }
+        WOLFSENTRY_RETURN_VALUE(0);
+    }
+    #define sem_post threadx_sem_post
+    static int threadx_sem_post( sem_t * sem )
+    {
+        if (tx_semaphore_put(sem) != TX_SUCCESS) {
+            errno = EINVAL;
+            WOLFSENTRY_RETURN_VALUE(-1);
+        }
+        WOLFSENTRY_RETURN_VALUE(0);
+    }
+    #define sem_timedwait threadx_sem_timedwait
+    static int threadx_sem_timedwait( sem_t * sem,
+                    const struct timespec * abstime )
+    {
+        if (tx_semaphore_get(sem, (uint32_t)(TX_TICK_TIME_MS *
+            (abstime->tv_sec * 1000) + (abstime->tv_nsec / 1000000))) != TX_SUCCESS) {
+            errno = EINVAL;
+            WOLFSENTRY_RETURN_VALUE(-1);
+        }
+        WOLFSENTRY_RETURN_VALUE(0);
+    }
+    #define sem_wait threadx_sem_wait
+    static int threadx_sem_wait( sem_t * sem )
+    {
+        if (tx_semaphore_get(sem, TX_WAIT_FOREVER) != TX_SUCCESS) {
+            errno = EINVAL;
+            WOLFSENTRY_RETURN_VALUE(-1);
+        }
+        WOLFSENTRY_RETURN_VALUE(0);
+    }
+    #define sem_trywait threadx_sem_trywait
+    static int threadx_sem_trywait( sem_t * sem )
+    {
+        if (tx_semaphore_get(sem, 0) != TX_SUCCESS) {
+            errno = EINVAL;
+            WOLFSENTRY_RETURN_VALUE(-1);
+        }
+        WOLFSENTRY_RETURN_VALUE(0);
+    }
+    static int threadx_sem_destroy( sem_t * sem )
+    {
+        if (tx_semaphore_delete(sem) != TX_SUCCESS) {
+            errno = EINVAL;
+            WOLFSENTRY_RETURN_VALUE(-1);
+        }
+        WOLFSENTRY_RETURN_VALUE(0);
+    }
+
+    #define sem_destroy threadx_sem_destroy
+
 #else
 
 #error Semaphore builtins not implemented for target -- build wolfSentry with -DWOLFSENTRY_NO_SEM_BUILTIN, and supply semaphore implementation with struct wolfsentry_host_platform_interface argument to wolfsentry_init().
@@ -2847,7 +2916,7 @@ WOLFSENTRY_API wolfsentry_errcode_t wolfsentry_lock_shared2mutex_abstimed(struct
                     WOLFSENTRY_ERROR_RETURN(SYS_OP_FATAL);
             }
         }
-    } else 
+    } else
         ret = sem_timedwait(&lock->sem_read2write_waiters, abs_timeout);
 
     if (ret < 0) {
@@ -3317,6 +3386,19 @@ static wolfsentry_errcode_t wolfsentry_builtin_get_time(void *context, wolfsentr
     WOLFSENTRY_RETURN_OK;
 }
 
+#elif defined(THREADX)
+
+static wolfsentry_errcode_t wolfsentry_builtin_get_time(void *context, wolfsentry_time_t *now) {
+    struct timespec ts;
+    uint32_t tick_count;
+    (void)context;
+    tick_count = tx_time_get();
+    ts.tv_sec = (long)tick_count / TX_TICK_TIME_MS;
+    ts.tv_nsec = (long)(tick_count % TX_TICK_TIME_MS) * 1000000;
+    *now = ((wolfsentry_time_t)ts.tv_sec * (wolfsentry_time_t)1000000) + ((wolfsentry_time_t)ts.tv_nsec / (wolfsentry_time_t)1000);
+    WOLFSENTRY_RETURN_OK;
+}
+
 #else
 
 #include <time.h>
@@ -4264,7 +4346,7 @@ WOLFSENTRY_API wolfsentry_errcode_t wolfsentry_base64_decode(const char *src, si
     const char *src_end = src + src_len;
     size_t dest_len = 0;
 
-    if (WOLFSENTRY_BASE64_DECODED_BUFSPC(src, src_len) > *dest_spc)
+    if (WOLFSENTRY_BASE64_DECODED_BUFSPC(src, (int)src_len) > (int)*dest_spc)
         WOLFSENTRY_ERROR_RETURN(BUFFER_TOO_SMALL);
 
     for (; src < src_end; ++src) {

src/wolfsentry_util.c

@@ -3341,7 +3341,7 @@ WOLFSENTRY_API wolfsentry_errcode_t wolfsentry_user_values_iterate_end(
     (((((len)+3)/4)*3) - ((len) > 1 ? \
                           ((buf)[(len)-1] == '=') : \
                           0) \
-     - ((len) > 2 ? ((buf)[(len)-2] == '=') : 0)) \
+     - ((len) > 2 ? ((buf)[(len)-2] == '=') : 0))
     /*!< \brief Given valid base64 string `buf` of length `len`, evaluates to the exact decoded length. @hideinitializer */
 
 WOLFSENTRY_API wolfsentry_errcode_t wolfsentry_base64_decode(

wolfsentry/wolfsentry.h

@@ -39,7 +39,7 @@
 #endif
 
 typedef int32_t wolfsentry_errcode_t; /*!< \brief The structured result code type for wolfSentry.  It encodes a failure or success code, a source code file ID, and a line number. */
-#ifdef FREERTOS
+#if defined(FREERTOS) || defined(THREADX)
 #define WOLFSENTRY_ERRCODE_FMT "%d"
 #elif defined(PRId32)
 #define WOLFSENTRY_ERRCODE_FMT "%" PRId32

wolfsentry/wolfsentry_errcodes.h

@@ -110,6 +110,15 @@
     #endif
 #endif
 
+#ifdef THREADX
+    #ifdef NEED_THREADX_TYPES
+        #include <types.h>
+        #include <stdio.h>
+    #endif
+    #include <tx_api.h>
+#endif
+
+
 /*! \addtogroup wolfsentry_init
  * @{
  */
@@ -193,13 +202,13 @@
 #endif
 
 #ifndef WOLFSENTRY_USE_NONPOSIX_SEMAPHORES
-    #if defined(__MACH__) || defined(FREERTOS) || defined(_WIN32)
+    #if defined(__MACH__) || defined(FREERTOS) || defined(_WIN32) || defined(THREADX)
         #define WOLFSENTRY_USE_NONPOSIX_SEMAPHORES
     #endif
 #endif
 
 #ifndef WOLFSENTRY_USE_NONPOSIX_THREADS
-    #if defined(FREERTOS) || defined(_WIN32)
+    #if defined(FREERTOS) || defined(_WIN32) || defined(THREADX)
         #define WOLFSENTRY_USE_NONPOSIX_THREADS
     #endif
 #endif
@@ -543,6 +552,10 @@ typedef uint16_t wolfsentry_priority_t;
 
 #define sem_t StaticSemaphore_t
 
+#elif defined(THREADX)
+
+#define sem_t TX_SEMAPHORE
+
 #else
 
 /*! @} */
@@ -589,6 +602,8 @@ typedef uint16_t wolfsentry_priority_t;
         typedef pthread_t wolfsentry_thread_id_t;
     #elif defined(FREERTOS)
         typedef TaskHandle_t wolfsentry_thread_id_t;
+    #elif defined(THREADX)
+        typedef TX_THREAD* wolfsentry_thread_id_t;
     #else
         #error Must supply WOLFSENTRY_THREAD_ID_T for WOLFSENTRY_THREADSAFE on non-POSIX targets.
     #endif
@@ -598,6 +613,8 @@ typedef uint16_t wolfsentry_priority_t;
        #define WOLFSENTRY_THREAD_GET_ID_HANDLER pthread_self
     #elif defined(FREERTOS)
        #define WOLFSENTRY_THREAD_GET_ID_HANDLER xTaskGetCurrentTaskHandle
+    #elif defined(THREADX)
+       #define WOLFSENTRY_THREAD_GET_ID_HANDLER tx_thread_identify
     #else
         #error Must supply WOLFSENTRY_THREAD_GET_ID_HANDLER for WOLFSENTRY_THREADSAFE on non-POSIX targets.
     #endif

wolfsentry/wolfsentry_settings.h

@@ -171,7 +171,7 @@
     !defined(WOLFSENTRY_ATOMIC_POSTINCREMENT) || !defined(WOLFSENTRY_ATOMIC_POSTDECREMENT) || \
     !defined(WOLFSENTRY_ATOMIC_STORE) || !defined(WOLFSENTRY_ATOMIC_LOAD) || \
     !defined(WOLFSENTRY_ATOMIC_CMPXCHG)
-#error Missing required atomic implementation(s)
+   #error Missing required atomic implementation(s)
 #endif
 
 #endif /* WOLFSENTRY_HAVE_GNU_ATOMICS */