From 8eace27f9b341bc7c83d4f23e50fe19984a3edaa Mon Sep 17 00:00:00 2001 From: Adam Dunkels Date: Thu, 12 Dec 2013 20:50:07 +0100 Subject: [PATCH] Moved net/rime.h to net/rime/rime.h --- apps/collect-view/collect-view.c | 2 +- apps/deluge/deluge.c | 2 +- apps/deluge/deluge.h | 2 +- apps/powertrace/powertrace.c | 2 +- apps/serial-shell/serial-shell.c | 2 +- apps/shell/shell-download.c | 2 +- apps/shell/shell-netfile.c | 2 +- apps/shell/shell-netperf.c | 2 +- apps/shell/shell-rime-debug-runicast.c | 2 +- apps/shell/shell-rime-debug.c | 2 +- apps/shell/shell-rime-neighbors.c | 2 +- apps/shell/shell-rime-netcmd.c | 2 +- apps/shell/shell-rime-ping.c | 2 +- apps/shell/shell-rime-sendcmd.c | 2 +- apps/shell/shell-rime-sniff.c | 2 +- apps/shell/shell-rime-unicast.c | 2 +- apps/shell/shell-rime.c | 2 +- apps/shell/shell-rsh.c | 2 +- apps/shell/shell-sendtest.c | 2 +- apps/shell/shell-sky.c | 2 +- apps/shell/shell.c | 2 +- core/contiki-net.h | 2 +- core/lib/print-stats.c | 2 +- core/net/ipv4/uip-over-mesh.h | 2 +- core/net/ipv6/sicslowpan.c | 2 +- core/net/mac/contikimac/contikimac.c | 2 +- core/net/mac/cxmac/cxmac.c | 2 +- core/net/mac/mac-sequence.c | 2 +- core/net/packetbuf.c | 2 +- core/net/rime/abc.c | 2 +- core/net/rime/broadcast-announcement.c | 2 +- core/net/rime/chameleon-bitopt.c | 2 +- core/net/rime/chameleon-raw.c | 2 +- core/net/rime/chameleon.c | 2 +- core/net/rime/channel.c | 2 +- core/net/rime/collect.c | 2 +- core/net/rime/ipolite.c | 2 +- core/net/rime/mesh.c | 2 +- core/net/rime/multihop.c | 2 +- core/net/rime/neighbor-discovery.c | 2 +- core/net/rime/polite-announcement.c | 2 +- core/net/rime/polite.c | 2 +- core/net/rime/rime.c | 2 +- core/net/{ => rime}/rime.h | 0 core/net/rime/rmh.c | 2 +- core/net/rime/route-discovery.c | 2 +- core/net/rime/rucb.c | 2 +- core/net/rime/rudolph0.c | 2 +- core/net/rime/rudolph1.c | 2 +- core/net/rime/rudolph2.c | 2 +- core/net/rime/runicast.c | 2 +- core/net/rime/stbroadcast.c | 2 +- core/net/rime/stunicast.c | 2 +- core/net/rime/timesynch.c | 2 +- core/net/rime/unicast.c | 2 +- examples/antelope/netdb/netdb-client.c | 2 +- examples/antelope/netdb/netdb-server.c | 2 +- examples/example-shell/example-shell.c | 2 +- examples/powertrace/example-powertrace.c | 2 +- examples/rime/example-abc.c | 2 +- examples/rime/example-announcement.c | 2 +- examples/rime/example-broadcast.c | 2 +- examples/rime/example-collect.c | 2 +- examples/rime/example-mesh.c | 2 +- examples/rime/example-multihop.c | 2 +- examples/rime/example-neighbors.c | 2 +- examples/rime/example-rudolph2.c | 2 +- examples/rime/example-runicast.c | 2 +- examples/rime/example-unicast.c | 2 +- examples/sensinode/broadcast-rime.c | 2 +- examples/sensinode/cc2431-location-engine/blind-node.c | 2 +- examples/sensinode/sensors/sensors-example.c | 2 +- examples/sky-ip/sky-telnet-server.c | 2 +- examples/sky-ip/telnet-webserver.c | 2 +- examples/sky-ip/telnet.c | 2 +- examples/sky-shell-exec/sky-shell-exec.c | 2 +- examples/sky-shell/sky-shell.c | 2 +- examples/sky/radio-test.c | 2 +- examples/sky/rssi-scanner.c | 2 +- examples/sky/sky-collect.c | 2 +- examples/z1/rssi_scanner/rssi-scanner.c | 2 +- examples/z1/tutorials/example-unicast-temp.c | 2 +- examples/z1/tutorials/example-unicast2.c | 2 +- platform/avr-atmega128rfa1/contiki-main.c | 2 +- platform/avr-raven/contiki-raven-main.c | 2 +- platform/avr-ravenusb/sicslow_ethernet.c | 2 +- platform/cc2530dk/contiki-main.c | 2 +- platform/cooja/contiki-cooja-main.c | 2 +- platform/exp5438/contiki-exp5438-main.c | 2 +- platform/iris/contiki-iris-main.c | 2 +- platform/mbxxx/contiki-main.c | 2 +- platform/micaz/contiki-micaz-main.c | 2 +- platform/native/contiki-main.c | 2 +- platform/sensinode/contiki-sensinode-main.c | 2 +- platform/sky/contiki-sky-main.c | 2 +- platform/wismote/contiki-wismote-main.c | 2 +- platform/z1/contiki-z1-main.c | 2 +- tools/sky/uip6-bridge/sicslow_ethernet.c | 2 +- tools/stm32w/uip6_bridge/sicslow_ethernet.c | 2 +- 99 files changed, 98 insertions(+), 98 deletions(-) rename core/net/{ => rime}/rime.h (100%) diff --git a/apps/collect-view/collect-view.c b/apps/collect-view/collect-view.c index aa3d1e2c7..8491e6c05 100644 --- a/apps/collect-view/collect-view.c +++ b/apps/collect-view/collect-view.c @@ -39,7 +39,7 @@ #include "contiki.h" #include "net/rime/collect-neighbor.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/timesynch.h" #include "collect-view.h" diff --git a/apps/deluge/deluge.c b/apps/deluge/deluge.c index 686d4a514..05027b281 100644 --- a/apps/deluge/deluge.c +++ b/apps/deluge/deluge.c @@ -41,7 +41,7 @@ */ #include "contiki.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "cfs/cfs.h" #include "loader/elfloader.h" #include "lib/crc16.h" diff --git a/apps/deluge/deluge.h b/apps/deluge/deluge.h index b0de04a95..6aa31e81f 100644 --- a/apps/deluge/deluge.h +++ b/apps/deluge/deluge.h @@ -40,7 +40,7 @@ #ifndef DELUGE_H #define DELUGE_H -#include "net/rime.h" +#include "net/rime/rime.h" PROCESS_NAME(deluge_process); diff --git a/apps/powertrace/powertrace.c b/apps/powertrace/powertrace.c index 9c2c2cbff..4e43acb0f 100644 --- a/apps/powertrace/powertrace.c +++ b/apps/powertrace/powertrace.c @@ -41,7 +41,7 @@ #include "contiki-lib.h" #include "sys/compower.h" #include "powertrace.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include #include diff --git a/apps/serial-shell/serial-shell.c b/apps/serial-shell/serial-shell.c index 024f2405a..a3aef3745 100644 --- a/apps/serial-shell/serial-shell.c +++ b/apps/serial-shell/serial-shell.c @@ -45,7 +45,7 @@ #include "shell.h" #include "dev/serial-line.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include #include diff --git a/apps/shell/shell-download.c b/apps/shell/shell-download.c index 82bb157f4..a49f6b633 100644 --- a/apps/shell/shell-download.c +++ b/apps/shell/shell-download.c @@ -41,7 +41,7 @@ #include "contiki.h" #include "shell.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "cfs/cfs.h" #include "dev/leds.h" diff --git a/apps/shell/shell-netfile.c b/apps/shell/shell-netfile.c index 75e8e30a7..45c303974 100644 --- a/apps/shell/shell-netfile.c +++ b/apps/shell/shell-netfile.c @@ -39,7 +39,7 @@ #include "contiki.h" #include "shell-netfile.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/rudolph0.h" #include "dev/leds.h" diff --git a/apps/shell/shell-netperf.c b/apps/shell/shell-netperf.c index 1fa4643e2..b9a7cf0b0 100644 --- a/apps/shell/shell-netperf.c +++ b/apps/shell/shell-netperf.c @@ -39,7 +39,7 @@ #include "contiki.h" #include "shell-netperf.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "contiki-conf.h" #include diff --git a/apps/shell/shell-rime-debug-runicast.c b/apps/shell/shell-rime-debug-runicast.c index 1ab08cc23..2de2bb468 100644 --- a/apps/shell/shell-rime-debug-runicast.c +++ b/apps/shell/shell-rime-debug-runicast.c @@ -45,7 +45,7 @@ #include "lib/random.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/route.h" #include "net/rime/trickle.h" diff --git a/apps/shell/shell-rime-debug.c b/apps/shell/shell-rime-debug.c index fd83c0723..b034a0f1f 100644 --- a/apps/shell/shell-rime-debug.c +++ b/apps/shell/shell-rime-debug.c @@ -45,7 +45,7 @@ #include "lib/random.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/route.h" #include "net/rime/trickle.h" diff --git a/apps/shell/shell-rime-neighbors.c b/apps/shell/shell-rime-neighbors.c index 85b048805..8ac97cec4 100644 --- a/apps/shell/shell-rime-neighbors.c +++ b/apps/shell/shell-rime-neighbors.c @@ -39,7 +39,7 @@ #include #include "shell.h" -#include "net/rime.h" +#include "net/rime/rime.h" PROCESS(shell_neighbors_process, "neighbors"); SHELL_COMMAND(neighbors_command, diff --git a/apps/shell/shell-rime-netcmd.c b/apps/shell/shell-rime-netcmd.c index 763088091..08acc2ed1 100644 --- a/apps/shell/shell-rime-netcmd.c +++ b/apps/shell/shell-rime-netcmd.c @@ -46,7 +46,7 @@ #include "lib/crc16.h" #include "lib/random.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/route.h" #include "net/rime/trickle.h" diff --git a/apps/shell/shell-rime-ping.c b/apps/shell/shell-rime-ping.c index d146c8cda..e0af535a2 100644 --- a/apps/shell/shell-rime-ping.c +++ b/apps/shell/shell-rime-ping.c @@ -39,7 +39,7 @@ #include "shell.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include #include diff --git a/apps/shell/shell-rime-sendcmd.c b/apps/shell/shell-rime-sendcmd.c index 80a427cbc..70d18727e 100644 --- a/apps/shell/shell-rime-sendcmd.c +++ b/apps/shell/shell-rime-sendcmd.c @@ -39,7 +39,7 @@ #include "lib/crc16.h" #include "lib/random.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/unicast.h" #include "net/rime/timesynch.h" diff --git a/apps/shell/shell-rime-sniff.c b/apps/shell/shell-rime-sniff.c index 44cb82c63..9e9e2a9fb 100644 --- a/apps/shell/shell-rime-sniff.c +++ b/apps/shell/shell-rime-sniff.c @@ -38,7 +38,7 @@ */ #include "shell.h" -#include "net/rime.h" +#include "net/rime/rime.h" static uint8_t sniff_for_attributes; diff --git a/apps/shell/shell-rime-unicast.c b/apps/shell/shell-rime-unicast.c index 16d44fc72..8d377ef8b 100644 --- a/apps/shell/shell-rime-unicast.c +++ b/apps/shell/shell-rime-unicast.c @@ -45,7 +45,7 @@ #include "lib/random.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/route.h" #include "net/rime/trickle.h" diff --git a/apps/shell/shell-rime.c b/apps/shell/shell-rime.c index 0d20b774f..07a68bf67 100644 --- a/apps/shell/shell-rime.c +++ b/apps/shell/shell-rime.c @@ -46,7 +46,7 @@ #include "lib/crc16.h" #include "lib/random.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/netstack.h" #include "net/rime/route.h" diff --git a/apps/shell/shell-rsh.c b/apps/shell/shell-rsh.c index e74d882c9..31d778da8 100644 --- a/apps/shell/shell-rsh.c +++ b/apps/shell/shell-rsh.c @@ -40,7 +40,7 @@ #include "contiki.h" #include "shell.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/meshconn.h" #include diff --git a/apps/shell/shell-sendtest.c b/apps/shell/shell-sendtest.c index e518fbc77..1fa28b3b4 100644 --- a/apps/shell/shell-sendtest.c +++ b/apps/shell/shell-sendtest.c @@ -39,7 +39,7 @@ #include "contiki.h" #include "shell-ps.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include #include diff --git a/apps/shell/shell-sky.c b/apps/shell/shell-sky.c index ad779d268..65c4859ed 100644 --- a/apps/shell/shell-sky.c +++ b/apps/shell/shell-sky.c @@ -42,7 +42,7 @@ #include "dev/watchdog.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/netstack.h" #include "cc2420.h" #include "dev/leds.h" diff --git a/apps/shell/shell.c b/apps/shell/shell.c index 7efecdf5f..fd909c791 100644 --- a/apps/shell/shell.c +++ b/apps/shell/shell.c @@ -45,7 +45,7 @@ #include "contiki.h" #include "contiki-lib.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "shell.h" diff --git a/core/contiki-net.h b/core/contiki-net.h index b733c265e..453b5a468 100644 --- a/core/contiki-net.h +++ b/core/contiki-net.h @@ -54,7 +54,7 @@ #include "net/ip/psock.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/netstack.h" diff --git a/core/lib/print-stats.c b/core/lib/print-stats.c index ce7b0dddf..ac615afbf 100644 --- a/core/lib/print-stats.c +++ b/core/lib/print-stats.c @@ -39,7 +39,7 @@ #include "lib/print-stats.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "sys/energest.h" #include diff --git a/core/net/ipv4/uip-over-mesh.h b/core/net/ipv4/uip-over-mesh.h index 9a217c6c4..c00b54f41 100644 --- a/core/net/ipv4/uip-over-mesh.h +++ b/core/net/ipv4/uip-over-mesh.h @@ -42,7 +42,7 @@ #include "net/ip/uip.h" #include "net/ipv4/uip-fw.h" -#include "net/rime.h" +#include "net/rime/rime.h" void uip_over_mesh_init(uint16_t channels); uint8_t uip_over_mesh_send(void); diff --git a/core/net/ipv6/sicslowpan.c b/core/net/ipv6/sicslowpan.c index 5fb557013..c038c702d 100644 --- a/core/net/ipv6/sicslowpan.c +++ b/core/net/ipv6/sicslowpan.c @@ -63,7 +63,7 @@ #include "net/ip/tcpip.h" #include "net/ip/uip.h" #include "net/ipv6/uip-ds6.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/ipv6/sicslowpan.h" #include "net/netstack.h" diff --git a/core/net/mac/contikimac/contikimac.c b/core/net/mac/contikimac/contikimac.c index d809ded09..67a0d190f 100644 --- a/core/net/mac/contikimac/contikimac.c +++ b/core/net/mac/contikimac/contikimac.c @@ -47,7 +47,7 @@ #include "net/mac/mac-sequence.h" #include "net/mac/contikimac/contikimac.h" #include "net/netstack.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "sys/compower.h" #include "sys/pt.h" #include "sys/rtimer.h" diff --git a/core/net/mac/cxmac/cxmac.c b/core/net/mac/cxmac/cxmac.c index 151604604..8aa55e66b 100644 --- a/core/net/mac/cxmac/cxmac.c +++ b/core/net/mac/cxmac/cxmac.c @@ -45,7 +45,7 @@ #include "net/netstack.h" #include "lib/random.h" #include "net/mac/cxmac/cxmac.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/timesynch.h" #include "sys/compower.h" #include "sys/pt.h" diff --git a/core/net/mac/mac-sequence.c b/core/net/mac/mac-sequence.c index be646607f..a9f73289b 100644 --- a/core/net/mac/mac-sequence.c +++ b/core/net/mac/mac-sequence.c @@ -47,7 +47,7 @@ #include "contiki-net.h" #include "net/mac/mac-sequence.h" #include "net/packetbuf.h" -#include "net/rime.h" +#include "net/rime/rime.h" struct seqno { rimeaddr_t sender; diff --git a/core/net/packetbuf.c b/core/net/packetbuf.c index 82f85377c..9df17ebd2 100644 --- a/core/net/packetbuf.c +++ b/core/net/packetbuf.c @@ -46,7 +46,7 @@ #include "contiki-net.h" #include "net/packetbuf.h" -#include "net/rime.h" +#include "net/rime/rime.h" struct packetbuf_attr packetbuf_attrs[PACKETBUF_NUM_ATTRS]; struct packetbuf_addr packetbuf_addrs[PACKETBUF_NUM_ADDRS]; diff --git a/core/net/rime/abc.c b/core/net/rime/abc.c index 4478b7716..8f9bef65b 100644 --- a/core/net/rime/abc.c +++ b/core/net/rime/abc.c @@ -46,7 +46,7 @@ */ #include "contiki-net.h" -#include "net/rime.h" +#include "net/rime/rime.h" #define DEBUG 0 diff --git a/core/net/rime/broadcast-announcement.c b/core/net/rime/broadcast-announcement.c index e6297225d..89c068139 100644 --- a/core/net/rime/broadcast-announcement.c +++ b/core/net/rime/broadcast-announcement.c @@ -44,7 +44,7 @@ #include "contiki.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/announcement.h" #include "net/rime/broadcast.h" #include "lib/random.h" diff --git a/core/net/rime/chameleon-bitopt.c b/core/net/rime/chameleon-bitopt.c index 278f51611..4b4c2ce65 100644 --- a/core/net/rime/chameleon-bitopt.c +++ b/core/net/rime/chameleon-bitopt.c @@ -38,7 +38,7 @@ #include "net/rime/chameleon.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include diff --git a/core/net/rime/chameleon-raw.c b/core/net/rime/chameleon-raw.c index 20c276f8b..15b12691a 100644 --- a/core/net/rime/chameleon-raw.c +++ b/core/net/rime/chameleon-raw.c @@ -40,7 +40,7 @@ #include #include "net/rime/chameleon.h" -#include "net/rime.h" +#include "net/rime/rime.h" /* This option enables an optimization where the link addresses are left to the MAC RDC and not encoded in the Chameleon header. diff --git a/core/net/rime/chameleon.c b/core/net/rime/chameleon.c index 60ab8763f..8b1033d83 100644 --- a/core/net/rime/chameleon.c +++ b/core/net/rime/chameleon.c @@ -39,7 +39,7 @@ #include "net/rime/chameleon.h" #include "net/rime/channel.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "lib/list.h" #include diff --git a/core/net/rime/channel.c b/core/net/rime/channel.c index 9e8fa7b15..5fd6f259b 100644 --- a/core/net/rime/channel.c +++ b/core/net/rime/channel.c @@ -38,7 +38,7 @@ */ #include "net/rime/chameleon.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "lib/list.h" LIST(channel_list); diff --git a/core/net/rime/collect.c b/core/net/rime/collect.c index d225e1574..8c31584e4 100644 --- a/core/net/rime/collect.c +++ b/core/net/rime/collect.c @@ -44,7 +44,7 @@ #include "contiki.h" #include "net/netstack.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/collect.h" #include "net/rime/collect-neighbor.h" #include "net/rime/collect-link-estimate.h" diff --git a/core/net/rime/ipolite.c b/core/net/rime/ipolite.c index af49ecad5..cd4d6e42b 100644 --- a/core/net/rime/ipolite.c +++ b/core/net/rime/ipolite.c @@ -42,7 +42,7 @@ * Adam Dunkels */ -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/ipolite.h" #include "lib/random.h" diff --git a/core/net/rime/mesh.c b/core/net/rime/mesh.c index f8ea14b51..c4239b2c6 100644 --- a/core/net/rime/mesh.c +++ b/core/net/rime/mesh.c @@ -43,7 +43,7 @@ */ #include "contiki.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/route.h" #include "net/rime/mesh.h" diff --git a/core/net/rime/multihop.c b/core/net/rime/multihop.c index e1215fbee..18aa0b346 100644 --- a/core/net/rime/multihop.c +++ b/core/net/rime/multihop.c @@ -43,7 +43,7 @@ */ #include "contiki.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/multihop.h" #include "net/rime/route.h" diff --git a/core/net/rime/neighbor-discovery.c b/core/net/rime/neighbor-discovery.c index c4e0cddf1..5b02b60c2 100644 --- a/core/net/rime/neighbor-discovery.c +++ b/core/net/rime/neighbor-discovery.c @@ -44,7 +44,7 @@ #include "contiki.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/neighbor-discovery.h" #include "dev/radio-sensor.h" diff --git a/core/net/rime/polite-announcement.c b/core/net/rime/polite-announcement.c index a5c7d9ec3..7fd1d633c 100644 --- a/core/net/rime/polite-announcement.c +++ b/core/net/rime/polite-announcement.c @@ -45,7 +45,7 @@ #include "contiki.h" #include "lib/list.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/announcement.h" #include "net/rime/ipolite.h" diff --git a/core/net/rime/polite.c b/core/net/rime/polite.c index f1cb464b6..2d8ea44bc 100644 --- a/core/net/rime/polite.c +++ b/core/net/rime/polite.c @@ -42,7 +42,7 @@ * Adam Dunkels */ -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/polite.h" #include "lib/random.h" diff --git a/core/net/rime/rime.c b/core/net/rime/rime.c index 49172e57a..8a45e8177 100644 --- a/core/net/rime/rime.c +++ b/core/net/rime/rime.c @@ -51,7 +51,7 @@ #endif #include "net/netstack.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/chameleon.h" #include "net/rime/route.h" #include "net/rime/announcement.h" diff --git a/core/net/rime.h b/core/net/rime/rime.h similarity index 100% rename from core/net/rime.h rename to core/net/rime/rime.h diff --git a/core/net/rime/rmh.c b/core/net/rime/rmh.c index a3a05b457..15000848d 100644 --- a/core/net/rime/rmh.c +++ b/core/net/rime/rmh.c @@ -43,7 +43,7 @@ */ #include "contiki.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/rmh.h" struct data_hdr { diff --git a/core/net/rime/route-discovery.c b/core/net/rime/route-discovery.c index 215b1ae7d..cf72b3992 100644 --- a/core/net/rime/route-discovery.c +++ b/core/net/rime/route-discovery.c @@ -43,7 +43,7 @@ */ #include "contiki.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/route.h" #include "net/rime/route-discovery.h" diff --git a/core/net/rime/rucb.c b/core/net/rime/rucb.c index b0593ddb3..ab9f8ebc4 100644 --- a/core/net/rime/rucb.c +++ b/core/net/rime/rucb.c @@ -38,7 +38,7 @@ */ #include "net/rime/rucb.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include #define MAX_TRANSMISSIONS 8 diff --git a/core/net/rime/rudolph0.c b/core/net/rime/rudolph0.c index d74566360..d1f7d876f 100644 --- a/core/net/rime/rudolph0.c +++ b/core/net/rime/rudolph0.c @@ -44,7 +44,7 @@ #include /* for offsetof */ -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/rudolph0.h" #define STEADY_TIME CLOCK_SECOND * 2 diff --git a/core/net/rime/rudolph1.c b/core/net/rime/rudolph1.c index c195946f5..ffaedbdeb 100644 --- a/core/net/rime/rudolph1.c +++ b/core/net/rime/rudolph1.c @@ -45,7 +45,7 @@ #include #include /* for offsetof */ -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/rudolph1.h" #include "cfs/cfs.h" diff --git a/core/net/rime/rudolph2.c b/core/net/rime/rudolph2.c index 8c0968902..8502f064d 100644 --- a/core/net/rime/rudolph2.c +++ b/core/net/rime/rudolph2.c @@ -51,7 +51,7 @@ #include #include /* for offsetof */ -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/polite.h" #include "net/rime/rudolph2.h" #include "cfs/cfs.h" diff --git a/core/net/rime/runicast.c b/core/net/rime/runicast.c index 88a98c176..575e32546 100644 --- a/core/net/rime/runicast.c +++ b/core/net/rime/runicast.c @@ -44,7 +44,7 @@ */ #include "net/rime/runicast.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include diff --git a/core/net/rime/stbroadcast.c b/core/net/rime/stbroadcast.c index fa56b9bc9..a0a71d18e 100644 --- a/core/net/rime/stbroadcast.c +++ b/core/net/rime/stbroadcast.c @@ -44,7 +44,7 @@ */ #include "net/rime/stbroadcast.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include /*---------------------------------------------------------------------------*/ diff --git a/core/net/rime/stunicast.c b/core/net/rime/stunicast.c index cf3992417..658e0f66c 100644 --- a/core/net/rime/stunicast.c +++ b/core/net/rime/stunicast.c @@ -43,7 +43,7 @@ */ #include "net/rime/stunicast.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include #define DEBUG 0 diff --git a/core/net/rime/timesynch.c b/core/net/rime/timesynch.c index 154ecd822..f0a2980dd 100644 --- a/core/net/rime/timesynch.c +++ b/core/net/rime/timesynch.c @@ -45,7 +45,7 @@ #include "contiki.h" #include "lib/random.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/timesynch.h" #include diff --git a/core/net/rime/unicast.c b/core/net/rime/unicast.c index d2a15fedf..97a1272c1 100644 --- a/core/net/rime/unicast.c +++ b/core/net/rime/unicast.c @@ -43,7 +43,7 @@ * Adam Dunkels */ -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/unicast.h" #include diff --git a/examples/antelope/netdb/netdb-client.c b/examples/antelope/netdb/netdb-client.c index 370a40b02..5e6e808fc 100644 --- a/examples/antelope/netdb/netdb-client.c +++ b/examples/antelope/netdb/netdb-client.c @@ -39,7 +39,7 @@ #include "contiki.h" #include "dev/serial-line.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/mesh.h" #include "antelope.h" diff --git a/examples/antelope/netdb/netdb-server.c b/examples/antelope/netdb/netdb-server.c index 18fe196a8..c498c493f 100644 --- a/examples/antelope/netdb/netdb-server.c +++ b/examples/antelope/netdb/netdb-server.c @@ -41,7 +41,7 @@ #include "dev/serial-line.h" #include "dev/sht11/sht11.h" #include "lib/random.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/mesh.h" #include "antelope.h" diff --git a/examples/example-shell/example-shell.c b/examples/example-shell/example-shell.c index 97943a308..24b7c2a05 100644 --- a/examples/example-shell/example-shell.c +++ b/examples/example-shell/example-shell.c @@ -41,7 +41,7 @@ #include "shell.h" #include "serial-shell.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "dev/leds.h" #include "net/rime/timesynch.h" diff --git a/examples/powertrace/example-powertrace.c b/examples/powertrace/example-powertrace.c index 895c3c7cb..b75d6c83f 100644 --- a/examples/powertrace/example-powertrace.c +++ b/examples/powertrace/example-powertrace.c @@ -38,7 +38,7 @@ */ #include "contiki.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "random.h" #include "powertrace.h" diff --git a/examples/rime/example-abc.c b/examples/rime/example-abc.c index 3a844836e..655be86df 100644 --- a/examples/rime/example-abc.c +++ b/examples/rime/example-abc.c @@ -38,7 +38,7 @@ */ #include "contiki.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "random.h" #include "dev/button-sensor.h" diff --git a/examples/rime/example-announcement.c b/examples/rime/example-announcement.c index 125d69fa0..a1f362614 100644 --- a/examples/rime/example-announcement.c +++ b/examples/rime/example-announcement.c @@ -38,7 +38,7 @@ */ #include "contiki.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/announcement.h" diff --git a/examples/rime/example-broadcast.c b/examples/rime/example-broadcast.c index 07ea2d340..c7321e895 100644 --- a/examples/rime/example-broadcast.c +++ b/examples/rime/example-broadcast.c @@ -38,7 +38,7 @@ */ #include "contiki.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "random.h" #include "dev/button-sensor.h" diff --git a/examples/rime/example-collect.c b/examples/rime/example-collect.c index 6f4953465..a5670e36f 100644 --- a/examples/rime/example-collect.c +++ b/examples/rime/example-collect.c @@ -39,7 +39,7 @@ #include "contiki.h" #include "lib/random.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/collect.h" #include "dev/leds.h" #include "dev/button-sensor.h" diff --git a/examples/rime/example-mesh.c b/examples/rime/example-mesh.c index 4596ca54a..94fe1bce8 100644 --- a/examples/rime/example-mesh.c +++ b/examples/rime/example-mesh.c @@ -38,7 +38,7 @@ */ #include "contiki.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/mesh.h" #include "dev/button-sensor.h" diff --git a/examples/rime/example-multihop.c b/examples/rime/example-multihop.c index fb64b5a81..bffe45c83 100644 --- a/examples/rime/example-multihop.c +++ b/examples/rime/example-multihop.c @@ -71,7 +71,7 @@ */ #include "contiki.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "lib/list.h" #include "lib/memb.h" #include "lib/random.h" diff --git a/examples/rime/example-neighbors.c b/examples/rime/example-neighbors.c index 9126d343b..71d95dc97 100644 --- a/examples/rime/example-neighbors.c +++ b/examples/rime/example-neighbors.c @@ -56,7 +56,7 @@ #include "lib/list.h" #include "lib/memb.h" #include "lib/random.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include diff --git a/examples/rime/example-rudolph2.c b/examples/rime/example-rudolph2.c index e26f7e9ea..d55eda9d4 100644 --- a/examples/rime/example-rudolph2.c +++ b/examples/rime/example-rudolph2.c @@ -38,7 +38,7 @@ */ #include "contiki.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/rudolph2.h" #include "dev/button-sensor.h" diff --git a/examples/rime/example-runicast.c b/examples/rime/example-runicast.c index c0a3b8ec9..a84c7d07e 100644 --- a/examples/rime/example-runicast.c +++ b/examples/rime/example-runicast.c @@ -40,7 +40,7 @@ #include #include "contiki.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "lib/list.h" #include "lib/memb.h" diff --git a/examples/rime/example-unicast.c b/examples/rime/example-unicast.c index 496841ed2..71dbbcbee 100644 --- a/examples/rime/example-unicast.c +++ b/examples/rime/example-unicast.c @@ -38,7 +38,7 @@ */ #include "contiki.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "dev/button-sensor.h" diff --git a/examples/sensinode/broadcast-rime.c b/examples/sensinode/broadcast-rime.c index dd6b96867..bea4a9187 100644 --- a/examples/sensinode/broadcast-rime.c +++ b/examples/sensinode/broadcast-rime.c @@ -37,7 +37,7 @@ * Adam Dunkels */ #include "contiki.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "lib/random.h" #include "net/rime/rimestats.h" #include "dev/leds.h" diff --git a/examples/sensinode/cc2431-location-engine/blind-node.c b/examples/sensinode/cc2431-location-engine/blind-node.c index 7fd40623d..2b6f420ea 100644 --- a/examples/sensinode/cc2431-location-engine/blind-node.c +++ b/examples/sensinode/cc2431-location-engine/blind-node.c @@ -55,7 +55,7 @@ */ #include "contiki.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "cc2431_loc_eng.h" #include "cc2430_sfr.h" diff --git a/examples/sensinode/sensors/sensors-example.c b/examples/sensinode/sensors/sensors-example.c index 9dbba9793..f138916dc 100644 --- a/examples/sensinode/sensors/sensors-example.c +++ b/examples/sensinode/sensors/sensors-example.c @@ -81,7 +81,7 @@ #include "contiki.h" #include "contiki-conf.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "dev/leds.h" #include "dev/watchdog.h" #include "lib/random.h" diff --git a/examples/sky-ip/sky-telnet-server.c b/examples/sky-ip/sky-telnet-server.c index 41324a6b4..71e4c7f95 100644 --- a/examples/sky-ip/sky-telnet-server.c +++ b/examples/sky-ip/sky-telnet-server.c @@ -43,7 +43,7 @@ #include "contiki.h" #include "contiki-net.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include /*---------------------------------------------------------------------------*/ diff --git a/examples/sky-ip/telnet-webserver.c b/examples/sky-ip/telnet-webserver.c index 7678ce06b..994cf221d 100644 --- a/examples/sky-ip/telnet-webserver.c +++ b/examples/sky-ip/telnet-webserver.c @@ -43,7 +43,7 @@ #include "contiki.h" #include "contiki-net.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include /*---------------------------------------------------------------------------*/ diff --git a/examples/sky-ip/telnet.c b/examples/sky-ip/telnet.c index 2154704b7..02ed7bb22 100644 --- a/examples/sky-ip/telnet.c +++ b/examples/sky-ip/telnet.c @@ -42,7 +42,7 @@ #include "contiki.h" #include "contiki-net.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include /*---------------------------------------------------------------------------*/ diff --git a/examples/sky-shell-exec/sky-shell-exec.c b/examples/sky-shell-exec/sky-shell-exec.c index 94c44dbe6..bab3969c0 100644 --- a/examples/sky-shell-exec/sky-shell-exec.c +++ b/examples/sky-shell-exec/sky-shell-exec.c @@ -36,7 +36,7 @@ #include "dev/watchdog.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "cc2420.h" #include "dev/leds.h" #include "dev/light.h" diff --git a/examples/sky-shell/sky-shell.c b/examples/sky-shell/sky-shell.c index 7313783ef..c0c38c3ef 100644 --- a/examples/sky-shell/sky-shell.c +++ b/examples/sky-shell/sky-shell.c @@ -42,7 +42,7 @@ #include "serial-shell.h" #include "collect-view.h" -#include "net/rime.h" +#include "net/rime/rime.h" /*---------------------------------------------------------------------------*/ PROCESS(sky_shell_process, "Sky Contiki shell"); diff --git a/examples/sky/radio-test.c b/examples/sky/radio-test.c index 4a8e05f66..8daf9f4c3 100644 --- a/examples/sky/radio-test.c +++ b/examples/sky/radio-test.c @@ -44,7 +44,7 @@ */ #include "contiki.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "dev/leds.h" #include "dev/button-sensor.h" #include "cc2420.h" diff --git a/examples/sky/rssi-scanner.c b/examples/sky/rssi-scanner.c index d3139f9c4..92da5aa3e 100644 --- a/examples/sky/rssi-scanner.c +++ b/examples/sky/rssi-scanner.c @@ -39,7 +39,7 @@ */ #include "contiki.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/netstack.h" #include "dev/leds.h" diff --git a/examples/sky/sky-collect.c b/examples/sky/sky-collect.c index 142c86eb7..e79fb02ef 100644 --- a/examples/sky/sky-collect.c +++ b/examples/sky/sky-collect.c @@ -39,7 +39,7 @@ #include "contiki.h" #include "net/netstack.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/collect.h" #include "net/rime/collect-neighbor.h" #include "net/rime/timesynch.h" diff --git a/examples/z1/rssi_scanner/rssi-scanner.c b/examples/z1/rssi_scanner/rssi-scanner.c index 7cb1419c6..bbca9cdb6 100644 --- a/examples/z1/rssi_scanner/rssi-scanner.c +++ b/examples/z1/rssi_scanner/rssi-scanner.c @@ -39,7 +39,7 @@ */ #include "contiki.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/netstack.h" #include "dev/leds.h" diff --git a/examples/z1/tutorials/example-unicast-temp.c b/examples/z1/tutorials/example-unicast-temp.c index 2ba5dc51b..9c43bebb7 100644 --- a/examples/z1/tutorials/example-unicast-temp.c +++ b/examples/z1/tutorials/example-unicast-temp.c @@ -38,7 +38,7 @@ */ #include "contiki.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "dev/button-sensor.h" diff --git a/examples/z1/tutorials/example-unicast2.c b/examples/z1/tutorials/example-unicast2.c index b6b63be81..98383330b 100644 --- a/examples/z1/tutorials/example-unicast2.c +++ b/examples/z1/tutorials/example-unicast2.c @@ -38,7 +38,7 @@ */ #include "contiki.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "dev/button-sensor.h" diff --git a/platform/avr-atmega128rfa1/contiki-main.c b/platform/avr-atmega128rfa1/contiki-main.c index b749d0ac8..f755b78e4 100644 --- a/platform/avr-atmega128rfa1/contiki-main.c +++ b/platform/avr-atmega128rfa1/contiki-main.c @@ -88,7 +88,7 @@ #include "net/rime/rime-udp.h" #endif -#include "net/rime.h" +#include "net/rime/rime.h" /* Track interrupt flow through mac, rdc and radio driver */ //#define DEBUGFLOWSIZE 32 diff --git a/platform/avr-raven/contiki-raven-main.c b/platform/avr-raven/contiki-raven-main.c index 664efc299..70fe8e606 100644 --- a/platform/avr-raven/contiki-raven-main.c +++ b/platform/avr-raven/contiki-raven-main.c @@ -106,7 +106,7 @@ unsigned char debugflowsize,debugflow[DEBUGFLOWSIZE]; #include "net/rime/rime-udp.h" #endif -#include "net/rime.h" +#include "net/rime/rime.h" #include "params.h" diff --git a/platform/avr-ravenusb/sicslow_ethernet.c b/platform/avr-ravenusb/sicslow_ethernet.c index 588100985..336aa28a4 100644 --- a/platform/avr-ravenusb/sicslow_ethernet.c +++ b/platform/avr-ravenusb/sicslow_ethernet.c @@ -226,7 +226,7 @@ #include "uip.h" #include "uip_arp.h" //For ethernet header structure -#include "net/rime.h" +#include "net/rime/rime.h" #include "sicslowpan.h" #include "sicslow_ethernet.h" #if !RF230BB diff --git a/platform/cc2530dk/contiki-main.c b/platform/cc2530dk/contiki-main.c index 1935470bc..9e9373f04 100644 --- a/platform/cc2530dk/contiki-main.c +++ b/platform/cc2530dk/contiki-main.c @@ -16,7 +16,7 @@ #include "dev/button-sensor.h" #include "dev/adc-sensor.h" #include "dev/leds-arch.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/netstack.h" #include "net/mac/frame802154.h" #include "debug.h" diff --git a/platform/cooja/contiki-cooja-main.c b/platform/cooja/contiki-cooja-main.c index 2f91ef58e..7cc3ecd66 100644 --- a/platform/cooja/contiki-cooja-main.c +++ b/platform/cooja/contiki-cooja-main.c @@ -49,7 +49,7 @@ #include "lib/random.h" #include "lib/simEnvChange.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/netstack.h" #include "dev/serial-line.h" diff --git a/platform/exp5438/contiki-exp5438-main.c b/platform/exp5438/contiki-exp5438-main.c index 62b6ebd6e..61ac1551a 100644 --- a/platform/exp5438/contiki-exp5438-main.c +++ b/platform/exp5438/contiki-exp5438-main.c @@ -46,7 +46,7 @@ #include "lib/sensors.h" #include "net/mac/frame802154.h" #include "net/netstack.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "sys/autostart.h" #include "sys/node-id.h" diff --git a/platform/iris/contiki-iris-main.c b/platform/iris/contiki-iris-main.c index a5bdf4cc2..26a2c81bc 100644 --- a/platform/iris/contiki-iris-main.c +++ b/platform/iris/contiki-iris-main.c @@ -45,7 +45,7 @@ #include "contiki.h" #include "contiki-lib.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "dev/leds.h" #include "dev/rs232.h" #include "dev/watchdog.h" diff --git a/platform/mbxxx/contiki-main.c b/platform/mbxxx/contiki-main.c index 287fed7fe..abde1591f 100644 --- a/platform/mbxxx/contiki-main.c +++ b/platform/mbxxx/contiki-main.c @@ -69,7 +69,7 @@ #include "dev/stm32w-radio.h" #include "net/netstack.h" #include "net/rimeaddr.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/rime/rime-udp.h" #include "net/ip/uip.h" diff --git a/platform/micaz/contiki-micaz-main.c b/platform/micaz/contiki-micaz-main.c index 4d09aca6f..488503df4 100644 --- a/platform/micaz/contiki-micaz-main.c +++ b/platform/micaz/contiki-micaz-main.c @@ -45,7 +45,7 @@ #include "contiki.h" #include "contiki-lib.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "dev/leds.h" #include "dev/rs232.h" #include "dev/watchdog.h" diff --git a/platform/native/contiki-main.c b/platform/native/contiki-main.c index 5b92451c8..8acf47eb3 100644 --- a/platform/native/contiki-main.c +++ b/platform/native/contiki-main.c @@ -58,7 +58,7 @@ #include "net/ipv6/uip-ds6.h" #endif /* WITH_UIP6 */ -#include "net/rime.h" +#include "net/rime/rime.h" #ifdef SELECT_CONF_MAX #define SELECT_MAX SELECT_CONF_MAX diff --git a/platform/sensinode/contiki-sensinode-main.c b/platform/sensinode/contiki-sensinode-main.c index a13e440d2..18b95620c 100644 --- a/platform/sensinode/contiki-sensinode-main.c +++ b/platform/sensinode/contiki-sensinode-main.c @@ -12,7 +12,7 @@ #include "dev/cc2430_rf.h" #include "dev/watchdog.h" #include "dev/lpm.h" -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/netstack.h" #include "net/mac/frame802154.h" #include "debug.h" diff --git a/platform/sky/contiki-sky-main.c b/platform/sky/contiki-sky-main.c index 6d05ee2f5..932183931 100644 --- a/platform/sky/contiki-sky-main.c +++ b/platform/sky/contiki-sky-main.c @@ -47,7 +47,7 @@ #include "net/ipv6/uip-ds6.h" #endif /* WITH_UIP6 */ -#include "net/rime.h" +#include "net/rime/rime.h" #include "sys/node-id.h" #include "cfs-coffee-arch.h" diff --git a/platform/wismote/contiki-wismote-main.c b/platform/wismote/contiki-wismote-main.c index fe4ea65ba..edbaf22ec 100644 --- a/platform/wismote/contiki-wismote-main.c +++ b/platform/wismote/contiki-wismote-main.c @@ -48,7 +48,7 @@ #include "net/ipv6/uip-ds6.h" #endif /* WITH_UIP6 */ -#include "net/rime.h" +#include "net/rime/rime.h" #include "sys/node-id.h" #include "sys/autostart.h" diff --git a/platform/z1/contiki-z1-main.c b/platform/z1/contiki-z1-main.c index fd6f96011..031dd7e8d 100644 --- a/platform/z1/contiki-z1-main.c +++ b/platform/z1/contiki-z1-main.c @@ -51,7 +51,7 @@ #include "net/ipv6/uip-ds6.h" #endif /* WITH_UIP6 */ -#include "net/rime.h" +#include "net/rime/rime.h" #include "sys/node-id.h" #include "cfs-coffee-arch.h" diff --git a/tools/sky/uip6-bridge/sicslow_ethernet.c b/tools/sky/uip6-bridge/sicslow_ethernet.c index f008606e3..7726e41f5 100644 --- a/tools/sky/uip6-bridge/sicslow_ethernet.c +++ b/tools/sky/uip6-bridge/sicslow_ethernet.c @@ -145,7 +145,7 @@ #include "uip.h" #include "uip_arp.h" /* For ethernet header structure */ -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/ipv6/sicslowpan.h" #include "sicslow_ethernet.h" diff --git a/tools/stm32w/uip6_bridge/sicslow_ethernet.c b/tools/stm32w/uip6_bridge/sicslow_ethernet.c index b6b9eafa7..917e5f754 100644 --- a/tools/stm32w/uip6_bridge/sicslow_ethernet.c +++ b/tools/stm32w/uip6_bridge/sicslow_ethernet.c @@ -150,7 +150,7 @@ #include "net/ip/uip.h" #include "net/ipv4/uip_arp.h" /* For ethernet header structure */ -#include "net/rime.h" +#include "net/rime/rime.h" #include "net/ipv6/sicslowpan.h" #include "sicslow_ethernet.h" #include "dev/stm32w-radio.h"