Skip to content

Commit

Permalink
net: openthread: enable new CSL and TREL config options
Browse files Browse the repository at this point in the history
Enable new OpenThread configuration options:
- OPENTHREAD_CONFIG_RADIO_LINK_IEEE_802_15_4_ENABLE
- OPENTHREAD_CONFIG_RADIO_LINK_TREL_ENABLE
- OPENTHREAD_CONFIG_CSL_SAMPLE_WINDOW
- OPENTHREAD_CONFIG_CSL_RECEIVE_TIME_AHEAD

Update OPENTHREAD_CONFIG_PLAT_LOG_MACRO_NAME

Signed-off-by: Eduardo Montoya <[email protected]>
  • Loading branch information
edmont authored and carlescufi committed Dec 16, 2020
1 parent 938c895 commit f0379e7
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 8 deletions.
15 changes: 15 additions & 0 deletions subsys/net/l2/openthread/Kconfig.thread
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,18 @@ config OPENTHREAD_MAX_IP_ADDR_PER_CHILD
config OPENTHREAD_CONFIG_PLATFORM_INFO
string "The platform-specific string to insert into the OpenThread version string"
default "Zephyr"

config OPENTHREAD_RADIO_LINK_IEEE_802_15_4_ENABLE
bool "Enable support for IEEE802.15.4 radio link"
default y

config OPENTHREAD_RADIO_LINK_TREL_ENABLE
bool "Thread Radio Encapsulation Link (TREL)"

config OPENTHREAD_CSL_SAMPLE_WINDOW
int "CSL sample window in units of 10 symbols"
default 30

config OPENTHREAD_CSL_RECEIVE_TIME_AHEAD
int "CSL receiver wake up margin in units of 10 symbols"
default 3
62 changes: 54 additions & 8 deletions subsys/net/lib/openthread/platform/openthread-core-zephyr-config.h
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
#endif

/**
* @def OPENTHREAD_CONFIG_PLAT_LOG_FUNCTION
* @def OPENTHREAD_CONFIG_PLAT_LOG_MACRO_NAME
*
* The platform logging function for openthread.
*
Expand All @@ -195,7 +195,7 @@
_OT_CONF_PLAT_LOG_FUN_NARGS__IMPL(__VA_ARGS__,\
15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, ~)

#define OPENTHREAD_CONFIG_PLAT_LOG_FUNCTION__COUNT_ARGS(aLogLevel, unused, \
#define OPENTHREAD_CONFIG_PLAT_LOG_MACRO_NAME__COUNT_ARGS(aLogLevel, unused, \
aFormat, ...) \
do { \
ARG_UNUSED(unused); \
Expand All @@ -205,12 +205,58 @@
aFormat, ##__VA_ARGS__); \
} while (false)

#ifdef OPENTHREAD_CONFIG_PLAT_LOG_FUNCTION
#error OPENTHREAD_CONFIG_PLAT_LOG_FUNCTION \
"OPENTHREAD_CONFIG_PLAT_LOG_FUNCTION mustn't be defined before"
#ifdef OPENTHREAD_CONFIG_PLAT_LOG_MACRO_NAME
#error OPENTHREAD_CONFIG_PLAT_LOG_MACRO_NAME \
"OPENTHREAD_CONFIG_PLAT_LOG_MACRO_NAME mustn't be defined before"
#endif

#define OPENTHREAD_CONFIG_PLAT_LOG_FUNCTION \
OPENTHREAD_CONFIG_PLAT_LOG_FUNCTION__COUNT_ARGS
#define OPENTHREAD_CONFIG_PLAT_LOG_MACRO_NAME \
OPENTHREAD_CONFIG_PLAT_LOG_MACRO_NAME__COUNT_ARGS

#endif /* OPENTHREAD_CORE_NRF52840_CONFIG_H_ */
/**
* @def OPENTHREAD_CONFIG_RADIO_LINK_IEEE_802_15_4_ENABLE
*
* Set to 1 to enable support for IEEE802.15.4 radio link.
*
*/
#ifdef CONFIG_OPENTHREAD_RADIO_LINK_IEEE_802_15_4_ENABLE
#define OPENTHREAD_CONFIG_RADIO_LINK_IEEE_802_15_4_ENABLE \
CONFIG_OPENTHREAD_RADIO_LINK_IEEE_802_15_4_ENABLE
#endif /* CONFIG_OPENTHREAD_RADIO_LINK_IEEE_802_15_4_ENABLE */

/**
* @def OPENTHREAD_CONFIG_RADIO_LINK_TREL_ENABLE
*
* Set to 1 to enable support for Thread Radio Encapsulation Link (TREL).
*
*/
#ifdef CONFIG_OPENTHREAD_RADIO_LINK_TREL_ENABLE
#define OPENTHREAD_CONFIG_RADIO_LINK_TREL_ENABLE \
CONFIG_OPENTHREAD_RADIO_LINK_TREL_ENABLE
#endif /* CONFIG_OPENTHREAD_RADIO_LINK_TREL_ENABLE */

/**
* @def OPENTHREAD_CONFIG_CSL_SAMPLE_WINDOW
*
* CSL sample window in units of 10 symbols.
*
*/
#ifdef CONFIG_OPENTHREAD_CSL_SAMPLE_WINDOW
#define OPENTHREAD_CONFIG_CSL_SAMPLE_WINDOW \
CONFIG_OPENTHREAD_CSL_SAMPLE_WINDOW
#endif /* CONFIG_OPENTHREAD_CSL_SAMPLE_WINDOW */

/**
* @def OPENTHREAD_CONFIG_CSL_RECEIVE_TIME_AHEAD
*
* For some reasons, CSL receivers wake up a little later than expected. This
* variable specifies how much time that CSL receiver would wake up earlier
* than the expected sample window. The time is in unit of 10 symbols.
*
*/
#ifdef CONFIG_OPENTHREAD_CSL_RECEIVE_TIME_AHEAD
#define OPENTHREAD_CONFIG_CSL_RECEIVE_TIME_AHEAD \
CONFIG_OPENTHREAD_CSL_RECEIVE_TIME_AHEAD
#endif /* CONFIG_OPENTHREAD_CSL_RECEIVE_TIME_AHEAD */

#endif /* OPENTHREAD_CORE_ZEPHYR_CONFIG_H_ */

0 comments on commit f0379e7

Please sign in to comment.