[types] move types into specific headers (#2946)

2026-07-28 06:37:46 +00:00 · 2018-08-08 11:19:41 -07:00
parent 90ee0a4d66
commit 9d585edc46
270 changed files with 1318 additions and 1587 deletions
@@ -42,13 +42,13 @@ REM Copy the relavant include headers

 copy include\openthread\commissioner.h release\include\openthread
 copy include\openthread\dataset.h release\include\openthread
+copy include\openthread\error.h release\include\openthread
 copy include\openthread\instance.h release\include\openthread
 copy include\openthread\ip6.h release\include\openthread
 copy include\openthread\joiner.h release\include\openthread
 copy include\openthread\link.h release\include\openthread
 copy include\openthread\message.h release\include\openthread
 copy include\openthread\netdata.h release\include\openthread
-copy include\openthread\openthread.h release\include\openthread
 copy include\openthread\thread.h release\include\openthread
 copy include\openthread\types.h release\include\openthread
 copy include\openthread\platform\toolchain.h release\include\openthread\platform
@@ -68,7 +68,7 @@ AC_SUBST(LIBOPENTHREAD_VERSION_INFO,     [${LIBOPENTHREAD_VERSION_CURRENT}:${LIB
 # Check the sanity of the source directory by checking for the
 # presence of a key watch file
 #
-AC_CONFIG_SRCDIR([include/openthread/openthread.h])
+AC_CONFIG_SRCDIR([include/openthread/error.h])

 #
 # Tell autoconf where to find auxilliary build tools (e.g. config.guess,
@@ -173,6 +173,7 @@
    <ClInclude Include="..\..\include\openthread\dataset_ftd.h" />
    <ClInclude Include="..\..\include\openthread\dhcp6_client.h" />
    <ClInclude Include="..\..\include\openthread\dhcp6_server.h" />
+    <ClInclude Include="..\..\include\openthread\error.h" />
    <ClInclude Include="..\..\include\openthread\icmp6.h" />
    <ClInclude Include="..\..\include\openthread\instance.h" />
    <ClInclude Include="..\..\include\openthread\ip6.h" />
@@ -181,11 +182,9 @@
    <ClInclude Include="..\..\include\openthread\link.h" />
    <ClInclude Include="..\..\include\openthread\message.h" />
    <ClInclude Include="..\..\include\openthread\netdata.h" />
-    <ClInclude Include="..\..\include\openthread\openthread.h" />
    <ClInclude Include="..\..\include\openthread\tasklet.h" />
    <ClInclude Include="..\..\include\openthread\thread.h" />
    <ClInclude Include="..\..\include\openthread\thread_ftd.h" />
-    <ClInclude Include="..\..\include\openthread\types.h" />
    <ClInclude Include="..\..\include\openthread-windows-config.h" />
    <ClInclude Include="..\..\include\openthread\udp.h" />
    <ClInclude Include="..\..\src\core\api\link_raw.hpp" />
@@ -614,9 +614,6 @@
    <ClInclude Include="..\..\src\core\openthread-core-default-config.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\include\openthread\types.h">
-      <Filter>Header Files\openthread</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\examples\drivers\windows\include\openthread-core-windows-config.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -644,6 +641,9 @@
    <ClInclude Include="..\..\include\openthread\dhcp6_server.h">
      <Filter>Header Files\openthread</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\include\openthread\error.h">
+      <Filter>Header Files\openthread</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\include\openthread\icmp6.h">
      <Filter>Header Files\openthread</Filter>
    </ClInclude>
@@ -668,9 +668,6 @@
    <ClInclude Include="..\..\include\openthread\netdata.h">
      <Filter>Header Files\openthread</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\include\openthread\openthread.h">
-      <Filter>Header Files\openthread</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\include\openthread\tasklet.h">
      <Filter>Header Files\openthread</Filter>
    </ClInclude>
@@ -32,7 +32,7 @@

 #include <openthread/cli.h>
 #include <openthread/diag.h>
-#include <openthread/openthread.h>
+#include <openthread/tasklet.h>
 #include <openthread/platform/logging.h>

 #include "openthread-system.h"
@@ -32,7 +32,7 @@

 #include <openthread/diag.h>
 #include <openthread/ncp.h>
-#include <openthread/openthread.h>
+#include <openthread/tasklet.h>

 #include "openthread-system.h"

@@ -29,7 +29,6 @@
 #pragma once

 #define OTDLL 1
-#include <openthread/openthread.h>
 #include <openthread/border_router.h>
 #include <openthread/thread_ftd.h>
 #include <openthread/commissioner.h>
@@ -35,8 +35,6 @@
 #ifndef __OTLWFIOCTL_H__
 #define __OTLWFIOCTL_H__

-#include <openthread/types.h>
-
 __inline LONG ThreadErrorToNtstatus(otError error) { return (LONG)-((int)error); }

 // User-mode IOCTL path for CreateFile
@@ -29,14 +29,12 @@
 /**
 * @file
 * @brief
- *  This file defines a node interface for openthread.h to be used for certification tests
+ *  This file defines a node interface for openthread to be used for certification tests
 */

 #ifndef OTNODE_H_
 #define OTNODE_H_

-#include <openthread/openthread.h>
-
 #ifndef OTNODEAPI
 #define OTNODEAPI __declspec(dllimport)
 #endif
@@ -21,9 +21,9 @@
 #define OTDLL
 #define OTAPI EXTERN_C __declspec(dllexport)

-#include <openthread/openthread.h>
 #include <openthread/border_router.h>
 #include <openthread/dataset_ftd.h>
+#include <openthread/error.h>
 #include <openthread/thread_ftd.h>
 #include <openthread/commissioner.h>
 #include <openthread/joiner.h>
@@ -29,7 +29,6 @@
 #include <windows.h>
 #include <stdio.h>

-#include <openthread/openthread.h>
 #include <openthread/cli.h>
 #include <openthread/platform/uart.h>
 #include <openthread/platform/misc.h>
@@ -61,7 +61,6 @@ RtlCopyBufferToMdl(

 #include <openthread-windows-config.h>
 #include <openthread-core-config.h>
-#include <openthread/openthread.h>
 #include <openthread/border_router.h>
 #include <openthread/dataset_ftd.h>
 #include <openthread/thread_ftd.h>
@@ -49,7 +49,6 @@ using namespace std;
 #define OTDLL
 #define OTNODEAPI EXTERN_C __declspec(dllexport)

-#include <openthread/openthread.h>
 #include <openthread/border_router.h>
 #include <openthread/dataset_ftd.h>
 #include <openthread/thread_ftd.h>
@@ -38,8 +38,6 @@
 #include <stdbool.h>
 #include <stdint.h>

-#include <openthread/openthread.h>
-
 #include <openthread/platform/alarm-milli.h>
 #include <openthread/platform/diag.h>

@@ -33,7 +33,6 @@
 #include <string.h>

 #include <openthread/config.h>
-#include <openthread/openthread.h>
 #include <openthread/platform/alarm-milli.h>
 #include <openthread/platform/radio.h>

@@ -34,6 +34,7 @@
 #include <openthread-core-config.h>
 #include <openthread/config.h>
 #include <openthread/platform/logging.h>
+#include <openthread/platform/toolchain.h>

 #if (OPENTHREAD_CONFIG_LOG_OUTPUT == OPENTHREAD_CONFIG_LOG_OUTPUT_PLATFORM_DEFINED) || \
    (OPENTHREAD_CONFIG_LOG_OUTPUT == OPENTHREAD_CONFIG_LOG_OUTPUT_NCP_SPINEL)
@@ -29,7 +29,6 @@
 #include <openthread/config.h>

 #include <driverlib/sys_ctrl.h>
-#include <openthread/types.h>
 #include <openthread/platform/misc.h>

 /*
@@ -32,7 +32,7 @@
 #include <openthread-core-config.h>
 #include <stdint.h>
 #include <openthread/config.h>
-#include "openthread/types.h"
+#include <openthread/instance.h>

 #ifdef __cplusplus
 extern "C" {
@@ -36,8 +36,6 @@

 #include <assert.h>
 #include <utils/code_utils.h>
-#include <openthread/openthread.h>
-#include <openthread/types.h>
 #include <openthread/platform/alarm-milli.h>
 #include <openthread/platform/diag.h>
 #include <openthread/platform/radio.h>
@@ -31,7 +31,6 @@
 #include <stddef.h>

 #include <utils/code_utils.h>
-#include <openthread/types.h>
 #include <openthread/platform/random.h>

 #include <driverlib/prcm.h>
@@ -36,7 +36,6 @@

 #include "platform-cc1352.h"
 #include <stdio.h>
-#include <openthread/types.h>

 #include "inc/hw_ccfg.h"
 #include "inc/hw_ccfg_simple_struct.h"
@@ -39,7 +39,6 @@
 #include <stddef.h>
 #include <stdio.h>

-#include <openthread/types.h>
 #include <openthread/platform/debug_uart.h>
 #include <openthread/platform/logging.h>
 #include <openthread/platform/uart.h>
@@ -36,7 +36,6 @@
 #include <stdint.h>

 #include <openthread/config.h>
-#include <openthread/openthread.h>
 #include <openthread/platform/alarm-milli.h>
 #include <openthread/platform/diag.h>

@@ -32,7 +32,6 @@
 #include <sys/time.h>

 #include <openthread/config.h>
-#include <openthread/openthread.h>
 #include <openthread/platform/alarm-milli.h>
 #include <openthread/platform/radio.h>

@@ -34,6 +34,7 @@
 #include <openthread-core-config.h>
 #include <openthread/config.h>
 #include <openthread/platform/logging.h>
+#include <openthread/platform/toolchain.h>

 #if (OPENTHREAD_CONFIG_LOG_OUTPUT == OPENTHREAD_CONFIG_LOG_OUTPUT_PLATFORM_DEFINED) || \
    (OPENTHREAD_CONFIG_LOG_OUTPUT == OPENTHREAD_CONFIG_LOG_OUTPUT_NCP_SPINEL)
@@ -26,7 +26,6 @@
 *  POSSIBILITY OF SUCH DAMAGE.
 */

-#include <openthread/types.h>
 #include <openthread/platform/misc.h>

 #include "platform-cc2538.h"
@@ -38,8 +38,7 @@
 #include <openthread-core-config.h>
 #include <stdint.h>
 #include <openthread/config.h>
-
-#include <openthread/types.h>
+#include <openthread/instance.h>

 #include "cc2538-reg.h"

@@ -33,7 +33,6 @@
 */

 #include <openthread/config.h>
-#include <openthread/openthread.h>
 #include <openthread/platform/alarm-milli.h>
 #include <openthread/platform/diag.h>
 #include <openthread/platform/radio.h>
@@ -32,7 +32,6 @@
 *
 */

-#include <openthread/types.h>
 #include <openthread/platform/radio.h>
 #include <openthread/platform/random.h>

@@ -39,7 +39,6 @@
 #include <stddef.h>
 #include <stdio.h>

-#include <openthread/types.h>
 #include <openthread/platform/debug_uart.h>
 #include <openthread/platform/logging.h>
 #include <openthread/platform/uart.h>
@@ -29,7 +29,6 @@
 #include <driverlib/aon_rtc.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <openthread/types.h>

 #include <openthread/platform/alarm-milli.h>
 #include <openthread/platform/diag.h>
@@ -28,6 +28,8 @@

 #include "platform-cc2650.h"

+#include <openthread/error.h>
+
 /**
 * @warning this file only implements stubs for the function calls. There is
 * not enough space on the cc2650 to support NV as an SoC.
@@ -34,6 +34,7 @@
 #include <openthread-core-config.h>
 #include <openthread/config.h>
 #include <openthread/platform/logging.h>
+#include <openthread/platform/toolchain.h>

 #if (OPENTHREAD_CONFIG_LOG_OUTPUT == OPENTHREAD_CONFIG_LOG_OUTPUT_PLATFORM_DEFINED) || \
    (OPENTHREAD_CONFIG_LOG_OUTPUT == OPENTHREAD_CONFIG_LOG_OUTPUT_NCP_SPINEL)
@@ -27,7 +27,6 @@
 */

 #include <driverlib/sys_ctrl.h>
-#include <openthread/types.h>
 #include <openthread/platform/misc.h>

 /**
@@ -32,7 +32,7 @@
 #include <openthread-core-config.h>
 #include <stdint.h>
 #include <openthread/config.h>
-#include "openthread/types.h"
+#include <openthread/instance.h>

 #ifdef __cplusplus
 extern "C" {
@@ -28,8 +28,6 @@

 #include <openthread/config.h>

-#include <openthread/types.h>
-
 #include "cc2650_radio.h"
 #include <assert.h>
 #include <utils/code_utils.h>
@@ -27,7 +27,6 @@
 */

 #include <utils/code_utils.h>
-#include <openthread/types.h>

 #include <driverlib/prcm.h>
 #include <driverlib/trng.h>
@@ -28,7 +28,6 @@

 #include "platform-cc2650.h"
 #include <stdio.h>
-#include <openthread/types.h>
 #include "inc/hw_ccfg_simple_struct.h"

 extern const ccfg_t __ccfg;
@@ -34,7 +34,6 @@
 #include <driverlib/uart.h>

 #include <utils/code_utils.h>
-#include <openthread/types.h>
 #include <openthread/platform/uart.h>

 /**
@@ -38,8 +38,6 @@
 #include <stdbool.h>
 #include <stdint.h>

-#include <openthread/openthread.h>
-
 #include <openthread/platform/alarm-milli.h>
 #include <openthread/platform/diag.h>

@@ -33,7 +33,6 @@
 #include <string.h>

 #include <openthread/config.h>
-#include <openthread/openthread.h>
 #include <openthread/platform/alarm-milli.h>
 #include <openthread/platform/radio.h>

@@ -34,6 +34,7 @@
 #include <openthread-core-config.h>
 #include <openthread/config.h>
 #include <openthread/platform/logging.h>
+#include <openthread/platform/toolchain.h>

 #if (OPENTHREAD_CONFIG_LOG_OUTPUT == OPENTHREAD_CONFIG_LOG_OUTPUT_PLATFORM_DEFINED) || \
    (OPENTHREAD_CONFIG_LOG_OUTPUT == OPENTHREAD_CONFIG_LOG_OUTPUT_NCP_SPINEL)
@@ -29,7 +29,6 @@
 #include <openthread/config.h>

 #include <driverlib/sys_ctrl.h>
-#include <openthread/types.h>
 #include <openthread/platform/misc.h>

 /*
@@ -32,7 +32,7 @@
 #include <openthread-core-config.h>
 #include <stdint.h>
 #include <openthread/config.h>
-#include "openthread/types.h"
+#include <openthread/instance.h>

 #ifdef __cplusplus
 extern "C" {
@@ -36,8 +36,6 @@

 #include <assert.h>
 #include <utils/code_utils.h>
-#include <openthread/openthread.h>
-#include <openthread/types.h>
 #include <openthread/platform/alarm-milli.h>
 #include <openthread/platform/diag.h>
 #include <openthread/platform/radio.h>
@@ -31,7 +31,6 @@
 #include <stddef.h>

 #include <utils/code_utils.h>
-#include <openthread/types.h>
 #include <openthread/platform/random.h>

 #include <driverlib/prcm.h>
@@ -36,7 +36,6 @@

 #include "platform-cc2652.h"
 #include <stdio.h>
-#include <openthread/types.h>

 #include "inc/hw_ccfg.h"
 #include "inc/hw_ccfg_simple_struct.h"
@@ -39,7 +39,6 @@
 #include <stddef.h>
 #include <stdio.h>

-#include <openthread/types.h>
 #include <openthread/platform/debug_uart.h>
 #include <openthread/platform/logging.h>
 #include <openthread/platform/uart.h>
@@ -32,7 +32,10 @@
 *
 */

+#include <openthread-core-config.h>
+#include <openthread/config.h>
 #include <openthread/platform/logging.h>
+#include <openthread/platform/toolchain.h>

 #if (OPENTHREAD_CONFIG_LOG_OUTPUT == OPENTHREAD_CONFIG_LOG_OUTPUT_PLATFORM_DEFINED) || \
    (OPENTHREAD_CONFIG_LOG_OUTPUT == OPENTHREAD_CONFIG_LOG_OUTPUT_NCP_SPINEL)
@@ -31,7 +31,8 @@

 #include <openthread-core-config.h>
 #include <openthread/config.h>
-#include <openthread/types.h>
+
+#include <openthread/instance.h>

 /**
 * This function initializes the radio service used by OpenThread.
@@ -33,7 +33,7 @@

 #include <openthread/commissioner.h>
 #include <openthread/joiner.h>
-#include <openthread/openthread.h>
+#include <openthread/thread.h>
 #include <openthread/platform/alarm-milli.h>

 #include "platform-da15000.h"
@@ -35,6 +35,7 @@
 #include <openthread-core-config.h>
 #include <openthread/config.h>
 #include <openthread/platform/logging.h>
+#include <openthread/platform/toolchain.h>

 #if (OPENTHREAD_CONFIG_LOG_OUTPUT == OPENTHREAD_CONFIG_LOG_OUTPUT_PLATFORM_DEFINED) || \
    (OPENTHREAD_CONFIG_LOG_OUTPUT == OPENTHREAD_CONFIG_LOG_OUTPUT_NCP_SPINEL)
@@ -31,7 +31,6 @@
 *   This file implements the OpenThread platform abstraction for miscellaneous behaviors.
 */

-#include <openthread/types.h>
 #include <openthread/platform/misc.h>

 #include "em_rmu.h"
@@ -35,7 +35,6 @@
 #include <assert.h>

 #include <openthread/config.h>
-#include <openthread/types.h>
 #include <openthread/platform/alarm-milli.h>
 #include <openthread/platform/diag.h>
 #include <openthread/platform/radio.h>
@@ -32,7 +32,6 @@
 *
 */

-#include <openthread/types.h>
 #include <openthread/platform/random.h>

 #include "utils/code_utils.h"
@@ -34,7 +34,6 @@

 #include <stddef.h>

-#include <openthread/types.h>
 #include <openthread/platform/uart.h>

 #include "utils/code_utils.h"
@@ -32,9 +32,10 @@
 *
 */

-#include "openthread/platform/logging.h"
 #include <openthread-core-config.h>
 #include <openthread/config.h>
+#include <openthread/platform/logging.h>
+#include <openthread/platform/toolchain.h>

 #if (OPENTHREAD_CONFIG_LOG_OUTPUT == OPENTHREAD_CONFIG_LOG_OUTPUT_PLATFORM_DEFINED) || \
    (OPENTHREAD_CONFIG_LOG_OUTPUT == OPENTHREAD_CONFIG_LOG_OUTPUT_NCP_SPINEL)
@@ -39,7 +39,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <openthread/config.h>
-#include "openthread/types.h"
+#include <openthread/instance.h>

 #include "board/board.h"

@@ -34,14 +34,16 @@
 #include <openthread-core-config.h>
 #include <openthread/config.h>

-#include "openthread/types.h"
+#include <string.h>

 #include "platform-emsk.h"
-#include <utils/code_utils.h>
+
+#include <openthread/dataset.h>
 #include <openthread/platform/alarm-milli.h>
 #include <openthread/platform/radio.h>

-#include <string.h>
+#include "utils/code_utils.h"
+
 #include "device/device_hal/inc/dev_gpio.h"

 #include <stdio.h>
@@ -34,7 +34,6 @@
 */

 #include "platform-emsk.h"
-#include "openthread/openthread.h"
 #include "openthread/platform/uart.h"

 #include <stdio.h>
@@ -37,7 +37,6 @@
 #include "platform-emsk.h"
 #include <utils/code_utils.h>
 #include "openthread/platform/uart.h"
-#include "openthread/types.h"

 #include <stdio.h>
 #define DBG(fmt, ...) printf(fmt, ##__VA_ARGS__)
@@ -37,7 +37,6 @@
 #include <sys/time.h>

 #include "alarm_qorvo.h"
-#include <openthread/openthread.h>
 #include <openthread/platform/alarm-milli.h>
 #include <openthread/platform/diag.h>

@@ -38,7 +38,6 @@
 #include <stdint.h>
 #include <sys/time.h>
 #include <unistd.h>
-#include <openthread/types.h>

 typedef void (*qorvoAlarmCallback_t)( void* );

@@ -32,7 +32,6 @@
 #include <sys/time.h>

 #include <openthread/config.h>
-#include <openthread/openthread.h>
 #include <openthread/platform/alarm-milli.h>
 #include <openthread/platform/radio.h>

@@ -42,6 +42,7 @@
 #endif

 #include <openthread/platform/logging.h>
+#include <openthread/platform/toolchain.h>

 #include "utils/code_utils.h"

@@ -33,7 +33,8 @@

 #include "radio_qorvo.h"
 #include <stdlib.h>
-#include <openthread/types.h>
+
+#include <openthread/instance.h>
 #include <openthread/platform/misc.h>

 extern int    gArgumentsCount;
@@ -37,8 +37,8 @@

 #include <openthread/config.h>
 #include <openthread-core-config.h>
+
 #include <stdint.h>
-#include <openthread/types.h>

 typedef void     (*qorvoPlatPollFunction_t)(uint8_t);
 typedef uint8_t  (*qorvoPlatGotoSleepCheckCallback_t) (void);
@@ -34,8 +34,6 @@

 #include <string.h>

-#include <openthread/openthread.h>
-
 #include <openthread/platform/diag.h>
 #include <openthread/platform/radio.h>

@@ -36,7 +36,8 @@
 #define RADIO_QORVO_H_

 #include <stdint.h>
-#include <openthread/types.h>
+
+#include <openthread/error.h>
 #include <openthread/platform/radio.h>

 /**
@@ -35,7 +35,7 @@
 #include <assert.h>
 #include <stdio.h>

-#include <openthread/types.h>
+#include <openthread/error.h>
 #include <openthread/platform/random.h>

 #include "utils/code_utils.h"
@@ -36,7 +36,6 @@
 #define RANDOM_QORVO_H_

 #include <stdint.h>
-#include <openthread/types.h>

 /**
 * This function initializes the random number service used by OpenThread.
@@ -36,7 +36,6 @@
 #define UART_QORVO_H_

 #include <stdint.h>
-#include <openthread/types.h>

 /**
 * This function initializes the UART driver.
@@ -37,9 +37,8 @@
 #include "fsl_pit.h"
 #include <stdint.h>

-#include "openthread/openthread.h"
-#include "openthread/platform/alarm-milli.h"
-#include "openthread/platform/diag.h"
+#include <openthread/platform/alarm-milli.h>
+#include <openthread/platform/diag.h>

 static volatile uint32_t sTime      = 0;
 static uint32_t          sAlarmTime = 0;
@@ -36,11 +36,10 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
-#include "openthread/config.h"
-#include "openthread/openthread.h"

-#include "openthread/platform/alarm-milli.h"
-#include "openthread/platform/radio.h"
+#include <openthread/config.h>
+#include <openthread/platform/alarm-milli.h>
+#include <openthread/platform/radio.h>

 #if OPENTHREAD_ENABLE_DIAG

@@ -35,6 +35,7 @@
 #include <openthread-core-config.h>
 #include <openthread/config.h>
 #include <openthread/platform/logging.h>
+#include <openthread/platform/toolchain.h>

 #if (OPENTHREAD_CONFIG_LOG_OUTPUT == OPENTHREAD_CONFIG_LOG_OUTPUT_PLATFORM_DEFINED) || \
    (OPENTHREAD_CONFIG_LOG_OUTPUT == OPENTHREAD_CONFIG_LOG_OUTPUT_NCP_SPINEL)
@@ -29,7 +29,6 @@
 #include "openthread/platform/misc.h"
 #include "fsl_device_registers.h"
 #include <stdint.h>
-#include "openthread/types.h"

 void otPlatReset(otInstance *aInstance)
 {
@@ -37,9 +37,11 @@

 #include <openthread/config.h>
 #include <openthread-core-config.h>
+
 #include <stdint.h>

-#include "openthread/types.h"
+#include <openthread/instance.h>
+
 /**
 * This function initializes the alarm service used by OpenThread.
 *
@@ -38,7 +38,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <utils/code_utils.h>
-#include "openthread/types.h"

 void kw41zRandomInit(void)
 {
@@ -39,7 +39,6 @@
 #include "platform-kw41z.h"
 #include <stdint.h>
 #include "openthread/platform/uart.h"
-#include "openthread/types.h"

 otInstance *sInstance;

@@ -38,7 +38,6 @@

 #include <utils/code_utils.h>
 #include "openthread/platform/uart.h"
-#include "openthread/types.h"

 #include "fsl_clock.h"
 #include "fsl_lpuart.h"
@@ -57,7 +57,6 @@
 #include <hal/nrf_rtc.h>

 #include <openthread/config.h>
-#include <openthread/types.h>

 // clang-format off
 #define RTC_FREQUENCY       32768ULL
@@ -35,7 +35,6 @@

 #include <utils/code_utils.h>
 #include <utils/flash.h>
-#include <openthread/types.h>
 #include <openthread/platform/alarm-milli.h>

 #include "platform-nrf5.h"
@@ -33,7 +33,6 @@
 #include <string.h>
 #include <assert.h>

-#include <openthread/types.h>
 #include <utils/code_utils.h>
 #include <utils/flash.h>

@@ -33,7 +33,6 @@
 #include <string.h>
 #include <assert.h>

-#include <openthread/types.h>
 #include <openthread/platform/alarm-milli.h>

 #include <utils/code_utils.h>
@@ -46,7 +46,6 @@

 #include <openthread-core-config.h>
 #include <openthread/config.h>
-#include <openthread/types.h>

 #if (OPENTHREAD_CONFIG_LOG_OUTPUT == OPENTHREAD_CONFIG_LOG_OUTPUT_PLATFORM_DEFINED) || \
    (OPENTHREAD_CONFIG_LOG_OUTPUT == OPENTHREAD_CONFIG_LOG_OUTPUT_NCP_SPINEL)
@@ -37,7 +37,7 @@

 #include <stdint.h>

-#include <openthread/types.h>
+#include <openthread/instance.h>

 #include "platform-config.h"

@@ -57,7 +57,6 @@

 #include <openthread-core-config.h>
 #include <openthread/config.h>
-#include <openthread/types.h>

 // clang-format off

@@ -44,7 +44,6 @@
 #include "platform-softdevice.h"
 #include "platform-nrf5.h"

-#include <openthread/types.h>
 #include <nrf_raal_softdevice.h>

 otError nrf5SdErrorToOtError(uint32_t aSdError)
@@ -33,7 +33,6 @@
 */

 #include <utils/code_utils.h>
-#include <openthread/types.h>
 #include <openthread/platform/spi-slave.h>

 #include <hal/nrf_gpio.h>
@@ -39,7 +39,6 @@
 #include <stdint.h>

 #include <utils/code_utils.h>
-#include <openthread/types.h>
 #include <openthread/platform/toolchain.h>
 #include <openthread/platform/uart.h>

@@ -45,7 +45,6 @@

 #include <common/logging.hpp>
 #include <utils/code_utils.h>
-#include <openthread/types.h>
 #include <openthread/platform/alarm-milli.h>
 #include <openthread/platform/diag.h>
 #include <openthread/platform/misc.h>
@@ -35,7 +35,7 @@
 #ifndef OPENTHREAD_SYSTEM_H_
 #define OPENTHREAD_SYSTEM_H_

-#include <openthread/types.h>
+#include <openthread/instance.h>

 #ifdef __cplusplus
 extern "C" {
@@ -34,7 +34,6 @@
 #include <sys/time.h>

 #include <openthread/config.h>
-#include <openthread/openthread.h>
 #include <openthread/platform/alarm-milli.h>
 #include <openthread/platform/radio.h>

@@ -42,6 +42,7 @@
 #endif

 #include <openthread/platform/logging.h>
+#include <openthread/platform/toolchain.h>

 #include "utils/code_utils.h"

@@ -32,7 +32,6 @@
 #include <unistd.h>
 #endif

-#include <openthread/types.h>
 #include <openthread/platform/misc.h>

 #include "openthread-system.h"
@@ -79,7 +79,7 @@ __forceinline void timersub(struct timeval *a, struct timeval *b, struct timeval
 #define POLL poll
 #endif

-#include <openthread/openthread.h>
+#include <openthread/instance.h>

 #include "openthread-core-config.h"

@@ -30,6 +30,7 @@

 #if OPENTHREAD_POSIX_VIRTUAL_TIME == 0

+#include <openthread/dataset.h>
 #include <openthread/platform/alarm-micro.h>
 #include <openthread/platform/alarm-milli.h>
 #include <openthread/platform/diag.h>
@@ -37,7 +37,6 @@

 #include "platform-posix.h"

-#include <openthread/types.h>
 #include <openthread/platform/random.h>

 #include "utils/code_utils.h"
@@ -45,7 +45,6 @@
 #include <stdlib.h>
 #include <syslog.h>

-#include <openthread/openthread.h>
 #include <openthread/tasklet.h>
 #include <openthread/platform/alarm-milli.h>

@@ -48,7 +48,6 @@
 #include <syslog.h>
 #endif

-#include <openthread/openthread.h>
 #include <openthread/tasklet.h>
 #include <openthread/platform/alarm-milli.h>

--- a/Show More
+++ b/Show More