Skip to content

Commit 68b32b2

Browse files
committed
Update rpmsg dependency based on lates rpmsg changes.
Signed-off-by: Cervenka Dusan <cervenka@acrios.com>
1 parent ad1ce45 commit 68b32b2

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

erpc_c/port/erpc_setup_extensions_freertos.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ using namespace erpc;
1616

1717
static Semaphore *s_erpc_call_in_progress = NULL;
1818
static TimerHandle_t s_erpc_call_timer_cb = NULL;
19-
#if configSUPPORT_STATIC_ALLOCATION
19+
#if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
2020
static StaticTimer_t s_static_erpc_call_timer_cb;
2121
#endif
2222

@@ -49,7 +49,7 @@ void erpc_init_call_progress_detection_default(
4949
s_erpc_call_in_progress = new Semaphore(1);
5050
assert(s_erpc_call_in_progress && "Creating eRPC semaphore failed.");
5151

52-
#if configSUPPORT_STATIC_ALLOCATION
52+
#if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
5353
s_erpc_call_timer_cb = xTimerCreateStatic("Erpc client call timer", waitTimeMs / portTICK_PERIOD_MS, pdFALSE, NULL,
5454
erpc_call_timer_cb, &s_static_erpc_call_timer_cb);
5555
#else

erpc_c/transports/erpc_rpmsg_lite_base_transport.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include "erpc_config_internal.h"
1616

1717
#include "rpmsg_lite.h"
18+
#include "rpmsg_env_specific.h"
1819

1920
#if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
2021
#ifndef RL_USE_STATIC_API
@@ -38,9 +39,6 @@
3839
// Classes
3940
////////////////////////////////////////////////////////////////////////////////
4041

41-
/* TODO: replace bellow size representing sizeof(rpmsg_queue_rx_cb_data_t)*/
42-
#define SIZE_OF_RPMSG_QUEUE 12
43-
4442
namespace erpc {
4543
/*!
4644
* @brief Transport that other RPMsg transports inherits.
@@ -69,8 +67,8 @@ class RPMsgBaseTransport : public Transport
6967
#if RL_USE_STATIC_API
7068
struct rpmsg_lite_instance m_static_context;
7169
struct rpmsg_lite_ept_static_context m_ept_context;
72-
rpmsg_static_queue m_queue_context;
73-
uint8_t m_queue_stack[SIZE_OF_RPMSG_QUEUE * RL_BUFFER_COUNT];
70+
rpmsg_static_queue_ctxt m_queue_context;
71+
uint8_t m_queue_stack[RL_ENV_QUEUE_STATIC_STORAGE_SIZE];
7472
#endif
7573
};
7674

0 commit comments

Comments
 (0)