From 4edc17872ad36a04cba1b4c043d088cb4a9f3838 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Per=20=C3=85strand?= <per.astrand@arm.com>
Date: Tue, 12 Jan 2021 14:33:36 +0100
Subject: Use ethosu namespace for core interface

Change-Id: I832b8d7b502ae501e39f1a795d4192506d47fa55
---
 applications/message_process/include/message_process.hpp | 16 ++++++++--------
 applications/message_process/src/message_process.cpp     |  1 +
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/applications/message_process/include/message_process.hpp b/applications/message_process/include/message_process.hpp
index 62788b8..cae1e35 100644
--- a/applications/message_process/include/message_process.hpp
+++ b/applications/message_process/include/message_process.hpp
@@ -31,13 +31,13 @@ namespace MessageProcess {
 
 template <uint32_t SIZE>
 struct Queue {
-    ethosu_core_queue_header header;
+    EthosU::ethosu_core_queue_header header;
     uint8_t data[SIZE];
 
     constexpr Queue() : header({SIZE, 0, 0}) {}
 
-    constexpr ethosu_core_queue *toQueue() {
-        return reinterpret_cast<ethosu_core_queue *>(&header);
+    constexpr EthosU::ethosu_core_queue *toQueue() {
+        return reinterpret_cast<EthosU::ethosu_core_queue *>(&header);
     }
 };
 
@@ -48,7 +48,7 @@ public:
         size_t length;
     };
 
-    QueueImpl(ethosu_core_queue &queue);
+    QueueImpl(EthosU::ethosu_core_queue &queue);
 
     bool empty() const;
     size_t available() const;
@@ -73,20 +73,20 @@ private:
     void invalidateHeader() const;
     void invalidateHeaderData() const;
 
-    ethosu_core_queue &queue;
+    EthosU::ethosu_core_queue &queue;
 };
 
 class MessageProcess {
 public:
-    MessageProcess(ethosu_core_queue &in,
-                   ethosu_core_queue &out,
+    MessageProcess(EthosU::ethosu_core_queue &in,
+                   EthosU::ethosu_core_queue &out,
                    Mailbox::Mailbox &mbox,
                    InferenceProcess::InferenceProcess &inferenceProcess);
 
     void run();
     bool handleMessage();
     void sendPong();
-    void sndErrorRspAndResetQueue(ethosu_core_msg_err_type type, const char *message);
+    void sndErrorRspAndResetQueue(EthosU::ethosu_core_msg_err_type type, const char *message);
     void sendVersionRsp();
     void sendInferenceRsp(uint64_t userArg,
                           std::vector<InferenceProcess::DataPtr> &ofm,
diff --git a/applications/message_process/src/message_process.cpp b/applications/message_process/src/message_process.cpp
index 84a3742..9fa1dbe 100644
--- a/applications/message_process/src/message_process.cpp
+++ b/applications/message_process/src/message_process.cpp
@@ -27,6 +27,7 @@
 
 using namespace std;
 using namespace InferenceProcess;
+using namespace EthosU;
 
 namespace MessageProcess {
 
-- 
cgit v1.2.1