eRPC updates 05/2022

-- Several MISRA violations addressed.
-- Avoid build warnings in test projects.
-- Updated minor version
-- Apply workaround for Compiler redefinition errors in arm_compat.h after updating to CMSIS 5.8.0 in unit tests. (ensure the arm_compat.h is included before the CMSIS compliant device-specific header file, in our case the rpmsg_compiler.h needs to be included as first where needed, Article ID: KA004795 on developer.arm.com)

Author: MichalPrincNXP

doxygen/Doxyfile.erpc

@@ -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.9.0"
+PROJECT_NUMBER         = "Rev. 1.9.1"
 
 # 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

doxygen/Doxyfile.erpcgen

@@ -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.9.0"
+PROJECT_NUMBER         = "Rev. 1.9.1"
 
 # 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

erpc_c/infra/erpc_arbitrated_client_manager.cpp

@@ -40,7 +40,7 @@ void ArbitratedClientManager::performClientRequest(RequestContext &request)
     erpc_status_t err;
     TransportArbitrator::client_token_t token = 0;
 
-    erpc_assert(m_arbitrator && "arbitrator not set");
+    erpc_assert((m_arbitrator != NULL) && ("arbitrator not set" != NULL));
 
     // Set up the client receive before we send the request, so if the reply is sent
     // before we get to the clientReceive() call below the arbitrator already has the buffer.
@@ -55,7 +55,7 @@ void ArbitratedClientManager::performClientRequest(RequestContext &request)
         if (request.getCodec()->isStatusOk() == true)
         {
             token = m_arbitrator->prepareClientReceive(request);
-            if (!token)
+            if (token == 0U)
             {
                 request.getCodec()->updateStatus(kErpcStatus_Fail);
             }

erpc_c/infra/erpc_client_manager.cpp

@@ -47,7 +47,7 @@ void ClientManager::performRequest(RequestContext &request)
 #if ERPC_NESTED_CALLS
     if (performRequest)
     {
-        erpc_assert(m_serverThreadId && "server thread id was not set");
+        erpc_assert((m_serverThreadId != NULL) && ("server thread id was not set" != NULL));
         if (Thread::getCurrentThreadId() == m_serverThreadId)
         {
             performNestedClientRequest(request);
@@ -118,7 +118,7 @@ void ClientManager::performNestedClientRequest(RequestContext &request)
 {
     erpc_status_t err;
 
-    erpc_assert(m_transport && "transport/arbitrator not set");
+    erpc_assert((m_transport != NULL) && ("transport/arbitrator not set" != NULL));
 
 #if ERPC_MESSAGE_LOGGING
     if (request.getCodec()->isStatusOk() == true)
@@ -141,7 +141,7 @@ void ClientManager::performNestedClientRequest(RequestContext &request)
         // Receive reply.
         if (request.getCodec()->isStatusOk() == true)
         {
-            erpc_assert(m_server && "server for nesting calls was not set");
+            erpc_assert((m_server != NULL) && ("server for nesting calls was not set" != NULL));
             err = m_server->run(request);
             request.getCodec()->updateStatus(err);
         }

erpc_c/infra/erpc_framed_transport.cpp

@@ -43,7 +43,7 @@ erpc_status_t FramedTransport::receive(MessageBuffer *message)
     erpc_status_t retVal;
     uint16_t computedCrc;
 
-    erpc_assert(m_crcImpl && "Uninitialized Crc16 object.");
+    erpc_assert((m_crcImpl != NULL) && ("Uninitialized Crc16 object." != NULL));
 
     {
 #if !ERPC_THREADS_IS(NONE)
@@ -101,7 +101,7 @@ erpc_status_t FramedTransport::send(MessageBuffer *message)
     uint16_t messageLength;
     Header h;
 
-    erpc_assert(m_crcImpl && "Uninitialized Crc16 object.");
+    erpc_assert((m_crcImpl != NULL) && ("Uninitialized Crc16 object." != NULL));
 
 #if !ERPC_THREADS_IS(NONE)
     Mutex::Guard lock(m_sendLock);

erpc_c/infra/erpc_message_buffer.cpp

@@ -107,11 +107,11 @@ void MessageBuffer::Cursor::set(MessageBuffer *buffer)
 
 erpc_status_t MessageBuffer::Cursor::read(void *data, uint32_t length)
 {
-    erpc_assert(m_pos && "Data buffer wasn't set to MessageBuffer.");
+    erpc_assert((m_pos != NULL) && ("Data buffer wasn't set to MessageBuffer." != NULL));
 
     erpc_status_t err = kErpcStatus_Success;
 
-    if (length > 0)
+    if (length > 0U)
     {
         if (data == NULL)
         {
@@ -134,11 +134,11 @@ erpc_status_t MessageBuffer::Cursor::read(void *data, uint32_t length)
 
 erpc_status_t MessageBuffer::Cursor::write(const void *data, uint32_t length)
 {
-    erpc_assert(m_pos && "Data buffer wasn't set to MessageBuffer.");
+    erpc_assert((m_pos != NULL) && ("Data buffer wasn't set to MessageBuffer." != NULL));
 
     erpc_status_t err = kErpcStatus_Success;
 
-    if (length > 0)
+    if (length > 0U)
     {
         if (data == NULL)
         {

erpc_c/infra/erpc_message_buffer.h

@@ -373,7 +373,7 @@ class MessageBufferFactory
     MessageBufferFactory(void) {}
 
     /*!
-     * @brief ClientManager destructor
+     * @brief MessageBufferFactory destructor
      */
     virtual ~MessageBufferFactory(void) {}
 

erpc_c/infra/erpc_server.h

@@ -118,7 +118,7 @@ class Server : public ClientServerCommon
     }
 
     /*!
-     * @brief ClientManager destructor
+     * @brief Server destructor
      */
     virtual ~Server(void) {}
 

erpc_c/infra/erpc_transport_arbitrator.cpp

@@ -46,21 +46,21 @@ TransportArbitrator::~TransportArbitrator(void)
 
 void TransportArbitrator::setCrc16(Crc16 *crcImpl)
 {
-    erpc_assert(crcImpl);
-    erpc_assert(m_sharedTransport);
+    erpc_assert(crcImpl != NULL);
+    erpc_assert(m_sharedTransport != NULL);
     m_sharedTransport->setCrc16(crcImpl);
 }
 
 bool TransportArbitrator::hasMessage(void)
 {
-    erpc_assert(m_sharedTransport && "shared transport is not set");
+    erpc_assert((m_sharedTransport != NULL) && ("shared transport is not set" != NULL));
 
     return m_sharedTransport->hasMessage();
 }
 
 erpc_status_t TransportArbitrator::receive(MessageBuffer *message)
 {
-    erpc_assert(m_sharedTransport && "shared transport is not set");
+    erpc_assert((m_sharedTransport != NULL) && ("shared transport is not set" != NULL));
 
     erpc_status_t err;
     message_type_t msgType;
@@ -141,7 +141,7 @@ erpc_status_t TransportArbitrator::receive(MessageBuffer *message)
 
 erpc_status_t TransportArbitrator::send(MessageBuffer *message)
 {
-    erpc_assert(m_sharedTransport && "shared transport is not set");
+    erpc_assert((m_sharedTransport != NULL) && ("shared transport is not set" != NULL));
     return m_sharedTransport->send(message);
 }
 
@@ -158,7 +158,7 @@ TransportArbitrator::client_token_t TransportArbitrator::prepareClientReceive(Re
 
 erpc_status_t TransportArbitrator::clientReceive(client_token_t token)
 {
-    erpc_assert((token != 0) && "invalid client token");
+    erpc_assert((token != 0) && ("invalid client token" != NULL));
 
     // Convert token to pointer to info struct for this client receive request.
     PendingClientInfo *info = reinterpret_cast<PendingClientInfo *>(token);

erpc_c/infra/erpc_version.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2016, Freescale Semiconductor, Inc.
- * Copyright 2016-2021 NXP
+ * Copyright 2016-2022 NXP
  * All rights reserved.
  *
  *
@@ -20,9 +20,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //! @brief String version of eRPC.
-#define ERPC_VERSION "1.9.0"
+#define ERPC_VERSION "1.9.1"
 //! @brief Integer version of eRPC.
-#define ERPC_VERSION_NUMBER 10900
+#define ERPC_VERSION_NUMBER 10901
 
 /*! @} */