wireless/ieee802154: Updates configuration settings

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

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