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

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

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"

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

core/net/rime/chameleon-raw.c

@@ -40,7 +40,7 @@
 #include <string.h>
 
 #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.

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

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

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"

core/net/rime/ipolite.c

@@ -42,7 +42,7 @@
  *         Adam Dunkels <adam@sics.se>
  */
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/ipolite.h"
 #include "lib/random.h"
 

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"
 

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"
 

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"

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"
 

core/net/rime/polite.c

@@ -42,7 +42,7 @@
  *         Adam Dunkels <adam@sics.se>
  */
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/polite.h"
 #include "lib/random.h"
 

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"

core/net/rime/rime.h

@@ -0,0 +1,115 @@
+/**
+ * \addtogroup rime
+ * @{
+ */
+
+/*
+ * Copyright (c) 2006, Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ */
+
+/**
+ * \file
+ *         Header file for the Rime stack
+ * \author
+ *         Adam Dunkels <adam@sics.se>
+ */
+
+#ifndef RIME_H_
+#define RIME_H_
+
+#include "net/rime/announcement.h"
+#include "net/rime/collect.h"
+#include "net/rime/ipolite.h"
+#include "net/rime/mesh.h"
+#include "net/rime/multihop.h"
+#include "net/rime/neighbor-discovery.h"
+#include "net/rime/netflood.h"
+#include "net/rime/polite-announcement.h"
+#include "net/rime/polite.h"
+#include "net/queuebuf.h"
+#include "net/rimeaddr.h"
+#include "net/packetbuf.h"
+#include "net/rime/rimestats.h"
+#include "net/rime/rmh.h"
+#include "net/rime/route-discovery.h"
+#include "net/rime/route.h"
+#include "net/rime/rucb.h"
+#include "net/rime/runicast.h"
+#include "net/rime/timesynch.h"
+#include "net/rime/trickle.h"
+
+#include "net/mac/mac.h"
+/**
+ * \brief      Initialize Rime
+ *
+ *             This function should be called from the system boot up
+ *             code to initialize Rime.
+ */
+int rime_init(void);
+
+/**
+ * \brief      Send an incoming packet to Rime
+ *
+ *             This function should be called by the network driver to
+ *             hand over a packet to Rime for further processing. The
+ *             packet should be placed in the packetbuf (with
+ *             packetbuf_copyfrom()) before calling this function.
+ *
+ */
+void rime_input(void);
+
+int rime_output(struct channel *c);
+
+struct rime_sniffer {
+  struct rime_sniffer *next;
+  void (* input_callback)(void);
+  void (* output_callback)(int mac_status);
+};
+
+#define RIME_SNIFFER(name, input_callback, output_callback) \
+static struct rime_sniffer name = { NULL, input_callback, output_callback }
+
+void rime_sniffer_add(struct rime_sniffer *s);
+void rime_sniffer_remove(struct rime_sniffer *s);
+
+extern const struct network_driver rime_driver;
+
+/* Generic Rime return values. */
+enum {
+  RIME_OK,
+  RIME_ERR,
+  RIME_ERR_CONTENTION,
+  RIME_ERR_NOACK,
+};
+#endif /* RIME_H_ */
+
+/** @} */
+/** @} */

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 {

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"
 

core/net/rime/rucb.c

@@ -38,7 +38,7 @@
  */
 
 #include "net/rime/rucb.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include <string.h>
 
 #define MAX_TRANSMISSIONS 8

core/net/rime/rudolph0.c

@@ -44,7 +44,7 @@
 
 #include <stddef.h> /* for offsetof */
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/rudolph0.h"
 
 #define STEADY_TIME CLOCK_SECOND * 2

core/net/rime/rudolph1.c

@@ -45,7 +45,7 @@
 #include <stdio.h>
 #include <stddef.h> /* for offsetof */
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/rudolph1.h"
 #include "cfs/cfs.h"
 

core/net/rime/rudolph2.c

@@ -51,7 +51,7 @@
 #include <stdio.h>
 #include <stddef.h> /* 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"

core/net/rime/runicast.c

@@ -44,7 +44,7 @@
  */
 
 #include "net/rime/runicast.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include <string.h>
 
 

core/net/rime/stbroadcast.c

@@ -44,7 +44,7 @@
  */
 
 #include "net/rime/stbroadcast.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include <string.h>
 
 /*---------------------------------------------------------------------------*/

core/net/rime/stunicast.c

@@ -43,7 +43,7 @@
  */
 
 #include "net/rime/stunicast.h"
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include <string.h>
 
 #define DEBUG 0

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

core/net/rime/unicast.c

@@ -43,7 +43,7 @@
  *         Adam Dunkels <adam@sics.se>
  */
 
-#include "net/rime.h"
+#include "net/rime/rime.h"
 #include "net/rime/unicast.h"
 #include <string.h>