Skip to content

Commit

Permalink
drivers: Make general IEEE 802.15.4 driver part of netdev
Browse files Browse the repository at this point in the history
  • Loading branch information
miri64 committed Oct 16, 2014
1 parent 0812d47 commit 4c8e20a
Show file tree
Hide file tree
Showing 16 changed files with 1,327 additions and 566 deletions.
6 changes: 5 additions & 1 deletion Makefile.dep
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ ifneq (,$(filter cc110x_ng,$(USEMODULE)))
endif

ifneq (,$(filter cc2420,$(USEMODULE)))
USEMODULE += transceiver
USEMODULE += netdev_802154
USEMODULE += ieee802154
endif

Expand All @@ -95,6 +95,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
Expand Down
6 changes: 4 additions & 2 deletions boards/telosb/Makefile.include
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 4 additions & 2 deletions boards/wsn430-v1_4/Makefile.dep
Original file line number Diff line number Diff line change
@@ -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
10 changes: 4 additions & 6 deletions boards/z1/Makefile.include
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions drivers/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,8 @@ endif
ifneq (,$(filter isl29020,$(USEMODULE)))
DIRS += isl29020
endif
ifneq (,$(filter netdev_802154,$(USEMODULE)))
DIRS += netdev/802154
endif

include $(RIOTBASE)/Makefile.base
Loading

0 comments on commit 4c8e20a

Please sign in to comment.