Update rpmsg type names in message handler

With the restructuring of the Linux kernel driver source files, some
macros and types in the rpmsg header was renamed to better namespace
their usage.

The message handler openamp application has been updated accordingly.

Change-Id: Ibfc11ced58cddd23463bb2060d658cc9b374e035
Signed-off-by: Mikael Olsson <mikael.olsson@arm.com>

1 files changed, 14 insertions, 15 deletions

diff --git a/applications/message_handler_openamp/message_handler.hpp b/applications/message_handler_openamp/message_handler.hpp
index 9461569..ea8bc3e 100644
--- a/applications/message_handler_openamp/message_handler.hpp
+++ b/applications/message_handler_openamp/message_handler.hpp
@@ -35,19 +35,19 @@ struct Message {
     Message() {}
 
     Message(const uint32_t _src,
-            const EthosU::ethosu_core_msg_type _type = EthosU::ETHOSU_CORE_MSG_MAX,
-            const uint64_t msgId                     = 0,
-            const uint32_t _length                   = 0) :
+            const EthosU::ethosu_rpmsg_type _type = EthosU::ETHOSU_RPMSG_MAX,
+            const uint64_t msgId                  = 0,
+            const uint32_t _length                = 0) :
         src(_src),
         length(_length) {
-        rpmsg.header.magic  = ETHOSU_CORE_MSG_MAGIC;
+        rpmsg.header.magic  = ETHOSU_RPMSG_MAGIC;
         rpmsg.header.type   = _type;
         rpmsg.header.msg_id = msgId;
     }
 
     uint32_t src    = 0;
     uint32_t length = 0;
-    EthosU::ethosu_core_rpmsg rpmsg;
+    EthosU::ethosu_rpmsg rpmsg;
 };
 
 /*****************************************************************************
@@ -75,19 +75,18 @@ protected:
     int handleMessage(void *data, size_t len, uint32_t src) override;
 
     // Outgoing messages
-    void sendError(const uint32_t src, const EthosU::ethosu_core_err_type type, const char *message);
+    void sendError(const uint32_t src, const EthosU::ethosu_rpmsg_err_type type, const char *message);
     void sendPong(const uint32_t src, const uint64_t msgId);
     void sendVersionRsp(const uint32_t src, const uint64_t msgId);
     void sendCapabilitiesRsp(const uint32_t src, const uint64_t msgId);
-    void sendNetworkInfoRsp(const uint32_t src, const uint64_t msgId, EthosU::ethosu_core_network_buffer &network);
-    void forwardInferenceReq(const uint32_t src,
-                             const uint64_t msgId,
-                             const EthosU::ethosu_core_msg_inference_req &inference);
-    void sendInferenceRsp(const uint32_t src, const uint64_t msgId, const EthosU::ethosu_core_status status);
-    void sendCancelInferenceRsp(const uint32_t src, const uint64_t msgId, const EthosU::ethosu_core_status status);
+    void sendNetworkInfoRsp(const uint32_t src, const uint64_t msgId, EthosU::ethosu_rpmsg_network_buffer &network);
+    void
+    forwardInferenceReq(const uint32_t src, const uint64_t msgId, const EthosU::ethosu_rpmsg_inference_req &inference);
+    void sendInferenceRsp(const uint32_t src, const uint64_t msgId, const EthosU::ethosu_rpmsg_status status);
+    void sendCancelInferenceRsp(const uint32_t src, const uint64_t msgId, const EthosU::ethosu_rpmsg_status status);
 
-    EthosU::ethosu_core_msg_capabilities_rsp getCapabilities() const;
-    bool getNetwork(EthosU::ethosu_core_network_buffer &buffer);
+    EthosU::ethosu_rpmsg_capabilities_rsp getCapabilities() const;
+    bool getNetwork(EthosU::ethosu_rpmsg_network_buffer &buffer);
 
     // Tasks returning response messages
     static void responseTask(void *param);
@@ -95,7 +94,7 @@ protected:
 private:
     InferenceQueue inferenceQueue;
     ResponseQueue responseQueue;
-    EthosU::ethosu_core_msg_capabilities_rsp capabilities;
+    EthosU::ethosu_rpmsg_capabilities_rsp capabilities;
 
     // FreeRTOS
     TaskHandle_t taskHandle;