Moved the rimeaddr.[ch] code from the core/net/rime module to the core/net module, as it is used not only by rime code

This commit is contained in:
Adam Dunkels 2013-12-05 22:45:43 +01:00
parent b02104e4c4
commit 0fe08205e1
26 changed files with 25 additions and 25 deletions

View File

@ -2,7 +2,7 @@
#define COLLECT_VIEW_H
#include "contiki-conf.h"
#include "net/rime/rimeaddr.h"
#include "net/rimeaddr.h"
#include "net/rime/collect.h"
struct collect_view_data_msg {

View File

@ -1,4 +1,4 @@
core-net_src = netstack.c packetbuf.c packetqueue.c queuebuf.c nbr-table.c
core-net_src = netstack.c packetbuf.c packetqueue.c queuebuf.c nbr-table.c rimeaddr.c
MODULES += core/net/mac
include $(CONTIKI)/core/net/mac/Makefile.core-net-mac

View File

@ -47,7 +47,7 @@
#include <stdlib.h>
#include <stddef.h>
#include "lib/list.h"
#include "net/rime/rimeaddr.h"
#include "net/rimeaddr.h"
#include "net/packetbuf.h"
#include "net/ipv6/uip-ds6-nbr.h"

View File

@ -62,7 +62,7 @@
#define FRAME_802154_H
#include "contiki-conf.h"
#include "net/rime/rimeaddr.h"
#include "net/rimeaddr.h"
#ifdef IEEE802154_CONF_PANID
#define IEEE802154_PANID IEEE802154_CONF_PANID

View File

@ -40,7 +40,7 @@
#ifndef PHASE_H
#define PHASE_H
#include "net/rime/rimeaddr.h"
#include "net/rimeaddr.h"
#include "sys/timer.h"
#include "sys/rtimer.h"
#include "lib/list.h"

View File

@ -36,7 +36,7 @@
#define NBR_TABLE_H_
#include "contiki.h"
#include "net/rime/rimeaddr.h"
#include "net/rimeaddr.h"
#include "net/netstack.h"
/* Neighbor table size */

View File

@ -53,7 +53,7 @@
#define PACKETBUF_H_
#include "contiki-conf.h"
#include "net/rime/rimeaddr.h"
#include "net/rimeaddr.h"
/**
* \brief The size of the packetbuf, in bytes

View File

@ -55,7 +55,7 @@
#include "net/rime/polite-announcement.h"
#include "net/rime/polite.h"
#include "net/queuebuf.h"
#include "net/rime/rimeaddr.h"
#include "net/rimeaddr.h"
#include "net/packetbuf.h"
#include "net/rime/rimestats.h"
#include "net/rime/rmh.h"

View File

@ -1,5 +1,5 @@
RIME_CHAMELEON = chameleon.c channel.c chameleon-raw.c chameleon-bitopt.c
RIME_BASE = rimeaddr.c rime.c timesynch.c \
RIME_BASE = rime.c timesynch.c \
rimestats.c announcement.c polite-announcement.c \
broadcast-announcement.c
RIME_SINGLEHOP = broadcast.c stbroadcast.c unicast.c stunicast.c \

View File

@ -66,7 +66,7 @@
#ifndef ANNOUNCEMENT_H_
#define ANNOUNCEMENT_H_
#include "net/rime/rimeaddr.h"
#include "net/rimeaddr.h"
struct announcement;

View File

@ -66,7 +66,7 @@
#define BROADCAST_H_
#include "net/rime/abc.h"
#include "net/rime/rimeaddr.h"
#include "net/rimeaddr.h"
struct broadcast_conn;

View File

@ -51,7 +51,7 @@
#ifndef COLLECT_NEIGHBOR_H_
#define COLLECT_NEIGHBOR_H_
#include "net/rime/rimeaddr.h"
#include "net/rimeaddr.h"
#include "net/rime/collect-link-estimate.h"
#include "lib/list.h"

View File

@ -71,7 +71,7 @@
#define MULTIHOP_H_
#include "net/rime/unicast.h"
#include "net/rime/rimeaddr.h"
#include "net/rimeaddr.h"
struct multihop_conn;

View File

@ -66,7 +66,7 @@
#define RMH_H_
#include "net/rime/runicast.h"
#include "net/rime/rimeaddr.h"
#include "net/rimeaddr.h"
struct rmh_conn;

View File

@ -51,7 +51,7 @@
#ifndef ROUTE_H_
#define ROUTE_H_
#include "net/rime/rimeaddr.h"
#include "net/rimeaddr.h"
struct route_entry {
struct route_entry *next;

View File

@ -42,7 +42,7 @@
* Adam Dunkels <adam@sics.se>
*/
#include "net/rime/rimeaddr.h"
#include "net/rimeaddr.h"
#include <string.h>
rimeaddr_t rimeaddr_node_addr;

View File

@ -41,7 +41,7 @@
#include "sys/rtimer.h"
#include "net/packetbuf.h"
#include "net/rime/rimestats.h"
#include "net/rime/rimeaddr.h"
#include "net/rimeaddr.h"
#include "net/netstack.h"
#include "sys/energest.h"
#include "dev/cc2538-rf.h"

View File

@ -36,7 +36,7 @@
* Driver for the cc2538 IEEE addresses
*/
#include "contiki-conf.h"
#include "net/rime/rimeaddr.h"
#include "net/rimeaddr.h"
#include "ieee-addr.h"
#include <stdint.h>

View File

@ -46,7 +46,7 @@
*/
#include "contiki.h"
#include "sys/process.h"
#include "net/rime/rimeaddr.h"
#include "net/rimeaddr.h"
#include "usb-api.h"
#include "usb.h"
#include "usb-arch.h"

View File

@ -46,7 +46,7 @@
#include "net/packetbuf.h"
#include "net/rime/rimestats.h"
#include "net/rime/rimeaddr.h"
#include "net/rimeaddr.h"
#include "net/netstack.h"
#include <string.h>

View File

@ -39,7 +39,7 @@
#define COLLECT_COMMON_H_
#include "contiki.h"
#include "net/rime/rimeaddr.h"
#include "net/rimeaddr.h"
void collect_common_net_init(void);
void collect_common_net_print(void);

View File

@ -32,7 +32,7 @@
#include "contiki-net.h"
#include "net/ip/uip.h"
#include "net/rpl/rpl.h"
#include "net/rime/rimeaddr.h"
#include "net/rimeaddr.h"
#include "net/netstack.h"
#include "dev/button-sensor.h"

View File

@ -39,7 +39,7 @@
/* contiki */
#include "contiki.h"
#include "dev/button-sensor.h"
#include "net/rime/rimeaddr.h"
#include "net/rimeaddr.h"
#include "net/netstack.h"
/* mc1322x */

View File

@ -68,7 +68,7 @@
#include "dev/stm32w-radio.h"
#include "net/netstack.h"
#include "net/rime/rimeaddr.h"
#include "net/rimeaddr.h"
#include "net/rime.h"
#include "net/rime/rime-udp.h"
#include "net/ip/uip.h"

View File

@ -36,7 +36,7 @@
#include <string.h>
#include "contiki.h"
#include "net/rime/rimeaddr.h"
#include "net/rimeaddr.h"
#include "sys/ctimer.h"
#include "net/ip/uip.h"