From cac018e100ccd3e2b50268ea65fa705b3dafc567 Mon Sep 17 00:00:00 2001 From: Jonathan Hui Date: Wed, 24 Mar 2021 08:15:49 -0700 Subject: [PATCH] [openthread] update to db1b980e5 (#3) --- CMakeLists.txt | 1 - openthread | 2 +- src/openthread-core-kw41z-config.h | 8 +++++--- src/system.c | 6 ++++-- src/uart.c | 4 ++-- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f3f016..0b37b2c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,6 @@ target_compile_definitions(ot-config INTERFACE OPENTHREAD_CONFIG_FILE="openthread-core-kw41z-config.h" OPENTHREAD_PROJECT_CORE_CONFIG_FILE="openthread-core-kw41z-config.h" OPENTHREAD_CORE_CONFIG_PLATFORM_CHECK_FILE="openthread-core-kw41z-config-check.h" - OPENTHREAD_CONFIG_NCP_UART_ENABLE=1 ) target_include_directories(ot-config INTERFACE diff --git a/openthread b/openthread index 9ea89ca..db1b980 160000 --- a/openthread +++ b/openthread @@ -1 +1 @@ -Subproject commit 9ea89ca20499466e16dcb8e25ef92cdf259268b2 +Subproject commit db1b980e57ada62f6ef2002fcaddff37d55a356d diff --git a/src/openthread-core-kw41z-config.h b/src/openthread-core-kw41z-config.h index 923dc03..a9da59d 100644 --- a/src/openthread-core-kw41z-config.h +++ b/src/openthread-core-kw41z-config.h @@ -95,11 +95,13 @@ #define OPENTHREAD_CONFIG_MAC_SOFTWARE_TX_SECURITY_ENABLE 0 /** - * @def OPENTHREAD_CONFIG_NCP_UART_ENABLE + * @def OPENTHREAD_CONFIG_NCP_HDLC_ENABLE * - * Define to 1 to enable NCP UART support. + * Define to 1 to enable NCP HDLC support. * */ -#define OPENTHREAD_CONFIG_NCP_UART_ENABLE 1 +#ifndef OPENTHREAD_CONFIG_NCP_HDLC_ENABLE +#define OPENTHREAD_CONFIG_NCP_HDLC_ENABLE 1 +#endif #endif // OPENTHREAD_CORE_KW41Z_CONFIG_H_ diff --git a/src/system.c b/src/system.c index 8e0dc27..383779a 100644 --- a/src/system.c +++ b/src/system.c @@ -32,13 +32,15 @@ * */ +#include + +#include "utils/uart.h" + #include "clock_config.h" #include "fsl_clock.h" #include "fsl_device_registers.h" #include "fsl_port.h" #include "platform-kw41z.h" -#include -#include "openthread/platform/uart.h" otInstance *sInstance; diff --git a/src/uart.c b/src/uart.c index 226e04e..143a24e 100644 --- a/src/uart.c +++ b/src/uart.c @@ -36,8 +36,8 @@ #include #include -#include -#include "openthread/platform/uart.h" +#include "utils/code_utils.h" +#include "utils/uart.h" #include "fsl_clock.h" #include "fsl_lpuart.h"