diff --git a/examples/platforms/nrf52811/openthread-core-nrf52811-config.h b/examples/platforms/nrf52811/openthread-core-nrf52811-config.h index ceaa7e584..81a575590 100644 --- a/examples/platforms/nrf52811/openthread-core-nrf52811-config.h +++ b/examples/platforms/nrf52811/openthread-core-nrf52811-config.h @@ -48,8 +48,8 @@ * * The nrf52811 platform provides an otPlatLog() function. */ -#ifndef OPENTHREAD_CONFIG_LOG_OUTPUT /* allow command line override */ -#define OPENTHREAD_CONFIG_LOG_OUTPUT OPENTHREAD_CONFIG_LOG_OUTPUT_PLATFORM_DEFINED +#ifndef OPENTHREAD_CONFIG_LOG_OUTPUT +#define OPENTHREAD_CONFIG_LOG_OUTPUT OPENTHREAD_CONFIG_LOG_OUTPUT_PLATFORM_DEFINED #endif /** @@ -58,7 +58,7 @@ * The platform-specific string to insert into the OpenThread version string. * */ -#define OPENTHREAD_CONFIG_PLATFORM_INFO "NRF52811" +#define OPENTHREAD_CONFIG_PLATFORM_INFO "NRF52811" /** * @def OPENTHREAD_CONFIG_NUM_MESSAGE_BUFFERS @@ -66,7 +66,9 @@ * The number of message buffers in the buffer pool. * */ -#define OPENTHREAD_CONFIG_NUM_MESSAGE_BUFFERS 64 +#ifndef OPENTHREAD_CONFIG_NUM_MESSAGE_BUFFERS +#define OPENTHREAD_CONFIG_NUM_MESSAGE_BUFFERS 64 +#endif /** * @def OPENTHREAD_CONFIG_MAX_STATECHANGE_HANDLERS @@ -74,7 +76,9 @@ * The maximum number of state-changed callback handlers (set using `otSetStateChangedCallback()`). * */ -#define OPENTHREAD_CONFIG_MAX_STATECHANGE_HANDLERS 3 +#ifndef OPENTHREAD_CONFIG_MAX_STATECHANGE_HANDLERS +#define OPENTHREAD_CONFIG_MAX_STATECHANGE_HANDLERS 3 +#endif /** * @def OPENTHREAD_CONFIG_ADDRESS_CACHE_ENTRIES @@ -82,7 +86,9 @@ * The number of EID-to-RLOC cache entries. * */ -#define OPENTHREAD_CONFIG_ADDRESS_CACHE_ENTRIES 20 +#ifndef OPENTHREAD_CONFIG_ADDRESS_CACHE_ENTRIES +#define OPENTHREAD_CONFIG_ADDRESS_CACHE_ENTRIES 20 +#endif /** * @def OPENTHREAD_CONFIG_LOG_PREPREND_LEVEL @@ -91,7 +97,7 @@ * */ #ifndef OPENTHREAD_CONFIG_LOG_PREPEND_LEVEL -#define OPENTHREAD_CONFIG_LOG_PREPEND_LEVEL 0 +#define OPENTHREAD_CONFIG_LOG_PREPEND_LEVEL 0 #endif /** @@ -100,7 +106,9 @@ * Define to 1 if you want to enable software ACK timeout logic. * */ -#define OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ACK_TIMEOUT 0 +#ifndef OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ACK_TIMEOUT +#define OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ACK_TIMEOUT 0 +#endif /** * @def OPENTHREAD_CONFIG_ENABLE_SOFTWARE_RETRANSMIT @@ -108,7 +116,9 @@ * Define to 1 if you want to enable software retransmission logic. * */ -#define OPENTHREAD_CONFIG_ENABLE_SOFTWARE_RETRANSMIT 1 +#ifndef OPENTHREAD_CONFIG_ENABLE_SOFTWARE_RETRANSMIT +#define OPENTHREAD_CONFIG_ENABLE_SOFTWARE_RETRANSMIT 1 +#endif /** * @def OPENTHREAD_CONFIG_ENABLE_SOFTWARE_CSMA_BACKOFF @@ -116,7 +126,9 @@ * Define to 1 if you want to enable software CSMA-CA backoff logic. * */ -#define OPENTHREAD_CONFIG_ENABLE_SOFTWARE_CSMA_BACKOFF 0 +#ifndef OPENTHREAD_CONFIG_ENABLE_SOFTWARE_CSMA_BACKOFF +#define OPENTHREAD_CONFIG_ENABLE_SOFTWARE_CSMA_BACKOFF 0 +#endif /** * @def OPENTHREAD_CONFIG_ENABLE_PLATFORM_USEC_TIMER @@ -124,7 +136,9 @@ * Define to 1 if you want to support microsecond timer in platform. * */ -#define OPENTHREAD_CONFIG_ENABLE_PLATFORM_USEC_TIMER 1 +#ifndef OPENTHREAD_CONFIG_ENABLE_PLATFORM_USEC_TIMER +#define OPENTHREAD_CONFIG_ENABLE_PLATFORM_USEC_TIMER 1 +#endif /** * @def SETTINGS_CONFIG_BASE_ADDRESS @@ -132,7 +146,9 @@ * The base address of settings. * */ -#define SETTINGS_CONFIG_BASE_ADDRESS 0 +#ifndef SETTINGS_CONFIG_BASE_ADDRESS +#define SETTINGS_CONFIG_BASE_ADDRESS 0 +#endif /** * @def SETTINGS_CONFIG_PAGE_SIZE @@ -140,7 +156,9 @@ * The page size of settings. * */ -#define SETTINGS_CONFIG_PAGE_SIZE 4096 +#ifndef SETTINGS_CONFIG_PAGE_SIZE +#define SETTINGS_CONFIG_PAGE_SIZE 4096 +#endif /** * @def SETTINGS_CONFIG_PAGE_NUM @@ -148,7 +166,9 @@ * The page number of settings. * */ -#define SETTINGS_CONFIG_PAGE_NUM 2 +#ifndef SETTINGS_CONFIG_PAGE_NUM +#define SETTINGS_CONFIG_PAGE_NUM 2 +#endif /** * @def OPENTHREAD_CONFIG_HEAP_SIZE @@ -156,7 +176,9 @@ * The size of heap buffer when DTLS is enabled. * */ -#define OPENTHREAD_CONFIG_HEAP_SIZE (4096 * sizeof(void *)) +#ifndef OPENTHREAD_CONFIG_HEAP_SIZE +#define OPENTHREAD_CONFIG_HEAP_SIZE (4096 * sizeof(void *)) +#endif /** * @def OPENTHREAD_CONFIG_HEAP_SIZE_NO_DTLS @@ -164,7 +186,9 @@ * The size of heap buffer when DTLS is disabled. * */ -#define OPENTHREAD_CONFIG_HEAP_SIZE_NO_DTLS 2048 +#ifndef OPENTHREAD_CONFIG_HEAP_SIZE_NO_DTLS +#define OPENTHREAD_CONFIG_HEAP_SIZE_NO_DTLS 2048 +#endif /** * @def OPENTHREAD_CONFIG_ENABLE_TIME_SYNC @@ -172,7 +196,9 @@ * Define as 1 to enable the time synchronization service feature. * */ -#define OPENTHREAD_CONFIG_ENABLE_TIME_SYNC 0 +#ifndef OPENTHREAD_CONFIG_ENABLE_TIME_SYNC +#define OPENTHREAD_CONFIG_ENABLE_TIME_SYNC 0 +#endif /** * @def OPENTHREAD_CONFIG_HEADER_IE_SUPPORT @@ -185,7 +211,7 @@ * */ #if OPENTHREAD_CONFIG_ENABLE_TIME_SYNC -#define OPENTHREAD_CONFIG_HEADER_IE_SUPPORT 1 +#define OPENTHREAD_CONFIG_HEADER_IE_SUPPORT 1 #endif /** @@ -198,9 +224,9 @@ * */ #if OPENTHREAD_ENABLE_COMMISSIONER || OPENTHREAD_ENABLE_JOINER || OPENTHREAD_CONFIG_HEADER_IE_SUPPORT -#define NRF_MBEDTLS_AES_ALT_INTERRUPT_CONTEXT 1 +#define NRF_MBEDTLS_AES_ALT_INTERRUPT_CONTEXT 1 #else -#define NRF_MBEDTLS_AES_ALT_INTERRUPT_CONTEXT 0 +#define NRF_MBEDTLS_AES_ALT_INTERRUPT_CONTEXT 0 #endif /* diff --git a/examples/platforms/nrf52840/openthread-core-nrf52840-config.h b/examples/platforms/nrf52840/openthread-core-nrf52840-config.h index cad752004..4e6e1f668 100644 --- a/examples/platforms/nrf52840/openthread-core-nrf52840-config.h +++ b/examples/platforms/nrf52840/openthread-core-nrf52840-config.h @@ -48,8 +48,8 @@ * * The nrf52840 platform provides an otPlatLog() function. */ -#ifndef OPENTHREAD_CONFIG_LOG_OUTPUT /* allow command line override */ -#define OPENTHREAD_CONFIG_LOG_OUTPUT OPENTHREAD_CONFIG_LOG_OUTPUT_PLATFORM_DEFINED +#ifndef OPENTHREAD_CONFIG_LOG_OUTPUT +#define OPENTHREAD_CONFIG_LOG_OUTPUT OPENTHREAD_CONFIG_LOG_OUTPUT_PLATFORM_DEFINED #endif /** @@ -59,7 +59,7 @@ * */ #ifndef OPENTHREAD_CONFIG_PLATFORM_INFO -#define OPENTHREAD_CONFIG_PLATFORM_INFO "NRF52840" +#define OPENTHREAD_CONFIG_PLATFORM_INFO "NRF52840" #endif /** @@ -69,7 +69,7 @@ * */ #ifndef OPENTHREAD_CONFIG_MAX_CHILDREN -#define OPENTHREAD_CONFIG_MAX_CHILDREN 32 +#define OPENTHREAD_CONFIG_MAX_CHILDREN 32 #endif /** @@ -79,7 +79,7 @@ * */ #ifndef OPENTHREAD_CONFIG_NUM_MESSAGE_BUFFERS -#define OPENTHREAD_CONFIG_NUM_MESSAGE_BUFFERS 160 +#define OPENTHREAD_CONFIG_NUM_MESSAGE_BUFFERS 160 #endif /** @@ -89,7 +89,7 @@ * */ #ifndef OPENTHREAD_CONFIG_IP_ADDRS_PER_CHILD -#define OPENTHREAD_CONFIG_IP_ADDRS_PER_CHILD 6 +#define OPENTHREAD_CONFIG_IP_ADDRS_PER_CHILD 6 #endif /** @@ -99,7 +99,7 @@ * */ #ifndef OPENTHREAD_CONFIG_MAX_STATECHANGE_HANDLERS -#define OPENTHREAD_CONFIG_MAX_STATECHANGE_HANDLERS 3 +#define OPENTHREAD_CONFIG_MAX_STATECHANGE_HANDLERS 3 #endif /** @@ -109,7 +109,7 @@ * */ #ifndef OPENTHREAD_CONFIG_ADDRESS_CACHE_ENTRIES -#define OPENTHREAD_CONFIG_ADDRESS_CACHE_ENTRIES 32 +#define OPENTHREAD_CONFIG_ADDRESS_CACHE_ENTRIES 32 #endif /** @@ -119,7 +119,7 @@ * */ #ifndef OPENTHREAD_CONFIG_LOG_PREPEND_LEVEL -#define OPENTHREAD_CONFIG_LOG_PREPEND_LEVEL 0 +#define OPENTHREAD_CONFIG_LOG_PREPEND_LEVEL 0 #endif /** @@ -129,7 +129,7 @@ * */ #ifndef OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ACK_TIMEOUT -#define OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ACK_TIMEOUT 0 +#define OPENTHREAD_CONFIG_ENABLE_SOFTWARE_ACK_TIMEOUT 0 #endif /** @@ -139,7 +139,7 @@ * */ #ifndef OPENTHREAD_CONFIG_ENABLE_SOFTWARE_RETRANSMIT -#define OPENTHREAD_CONFIG_ENABLE_SOFTWARE_RETRANSMIT 1 +#define OPENTHREAD_CONFIG_ENABLE_SOFTWARE_RETRANSMIT 1 #endif /** @@ -149,7 +149,7 @@ * */ #ifndef OPENTHREAD_CONFIG_ENABLE_SOFTWARE_CSMA_BACKOFF -#define OPENTHREAD_CONFIG_ENABLE_SOFTWARE_CSMA_BACKOFF 0 +#define OPENTHREAD_CONFIG_ENABLE_SOFTWARE_CSMA_BACKOFF 0 #endif /** @@ -159,7 +159,7 @@ * */ #ifndef OPENTHREAD_CONFIG_ENABLE_PLATFORM_USEC_TIMER -#define OPENTHREAD_CONFIG_ENABLE_PLATFORM_USEC_TIMER 1 +#define OPENTHREAD_CONFIG_ENABLE_PLATFORM_USEC_TIMER 1 #endif /** @@ -169,7 +169,7 @@ * */ #ifndef SETTINGS_CONFIG_BASE_ADDRESS -#define SETTINGS_CONFIG_BASE_ADDRESS 0 +#define SETTINGS_CONFIG_BASE_ADDRESS 0 #endif /** @@ -179,7 +179,7 @@ * */ #ifndef SETTINGS_CONFIG_PAGE_SIZE -#define SETTINGS_CONFIG_PAGE_SIZE 4096 +#define SETTINGS_CONFIG_PAGE_SIZE 4096 #endif /** @@ -189,7 +189,7 @@ * */ #ifndef SETTINGS_CONFIG_PAGE_NUM -#define SETTINGS_CONFIG_PAGE_NUM 4 +#define SETTINGS_CONFIG_PAGE_NUM 4 #endif /** @@ -199,7 +199,7 @@ * */ #ifndef OPENTHREAD_CONFIG_HEAP_SIZE -#define OPENTHREAD_CONFIG_HEAP_SIZE (4096 * sizeof(void *)) +#define OPENTHREAD_CONFIG_HEAP_SIZE (4096 * sizeof(void *)) #endif /** @@ -209,7 +209,7 @@ * */ #ifndef OPENTHREAD_CONFIG_HEAP_SIZE_NO_DTLS -#define OPENTHREAD_CONFIG_HEAP_SIZE_NO_DTLS 2048 +#define OPENTHREAD_CONFIG_HEAP_SIZE_NO_DTLS 2048 #endif /** @@ -219,7 +219,7 @@ * */ #ifndef OPENTHREAD_CONFIG_ENABLE_TIME_SYNC -#define OPENTHREAD_CONFIG_ENABLE_TIME_SYNC 0 +#define OPENTHREAD_CONFIG_ENABLE_TIME_SYNC 0 #endif /** @@ -229,7 +229,7 @@ * */ #ifndef OPENTHREAD_CONFIG_CLI_UART_TX_BUFFER_SIZE -#define OPENTHREAD_CONFIG_CLI_UART_TX_BUFFER_SIZE 2048 +#define OPENTHREAD_CONFIG_CLI_UART_TX_BUFFER_SIZE 2048 #endif /** @@ -243,7 +243,7 @@ * */ #if OPENTHREAD_CONFIG_ENABLE_TIME_SYNC -#define OPENTHREAD_CONFIG_HEADER_IE_SUPPORT 1 +#define OPENTHREAD_CONFIG_HEADER_IE_SUPPORT 1 #endif /** @@ -256,9 +256,9 @@ * */ #if OPENTHREAD_ENABLE_COMMISSIONER || OPENTHREAD_ENABLE_JOINER || OPENTHREAD_CONFIG_HEADER_IE_SUPPORT -#define NRF_MBEDTLS_AES_ALT_INTERRUPT_CONTEXT 1 +#define NRF_MBEDTLS_AES_ALT_INTERRUPT_CONTEXT 1 #else -#define NRF_MBEDTLS_AES_ALT_INTERRUPT_CONTEXT 0 +#define NRF_MBEDTLS_AES_ALT_INTERRUPT_CONTEXT 0 #endif /*