diff --git a/configs/clicker2-stm32/mrf24j40-radio/defconfig b/configs/clicker2-stm32/mrf24j40-radio/defconfig index e7c649d2c5..b258d177c3 100644 --- a/configs/clicker2-stm32/mrf24j40-radio/defconfig +++ b/configs/clicker2-stm32/mrf24j40-radio/defconfig @@ -16,7 +16,7 @@ CONFIG_HOST_LINUX=y # # Build Configuration # -# CONFIG_APPS_DIR="../apps" +CONFIG_APPS_DIR="../apps" CONFIG_BUILD_FLAT=y # CONFIG_BUILD_2PASS is not set @@ -979,8 +979,7 @@ CONFIG_IOB_NCHAINS=0 # CONFIG_WIRELESS=y CONFIG_WIRELESS_IEEE802154=y -CONFIG_IEEE802154_MAC=y -# CONFIG_IEEE802154_MAC_DEV is not set +CONFIG_IEEE802154_MAC_DEV=y CONFIG_MAC802154_HPWORK=y CONFIG_IEEE802154_NTXDESC=3 CONFIG_IEEE802154_IND_PREALLOC=20 @@ -1163,10 +1162,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024 CONFIG_EXAMPLES_NSH=y CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y # CONFIG_EXAMPLES_NULL is not set -# CONFIG_EXAMPLES_NX is not set # CONFIG_EXAMPLES_NXFFS is not set # CONFIG_EXAMPLES_NXHELLO is not set # CONFIG_EXAMPLES_NXIMAGE is not set +# CONFIG_EXAMPLES_NX is not set # CONFIG_EXAMPLES_NXLINES is not set # CONFIG_EXAMPLES_NXTERM is not set # CONFIG_EXAMPLES_NXTEXT is not set @@ -1371,7 +1370,7 @@ CONFIG_READLINE_ECHO=y # # IEEE 802.15.4 applications # -# CONFIG_IEEE802154_LIBMAC is not set +CONFIG_IEEE802154_LIBMAC=y CONFIG_IEEE802154_LIBUTILS=y CONFIG_IEEE802154_I8SAK=y CONFIG_IEEE802154_I8SAK_PRIORITY=100 diff --git a/configs/clicker2-stm32/src/stm32_mrf24j40.c b/configs/clicker2-stm32/src/stm32_mrf24j40.c index c92b93239b..c89b28b838 100644 --- a/configs/clicker2-stm32/src/stm32_mrf24j40.c +++ b/configs/clicker2-stm32/src/stm32_mrf24j40.c @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/freedom-kl25z/src/stm32_mrf24j40.c + * configs/clicker2-stm32/src/stm32_mrf24j40.c * * Copyright (C) 2017 Gregory Nutt, All rights reserver * Author: Gregory Nutt @@ -220,9 +220,7 @@ static void stm32_enable_irq(FAR const struct mrf24j40_lower_s *lower, static int stm32_mrf24j40_devsetup(FAR struct stm32_priv_s *priv) { FAR struct ieee802154_radio_s *radio; -#ifdef CONFIG_IEEE802154_MAC MACHANDLE mac; -#endif FAR struct spi_dev_s *spi; int ret; @@ -248,7 +246,6 @@ static int stm32_mrf24j40_devsetup(FAR struct stm32_priv_s *priv) return -ENODEV; } -#if defined(CONFIG_IEEE802154_MAC) /* Create a 802.15.4 MAC device from a 802.15.4 compatible radio device. */ mac = mac802154_create(radio); @@ -285,8 +282,6 @@ static int stm32_mrf24j40_devsetup(FAR struct stm32_priv_s *priv) } #endif -#endif /* CONFIG_IEEE802154_MAC */ - return OK; } diff --git a/include/sys/ioctl.h b/include/sys/ioctl.h index 76abe7f01f..ded8c5a659 100644 --- a/include/sys/ioctl.h +++ b/include/sys/ioctl.h @@ -66,11 +66,9 @@ #ifdef CONFIG_WIRELESS_IEEE802154 -#ifdef CONFIG_IEEE802154_MAC /* Include ieee802.15.4 MAC IOCTL definitions */ # include -#endif #ifdef CONFIG_IEEE802154_MAC_DEV /* Include ieee802.15.4 character driver IOCTL definitions */ diff --git a/wireless/ieee802154/Kconfig b/wireless/ieee802154/Kconfig index 670ea474f3..9e12f8b1bb 100644 --- a/wireless/ieee802154/Kconfig +++ b/wireless/ieee802154/Kconfig @@ -3,31 +3,22 @@ # see the file kconfig-language.txt in the NuttX tools repository. # -config WIRELESS_IEEE802154 - bool "IEEE 802.15.4 Wireless Support" +menuconfig WIRELESS_IEEE802154 + bool "IEEE 802.15.4 Support" default n select MM_IOB - ---help--- - Enables support for the IEEE 802.14.5 Wireless library. - -if WIRELESS_IEEE802154 - -menuconfig IEEE802154_MAC - bool "Generic Media Access Control (MAC) layer for 802.15.4 radios" - default n - depends on WIRELESS_IEEE802154 + depends on WIRELESS ---help--- Enables a Media Access Controller for any IEEE802.15.4 radio device. This in turn can be used by higher layer entities - such as 6lowpan. It is not required to use 802.15.4 radios, - but is strongly suggested to ensure exchange of valid frames. + such as 6lowpan. -if IEEE802154_MAC +if WIRELESS_IEEE802154 config IEEE802154_MAC_DEV bool "Character driver for IEEE 802.15.4 MAC layer" default n - depends on IEEE802154_MAC + depends on WIRELESS_IEEE802154 ---help--- Enable the device driver to expose the IEEE 802.15.4 MAC layer access to user space as IOCTLs @@ -58,8 +49,6 @@ config IEEE802154_NTXDESC ---help--- Configured number of Tx descriptors. Default: 3 -endif # IEEE802154_MAC - config IEEE802154_IND_PREALLOC int "Number of pre-allocated meta-data structures" default 20 diff --git a/wireless/ieee802154/Make.defs b/wireless/ieee802154/Make.defs index 73354b2609..eedec934eb 100644 --- a/wireless/ieee802154/Make.defs +++ b/wireless/ieee802154/Make.defs @@ -37,22 +37,14 @@ ifeq ($(CONFIG_WIRELESS_IEEE802154),y) # Include IEEE 802.15.4 support -CSRCS += mac802154_indalloc.c +CSRCS += mac802154.c mac802154_indalloc.c # Include wireless devices build support -ifeq ($(CONFIG_IEEE802154_MAC),y) -CSRCS += mac802154.c -endif - ifeq ($(CONFIG_IEEE802154_MAC_DEV),y) CSRCS += mac802154_device.c endif -ifeq ($(CONFIG_IEEE802154_DEV),y) -CSRCS += radio802154_device.c -endif - ifeq ($(CONFIG_IEEE802154_NETDEV),y) CSRCS += mac802154_netdev.c endif