drivers: Make general IEEE 802.15.4 driver part of netdev

RIOT-OS · Oct 3, 2014 · 56fd960 · 56fd960
1 parent 49364da
commit 56fd960
Show file tree

Hide file tree

Showing 16 changed files with 1,283 additions and 567 deletions.
diff --git a/Makefile.dep b/Makefile.dep
@@ -72,7 +72,7 @@ ifneq (,$(filter cc110x_ng,$(USEMODULE)))
 endif
 
 ifneq (,$(filter cc2420,$(USEMODULE)))
-	USEMODULE += transceiver
+	USEMODULE += netdev_802154
 	USEMODULE += ieee802154
 endif
 
@@ -96,6 +96,10 @@ ifneq (,$(filter ccn_lite,$(USEMODULE)))
 	USEMODULE += crypto
 endif
 
+ifneq (,$(filter netdev_802154,$(USEMODULE)))
+	USEMODULE += netdev_base
+endif
+
 ifneq (,$(filter rgbled,$(USEMODULE)))
 	USEMODULE += color
 endif

diff --git a/boards/telosb/Makefile.include b/boards/telosb/Makefile.include
@@ -26,8 +26,10 @@ export INCLUDES += -I$(RIOTCPU)/msp430-common/include -I$(RIOTBOARD)/$(BOARD)/in
 export OFLAGS = -O ihex
 
 ifneq (,$(filter defaulttransceiver,$(USEMODULE)))
-	USEMODULE += cc2420
-	USEMODULE += transceiver
+    USEMODULE += cc2420
+    ifeq (,$(filter netdev_base,$(USEMODULE)))
+        USEMODULE += transceiver
+    endif
 endif
 
 export UNDEF += $(BINDIR)msp430_common/startup.o
diff --git a/boards/wsn430-v1_4/Makefile.dep b/boards/wsn430-v1_4/Makefile.dep
@@ -1,6 +1,8 @@
 USEMODULE += msp430_common
 
 ifneq (,$(filter defaulttransceiver,$(USEMODULE)))
-	USEMODULE += cc2420
-	USEMODULE += transceiver
+    USEMODULE += cc2420
+    ifeq (,$(filter netdev_base,$(USEMODULE)))
+        USEMODULE += transceiver
+    endif
 endif
diff --git a/boards/z1/Makefile.include b/boards/z1/Makefile.include
@@ -26,12 +26,10 @@ export TERMFLAGS += -p "$(PORT)"
 export INCLUDES += -I $(RIOTCPU)/msp430-common/include -I$(RIOTBOARD)/$(BOARD)/include -I$(RIOTBASE)/drivers/cc2420/include -I$(RIOTBASE)/sys/net/include
 
 ifneq (,$(filter defaulttransceiver,$(USEMODULE)))
-	ifeq (,$(filter cc2240,$(USEMODULE)))
-		USEMODULE += cc2420
-	endif
-	ifeq (,$(filter transceiver,$(USEMODULE)))
-		USEMODULE += transceiver
-	endif
+    USEMODULE += cc2420
+    ifeq (,$(filter netdev_base,$(USEMODULE)))
+        USEMODULE += transceiver
+    endif
 endif
 
 export UNDEF += $(BINDIR)msp430_common/startup.o
diff --git a/drivers/Makefile b/drivers/Makefile
@@ -43,5 +43,8 @@ endif
 ifneq (,$(filter netdev_base,$(USEMODULE)))
     DIRS += netdev/base
 endif
+ifneq (,$(filter netdev_802154,$(USEMODULE)))
+    DIRS += netdev/802154
+endif
 
 include $(RIOTBASE)/Makefile.base