Skip to content

Commit

Permalink
eRPC updates 07/2020
Browse files Browse the repository at this point in the history
-- Unit test code updated to handle service add and remove operations
-- Several MISRA issues in rpmsg-based transports addressed
-- Support MU transport unit testing
-- Fixed Linux/TCP acceptance tests in release target
-- Minor documentation updates, code formatting
  • Loading branch information
MichalPrincNXP committed Jul 21, 2020
1 parent af02b3e commit 5959ccd
Show file tree
Hide file tree
Showing 55 changed files with 1,039 additions and 472 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ Steps are described in [`erpcgen/VisualStudio_v14/readme_erpcgen.txt`](erpcgen/V
Install these packages:
* bison: GNU yacc-compatible parser generator
* flex: A fast lexical analyzer generator
* libboost-dev, libboost-filesystem-dev, libboost-system-dev: Boost C++ libraries (Linux needs to use libboost version 1.58.0)
* libboost-dev, libboost-filesystem-dev, libboost-system-dev: Boost C++ libraries (Linux needs to use libboost version 1.67.0)
* make: the GNU version of the 'make' utility
* python: Python language interpreter (either 2.7 or 3.5+ work)
* gcc-core: GNU Compiler Collection (C, OpenMP)
Expand Down
2 changes: 1 addition & 1 deletion doxygen/Doxyfile.erpc
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.3"
PROJECT_NUMBER = "Rev. 1.7.4"

# 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
Expand Down
2 changes: 1 addition & 1 deletion doxygen/Doxyfile.erpcgen
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.3"
PROJECT_NUMBER = "Rev. 1.7.4"

# 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
Expand Down
4 changes: 2 additions & 2 deletions doxygen/html_footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<!--BEGIN GENERATE_TREEVIEW-->
<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
<ul class="foot">
<li class="footer">&copy; 2016 NXP Semiconductors. All rights reserved.
<li class="footer">Copyright 2016-2020 NXP Semiconductors. All rights reserved.
</li>
</ul>
</div>
<!--END GENERATE_TREEVIEW-->
<!--BEGIN !GENERATE_TREEVIEW-->
<hr class="footer"/><address class="footer"><small>
&copy; 2016 NXP Semiconductors. All rights reserved.
Copyright 2016-2020 NXP Semiconductors. All rights reserved.
</small></address>
<!--END !GENERATE_TREEVIEW-->
</body>
Expand Down
7 changes: 4 additions & 3 deletions erpc_c/config/erpc_config.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2016, Freescale Semiconductor, Inc.
* Copyright 2016-2019 NXP
* Copyright 2016-2020 NXP
* All rights reserved.
*
*
Expand Down Expand Up @@ -95,8 +95,9 @@

//! @def ERPC_MESSAGE_LOGGING
//!
//! Enable eRPC message logging code through the eRPC. Take look into "erpc_message_loggers.h". Can be used for base printing
//! messages, or sending data to another system for data analysis. Default set to ERPC_MESSAGE_LOGGING_DISABLED.
//! Enable eRPC message logging code through the eRPC. Take look into "erpc_message_loggers.h". Can be used for base
//! printing messages, or sending data to another system for data analysis. Default set to
//! ERPC_MESSAGE_LOGGING_DISABLED.
//!
//! Uncomment for using logging feature.
//#define ERPC_MESSAGE_LOGGING (ERPC_MESSAGE_LOGGING_ENABLED)
Expand Down
6 changes: 5 additions & 1 deletion erpc_c/infra/erpc_arbitrated_client_manager.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2016, Freescale Semiconductor, Inc.
* Copyright 2016-2017 NXP
* Copyright 2016-2020 NXP
* All rights reserved.
*
*
Expand All @@ -11,6 +11,10 @@
#include "erpc_transport_arbitrator.h"
#include "assert.h"

#if ERPC_THREADS_IS(NONE)
#error "Arbitrator code does not work in no-threading configuration."
#endif

using namespace erpc;

////////////////////////////////////////////////////////////////////////////////
Expand Down
6 changes: 5 additions & 1 deletion erpc_c/infra/erpc_transport_arbitrator.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2016, Freescale Semiconductor, Inc.
* Copyright 2016-2017 NXP
* Copyright 2016-2020 NXP
* All rights reserved.
*
*
Expand All @@ -12,6 +12,10 @@
#include <cstdio>
#include <string>

#if ERPC_THREADS_IS(NONE)
#error "Arbitrator code does not work in no-threading configuration."
#endif

using namespace erpc;

////////////////////////////////////////////////////////////////////////////////
Expand Down
6 changes: 3 additions & 3 deletions erpc_c/infra/erpc_version.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2016, Freescale Semiconductor, Inc.
* Copyright 2016-2019 NXP
* Copyright 2016-2020 NXP
* All rights reserved.
*
*
Expand All @@ -20,9 +20,9 @@
////////////////////////////////////////////////////////////////////////////////

//! @brief String version of eRPC.
#define ERPC_VERSION "1.7.3"
#define ERPC_VERSION "1.7.4"
//! @brief Integer version of eRPC.
#define ERPC_VERSION_NUMBER 10703
#define ERPC_VERSION_NUMBER 10704

/*! @} */

Expand Down
16 changes: 8 additions & 8 deletions erpc_c/port/erpc_threading.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2014-2016, Freescale Semiconductor, Inc.
* Copyright 2016-2017 NXP
* Copyright 2016-2020 NXP
* All rights reserved.
*
*
Expand Down Expand Up @@ -214,7 +214,7 @@ class Thread
struct k_thread m_thread; /*!< Current thread. */
k_thread_stack_t *m_stack; /*!< Pointer to stack. */
#elif ERPC_THREADS_IS(MBED)
rtos::Thread* m_thread; /*!< Underlying Thread instance */
rtos::Thread *m_thread; /*!< Underlying Thread instance */
Thread *m_next; /*!< Pointer to next Thread. */
static Thread *s_first; /*!< Pointer to first Thread. */
#endif
Expand Down Expand Up @@ -249,10 +249,10 @@ class Thread
#elif ERPC_THREADS_IS(MBED)

/*!
* @brief This function execute threadEntryPoint function.
*
* @param[in] arg Thread to execute.
*/
* @brief This function execute threadEntryPoint function.
*
* @param[in] arg Thread to execute.
*/
static void threadEntryPointStub(void *arg);

#endif
Expand Down Expand Up @@ -359,7 +359,7 @@ class Mutex
#elif ERPC_THREADS_IS(ZEPHYR)
struct k_mutex m_mutex; /*!< Mutex.*/
#elif ERPC_THREADS_IS(MBED)
rtos::Mutex* m_mutex; /*!< Mutex. */
rtos::Mutex *m_mutex; /*!< Mutex. */
#endif

private:
Expand Down Expand Up @@ -442,7 +442,7 @@ class Semaphore
#elif ERPC_THREADS_IS(ZEPHYR)
struct k_sem m_sem; /*!< Semaphore. */
#elif ERPC_THREADS_IS(MBED)
rtos::Semaphore* m_sem; /*!< Semaphore. */
rtos::Semaphore *m_sem; /*!< Semaphore. */
int m_count; /*!< Semaphore count number. */
#endif

Expand Down
Loading

0 comments on commit 5959ccd

Please sign in to comment.