From 3c132d46200b26fbdea72d39d2c3c7bdcc3b5f29 Mon Sep 17 00:00:00 2001
From: Krzysztof Bogucki <kristofbo@gmail.com>
Date: Wed, 5 Aug 2020 22:00:53 +0200
Subject: [PATCH] [ncp] fix spinel encrypter compilation errors after recent
 refactoring (#5341)

---
 src/ncp/ncp_uart.cpp | 16 ++++++++--------
 src/ncp/ncp_uart.hpp |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/ncp/ncp_uart.cpp b/src/ncp/ncp_uart.cpp
index 09247b4b9..23a2bf242 100644
--- a/src/ncp/ncp_uart.cpp
+++ b/src/ncp/ncp_uart.cpp
@@ -133,7 +133,7 @@ void NcpUart::EncodeAndSendToUart(void)
     uint16_t len;
     bool     prevHostPowerState;
 #if OPENTHREAD_ENABLE_NCP_SPINEL_ENCRYPTER
-    Spinel::BufferEncrypterReader &txFrameBuffer = mTxFrameBufferEncrypterReader;
+    BufferEncrypterReader &txFrameBuffer = mTxFrameBufferEncrypterReader;
 #else
     Spinel::Buffer &txFrameBuffer = mTxFrameBuffer;
 #endif // OPENTHREAD_ENABLE_NCP_SPINEL_ENCRYPTER
@@ -308,19 +308,19 @@ void NcpUart::HandleError(otError aError, uint8_t *aBuf, uint16_t aBufLength)
 
 #if OPENTHREAD_ENABLE_NCP_SPINEL_ENCRYPTER
 
-NcpUart::Spinel::BufferEncrypterReader::SpinelBufferEncrypterReader(Spinel::Buffer &aTxFrameBuffer)
+NcpUart::BufferEncrypterReader::BufferEncrypterReader(Spinel::Buffer &aTxFrameBuffer)
     : mTxFrameBuffer(aTxFrameBuffer)
     , mDataBufferReadIndex(0)
     , mOutputDataLength(0)
 {
 }
 
-bool NcpUart::Spinel::BufferEncrypterReader::IsEmpty(void) const
+bool NcpUart::BufferEncrypterReader::IsEmpty(void) const
 {
     return mTxFrameBuffer.IsEmpty() && !mOutputDataLength;
 }
 
-otError NcpUart::Spinel::BufferEncrypterReader::OutFrameBegin(void)
+otError NcpUart::BufferEncrypterReader::OutFrameBegin(void)
 {
     otError status = OT_ERROR_FAILED;
 
@@ -350,22 +350,22 @@ otError NcpUart::Spinel::BufferEncrypterReader::OutFrameBegin(void)
     return status;
 }
 
-bool NcpUart::Spinel::BufferEncrypterReader::OutFrameHasEnded(void)
+bool NcpUart::BufferEncrypterReader::OutFrameHasEnded(void)
 {
     return (mDataBufferReadIndex >= mOutputDataLength);
 }
 
-uint8_t NcpUart::Spinel::BufferEncrypterReader::OutFrameReadByte(void)
+uint8_t NcpUart::BufferEncrypterReader::OutFrameReadByte(void)
 {
     return mDataBuffer[mDataBufferReadIndex++];
 }
 
-otError NcpUart::Spinel::BufferEncrypterReader::OutFrameRemove(void)
+otError NcpUart::BufferEncrypterReader::OutFrameRemove(void)
 {
     return mTxFrameBuffer.OutFrameRemove();
 }
 
-void NcpUart::Spinel::BufferEncrypterReader::Reset(void)
+void NcpUart::BufferEncrypterReader::Reset(void)
 {
     mOutputDataLength    = 0;
     mDataBufferReadIndex = 0;
diff --git a/src/ncp/ncp_uart.hpp b/src/ncp/ncp_uart.hpp
index 52214032f..5892c2f38 100644
--- a/src/ncp/ncp_uart.hpp
+++ b/src/ncp/ncp_uart.hpp
@@ -39,7 +39,7 @@
 #include "ncp/ncp_base.hpp"
 
 #if OPENTHREAD_ENABLE_NCP_SPINEL_ENCRYPTER
-#include "spinel_encrypter.hpp"
+#include "lib/spinel/spinel_encrypter.hpp"
 #endif // OPENTHREAD_ENABLE_NCP_SPINEL_ENCRYPTER
 
 namespace ot {
@@ -90,14 +90,14 @@ private:
      * Wraps Spinel::Buffer allowing to read data through spinel encrypter.
      * Creates additional buffers to allow transforming of the whole spinel frames.
      */
-    class Spinel::BufferEncrypterReader
+    class BufferEncrypterReader
     {
     public:
         /**
          * C-tor.
          * Takes a reference to Spinel::Buffer in order to read spinel frames.
          */
-        explicit Spinel::BufferEncrypterReader(Spinel::Buffer &aTxFrameBuffer);
+        explicit BufferEncrypterReader(Spinel::Buffer &aTxFrameBuffer);
         bool    IsEmpty(void) const;
         otError OutFrameBegin(void);
         bool    OutFrameHasEnded(void);
@@ -137,7 +137,7 @@ private:
     Tasklet                              mUartSendTask;
 
 #if OPENTHREAD_ENABLE_NCP_SPINEL_ENCRYPTER
-    Spinel::BufferEncrypterReader mTxFrameBufferEncrypterReader;
+    BufferEncrypterReader mTxFrameBufferEncrypterReader;
 #endif // OPENTHREAD_ENABLE_NCP_SPINEL_ENCRYPTER
 };