Skip to content

Commit

Permalink
Merge pull request #3334 from kaspar030/remove_old_net
Browse files Browse the repository at this point in the history
remove old network stack
  • Loading branch information
OlegHahm committed Aug 6, 2015
2 parents 68d0519 + f9ee9da commit f90032f
Show file tree
Hide file tree
Showing 347 changed files with 76 additions and 53,294 deletions.
107 changes: 4 additions & 103 deletions Makefile.dep
@@ -1,53 +1,3 @@
ifneq (,$(filter libcoap,$(USEPKG)))
USEMODULE += pnet
endif

ifneq (,$(filter pnet,$(USEMODULE)))
USEMODULE += posix
USEMODULE += socket_base
USEMODULE += net_help
endif

ifneq (,$(filter transport_layer,$(USEMODULE)))
USEMODULE += tcp
USEMODULE += udp
endif

ifneq (,$(filter udp,$(USEMODULE)))
USEMODULE += socket_base
endif

ifneq (,$(filter tcp,$(USEMODULE)))
USEMODULE += socket_base
endif

ifneq (,$(filter socket_base,$(USEMODULE)))
USEMODULE += sixlowpan
USEMODULE += net_help
USEMODULE += vtimer
endif

ifneq (,$(filter sixlowborder,$(USEMODULE)))
USEMODULE += sixlowpan
endif

ifneq (,$(filter rpl,$(USEMODULE)))
USEMODULE += trickle
USEMODULE += routing
endif

ifneq (,$(filter routing,$(USEMODULE)))
USEMODULE += sixlowpan
endif

ifneq (,$(filter sixlowpan,$(USEMODULE)))
USEMODULE += ieee802154
USEMODULE += net_help
USEMODULE += net_if
USEMODULE += posix
USEMODULE += vtimer
endif

ifneq (,$(filter ng_netif_default,$(USEMODULE)))
USEMODULE += ng_netif
endif
Expand Down Expand Up @@ -232,14 +182,6 @@ ifneq (,$(filter ng_slip,$(USEMODULE)))
USEMODULE += ng_netbase
endif

ifneq (,$(filter aodvv2,$(USEMODULE)))
USEMODULE += vtimer
USEMODULE += sixlowpan
USEMODULE += oonf_common
USEMODULE += oonf_rfc5444
USEMODULE += fib
endif

ifneq (,$(filter uart0,$(USEMODULE)))
USEMODULE += posix
endif
Expand All @@ -253,51 +195,10 @@ ifneq (,$(filter cbor,$(USEMODULE)))
USEMODULE += net_help
endif

ifneq (,$(filter cc110x%,$(USEMODULE)))
USEMODULE += protocol_multiplex
USEMODULE += vtimer
endif

ifneq (,$(filter cc110x,$(USEMODULE)))
USEMODULE += transceiver
endif

ifneq (,$(filter cc110x_legacy,$(USEMODULE)))
USEMODULE += transceiver
endif

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

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

ifneq (,$(filter l2_ping,$(USEMODULE)))
USEMODULE += vtimer
endif

ifneq (,$(filter vtimer,$(USEMODULE)))
USEMODULE += timex
endif

ifneq (,$(filter net_if,$(USEMODULE)))
USEMODULE += transceiver
USEMODULE += net_help
USEMODULE += hashes
endif

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 All @@ -306,10 +207,6 @@ ifneq (,$(filter libfixmath-unittests,$(USEMODULE)))
USEPKG += libfixmath
endif

ifneq (,$(filter defaulttransceiver,$(USEMODULE)))
FEATURES_REQUIRED += transceiver
endif

ifneq (,$(filter nhdp,$(USEMODULE)))
USEMODULE += vtimer
USEMODULE += oonf_common
Expand Down Expand Up @@ -343,6 +240,10 @@ ifneq (,$(filter newlib,$(USEMODULE)))
USEMODULE += uart_stdio
endif

ifneq (,$(filter ng_netdev_eth,$(USEMODULE)))
USEMODULE += ng_pktbuf
endif

ifneq (,$(filter hih6130,$(USEMODULE)))
USEMODULE += vtimer
endif
2 changes: 0 additions & 2 deletions Makefile.pseudomodules
@@ -1,5 +1,3 @@
PSEUDOMODULES += defaulttransceiver
PSEUDOMODULES += transport_layer
PSEUDOMODULES += ng_netif_default
PSEUDOMODULES += ng_ieee802154
PSEUDOMODULES += ng_ipv6_default
Expand Down
9 changes: 2 additions & 7 deletions README.md
Expand Up @@ -40,9 +40,9 @@ Its features comprise
* the native port allows to run RIOT as-is on Linux, BSD, and MacOS. Multiple instances of RIOT running on a single machine can also be interconnected via a simple virtual Ethernet bridge
* Wiselib support (C++ algorithm library, including routing, clustering, timesync, localization, security and more algorithms)
* IPv6
* TCP and UDP
* UDP
* 6LoWPAN
* AODVv2, NHDP, RPL
* NHDP

## GETTING STARTED
* You want to start the RIOT? Just follow our [Getting started documentation](https://github.com/RIOT-OS/RIOT/wiki/Introduction)
Expand All @@ -58,11 +58,6 @@ There is a shellscript in `RIOT/cpu/native` called `tapsetup.sh` which you can u
To create a bridge and two (or count at your option) tap interfaces:
./tapsetup.sh create [count]

### EXAMPLE APPLICATIONS
In the `examples` directory you can find some example applications. The `default` application demonstrates all available features for the current platform.

For example, you can use it to the test the native networking by running two instances: `make term PORT=tap0` and `make term PORT=tap1`. Now configure two different addresses for both RIOT instances by typing `addr 1` and `addr 2` respectively and send a text message from one "node" to another by typing `txtsnd 2 hello` on the first "node".

## CONTRIBUTE

To contribute something to RIOT, please refer to the [development procedures](https://github.com/RIOT-OS/RIOT/wiki/Development-procedures) and read all notes for best practice.
Expand Down
1 change: 0 additions & 1 deletion boards/avsextrem/Makefile.features
@@ -1,3 +1,2 @@
FEATURES_PROVIDED += transceiver
FEATURES_PROVIDED += periph_rtc
FEATURES_MCU_GROUP = arm7
12 changes: 1 addition & 11 deletions boards/avsextrem/Makefile.include
@@ -1,12 +1,2 @@
export INCLUDES += -I$(RIOTBOARD)/avsextrem/include

ifneq (,$(filter defaulttransceiver,$(USEMODULE)))
USEMODULE += cc110x_legacy
USEMODULE += transceiver
endif

ifneq (,$(filter cc110x_legacy_csma,$(USEMODULE)))
INCLUDES += -I$(RIOTBASE)/sys/net/include
endif

export INCLUDES += -I$(RIOTCPU)/$(CPU)/include/ -I$(RIOTBOARD)/$(BOARD)/include/
include $(RIOTBOARD)/msba2-common/Makefile.include

0 comments on commit f90032f

Please sign in to comment.