Put 6LoWPAN border router in its own module

2014-02-16 16:08:48 +01:00 · 2014-02-16 16:08:48 +01:00 · 4e39cbdd54
parent 90e946eb49
commit 4e39cbdd54
9 changed files with 12 additions and 1 deletions
--- a/Makefile.dep
+++ b/Makefile.dep
@ -79,6 +79,12 @@ ifneq (,$(filter destiny,$(USEMODULE)))
 	endif
 endif

+ifneq (,$(filter sixlowborder,$(USEMODULE)))
+	ifeq (,$(filter sixlowpan,$(USEMODULE)))
+		USEMODULE += sixlowpan
+	endif
+endif
+
 ifneq (,$(filter sixlowpan,$(USEMODULE)))
 	ifeq (,$(filter ieee802154,$(USEMODULE)))
 		USEMODULE += ieee802154
--- a/sys/Makefile
+++ b/sys/Makefile
@ -57,6 +57,9 @@ endif
 ifneq (,$(filter sixlowpan,$(USEMODULE)))
    DIRS += net/network_layer/sixlowpan
 endif
+ifneq (,$(filter sixlowborder,$(USEMODULE)))
+    DIRS += net/network_layer/sixlowpan/border
+endif
 ifneq (,$(filter rpl,$(USEMODULE)))
    DIRS += net/routing/rpl
 endif
--- a/sys/net/network_layer/sixlowpan/border/border.c
+++ b/sys/net/network_layer/sixlowpan/border/border.c
--- a/sys/net/network_layer/sixlowpan/border/border.h
+++ b/sys/net/network_layer/sixlowpan/border/border.h
--- a/sys/net/network_layer/sixlowpan/border/bordermultiplex.c
+++ b/sys/net/network_layer/sixlowpan/border/bordermultiplex.c
--- a/sys/net/network_layer/sixlowpan/border/bordermultiplex.h
+++ b/sys/net/network_layer/sixlowpan/border/bordermultiplex.h
--- a/sys/net/network_layer/sixlowpan/border/flowcontrol.c
+++ b/sys/net/network_layer/sixlowpan/border/flowcontrol.c
--- a/sys/net/network_layer/sixlowpan/border/flowcontrol.h
+++ b/sys/net/network_layer/sixlowpan/border/flowcontrol.h
--- a/sys/net/network_layer/sixlowpan/lowpan.c
+++ b/sys/net/network_layer/sixlowpan/lowpan.c
@ -36,7 +36,9 @@
 #include "sixlowpan/ndp.h"

 #include "lowpan.h"
-#include "border.h"
+#ifdef MODULE_SIXLOWBORDER
+#include "border/border.h"
+#endif
 #include "ip.h"
 #include "icmp.h"