Skip to content

Commit 0df0a3b

Browse files
HadatkoHadatko
committed
RPMSG compile issues.
!!! removed one mbf file and one file renamed. Signed-off-by: Cervenka Dusan <[email protected]>
1 parent 9386c32 commit 0df0a3b

9 files changed

+44
-180
lines changed

‎erpc_c/setup/erpc_setup_mbf_rpmsg.cpp‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,16 @@
1212
#include "erpc_manually_constructed.hpp"
1313
#include "erpc_mbf_setup.h"
1414
#include "erpc_message_buffer.hpp"
15-
#include "erpc_rpmsg_lite_base_transport.hpp"
15+
#include "erpc_rpmsg_lite_base.hpp"
1616

1717
extern "C" {
1818
#include "rpmsg_lite.h"
1919
}
2020

2121
using namespace erpc;
2222

23+
#define TIMEOUT_MS 10
24+
2325
////////////////////////////////////////////////////////////////////////////////
2426
// Classes
2527
////////////////////////////////////////////////////////////////////////////////
@@ -51,7 +53,7 @@ class RPMsgMessageBufferFactory : public MessageBufferFactory
5153
{
5254
void *buf = NULL;
5355
uint32_t size = 0;
54-
buf = rpmsg_lite_alloc_tx_buffer(m_rpmsg, &size, RL_BLOCK);
56+
buf = rpmsg_lite_alloc_tx_buffer(m_rpmsg, &size, TIMEOUT_MS);
5557

5658
erpc_assert(NULL != buf);
5759
return MessageBuffer(reinterpret_cast<uint8_t *>(buf), size);
@@ -82,9 +84,10 @@ class RPMsgMessageBufferFactory : public MessageBufferFactory
8284
erpc_status_t status;
8385

8486
dispose(&message);
85-
message = create(reserveHeaderSize);
86-
if (message->get() != NULL)
87+
message = create();
88+
if (message.get() != NULL)
8789
{
90+
message.setUsed(reserveHeaderSize);
8891
status = kErpcStatus_Success;
8992
}
9093
else
@@ -118,12 +121,12 @@ erpc_mbf_t erpc_mbf_rpmsg_init(erpc_transport_t transport)
118121
}
119122
else
120123
{
121-
s_msgFactory.construct(reinterpret_cast<RPMsgBaseTransport *>(transport)->get_rpmsg_lite_instance());
124+
s_msgFactory.construct(reinterpret_cast<RPMsgBase *>(transport)->get_rpmsg_lite_instance());
122125
msgFactory = s_msgFactory.get();
123126
}
124127
#elif ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC
125128
msgFactory =
126-
new RPMsgMessageBufferFactory(reinterpret_cast<RPMsgBaseTransport *>(transport)->get_rpmsg_lite_instance());
129+
new RPMsgMessageBufferFactory(reinterpret_cast<RPMsgBase *>(transport)->get_rpmsg_lite_instance());
127130
#else
128131
#error "Unknown eRPC allocation policy!"
129132
#endif

‎erpc_c/setup/erpc_setup_mbf_rpmsg_tty.cpp‎

Lines changed: 0 additions & 145 deletions
This file was deleted.

‎erpc_c/transports/erpc_rpmsg_lite_base_transport.hpp‎ renamed to ‎erpc_c/transports/erpc_rpmsg_lite_base.hpp‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@
88
* SPDX-License-Identifier: BSD-3-Clause
99
*/
1010

11-
#ifndef _EMBEDDED_RPC__RPMSG_LITE_BASE_TRANSPORT_H_
12-
#define _EMBEDDED_RPC__RPMSG_LITE_BASE_TRANSPORT_H_
11+
#ifndef _EMBEDDED_RPC__RPMSG_LITE_BASE_H_
12+
#define _EMBEDDED_RPC__RPMSG_LITE_BASE_H_
1313

1414
#include "erpc_config_internal.h"
15-
#include "erpc_transport.hpp"
1615

1716
extern "C" {
18-
#include "rpmsg_lite.h"
1917
#include "rpmsg_env_specific.h"
18+
#include "rpmsg_lite.h"
2019
}
2120

2221
#if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_STATIC
@@ -47,13 +46,12 @@ namespace erpc {
4746
* @ingroup rpmsg_lite_transport
4847
* @ingroup rpmsg_lite_rtos_transport
4948
*/
50-
class RPMsgBaseTransport : public Transport
49+
class RPMsgBase
5150
{
5251
public:
53-
RPMsgBaseTransport(void)
54-
: Transport(){};
52+
RPMsgBase(void){};
5553

56-
virtual ~RPMsgBaseTransport(void) {}
54+
virtual ~RPMsgBase(void) {}
5755

5856
/*!
5957
* @brief This function returns pointer to instance of RPMSG lite
@@ -82,4 +80,4 @@ class RPMsgBaseTransport : public Transport
8280

8381
/*! @} */
8482

85-
#endif // _EMBEDDED_RPC__RPMSG_LITE_BASE_TRANSPORT_H_
83+
#endif // _EMBEDDED_RPC__RPMSG_LITE_BASE_H_

‎erpc_c/transports/erpc_rpmsg_lite_rtos_transport.cpp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
*/
1010

1111
#include "erpc_rpmsg_lite_rtos_transport.hpp"
12+
1213
#include "erpc_config_internal.h"
1314

1415
extern "C" {
@@ -20,15 +21,16 @@ using namespace erpc;
2021
////////////////////////////////////////////////////////////////////////////////
2122
// Variables
2223
////////////////////////////////////////////////////////////////////////////////
23-
uint8_t RPMsgBaseTransport::s_initialized = 0U;
24-
struct rpmsg_lite_instance *RPMsgBaseTransport::s_rpmsg;
24+
uint8_t RPMsgBase::s_initialized = 0U;
25+
struct rpmsg_lite_instance *RPMsgBase::s_rpmsg;
2526

2627
////////////////////////////////////////////////////////////////////////////////
2728
// Code
2829
////////////////////////////////////////////////////////////////////////////////
2930

3031
RPMsgRTOSTransport::RPMsgRTOSTransport(void)
31-
: RPMsgBaseTransport()
32+
: RPMsgBase()
33+
, Transport()
3234
, m_rdev(NULL)
3335
, m_app_rp_chnl(NULL)
3436
, m_dst_addr(0)

‎erpc_c/transports/erpc_rpmsg_lite_rtos_transport.hpp‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212

1313
#include "erpc_crc16.hpp"
1414
#include "erpc_message_buffer.hpp"
15-
#include "erpc_rpmsg_lite_base_transport.hpp"
15+
#include "erpc_rpmsg_lite_base.hpp"
16+
#include "erpc_transport.hpp"
1617

1718
extern "C" {
1819
#include "rpmsg_lite.h"
@@ -39,7 +40,7 @@ namespace erpc {
3940
*
4041
* @ingroup rpmsg_lite_rtos_transport
4142
*/
42-
class RPMsgRTOSTransport : public RPMsgBaseTransport
43+
class RPMsgRTOSTransport : public RPMsgBase, public Transport
4344
{
4445
public:
4546
/*!
@@ -96,7 +97,7 @@ class RPMsgRTOSTransport : public RPMsgBaseTransport
9697
* @retval kErpcStatus_ReceiveFailed Failed to receive message buffer.
9798
* @retval kErpcStatus_Success Successfully received all data.
9899
*/
99-
virtual erpc_status_t receive(MessageBuffer *message);
100+
virtual erpc_status_t receive(MessageBuffer *message) override;
100101

101102
/*!
102103
* @brief Function to send prepared message.
@@ -106,7 +107,7 @@ class RPMsgRTOSTransport : public RPMsgBaseTransport
106107
* @retval kErpcStatus_SendFailed Failed to send message buffer.
107108
* @retval kErpcStatus_Success Successfully sent all data.
108109
*/
109-
virtual erpc_status_t send(MessageBuffer *message);
110+
virtual erpc_status_t send(MessageBuffer *message) override;
110111

111112
/*!
112113
* @brief This functions sets the CRC-16 implementation.

‎erpc_c/transports/erpc_rpmsg_lite_transport.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ using namespace erpc;
2020
////////////////////////////////////////////////////////////////////////////////
2121
// Variables
2222
////////////////////////////////////////////////////////////////////////////////
23-
uint8_t RPMsgBaseTransport::s_initialized = 0U;
24-
struct rpmsg_lite_instance *RPMsgBaseTransport::s_rpmsg = NULL;
23+
uint8_t RPMsgBase::s_initialized = 0U;
24+
struct rpmsg_lite_instance *RPMsgBase::s_rpmsg = NULL;
2525

2626
////////////////////////////////////////////////////////////////////////////////
2727
// Code
@@ -40,7 +40,8 @@ int32_t RPMsgTransport::rpmsg_read_cb(void *payload, uint32_t payload_len, uint3
4040
}
4141

4242
RPMsgTransport::RPMsgTransport(void)
43-
: RPMsgBaseTransport()
43+
: RPMsgBase()
44+
, Transport()
4445
, m_dst_addr(0)
4546
, m_rpmsg_ept(NULL)
4647
, m_crcImpl(NULL)

‎erpc_c/transports/erpc_rpmsg_lite_transport.hpp‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@
1010
#ifndef _EMBEDDED_RPC__RPMSG_LITE_TRANSPORT_H_
1111
#define _EMBEDDED_RPC__RPMSG_LITE_TRANSPORT_H_
1212

13-
#include "erpc_crc16.hpp"
1413
#include "erpc_config_internal.h"
14+
#include "erpc_crc16.hpp"
1515
#include "erpc_message_buffer.hpp"
16-
#include "erpc_rpmsg_lite_base_transport.hpp"
16+
#include "erpc_rpmsg_lite_base.hpp"
1717
#include "erpc_static_queue.hpp"
18+
#include "erpc_transport.hpp"
1819

1920
extern "C" {
2021
#include "rpmsg_lite.h"
@@ -40,7 +41,7 @@ namespace erpc {
4041
*
4142
* @ingroup rpmsg_lite_transport
4243
*/
43-
class RPMsgTransport : public RPMsgBaseTransport
44+
class RPMsgTransport : public RPMsgBase, public Transport
4445
{
4546
public:
4647
/*!
@@ -100,7 +101,7 @@ class RPMsgTransport : public RPMsgBaseTransport
100101
*
101102
* @return kErpcStatus_Success
102103
*/
103-
virtual erpc_status_t receive(MessageBuffer *message);
104+
virtual erpc_status_t receive(MessageBuffer *message) override;
104105

105106
/*!
106107
* @brief Function to send prepared message.
@@ -110,7 +111,7 @@ class RPMsgTransport : public RPMsgBaseTransport
110111
* @retval kErpcStatus_SendFailed Failed to send message buffer.
111112
* @retval kErpcStatus_Success Successfully sent all data.
112113
*/
113-
virtual erpc_status_t send(MessageBuffer *message);
114+
virtual erpc_status_t send(MessageBuffer *message) override;
114115

115116
/*!
116117
* @brief This functions sets the CRC-16 implementation.

0 commit comments

Comments
 (0)