From e09fc820968ee4de20df60e371088582a710bad0 Mon Sep 17 00:00:00 2001
From: Finn Williams <Finn.Williams@arm.com>
Date: Wed, 29 Apr 2020 13:17:30 +0100
Subject: IVGCVSW-4730 Remove the duplication of PIPE_MAGIC in the code base

Change-Id: I41c6e917b29eee33360758b6c5afe5dadba89093
Signed-off-by: Finn Williams <Finn.Williams@arm.com>
---
 profiling/common/include/Constants.hpp                 | 10 ++++++++++
 profiling/server/src/basePipeServer/BasePipeServer.cpp |  6 ++++--
 profiling/server/src/basePipeServer/BasePipeServer.hpp |  1 -
 3 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 profiling/common/include/Constants.hpp

(limited to 'profiling')

diff --git a/profiling/common/include/Constants.hpp b/profiling/common/include/Constants.hpp
new file mode 100644
index 0000000000..52e0e487a8
--- /dev/null
+++ b/profiling/common/include/Constants.hpp
@@ -0,0 +1,10 @@
+//
+// Copyright © 2020 Arm Ltd. All rights reserved.
+// SPDX-License-Identifier: MIT
+//
+#pragma once
+
+namespace armnnProfiling
+{
+    static const unsigned int PIPE_MAGIC = 0x45495434;
+}
\ No newline at end of file
diff --git a/profiling/server/src/basePipeServer/BasePipeServer.cpp b/profiling/server/src/basePipeServer/BasePipeServer.cpp
index 1d5e0b6414..7e8789aa2a 100644
--- a/profiling/server/src/basePipeServer/BasePipeServer.cpp
+++ b/profiling/server/src/basePipeServer/BasePipeServer.cpp
@@ -5,6 +5,8 @@
 
 #include "BasePipeServer.hpp"
 
+#include "common/include/Constants.hpp"
+
 #include <iostream>
 #include <boost/cast.hpp>
 #include <vector>
@@ -65,11 +67,11 @@ bool BasePipeServer::WaitForStreamMetaData()
     EchoPacket(PacketDirection::ReceivedData, pipeMagic, 4);
 
     // Before we interpret the length we need to read the pipe_magic word to determine endianness.
-    if (ToUint32(&pipeMagic[0], TargetEndianness::BeWire) == PIPE_MAGIC)
+    if (ToUint32(&pipeMagic[0], TargetEndianness::BeWire) == armnnProfiling::PIPE_MAGIC)
     {
         m_Endianness = TargetEndianness::BeWire;
     }
-    else if (ToUint32(&pipeMagic[0], TargetEndianness::LeWire) == PIPE_MAGIC)
+    else if (ToUint32(&pipeMagic[0], TargetEndianness::LeWire) == armnnProfiling::PIPE_MAGIC)
     {
         m_Endianness = TargetEndianness::LeWire;
     }
diff --git a/profiling/server/src/basePipeServer/BasePipeServer.hpp b/profiling/server/src/basePipeServer/BasePipeServer.hpp
index c03774e452..4e6e0c0e4b 100644
--- a/profiling/server/src/basePipeServer/BasePipeServer.hpp
+++ b/profiling/server/src/basePipeServer/BasePipeServer.hpp
@@ -107,7 +107,6 @@ private:
     armnnUtils::Sockets::Socket m_ClientConnection;
     bool m_EchoPackets;
     TargetEndianness m_Endianness;
-    static const uint32_t PIPE_MAGIC = 0x45495434;
 
     uint32_t m_StreamMetaDataVersion;
     uint32_t m_StreamMetaDataMaxDataLen;
-- 
cgit v1.2.1