Skip to content

Commit 4c625f8

Browse files
committed
Merge commit '1429addf400efb8362682859d77adec1e359e324' into feature/staticRPMSGApi
2 parents ae96b68 + 1429add commit 4c625f8

44 files changed

Lines changed: 1202 additions & 50 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitpod.Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
FROM gitpod/workspace-full
2+
3+
# Install custom tools, runtimes, etc.
4+
# For example "bastet", a command-line tetris clone:
5+
# RUN brew install bastet
6+
#
7+
# More information: https://www.gitpod.io/docs/config-docker/

.gitpod.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
image:
2+
file: .gitpod.Dockerfile
3+
- command: apt-get update && apt-get install flex
4+
5+
tasks:
6+
- init: make

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: cpp
22
sudo: required
3-
dist: trusty
3+
dist: xenial
44
compiler:
55
- gcc
66
- clang
@@ -14,7 +14,7 @@ before_install:
1414
- if [ $TRAVIS_OS_NAME == linux ]; then pyenv install 2.7.12 ; pyenv global 2.7.12; fi
1515
- if [ $TRAVIS_OS_NAME == osx ]; then brew update; fi
1616
- if [ $TRAVIS_OS_NAME == osx ]; then brew install python bison flex -v -f 2>&1 && brew upgrade boost || true; fi
17-
- if [ $TRAVIS_OS_NAME == osx ]; then curl "https://bootstrap.pypa.io/get-pip.py" | sudo python; fi
17+
- if [ $TRAVIS_OS_NAME == osx ]; then curl "https://bootstrap.pypa.io/pip/2.7/get-pip.py" | sudo python; fi
1818

1919
install:
2020
#- sudo pip install --upgrade pip setuptools

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Copyright 2014-2016 Freescale Semiconductor, Inc.
2-
Copyright 2016-2020 NXP
2+
Copyright 2016-2021 NXP
33
All rights reserved.
44

55
SPDX-License-Identifier: BSD-3-Clause

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/EmbeddedRPC/erpc)
2+
13
# eRPC
24

35
eRPC (Embedded RPC) is an open source Remote Procedure Call (RPC) system for multichip embedded systems and heterogeneous multicore SoCs.
@@ -192,4 +194,4 @@ Repository on Github contains two main branches. __Master__ and __develop__. Cod
192194
---
193195
Copyright 2014-2016 Freescale Semiconductor, Inc.
194196

195-
Copyright 2016-2020 NXP
197+
Copyright 2016-2021 NXP

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.8.0"
41+
PROJECT_NUMBER = "Rev. 1.8.1"
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.8.0"
41+
PROJECT_NUMBER = "Rev. 1.8.1"
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/config/erpc_config.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#define ERPC_THREADS_ZEPHYR (3) //!< ZEPHYR.
3030
#define ERPC_THREADS_MBED (4) //!< Mbed OS
3131
#define ERPC_THREADS_WIN32 (5) //!< WIN32
32+
#define ERPC_THREADS_THREADX (6) //!< THREADX
3233

3334
#define ERPC_NOEXCEPT_DISABLED (0) //!< Disabling noexcept feature.
3435
#define ERPC_NOEXCEPT_ENABLED (1) //!< Enabling noexcept feature.

erpc_c/infra/erpc_message_buffer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ class MessageBufferFactory
385385
virtual MessageBuffer create(void) = 0;
386386

387387
/*!
388-
* @brief This function inform server if it has to create buffer for received message.
388+
* @brief This function informs server if it has to create buffer for received message.
389389
*
390390
* @return Has to return TRUE when server need create buffer for receiving message.
391391
*/

erpc_c/infra/erpc_message_loggers.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/*
2-
* Copyright 2017 NXP
2+
* Copyright 2017-2021 NXP
33
* Copyright 2021 ACRIOS Systems s.r.o.
44
* All rights reserved.
55
*
66
*
77
* SPDX-License-Identifier: BSD-3-Clause
88
*/
9+
#include "erpc_config_internal.h"
10+
#if ERPC_MESSAGE_LOGGING
911

1012
#include "erpc_message_loggers.h"
1113

@@ -82,3 +84,4 @@ erpc_status_t MessageLoggers::logMessage(MessageBuffer *msg)
8284

8385
return err;
8486
}
87+
#endif /* ERPC_MESSAGE_LOGGING */

0 commit comments

Comments
 (0)