Merge pull request #1846 from thomaseichinger/at86rf23x

drivers/at86rf231: refactoring of the at86rf231 radio driver
RIOT-OS · Oct 31, 2014 · fce3a22 · fce3a22
2 parents bc37cbe + 9e2cfdc
commit fce3a22
Show file tree

Hide file tree

Showing 18 changed files with 1,658 additions and 144 deletions.
diff --git a/Makefile.dep b/Makefile.dep
@@ -76,9 +76,8 @@ ifneq (,$(filter cc2420,$(USEMODULE)))
 endif
 
 ifneq (,$(filter at86rf231,$(USEMODULE)))
-	USEMODULE += transceiver
+	USEMODULE += netdev_802154
 	USEMODULE += ieee802154
-	USEMODULE += vtimer
 endif
 
 ifneq (,$(filter vtimer,$(USEMODULE)))
@@ -95,6 +94,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/iot-lab_M3/Makefile.dep b/boards/iot-lab_M3/Makefile.dep
@@ -1,4 +1,6 @@
 ifneq (,$(filter defaulttransceiver,$(USEMODULE)))
     USEMODULE += at86rf231
-    USEMODULE += transceiver
+    ifeq (,$(filter netdev_base,$(USEMODULE)))
+        USEMODULE += transceiver
+    endif
 endif
diff --git a/drivers/Makefile b/drivers/Makefile
@@ -52,5 +52,8 @@ endif
 ifneq (,$(filter lps331ap,$(USEMODULE)))
     DIRS += lps331ap
 endif
+ifneq (,$(filter netdev_802154,$(USEMODULE)))
+    DIRS += netdev/802154
+endif
 
 include $(RIOTBASE)/Makefile.base