From e4a92810542b6d80da543f817453db84abb2a6de Mon Sep 17 00:00:00 2001 From: Simon Lin Date: Tue, 11 Aug 2020 00:12:38 +0800 Subject: [PATCH] [otns] fix otns status emission built by cmake (#5362) Seems the strong otPlatOtnsStatus is not used, but the weak otPlatOtnsStatus was used in the original code if built by cmake. This commit fixes this issue. Now both cmake and make builds correctly. --- examples/platforms/simulation/CMakeLists.txt | 1 - examples/platforms/simulation/Makefile.am | 1 - .../platforms/simulation/virtual_time/otns.c | 50 ------------------- .../simulation/virtual_time/platform-sim.c | 19 +++++++ 4 files changed, 19 insertions(+), 52 deletions(-) delete mode 100644 examples/platforms/simulation/virtual_time/otns.c diff --git a/examples/platforms/simulation/CMakeLists.txt b/examples/platforms/simulation/CMakeLists.txt index c1034328e..befb2b68f 100644 --- a/examples/platforms/simulation/CMakeLists.txt +++ b/examples/platforms/simulation/CMakeLists.txt @@ -66,7 +66,6 @@ add_library(openthread-simulation system.c uart.c virtual_time/alarm-sim.c - virtual_time/otns.c virtual_time/platform-sim.c $ ) diff --git a/examples/platforms/simulation/Makefile.am b/examples/platforms/simulation/Makefile.am index 6e3b40d7f..348c6b331 100644 --- a/examples/platforms/simulation/Makefile.am +++ b/examples/platforms/simulation/Makefile.am @@ -54,7 +54,6 @@ PLATFORM_SOURCES = \ system.c \ uart.c \ virtual_time/alarm-sim.c \ - virtual_time/otns.c \ virtual_time/platform-sim.c \ $(NULL) diff --git a/examples/platforms/simulation/virtual_time/otns.c b/examples/platforms/simulation/virtual_time/otns.c deleted file mode 100644 index 9b0204893..000000000 --- a/examples/platforms/simulation/virtual_time/otns.c +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2019, The OpenThread Authors. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holder nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#include "platform-simulation.h" - -#if OPENTHREAD_CONFIG_OTNS_ENABLE - -#include - -void otPlatOtnsStatus(const char *aStatus) -{ - struct Event event; - uint16_t statusLength = (uint16_t)strlen(aStatus); - - assert(statusLength < sizeof(event.mData)); - - memcpy(event.mData, aStatus, statusLength); - event.mDataLength = statusLength; - event.mDelay = 0; - event.mEvent = OT_SIM_EVENT_OTNS_STATUS_PUSH; - - otSimSendEvent(&event); -} - -#endif // OPENTHREAD_CONFIG_OTNS_ENABLE diff --git a/examples/platforms/simulation/virtual_time/platform-sim.c b/examples/platforms/simulation/virtual_time/platform-sim.c index b676b5a39..5e2d1f2e0 100644 --- a/examples/platforms/simulation/virtual_time/platform-sim.c +++ b/examples/platforms/simulation/virtual_time/platform-sim.c @@ -312,4 +312,23 @@ void otSysProcessDrivers(otInstance *aInstance) #endif } +#if OPENTHREAD_CONFIG_OTNS_ENABLE + +void otPlatOtnsStatus(const char *aStatus) +{ + struct Event event; + uint16_t statusLength = (uint16_t)strlen(aStatus); + + assert(statusLength < sizeof(event.mData)); + + memcpy(event.mData, aStatus, statusLength); + event.mDataLength = statusLength; + event.mDelay = 0; + event.mEvent = OT_SIM_EVENT_OTNS_STATUS_PUSH; + + otSimSendEvent(&event); +} + +#endif // OPENTHREAD_CONFIG_OTNS_ENABLE + #endif // OPENTHREAD_SIMULATION_VIRTUAL_TIME