Skip to content

Commit ec96013

Browse files
MichalPrincNXPMichalPrincNXP
committed
Merge branch 'master' into develop
# Conflicts: # erpc_c/setup/erpc_transport_setup.h
2 parents b3951d8 + 5cac701 commit ec96013

24 files changed

+866
-105
lines changed

‎doxygen/Doxyfile.erpc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = "eRPC API Reference"
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = "Rev. 1.10.0"
41+
PROJECT_NUMBER = "Rev. 1.11.0"
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

‎doxygen/Doxyfile.erpcgen‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = "eRPC Generator (erpcgen)"
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = "Rev. 1.10.0"
41+
PROJECT_NUMBER = "Rev. 1.11.0"
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

‎erpc_c/infra/erpc_version.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Copyright (c) 2016, Freescale Semiconductor, Inc.
3-
* Copyright 2016-2022 NXP
3+
* Copyright 2016-2023 NXP
44
* All rights reserved.
55
*
66
*
@@ -20,9 +20,9 @@
2020
////////////////////////////////////////////////////////////////////////////////
2121

2222
//! @brief String version of eRPC.
23-
#define ERPC_VERSION "1.10.0"
23+
#define ERPC_VERSION "1.11.0"
2424
//! @brief Integer version of eRPC.
25-
#define ERPC_VERSION_NUMBER 11000
25+
#define ERPC_VERSION_NUMBER 11100
2626

2727
/*! @} */
2828

‎erpc_c/setup/erpc_setup_lpi2c_slave.cpp‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/*
2+
* Copyright 2022-2023 NXP
3+
* All rights reserved.
4+
*
5+
*
6+
* SPDX-License-Identifier: BSD-3-Clause
7+
*/
8+
9+
#include "erpc_lpi2c_slave_transport.hpp"
10+
#include "erpc_manually_constructed.hpp"
11+
#include "erpc_transport_setup.h"
12+
13+
using namespace erpc;
14+
15+
////////////////////////////////////////////////////////////////////////////////
16+
// Variables
17+
////////////////////////////////////////////////////////////////////////////////
18+
19+
static ManuallyConstructed<LPI2cSlaveTransport> s_transport;
20+
21+
////////////////////////////////////////////////////////////////////////////////
22+
// Code
23+
////////////////////////////////////////////////////////////////////////////////
24+
25+
erpc_transport_t erpc_transport_lpi2c_slave_init(void *baseAddr, uint32_t baudRate, uint32_t srcClock_Hz)
26+
{
27+
s_transport.construct(reinterpret_cast<LPI2C_Type *>(baseAddr), baudRate, srcClock_Hz);
28+
(void)s_transport->init();
29+
return reinterpret_cast<erpc_transport_t>(s_transport.get());
30+
}

‎erpc_c/setup/erpc_setup_lpspi_slave.cpp‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/*
2+
* Copyright 2022-2023 NXP
3+
*
4+
* SPDX-License-Identifier: BSD-3-Clause
5+
*/
6+
7+
#include "erpc_lpspi_slave_transport.hpp"
8+
#include "erpc_manually_constructed.hpp"
9+
#include "erpc_transport_setup.h"
10+
11+
using namespace erpc;
12+
13+
////////////////////////////////////////////////////////////////////////////////
14+
// Variables
15+
////////////////////////////////////////////////////////////////////////////////
16+
17+
ERPC_MANUALLY_CONSTRUCTED(LPSpiSlaveTransport, s_transport);
18+
19+
////////////////////////////////////////////////////////////////////////////////
20+
// Code
21+
////////////////////////////////////////////////////////////////////////////////
22+
23+
erpc_transport_t erpc_transport_lpspi_slave_init(void *baseAddr, uint32_t baudRate, uint32_t srcClock_Hz)
24+
{
25+
s_transport.construct(reinterpret_cast<LPSPI_Type *>(baseAddr), baudRate, srcClock_Hz);
26+
(void)s_transport->init();
27+
return reinterpret_cast<erpc_transport_t>(s_transport.get());
28+
}

‎erpc_c/setup/erpc_transport_setup.h‎

Lines changed: 53 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Copyright (c) 2014-2016, Freescale Semiconductor, Inc.
3-
* Copyright 2016-2021 NXP
3+
* Copyright 2016-2022 NXP
44
* Copyright 2019 ACRIOS Systems s.r.o.
55
* All rights reserved.
66
*
@@ -110,6 +110,57 @@ void erpc_transport_i2c_slave_deinit(erpc_transport_t transport);
110110

111111
//@}
112112

113+
//! @name LPI2C transport setup
114+
//@{
115+
116+
/*!
117+
* @brief Create an LPI2C slave transport.
118+
*
119+
* Create LPI2C slave transport instance, to be used at slave core.
120+
*
121+
* @param[in] baseAddr Base address of LPI2C peripheral used in this transport layer.
122+
* @param[in] baudRate SPI baud rate.
123+
* @param[in] srcClock_Hz LPI2C source clock in Hz.
124+
*
125+
* @return Return NULL or erpc_transport_t instance pointer.
126+
*/
127+
erpc_transport_t erpc_transport_lpi2c_slave_init(void *baseAddr, uint32_t baudRate, uint32_t srcClock_Hz);
128+
129+
/*!
130+
* @brief Deinitialize LPI2C slave transport.
131+
*
132+
* @param[in] transport Transport which was initialized with init function.
133+
*/
134+
void erpc_transport_lpi2c_slave_deinit(erpc_transport_t transport);
135+
136+
//@}
137+
138+
//! @name LPSPI transport setup
139+
//@{
140+
141+
/*!
142+
* @brief Create a LPSPI slave transport.
143+
*
144+
* Create LPSPI slave transport instance, to be used at slave core.
145+
*
146+
* @param[in] baseAddr Base address of LPSPI peripheral used in this transport layer.
147+
* @param[in] baudRate LPSPI baud rate.
148+
* @param[in] srcClock_Hz LPSPI source clock in Hz.
149+
*
150+
* @return Return NULL or erpc_transport_t instance pointer.
151+
*/
152+
erpc_transport_t erpc_transport_lpspi_slave_init(void *baseAddr, uint32_t baudRate, uint32_t srcClock_Hz);
153+
154+
155+
/*!
156+
* @brief Deinitialize LPSPI slave transport.
157+
*
158+
* @param[in] transport Transport which was initialized with init function.
159+
*/
160+
void erpc_transport_lpspi_slave_deinit(erpc_transport_t transport);
161+
162+
//@}
163+
113164
//! @name MU transport setup
114165
//@{
115166

@@ -141,7 +192,7 @@ void erpc_transport_mu_deinit(erpc_transport_t transport);
141192
* @brief Create an Linux RPMSG endpoint transport.
142193
*
143194
* This function is using RPMSG endpoints based on this implementation:
144-
* github.com/NXPmicro/rpmsg-sysfs/tree/0aa1817545a765c200b1b2f9b6680a420dcf9171 .
195+
* github.com/nxp-mcuxpresso/rpmsg-sysfs/tree/0aa1817545a765c200b1b2f9b6680a420dcf9171 .
145196
*
146197
* When local/remote address is set to '-1', then default addresses will be used.
147198
* When type is set to '0', then Datagram model will be used, else Stream.

‎erpc_c/transports/erpc_i2c_slave_transport.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 NXP
2+
* Copyright 2021-2023 NXP
33
* All rights reserved.
44
*
55
*
@@ -9,7 +9,7 @@
99
#ifndef _EMBEDDED_RPC__I2C_SLAVE_TRANSPORT_H_
1010
#define _EMBEDDED_RPC__I2C_SLAVE_TRANSPORT_H_
1111

12-
#include "<cstdlib>"
12+
#include <cstdlib>
1313
#include "erpc_config_internal.h"
1414
#if ERPC_THREADS
1515
#include "erpc_threading.h"

0 commit comments

Comments
 (0)