Skip to content

Commit ad1ce45

Browse files
committed
Fixes based on PR review
Signed-off-by: Cervenka Dusan <cervenka@acrios.com>
1 parent 034ec82 commit ad1ce45

5 files changed

Lines changed: 9 additions & 9 deletions

File tree

erpc_c/port/erpc_setup_extensions_freertos.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ void erpc_deinit_call_progress_detection_default(void)
6363
{
6464
if (s_erpc_call_in_progress != NULL)
6565
{
66-
#if ERPC_ALLOCATION_POLICY == ERPC_DYNAMIC_POLICY
66+
#if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC
6767
delete s_erpc_call_in_progress;
6868
#endif
6969
s_erpc_call_in_progress = NULL;

erpc_c/port/erpc_threading.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ class Thread
161161
return reinterpret_cast<thread_id_t>(m_thread->get_id());
162162
#elif ERPC_THREADS_IS(WIN32)
163163
return reinterpret_cast<thread_id_t>(m_thread);
164-
#elif ERPC_THREADS_IS(THREADX)
164+
#elif ERPC_THREADS_IS(THREADX)
165165
return reinterpret_cast<thread_id_t>(m_thread.tx_thread_id);
166166
#endif
167167
}
@@ -234,7 +234,7 @@ class Thread
234234
TaskHandle_t m_task; /*!< Current task. */
235235
Thread *m_next; /*!< Pointer to next Thread. */
236236
static Thread *s_first; /*!< Pointer to first Thread. */
237-
#if ERPC_ALLOCATION_POLICY == ERPC_STATIC_POLICY
237+
#if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
238238
StaticTask_t m_staticTask; /*!< Hold static task data. */
239239
#endif
240240
#elif ERPC_THREADS_IS(ZEPHYR)
@@ -251,7 +251,7 @@ class Thread
251251
static Thread *s_first; /*!< Pointer to first Thread. */
252252
static CRITICAL_SECTION m_critical_section;
253253
static BOOL m_critical_section_inited;
254-
#elif ERPC_THREADS_IS(THREADX)
254+
#elif ERPC_THREADS_IS(THREADX)
255255
TX_THREAD m_thread; /*!< Underlying Thread instance */
256256
Thread *m_next; /*!< Pointer to next Thread. */
257257
static Thread *s_first; /*!< Pointer to first Thread. */

erpc_c/port/erpc_threading_freertos.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ void Thread::start(void *arg)
7171
// which will scan the linked list.
7272
taskENTER_CRITICAL();
7373

74-
#if ERPC_ALLOCATION_POLICY == ERPC_STATIC_POLICY
74+
#if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
7575
if (m_stackPtr != NULL)
7676
{
7777
m_task =
@@ -205,7 +205,7 @@ void Thread::threadEntryPointStub(void *arg)
205205
Mutex::Mutex(void)
206206
: m_mutex(0)
207207
{
208-
#if ERPC_ALLOCATION_POLICY == ERPC_STATIC_POLICY
208+
#if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
209209
m_mutex = xSemaphoreCreateRecursiveMutexStatic(&m_staticQueue);
210210
#elif configSUPPORT_DYNAMIC_ALLOCATION
211211
m_mutex = xSemaphoreCreateRecursiveMutex();
@@ -239,7 +239,7 @@ Semaphore::Semaphore(int count)
239239
: m_sem(0)
240240
{
241241
// Set max count to highest signed int.
242-
#if ERPC_ALLOCATION_POLICY == ERPC_STATIC_POLICY
242+
#if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
243243
m_sem = xSemaphoreCreateCountingStatic(0x7fffffff, count, &m_staticQueue);
244244
#elif configSUPPORT_DYNAMIC_ALLOCATION
245245
m_sem = xSemaphoreCreateCounting(0x7fffffff, count);

erpc_c/transports/erpc_rpmsg_lite_base_transport.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include "rpmsg_lite.h"
1818

19-
#if ERPC_ALLOCATION_POLICY == ERPC_STATIC_POLICY
19+
#if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
2020
#ifndef RL_USE_STATIC_API
2121
#warning "RPMSG is not set to use static allocation"
2222
#endif

erpc_c/transports/erpc_rpmsg_lite_rtos_transport.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ erpc_status_t RPMsgRTOSTransport::init(uint32_t src_addr, uint32_t dst_addr, voi
149149

150150
if (0U == s_initialized)
151151
{
152-
#if RL_USE_STATIC_API s_rpmsg =
152+
#if RL_USE_STATIC_API
153153
s_rpmsg = rpmsg_lite_remote_init(base_address, rpmsg_link_id, RL_NO_FLAGS, &m_static_context);
154154
#else
155155
s_rpmsg = rpmsg_lite_remote_init(base_address, rpmsg_link_id, RL_NO_FLAGS);

0 commit comments

Comments
 (0)