michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: 802.15.4: User can select desired RDC plugin

Browse source 
User is able to use either sicslowmac or nullrdc plugin for
RDC (Radio Duty Cycle) layer. Default is sicslowmac.

Change-Id: I51f72f0d5de67a271178b51f29644bea39ffa19f
Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
This commit is contained in:
Jukka Rissanen 2016-03-16 13:23:32 +02:00
commit 5cef4d13eb
3 changed files with 31 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
net/ip/Kconfig
View file

@ -257,6 +257,24 @@ config NETWORKING_WITH_15_4_MAC_CSMA
endchoice endchoice
choice
prompt "802.15.4 RDC Driver"
depends on NETWORKING && NETWORKING_WITH_15_4
help
The 802.15.4 RDC (Radio Duty Cycle) layer can use either
sicslowmac or nullrdc.
config NETWORKING_WITH_15_4_RDC_SICSLOWMAC
bool
prompt "sicslowmac driver"
help
Enable sicslowmac driver.
config NETWORKING_WITH_15_4_RDC_NULL
bool
prompt "nullrdc driver"
help
Enable nullrdc driver.
endchoice
config 15_4_RX_STACK_SIZE config 15_4_RX_STACK_SIZE
int "Stack size of 802.15.4 RX fiber" int "Stack size of 802.15.4 RX fiber"
depends on NETWORKING_WITH_15_4 depends on NETWORKING_WITH_15_4

10
net/ip/Makefile
View file

@ -75,7 +75,6 @@ ifeq ($(CONFIG_NETWORKING_WITH_6LOWPAN),y)
ccflags-y += -DSICSLOWPAN_CONF_ENABLE ccflags-y += -DSICSLOWPAN_CONF_ENABLE
obj-y += contiki/sicslowpan/sicslowpan_compression.o obj-y += contiki/sicslowpan/sicslowpan_compression.o
obj-$(CONFIG_NETWORKING_WITH_15_4) += contiki/sicslowpan/sicslowpan_fragmentation.o obj-$(CONFIG_NETWORKING_WITH_15_4) += contiki/sicslowpan/sicslowpan_fragmentation.o
obj-$(CONFIG_NETWORKING_WITH_15_4) += contiki/mac/sicslowmac/sicslowmac.o
else else
obj-$(CONFIG_NETWORKING_WITH_15_4) += contiki/mac/framer-nullmac.o \ obj-$(CONFIG_NETWORKING_WITH_15_4) += contiki/mac/framer-nullmac.o \
contiki/mac/nullrdc.o \ contiki/mac/nullrdc.o \
@ -83,6 +82,15 @@ else
contiki/sicslowpan/null_fragmentation.o contiki/sicslowpan/null_fragmentation.o
endif endif
# RDC driver
ifeq ($(CONFIG_NETWORKING_WITH_15_4_RDC_SICSLOWMAC),y)
obj-$(CONFIG_NETWORKING_WITH_15_4) += contiki/mac/sicslowmac/sicslowmac.o
else
ifeq ($(CONFIG_NETWORKING_WITH_15_4_RDC_NULL),y)
obj-$(CONFIG_NETWORKING_WITH_15_4) += contiki/mac/nullrdc.o
endif
endif
ccflags-$(CONFIG_NETWORKING_WITH_LOGGING) += -DUIP_CONF_LOGGING=1 ccflags-$(CONFIG_NETWORKING_WITH_LOGGING) += -DUIP_CONF_LOGGING=1
obj-$(CONFIG_NETWORKING_WITH_LOGGING) += contiki/uip-log.o obj-$(CONFIG_NETWORKING_WITH_LOGGING) += contiki/uip-log.o

4
net/ip/contiki/contiki-conf.h
View file

@ -91,7 +91,11 @@ typedef unsigned int uip_stats_t;
#endif /* CONFIG_NETWORKING_WITH_15_4_PAN_ID */ #endif /* CONFIG_NETWORKING_WITH_15_4_PAN_ID */
#define NETSTACK_CONF_FRAMER framer_802154 #define NETSTACK_CONF_FRAMER framer_802154
#ifdef CONFIG_NETWORKING_WITH_6LOWPAN #ifdef CONFIG_NETWORKING_WITH_6LOWPAN
#if defined(CONFIG_NETWORKING_WITH_15_4_RDC_SICSLOWMAC)
#define NETSTACK_CONF_RDC sicslowmac_driver #define NETSTACK_CONF_RDC sicslowmac_driver
#elif defined(CONFIG_NETWORKING_WITH_15_4_RDC_NULL)
#define NETSTACK_CONF_RDC nullrdc_driver
#endif /* RDC driver */
#endif /* CONFIG_NETWORKING_WITH_6LOWPAN */ #endif /* CONFIG_NETWORKING_WITH_6LOWPAN */
#ifdef CONFIG_NETWORKING_WITH_15_4_MAC_NULL #ifdef CONFIG_NETWORKING_WITH_15_4_MAC_NULL
#define NETSTACK_CONF_MAC nullmac_driver #define NETSTACK_CONF_MAC nullmac_driver