Moved net/rime.h to net/rime/rime.h

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"

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"

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"
 

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"

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"

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"
 

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"

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"

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"

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"

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 <stdio.h>
 

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"

examples/rime/example-runicast.c

@@ -40,7 +40,7 @@
 #include <stdio.h>
 
 #include "contiki.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 
 #include "lib/list.h"
 #include "lib/memb.h"

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"
 

examples/sensinode/broadcast-rime.c

@@ -37,7 +37,7 @@
  *         Adam Dunkels <adam@sics.se>
  */
 #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"

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"
 

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"

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 <stdio.h>
 
 /*---------------------------------------------------------------------------*/

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 <stdio.h>
 
 /*---------------------------------------------------------------------------*/

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 <stdio.h>
 
 /*---------------------------------------------------------------------------*/

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"

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");

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"

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"

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"

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"

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"
 

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"