michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: 15.4: nrf5: Add OpenThread support to 802.15.4 driver

Browse source 
Initially add support for OpenThread only for nRF 802.15.4 radio driver.

Signed-off-by: Kamil Sroka <kamil.sroka@nordicsemi.no>
This commit is contained in:
Kamil Sroka 2018-01-15 11:39:54 +01:00 • committed by Anas Nashif
commit 32907813b9
3 changed files with 35 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
drivers/ieee802154/CMakeLists.txt
View file

@ -4,3 +4,12 @@ zephyr_sources_ifdef(CONFIG_IEEE802154_UPIPE ieee802154_uart_pipe.c)
zephyr_sources_ifdef(CONFIG_IEEE802154_MCR20A ieee802154_mcr20a.c)
zephyr_sources_ifdef(CONFIG_IEEE802154_NRF5 ieee802154_nrf5.c)
zephyr_sources_ifdef(CONFIG_IEEE802154_CC1200 ieee802154_cc1200.c)
if(CONFIG_NET_L2_OPENTHREAD)
# This driver calls DEVICE_INIT with the context of openthread. The
# context of openthread is defined in one of OpenThread's header
# files so we need express that this driver depends on OpenThread
# being downloaded to make sure that we don't build this driver
# before all of it's header file dependencies are met.
add_dependencies(${ZEPHYR_CURRENT_LIBRARY} ot)
endif()

2
drivers/ieee802154/Kconfig
View file

@ -12,7 +12,7 @@
menuconfig IEEE802154
bool "IEEE 802.15.4 drivers options"
default n
default y if NET_L2_IEEE802154
default y if NET_L2_IEEE802154 || NET_L2_OPENTHREAD
if IEEE802154

34
drivers/ieee802154/ieee802154_nrf5.c
View file

@ -21,6 +21,10 @@
#include <net/net_if.h>
#include <net/net_pkt.h>
#if defined(CONFIG_NET_L2_OPENTHREAD)
#include <net/openthread.h>
#endif
#include <misc/byteorder.h>
#include <string.h>
#include <random/rand32.h>
@ -90,7 +94,9 @@ static void nrf5_rx_thread(void *arg1, void *arg2, void *arg3)
* The last 2 bytes contain LQI or FCS, depending if
* automatic CRC handling is enabled or not, respectively.
*/
if (IS_ENABLED(CONFIG_IEEE802154_RAW_MODE)) {
if (IS_ENABLED(CONFIG_IEEE802154_RAW_MODE) ||
IS_ENABLED(CONFIG_NET_L2_OPENTHREAD)) {
pkt_len = nrf5_radio->rx_psdu[0];
} else {
pkt_len = nrf5_radio->rx_psdu[0] - NRF5_FCS_LENGTH;
@ -423,20 +429,30 @@ static struct ieee802154_radio_api nrf5_radio_api = {
.tx = nrf5_tx,
};
#if defined(CONFIG_IEEE802154_RAW_MODE)
DEVICE_AND_API_INIT(nrf5_154_radio, CONFIG_IEEE802154_NRF5_DRV_NAME,
nrf5_init, &nrf5_data, &nrf5_radio_cfg,
POST_KERNEL, CONFIG_IEEE802154_NRF5_INIT_PRIO,
&nrf5_radio_api);
#else
#if defined(CONFIG_NET_L2_IEEE802154)
#define L2 IEEE802154_L2
#define L2_CTX_TYPE NET_L2_GET_CTX_TYPE(IEEE802154_L2)
#define MTU 125
#elif defined(CONFIG_NET_L2_OPENTHREAD)
#define L2 OPENTHREAD_L2
#define L2_CTX_TYPE NET_L2_GET_CTX_TYPE(OPENTHREAD_L2)
#define MTU 1280
#endif
#if defined(CONFIG_NET_L2_IEEE802154) || defined(CONFIG_NET_L2_OPENTHREAD)
NET_DEVICE_INIT(nrf5_154_radio, CONFIG_IEEE802154_NRF5_DRV_NAME,
nrf5_init, &nrf5_data, &nrf5_radio_cfg,
CONFIG_IEEE802154_NRF5_INIT_PRIO,
&nrf5_radio_api, IEEE802154_L2,
NET_L2_GET_CTX_TYPE(IEEE802154_L2), 125);
&nrf5_radio_api, L2,
L2_CTX_TYPE, MTU);
NET_STACK_INFO_ADDR(RX, nrf5_154_radio,
CONFIG_IEEE802154_NRF5_RX_STACK_SIZE,
CONFIG_IEEE802154_NRF5_RX_STACK_SIZE,
nrf5_data.rx_stack, 0);
#else
DEVICE_AND_API_INIT(nrf5_154_radio, CONFIG_IEEE802154_NRF5_DRV_NAME,
nrf5_init, &nrf5_data, &nrf5_radio_cfg,
POST_KERNEL, CONFIG_IEEE802154_NRF5_INIT_PRIO,
&nrf5_radio_api);
#endif