Cleaned up #includes to avoid cyclic dependencies - the Rime includes no longer depend on rime.h
This commit is contained in:
adamdunkels
parent
8287215c82
commit
758411d06d
|
|
@ -33,7 +33,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: rime.h,v 1.11 2007/12/05 13:21:58 adamdunkels Exp $
|
||||
* $Id: rime.h,v 1.12 2007/12/17 09:14:08 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -55,6 +55,13 @@
|
|||
#include "net/rime/sibc.h"
|
||||
#include "net/rime/mh.h"
|
||||
#include "net/rime/rmh.h"
|
||||
#include "net/rime/polite.h"
|
||||
#include "net/rime/ipolite.h"
|
||||
#include "net/rime/nf.h"
|
||||
#include "net/rime/route-discovery.h"
|
||||
#include "net/rime/neighbor-discovery.h"
|
||||
#include "net/rime/collect.h"
|
||||
#include "net/rime/mesh.h"
|
||||
#include "net/mac/mac.h"
|
||||
/**
|
||||
* \brief Initialize Rime
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: ipolite.h,v 1.1 2007/05/15 07:41:36 adamdunkels Exp $
|
||||
* $Id: ipolite.h,v 1.2 2007/12/17 09:14:08 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -59,7 +59,9 @@
|
|||
#ifndef __IPOLITE_H__
|
||||
#define __IPOLITE_H__
|
||||
|
||||
#include "net/rime.h"
|
||||
#include "net/rime/ibc.h"
|
||||
#include "net/rime/ctimer.h"
|
||||
#include "net/rime/queuebuf.h"
|
||||
|
||||
struct ipolite_conn;
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: mesh.h,v 1.8 2007/03/31 18:31:27 adamdunkels Exp $
|
||||
* $Id: mesh.h,v 1.9 2007/12/17 09:14:08 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -62,7 +62,7 @@
|
|||
#ifndef __MESH_H__
|
||||
#define __MESH_H__
|
||||
|
||||
#include "net/rime.h"
|
||||
#include "net/rime/queuebuf.h"
|
||||
#include "net/rime/mh.h"
|
||||
#include "net/rime/route-discovery.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: nf.c,v 1.13 2007/11/28 20:03:50 adamdunkels Exp $
|
||||
* $Id: nf.c,v 1.14 2007/12/17 09:14:08 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -44,7 +44,6 @@
|
|||
*/
|
||||
|
||||
#include "net/rime/nf.h"
|
||||
#include "net/rime.h"
|
||||
#include "lib/rand.h"
|
||||
#include <string.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: polite.h,v 1.1 2007/05/15 07:41:22 adamdunkels Exp $
|
||||
* $Id: polite.h,v 1.2 2007/12/17 09:14:08 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -59,7 +59,9 @@
|
|||
#ifndef __POLITE_H__
|
||||
#define __POLITE_H__
|
||||
|
||||
#include "net/rime.h"
|
||||
#include "net/rime/abc.h"
|
||||
#include "net/rime/queuebuf.h"
|
||||
#include "net/rime/ctimer.h"
|
||||
|
||||
struct polite_conn;
|
||||
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: route-discovery.h,v 1.3 2007/03/31 18:31:28 adamdunkels Exp $
|
||||
* $Id: route-discovery.h,v 1.4 2007/12/17 09:14:08 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
#ifndef __ROUTE_DISCOVERY_H__
|
||||
#define __ROUTE_DISCOVERY_H__
|
||||
|
||||
#include "net/rime.h"
|
||||
#include "net/rime/uc.h"
|
||||
#include "net/rime/nf.h"
|
||||
|
||||
struct route_discovery_conn;
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: route.c,v 1.7 2007/11/28 20:00:57 adamdunkels Exp $
|
||||
* $Id: route.c,v 1.8 2007/12/17 09:14:08 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -45,6 +45,9 @@
|
|||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "lib/list.h"
|
||||
#include "lib/memb.h"
|
||||
#include "net/rime/ctimer.h"
|
||||
#include "net/rime/route.h"
|
||||
|
||||
#define NUM_RT_ENTRIES 8
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: route.h,v 1.5 2007/03/31 18:31:28 adamdunkels Exp $
|
||||
* $Id: route.h,v 1.6 2007/12/17 09:14:08 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -52,8 +52,7 @@
|
|||
#ifndef __ROUTE_H__
|
||||
#define __ROUTE_H__
|
||||
|
||||
#include "contiki-net.h"
|
||||
#include "net/rime.h"
|
||||
#include "net/rime/rimeaddr.h"
|
||||
|
||||
struct route_entry {
|
||||
struct route_entry *next;
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: rudolph0.h,v 1.6 2007/11/17 18:05:21 adamdunkels Exp $
|
||||
* $Id: rudolph0.h,v 1.7 2007/12/17 09:14:08 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -60,10 +60,8 @@
|
|||
#ifndef __RUDOLPH0_H__
|
||||
#define __RUDOLPH0_H__
|
||||
|
||||
#include "net/rime.h"
|
||||
#include "net/rime/sabc.h"
|
||||
#include "net/rime/polite.h"
|
||||
#include "contiki-net.h"
|
||||
|
||||
struct rudolph0_conn;
|
||||
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: rudolph1.h,v 1.6 2007/11/17 18:05:21 adamdunkels Exp $
|
||||
* $Id: rudolph1.h,v 1.7 2007/12/17 09:14:08 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -60,10 +60,8 @@
|
|||
#ifndef __RUDOLPH1_H__
|
||||
#define __RUDOLPH1_H__
|
||||
|
||||
#include "net/rime.h"
|
||||
#include "net/rime/trickle.h"
|
||||
#include "net/rime/uabc.h"
|
||||
#include "contiki-net.h"
|
||||
#include "net/rime/ipolite.h"
|
||||
|
||||
struct rudolph1_conn;
|
||||
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: rudolph2.h,v 1.2 2007/11/17 18:05:21 adamdunkels Exp $
|
||||
* $Id: rudolph2.h,v 1.3 2007/12/17 09:14:08 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -60,10 +60,7 @@
|
|||
#ifndef __RUDOLPH2_H__
|
||||
#define __RUDOLPH2_H__
|
||||
|
||||
#include "net/rime.h"
|
||||
#include "net/rime/sabc.h"
|
||||
#include "net/rime/polite.h"
|
||||
#include "contiki-net.h"
|
||||
|
||||
struct rudolph2_conn;
|
||||
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
*
|
||||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
* $Id: trickle.h,v 1.4 2007/05/15 08:09:21 adamdunkels Exp $
|
||||
* $Id: trickle.h,v 1.5 2007/12/17 09:14:08 adamdunkels Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -58,7 +58,6 @@
|
|||
#ifndef __TRICKLE_H__
|
||||
#define __TRICKLE_H__
|
||||
|
||||
#include "net/rime.h"
|
||||
#include "net/rime/nf.h"
|
||||
|
||||
struct trickle_conn;
|
||||
|
|
|
|||
Loading…
Reference in a new issue