From 18e7515b70d40d4e20f60f9445601b7b1e014ddd Mon Sep 17 00:00:00 2001
From: Nick Banks <nibanks@microsoft.com>
Date: Fri, 16 Sep 2016 17:27:10 -0700
Subject: [PATCH] Fixes a bad merge from my otInstance declarations change.
 (#615)

* Fixes a bad merge from my otInstance declarations change.

* Update travis to build ncp-spi
---
 .travis.yml         | 3 +++
 .travis/script.sh   | 4 ++++
 src/ncp/ncp_spi.cpp | 6 +++---
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 98cc7c511..07233db87 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,6 +60,9 @@ matrix:
     - env: BUILD_TARGET="posix-32-bit" VERBOSE=1
       compiler: gcc
       os: linux
+    - env: BUILD_TARGET="posix-ncp-spi" VERBOSE=1
+      compiler: gcc
+      os: linux
     - env: BUILD_TARGET="posix-ncp" VERBOSE=1
       compiler: gcc
       os: linux
diff --git a/.travis/script.sh b/.travis/script.sh
index 60a171ea4..c6a237e41 100755
--- a/.travis/script.sh
+++ b/.travis/script.sh
@@ -66,6 +66,10 @@ set -x
     COVERAGE=1 CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32 BuildJobs=10 make -f examples/Makefile-posix check || die
 }
 
+[ $BUILD_TARGET != posix-ncp-spi ] || {
+    BuildJobs=10 make -f examples/Makefile-posix check configure_OPTIONS="--enable-ncp=spi --with-examples=posix --with-platform-info=POSIX" || die
+}
+
 [ $BUILD_TARGET != posix-ncp ] || {
     COVERAGE=1 NODE_TYPE=ncp-sim BuildJobs=10 make -f examples/Makefile-posix check || die
 }
diff --git a/src/ncp/ncp_spi.cpp b/src/ncp/ncp_spi.cpp
index b8fe9f61f..3ee63f986 100644
--- a/src/ncp/ncp_spi.cpp
+++ b/src/ncp/ncp_spi.cpp
@@ -89,9 +89,9 @@ static uint16_t spi_header_get_data_len(const uint8_t *header)
 
 NcpSpi::NcpSpi(otInstance *aInstance):
     NcpBase(aInstance),
-    mHandleRxFrame(sIp6->mTaskletScheduler, &NcpSpi::HandleRxFrame, this),
-    mHandleSendDone(sIp6->mTaskletScheduler, &NcpSpi::PrepareTxFrame, this),
-    mTxFrameBuffer(aInstance, mTxBuffer, sizeof(mTxBuffer))
+    mHandleRxFrameTask(sIp6->mTaskletScheduler, &NcpSpi::HandleRxFrame, this),
+    mPrepareTxFrameTask(sIp6->mTaskletScheduler, &NcpSpi::PrepareTxFrame, this),
+    mTxFrameBuffer(mTxBuffer, sizeof(mTxBuffer))
 {
     memset(mEmptySendFrame, 0, kSpiHeaderLength);
     memset(mSendFrame, 0, kSpiHeaderLength);