diff --git a/net/ip/Kconfig b/net/ip/Kconfig index 5e8f1e6890a..7d4442b3451 100644 --- a/net/ip/Kconfig +++ b/net/ip/Kconfig @@ -257,6 +257,24 @@ config NETWORKING_WITH_15_4_MAC_CSMA 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 int "Stack size of 802.15.4 RX fiber" depends on NETWORKING_WITH_15_4 diff --git a/net/ip/Makefile b/net/ip/Makefile index a61a480694a..b2b0afc1649 100644 --- a/net/ip/Makefile +++ b/net/ip/Makefile @@ -75,7 +75,6 @@ ifeq ($(CONFIG_NETWORKING_WITH_6LOWPAN),y) ccflags-y += -DSICSLOWPAN_CONF_ENABLE 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/mac/sicslowmac/sicslowmac.o else obj-$(CONFIG_NETWORKING_WITH_15_4) += contiki/mac/framer-nullmac.o \ contiki/mac/nullrdc.o \ @@ -83,6 +82,15 @@ else contiki/sicslowpan/null_fragmentation.o 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 obj-$(CONFIG_NETWORKING_WITH_LOGGING) += contiki/uip-log.o diff --git a/net/ip/contiki/contiki-conf.h b/net/ip/contiki/contiki-conf.h index 1dfb81c9cd3..df63e5e2e13 100644 --- a/net/ip/contiki/contiki-conf.h +++ b/net/ip/contiki/contiki-conf.h @@ -91,7 +91,11 @@ typedef unsigned int uip_stats_t; #endif /* CONFIG_NETWORKING_WITH_15_4_PAN_ID */ #define NETSTACK_CONF_FRAMER framer_802154 #ifdef CONFIG_NETWORKING_WITH_6LOWPAN +#if defined(CONFIG_NETWORKING_WITH_15_4_RDC_SICSLOWMAC) #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 */ #ifdef CONFIG_NETWORKING_WITH_15_4_MAC_NULL #define NETSTACK_CONF_MAC nullmac_driver