Merge branch 'main' into develop

# Conflicts:
#	erpc_c/infra/erpc_message_buffer.cpp
#	erpc_c/port/erpc_threading_freertos.cpp
#	erpc_c/port/erpc_threading_zephyr.cpp
#	erpc_c/setup/erpc_setup_rpmsg_tty_rtos_remote.cpp
#	erpc_c/setup/erpc_transport_setup.h
#	erpc_c/transports/erpc_rpmsg_lite_rtos_transport.cpp
#	erpc_c/transports/erpc_rpmsg_lite_transport.cpp
#	erpcgen/src/Generator.cpp
#	erpcgen/src/SymbolScanner.cpp
#	erpcgen/src/erpcgen.cpp
#	test/common/unit_test_tcp_arbitrator_client.cpp

Author: MichalPrincNXP

LICENSE

@@ -1,5 +1,5 @@
 Copyright 2014-2016 Freescale Semiconductor, Inc.
-Copyright 2016-2023 NXP
+Copyright 2016-2024 NXP
 All rights reserved.
 
 The BSD 3 Clause License

README.md

@@ -251,4 +251,4 @@ Repository on Github contains two main branches: __main__ and __develop__. Code
 ---
 Copyright 2014-2016 Freescale Semiconductor, Inc.
 
-Copyright 2016-2023 NXP
+Copyright 2016-2024 NXP

doxygen/Doxyfile.erpc

@@ -38,7 +38,7 @@ PROJECT_NAME           = "eRPC API Reference"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "Rev. 1.11.0"
+PROJECT_NUMBER         = "Rev. 1.12.0"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

doxygen/Doxyfile.erpcgen

@@ -38,7 +38,7 @@ PROJECT_NAME           = "eRPC Generator (erpcgen)"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "Rev. 1.11.0"
+PROJECT_NUMBER         = "Rev. 1.12.0"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

erpc_c/infra/erpc_message_buffer.cpp

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2014-2016, Freescale Semiconductor, Inc.
- * Copyright 2016-2021 NXP
+ * Copyright 2016-2023 NXP
  * Copyright 2021 ACRIOS Systems s.r.o.
  * All rights reserved.
  *
@@ -110,13 +110,17 @@ void MessageBuffer::swap(MessageBuffer *other)
 
 void Cursor::setBuffer(MessageBuffer &buffer, uint8_t reserved)
 {
-    erpc_assert(buffer != NULL);
-
-    m_buffer = buffer;
     // RPMSG when nested calls are enabled can set NULL buffer.
     // erpc_assert(buffer->get() && "Data buffer wasn't set to MessageBuffer.");
     // receive function should return err if it couldn't set data buffer.
-    m_pos = buffer.get() + reserved;
+
+    // erpc_assert(buffer != NULL);
+
+    m_buffer = buffer;
+    if (buffer != NULL)
+    {
+        m_pos = buffer.get() + reserved;
+    }
 }
 
 MessageBuffer Cursor::getBuffer(void)

erpc_c/infra/erpc_version.h

@@ -20,9 +20,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //! @brief String version of eRPC.
-#define ERPC_VERSION "1.11.0"
+#define ERPC_VERSION "1.12.0"
 //! @brief Integer version of eRPC.
-#define ERPC_VERSION_NUMBER 11100
+#define ERPC_VERSION_NUMBER 11200
 
 /*! @} */
 

erpc_c/port/erpc_port_zephyr.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2021 NXP
+ * Copyright 2017-2023 NXP
  * Copyright 2021 ACRIOS Systems s.r.o.
  * All rights reserved.
  *
@@ -12,7 +12,7 @@
 #include <new>
 
 extern "C" {
-#include "kernel.h"
+#include <zephyr/kernel.h>
 };
 
 using namespace std;

erpc_c/port/erpc_threading.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2014-2016, Freescale Semiconductor, Inc.
- * Copyright 2016-2021 NXP
+ * Copyright 2016-2023 NXP
  * Copyright 2021 ACRIOS Systems s.r.o.
  * All rights reserved.
  *
@@ -25,7 +25,7 @@
 #include "semphr.h"
 #include "task.h"
 #elif ERPC_THREADS_IS(ZEPHYR)
-#include "kernel.h"
+#include <zephyr/kernel.h>
 #elif ERPC_THREADS_IS(MBED)
 #if MBED_CONF_RTOS_PRESENT
 #include "rtos.h"
@@ -99,7 +99,7 @@ class Thread
      * @param[in] stackPtr Mandatory task stack pointer for static api usage.
      */
     Thread(thread_entry_t entry, uint32_t priority = 0, uint32_t stackSize = 0, const char *name = 0,
-           thread_stack_pointer stackPtr = 0);
+           thread_stack_pointer stackPtr = NULL);
 
     /*!
      * @brief Destructor.
@@ -128,7 +128,7 @@ class Thread
      * @param[in] stackSize Stack size.
      * @param[in] stackPtr Mandatory task stack pointer for static api usage.
      */
-    void init(thread_entry_t entry, uint32_t priority = 0, uint32_t stackSize = 0, thread_stack_pointer stackPtr = 0);
+    void init(thread_entry_t entry, uint32_t priority = 0, uint32_t stackSize = 0, thread_stack_pointer stackPtr = NULL);
 
     /*!
      * @brief This function starts thread execution.
@@ -156,7 +156,7 @@ class Thread
 #elif ERPC_THREADS_IS(FREERTOS)
         return reinterpret_cast<thread_id_t>(m_task);
 #elif ERPC_THREADS_IS(ZEPHYR)
-        return reinterpret_cast<thread_id_t>(m_thread);
+        return reinterpret_cast<thread_id_t>(m_thread_id);
 #elif ERPC_THREADS_IS(MBED)
         return reinterpret_cast<thread_id_t>(m_thread->get_id());
 #elif ERPC_THREADS_IS(WIN32)
@@ -238,7 +238,8 @@ class Thread
     StaticTask_t m_staticTask; /*!< Hold static task data. */
 #endif
 #elif ERPC_THREADS_IS(ZEPHYR)
-    struct k_thread m_thread;  /*!< Current thread. */
+    struct k_thread m_thread; /*!< Current thread. */
+    k_tid_t m_thread_id;
     k_thread_stack_t *m_stack; /*!< Pointer to stack. */
 #elif ERPC_THREADS_IS(MBED)
     rtos::Thread *m_thread; /*!< Underlying Thread instance */
@@ -282,7 +283,7 @@ class Thread
      * @param[in] arg2
      * @param[in] arg3
      */
-    static void *threadEntryPointStub(void *arg1, void *arg2, void *arg3);
+    static void threadEntryPointStub(void *arg1, void *arg2, void *arg3);
 
 #elif ERPC_THREADS_IS(MBED)
 

erpc_c/port/erpc_threading_freertos.cpp

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2016, Freescale Semiconductor, Inc.
- * Copyright 2016-2021 NXP
+ * Copyright 2016-2023 NXP
  * Copyright 2021 ACRIOS Systems s.r.o.
  * All rights reserved.
  *
@@ -27,14 +27,14 @@ Thread *Thread::s_first = NULL;
 ////////////////////////////////////////////////////////////////////////////////
 
 Thread::Thread(const char *name) :
-m_name(name), m_entry(0), m_arg(0), m_stackSize(0), m_priority(0), m_task(0), m_next(0)
+m_name(name), m_entry(NULL), m_arg(0), m_stackSize(0), m_priority(0), m_stackPtr(NULL), m_task(0), m_next(0)
 {
 }
 
 Thread::Thread(thread_entry_t entry, uint32_t priority, uint32_t stackSize, const char *name,
                thread_stack_pointer stackPtr) :
 m_name(name),
-m_entry(entry), m_arg(0), m_stackSize(stackSize), m_priority(priority), m_task(0), m_next(0)
+m_entry(entry), m_arg(0), m_stackSize(stackSize), m_priority(priority), m_stackPtr(stackPtr), m_task(0), m_next(0)
 {
 }
 

erpc_c/port/erpc_threading_zephyr.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2021 NXP
+ * Copyright 2017-2023 NXP
  * Copyright 2021 ACRIOS Systems s.r.o.
  * All rights reserved.
  *
@@ -18,14 +18,14 @@ using namespace erpc;
 ////////////////////////////////////////////////////////////////////////////////
 
 Thread::Thread(const char *name) :
-m_name(name), m_entry(0), m_arg(0), m_stackSize(0), m_priority(0), m_thread(0), m_stack(0)
+m_name(name), m_entry(0), m_arg(0), m_stackSize(0), m_priority(0), m_thread(), m_stack(0)
 {
 }
 
 Thread::Thread(thread_entry_t entry, uint32_t priority, uint32_t stackSize, const char *name,
                thread_stack_pointer stackPtr) :
 m_name(name),
-m_entry(entry), m_arg(0), m_stackSize(stackSize), m_priority(priority), m_thread(0), m_stack(0)
+m_entry(entry), m_arg(0), m_stackSize(stackSize), m_priority(priority), m_thread(), m_stack(0)
 {
 }
 
@@ -44,12 +44,13 @@ void Thread::start(void *arg)
     m_arg = arg;
 
     erpc_assert((m_stack != NULL) && ("Set stack address" != NULL));
-    k_thread_create(&m_thread, m_stack, m_stackSize, threadEntryPointStub, this, NULL, NULL, m_priority, 0, K_NO_WAIT);
+    m_thread_id = k_thread_create(&m_thread, m_stack, m_stackSize, threadEntryPointStub, this, NULL, NULL, m_priority,
+                                  0, K_NO_WAIT);
 }
 
 bool Thread::operator==(Thread &o)
 {
-    return m_thread == o.m_thread;
+    return &m_thread == &o.m_thread;
 }
 
 Thread *Thread::getCurrentThread(void)
@@ -59,7 +60,7 @@ Thread *Thread::getCurrentThread(void)
 
 void Thread::sleep(uint32_t usecs)
 {
-    k_sleep(usecs / 1000);
+    k_sleep(K_USEC(usecs));
 }
 
 void Thread::threadEntryPoint(void)
@@ -70,7 +71,7 @@ void Thread::threadEntryPoint(void)
     }
 }
 
-void *Thread::threadEntryPointStub(void *arg1, void *arg2, void *arg3)
+void Thread::threadEntryPointStub(void *arg1, void *arg2, void *arg3)
 {
     Thread *_this = reinterpret_cast<Thread *>(arg1);
     erpc_assert((_this != NULL) && ("Reinterpreting 'void *arg1' to 'Thread *' failed." != NULL));
@@ -81,7 +82,7 @@ void *Thread::threadEntryPointStub(void *arg1, void *arg2, void *arg3)
     k_thread_abort(k_current_get());
 }
 
-Mutex::Mutex(void) : m_mutex(0)
+Mutex::Mutex(void) : m_mutex()
 {
     k_mutex_init(&m_mutex);
 }
@@ -104,7 +105,7 @@ bool Mutex::unlock(void)
     return true;
 }
 
-Semaphore::Semaphore(int count) : m_sem(0)
+Semaphore::Semaphore(int count) : m_sem()
 {
     // Set max count to highest signed int.
     k_sem_init(&m_sem, count, 0x7fffffff);
@@ -131,12 +132,12 @@ bool Semaphore::get(uint32_t timeoutUsecs)
         }
     }
 
-    return (k_sem_take(&m_sem, timeoutUsecs) == 0);
+    return (k_sem_take(&m_sem, K_USEC(timeoutUsecs)) == 0);
 }
 
 int Semaphore::getCount(void) const
 {
-    return k_sem_count_get(m_sem);
+    return k_sem_count_get(const_cast<k_sem *>(&m_sem));
 }
 #endif /* ERPC_THREADS_IS(ZEPHYR) */