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
This commit is contained in:
Nick Banks
2016-09-16 17:27:10 -07:00
committed by Jonathan Hui
parent 79f2e3046f
commit 18e7515b70
3 changed files with 10 additions and 3 deletions
+3
View File
@@ -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
+4
View File
@@ -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
}
+3 -3
View File
@@ -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);