deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Updated include paths for the moved files under net/

Browse source
This commit is contained in:
Adam Dunkels 2013-11-22 09:17:54 +01:00
parent afdeed1c64
commit 5f3fe7f7c7
176 changed files with 342 additions and 338 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/net/ipv6/sicslowpan.c
View file

@ -60,11 +60,11 @@
#include "contiki.h"
#include "dev/watchdog.h"
#include "net/tcpip.h"
#include "net/uip.h"
#include "net/uip-ds6.h"
#include "net/ip/tcpip.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip-ds6.h"
#include "net/rime.h"
#include "net/sicslowpan.h"
#include "net/ipv6/sicslowpan.h"
#include "net/netstack.h"
#if UIP_CONF_IPV6
@ -72,7 +72,7 @@
#include <stdio.h>
#define DEBUG DEBUG_NONE
#include "net/uip-debug.h"
#include "net/ip/uip-debug.h"
#if DEBUG
/* PRINTFI and PRINTFO are defined for input and output to debug one without changing the timing of the other */
uint8_t p;

3
core/net/ipv6/sicslowpan.h
View file

@ -47,7 +47,8 @@
#ifndef SICSLOWPAN_H_
#define SICSLOWPAN_H_
#include "net/uip.h"
#include "net/ip/uip.h"
#include "net/mac/mac.h"
/**

4
core/net/ipv6/uip-ds6-nbr.c
View file

@ -49,10 +49,10 @@
#include "lib/list.h"
#include "net/rime/rimeaddr.h"
#include "net/packetbuf.h"
#include "net/uip-ds6-nbr.h"
#include "net/ipv6/uip-ds6-nbr.h"
#define DEBUG DEBUG_NONE
#include "net/uip-debug.h"
#include "net/ip/uip-debug.h"
#ifdef UIP_CONF_DS6_NEIGHBOR_STATE_CHANGED
#define NEIGHBOR_STATE_CHANGED(n) UIP_CONF_DS6_NEIGHBOR_STATE_CHANGED(n)

6
core/net/ipv6/uip-ds6-nbr.h
View file

@ -46,14 +46,14 @@
#ifndef UIP_DS6_NEIGHBOR_H_
#define UIP_DS6_NEIGHBOR_H_
#include "net/uip.h"
#include "net/ip/uip.h"
#include "net/nbr-table.h"
#include "sys/stimer.h"
#include "net/uip-ds6.h"
#include "net/ipv6/uip-ds6.h"
#include "net/nbr-table.h"
#if UIP_CONF_IPV6_QUEUE_PKT
#include "net/uip-packetqueue.h"
#include "net/ip/uip-packetqueue.h"
#endif /*UIP_CONF_QUEUE_PKT */
/*--------------------------------------------------*/

6
core/net/ipv6/uip-ds6-route.c
View file

@ -29,8 +29,8 @@
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
#include "net/uip-ds6.h"
#include "net/uip.h"
#include "net/ipv6/uip-ds6.h"
#include "net/ip/uip.h"
#include "lib/list.h"
#include "lib/memb.h"
@ -67,7 +67,7 @@ static int num_routes = 0;
#undef DEBUG
#define DEBUG DEBUG_NONE
#include "net/uip-debug.h"
#include "net/ip/uip-debug.h"
static void rm_routelist_callback(nbr_table_item_t *ptr);
/*---------------------------------------------------------------------------*/

8
core/net/ipv6/uip-ds6.c
View file

@ -44,14 +44,14 @@
#include <stdlib.h>
#include <stddef.h>
#include "lib/random.h"
#include "net/uip-nd6.h"
#include "net/uip-ds6.h"
#include "net/uip-packetqueue.h"
#include "net/ipv6/uip-nd6.h"
#include "net/ipv6/uip-ds6.h"
#include "net/ip/uip-packetqueue.h"
#if UIP_CONF_IPV6
#define DEBUG DEBUG_NONE
#include "net/uip-debug.h"
#include "net/ip/uip-debug.h"
struct etimer uip_ds6_timer_periodic; /** \brief Timer for maintenance of data structures */

10
core/net/ipv6/uip-ds6.h
View file

@ -42,12 +42,12 @@
#ifndef UIP_DS6_H_
#define UIP_DS6_H_
#include "net/uip.h"
#include "net/ip/uip.h"
#include "sys/stimer.h"
/* The size of uip_ds6_addr_t depends on UIP_ND6_DEF_MAXDADNS. Include uip-nd6.h to define it. */
#include "net/uip-nd6.h"
#include "net/uip-ds6-route.h"
#include "net/uip-ds6-nbr.h"
#include "net/ipv6/uip-nd6.h"
#include "net/ipv6/uip-ds6-route.h"
#include "net/ipv6/uip-ds6-nbr.h"
/*--------------------------------------------------*/
/** Configuration. For all tables (Neighbor cache, Prefix List, Routing Table,
@ -138,7 +138,7 @@
/*--------------------------------------------------*/
#if UIP_CONF_IPV6_QUEUE_PKT
#include "net/uip-packetqueue.h"
#include "net/ip/uip-packetqueue.h"
#endif /*UIP_CONF_QUEUE_PKT */
/** \brief A prefix list entry */

4
core/net/ipv6/uip-icmp6.c
View file

@ -43,8 +43,8 @@
*/
#include <string.h>
#include "net/uip-ds6.h"
#include "net/uip-icmp6.h"
#include "net/ipv6/uip-ds6.h"
#include "net/ipv6/uip-icmp6.h"
#include "contiki-default-conf.h"
#define DEBUG 0

2
core/net/ipv6/uip-icmp6.h
View file

@ -46,7 +46,7 @@
#ifndef ICMP6_H_
#define ICMP6_H_
#include "net/uip.h"
#include "net/ip/uip.h"
/** \name ICMPv6 message types */

8
core/net/ipv6/uip-nd6.c
View file

@ -69,15 +69,15 @@
*/
#include <string.h>
#include "net/uip-icmp6.h"
#include "net/uip-nd6.h"
#include "net/uip-ds6.h"
#include "net/ipv6/uip-icmp6.h"
#include "net/ipv6/uip-nd6.h"
#include "net/ipv6/uip-ds6.h"
#include "lib/random.h"
#if UIP_CONF_IPV6
/*------------------------------------------------------------------*/
#define DEBUG 0
#include "net/uip-debug.h"
#include "net/ip/uip-debug.h"
#if UIP_LOGGING
#include <stdio.h>

2
core/net/ipv6/uip-nd6.h
View file

@ -45,7 +45,7 @@
#ifndef UIP_ND6_H_
#define UIP_ND6_H_
#include "net/uip.h"
#include "net/ip/uip.h"
#include "sys/stimer.h"
/**
* \name General

12
core/net/ipv6/uip6.c
View file

@ -70,11 +70,11 @@
* the packet back to the peer.
*/
#include "net/uip.h"
#include "net/uipopt.h"
#include "net/uip-icmp6.h"
#include "net/uip-nd6.h"
#include "net/uip-ds6.h"
#include "net/ip/uip.h"
#include "net/ip/uipopt.h"
#include "net/ipv6/uip-icmp6.h"
#include "net/ipv6/uip-nd6.h"
#include "net/ipv6/uip-ds6.h"
#include <string.h>
@ -84,7 +84,7 @@
/*---------------------------------------------------------------------------*/
#define DEBUG DEBUG_NONE
#include "net/uip-debug.h"
#include "net/ip/uip-debug.h"
#if UIP_CONF_IPV6_RPL
#include "rpl/rpl.h"