net: Fix the include paths in Contiki sources

Fix the include paths in Contiki sources so that we do not
have to create links to include directories during compilation.

Change-Id: I9316f1e90474e0ee563557deadd0bdc321cbb0fa
Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
This commit is contained in:
Jukka Rissanen 2015-11-04 21:37:31 +02:00 committed by Anas Nashif
commit 0179583391
109 changed files with 274 additions and 277 deletions

View file

@ -157,6 +157,3 @@ obj-$(CONFIG_ER_COAP) += er-coap/er-coap.o \
rest-engine/rest-engine.o
obj-$(CONFIG_ER_COAP_CLIENT) += er-coap/er-coap-observe-client.o
# workaround for include file location
CREATE_INCLUDE_LINK_net := $(shell ln -s ${ZEPHYR_BASE}/net/ip/contiki ${ZEPHYR_BASE}/net/ip/contiki/net > /dev/null 2>&1)

View file

@ -36,23 +36,23 @@
#include "contiki.h"
#include "net/ip/uip.h"
#include "net/ip/uiplib.h"
#include "net/ip/uip-udp-packet.h"
#include "net/ip/simple-udp.h"
#include "net/ip/uip-nameserver.h"
#include "contiki/ip/uip.h"
#include "contiki/ip/uiplib.h"
#include "contiki/ip/uip-udp-packet.h"
#include "contiki/ip/simple-udp.h"
#include "contiki/ip/uip-nameserver.h"
#if NETSTACK_CONF_WITH_IPV6
#include "net/ipv6/uip-icmp6.h"
#include "net/ipv6/uip-ds6.h"
#include "contiki/ipv6/uip-icmp6.h"
#include "contiki/ipv6/uip-ds6.h"
#endif /* NETSTACK_CONF_WITH_IPV6 */
#if UIP_TCP
/* psock.h is only needed for TCP */
#include "net/ip/psock.h"
#include "contiki/ip/psock.h"
#endif
#include "net/ip/udp-socket.h"
#include "contiki/ip/udp-socket.h"
#include "contiki/packetbuf.h"

View file

@ -45,12 +45,12 @@
#include <net/ip_buf.h>
#include "contiki-net.h"
#include "net/ip/simple-udp.h"
#include "contiki/ip/simple-udp.h"
#include <string.h>
#define DEBUG 0
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
#if UIP_LOGGING
#include <stdio.h>

View file

@ -55,7 +55,7 @@
#ifndef SIMPLE_UDP_H
#define SIMPLE_UDP_H
#include "net/ip/uip.h"
#include "contiki/ip/uip.h"
struct simple_udp_connection;

View file

@ -41,12 +41,12 @@
#include <net/ip_buf.h>
#include "contiki-net.h"
#include "net/ip/uip-split.h"
#include "net/ip/uip-packetqueue.h"
#include "contiki/ip/uip-split.h"
#include "contiki/ip/uip-packetqueue.h"
#if NETSTACK_CONF_WITH_IPV6
#include "net/ipv6/uip-nd6.h"
#include "net/ipv6/uip-ds6.h"
#include "contiki/ipv6/uip-nd6.h"
#include "contiki/ipv6/uip-ds6.h"
#endif
#include <string.h>

View file

@ -68,7 +68,7 @@
#define TCPIP_H_
#include "contiki.h"
#include "net/ip/uipaddr.h"
#include "contiki/ip/uipaddr.h"
struct uip_conn;
@ -86,7 +86,7 @@ struct tcpip_uipstate {
typedef struct tcpip_uipstate uip_udp_appstate_t;
typedef struct tcpip_uipstate uip_tcp_appstate_t;
typedef struct tcpip_uipstate uip_icmp6_appstate_t;
#include "net/ip/uip.h"
#include "contiki/ip/uip.h"
void tcpip_uipcall(struct net_buf *buf);
/**

View file

@ -34,7 +34,7 @@
#include <net/buf.h>
#include "net/ip/uip.h"
#include "contiki/ip/uip.h"
struct udp_socket;

View file

@ -37,7 +37,7 @@
* Joakim Eriksson <joakime@sics.se>
*/
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
/*---------------------------------------------------------------------------*/
void

View file

@ -41,7 +41,7 @@
#ifndef UIP_DEBUG_H
#define UIP_DEBUG_H
#include "net/ip/uip.h"
#include "contiki/ip/uip.h"
#include <stdio.h>
void uip_debug_ipaddr_print(const uip_ipaddr_t *addr);

View file

@ -1,10 +1,10 @@
#include <stdio.h>
#include "net/ip/uip.h"
#include "contiki/ip/uip.h"
#include "lib/memb.h"
#include "net/ip/uip-packetqueue.h"
#include "contiki/ip/uip-packetqueue.h"
#define MAX_NUM_QUEUED_PACKETS 2
MEMB(packets_memb, struct uip_packetqueue_packet, MAX_NUM_QUEUED_PACKETS);

View file

@ -41,8 +41,8 @@
#include "contiki-conf.h"
#include "net/ip/uip-udp-packet.h"
#include "net/ipv6/multicast/uip-mcast6.h"
#include "contiki/ip/uip-udp-packet.h"
#include "contiki/ipv6/multicast/uip-mcast6.h"
#include <string.h>

View file

@ -42,7 +42,7 @@
#include <net/buf.h>
#include "net/ip/uip.h"
#include "contiki/ip/uip.h"
/* Return value: 0 - packet could not be sent, the net_buf is released by API
* 1 - packet sent, caller needs to de-allocate the buf

View file

@ -57,9 +57,9 @@
struct net_buf;
#include "net/ip/uipopt.h"
#include "net/ip/uipaddr.h"
#include "net/ip/tcpip.h"
#include "contiki/ip/uipopt.h"
#include "contiki/ip/uipaddr.h"
#include "contiki/ip/tcpip.h"
/* Header sizes. */
#if NETSTACK_CONF_WITH_IPV6

View file

@ -33,12 +33,12 @@
*/
#include "net/ip/uip.h"
#include "net/ip/uiplib.h"
#include "contiki/ip/uip.h"
#include "contiki/ip/uiplib.h"
#include <string.h>
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
/*-----------------------------------------------------------------------------------*/
#if NETSTACK_CONF_WITH_IPV6

View file

@ -43,7 +43,7 @@
#ifndef UIPLIB_H_
#define UIPLIB_H_
#include "net/ip/uip.h"
#include "contiki/ip/uip.h"
/**
* \addtogroup uipconvfunc

View file

@ -38,7 +38,7 @@
* Adam Dunkels <adam@sics.se>
*/
#include "net/ipv4/uip-neighbor.h"
#include "contiki/ipv4/uip-neighbor.h"
#include <string.h>
#include <stdio.h>

View file

@ -41,7 +41,7 @@
#ifndef UIP_NEIGHBOR_H_
#define UIP_NEIGHBOR_H_
#include "net/ip/uip.h"
#include "contiki/ip/uip.h"
struct uip_neighbor_addr {
#if UIP_NEIGHBOR_CONF_ADDRTYPE

View file

@ -70,14 +70,14 @@
* the packet back to the peer.
*/
#include "net/ip/uip.h"
#include "net/ip/uipopt.h"
#include "net/ipv4/uip_arp.h"
#include "contiki/ip/uip.h"
#include "contiki/ip/uipopt.h"
#include "contiki/ipv4/uip_arp.h"
#include "net/ipv4/uip-neighbor.h"
#include "contiki/ipv4/uip-neighbor.h"
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
#include <string.h>
/*---------------------------------------------------------------------------*/

View file

@ -57,7 +57,7 @@
* \note This ARP implementation only supports Ethernet.
*/
#include "net/ipv4/uip_arp.h"
#include "contiki/ipv4/uip_arp.h"
#include <string.h>

View file

@ -50,7 +50,7 @@
#ifndef UIP_ARP_H_
#define UIP_ARP_H_
#include "net/ip/uip.h"
#include "contiki/ip/uip.h"

View file

@ -43,14 +43,14 @@
#include "contiki.h"
#include "contiki-lib.h"
#include "contiki-net.h"
#include "net/ipv6/uip-icmp6.h"
#include "net/ipv6/multicast/uip-mcast6.h"
#include "net/ipv6/multicast/roll-tm.h"
#include "contiki/ipv6/uip-icmp6.h"
#include "contiki/ipv6/multicast/uip-mcast6.h"
#include "contiki/ipv6/multicast/roll-tm.h"
#include "dev/watchdog.h"
#include <string.h>
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
#define TRICKLE_VERBOSE 0

View file

@ -63,7 +63,7 @@
#define ROLL_TM_H_
#include "contiki-conf.h"
#include "net/ipv6/multicast/uip-mcast6-stats.h"
#include "contiki/ipv6/multicast/uip-mcast6-stats.h"
#include <stdint.h>
/*---------------------------------------------------------------------------*/

View file

@ -45,17 +45,17 @@
#include "contiki.h"
#include "contiki-net.h"
#include "net/ipv6/multicast/uip-mcast6.h"
#include "net/ipv6/multicast/uip-mcast6-route.h"
#include "net/ipv6/multicast/uip-mcast6-stats.h"
#include "net/ipv6/multicast/smrf.h"
#include "net/rpl/rpl.h"
#include "net/netstack.h"
#include "contiki/ipv6/multicast/uip-mcast6.h"
#include "contiki/ipv6/multicast/uip-mcast6-route.h"
#include "contiki/ipv6/multicast/uip-mcast6-stats.h"
#include "contiki/ipv6/multicast/smrf.h"
#include "contiki/rpl/rpl.h"
#include "contiki/netstack.h"
#include "contiki/os/lib/random.h"
#include <string.h>
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
/*---------------------------------------------------------------------------*/
/* Macros */

View file

@ -43,8 +43,8 @@
#include "contiki.h"
#include "lib/list.h"
#include "lib/memb.h"
#include "net/ip/uip.h"
#include "net/ipv6/multicast/uip-mcast6-route.h"
#include "contiki/ip/uip.h"
#include "contiki/ipv6/multicast/uip-mcast6-route.h"
#include <stdint.h>
#include <string.h>

View file

@ -43,7 +43,7 @@
#define UIP_MCAST6_ROUTE_H_
#include "contiki.h"
#include "net/ip/uip.h"
#include "contiki/ip/uip.h"
#include <stdint.h>
/*---------------------------------------------------------------------------*/

View file

@ -38,7 +38,7 @@
* \author
* George Oikonomou - <oikonomou@users.sourceforge.net>
*/
#include "net/ipv6/multicast/uip-mcast6-stats.h"
#include "contiki/ipv6/multicast/uip-mcast6-stats.h"
#include <string.h>
/*---------------------------------------------------------------------------*/

View file

@ -62,10 +62,10 @@
#include <net/buf.h>
#include "contiki-conf.h"
#include "net/ipv6/multicast/uip-mcast6-engines.h"
#include "net/ipv6/multicast/uip-mcast6-route.h"
#include "net/ipv6/multicast/smrf.h"
#include "net/ipv6/multicast/roll-tm.h"
#include "contiki/ipv6/multicast/uip-mcast6-engines.h"
#include "contiki/ipv6/multicast/uip-mcast6-route.h"
#include "contiki/ipv6/multicast/smrf.h"
#include "contiki/ipv6/multicast/roll-tm.h"
#include <string.h>
/*---------------------------------------------------------------------------*/

View file

@ -47,12 +47,12 @@
#include <stdlib.h>
#include <stddef.h>
#include "lib/list.h"
#include "net/linkaddr.h"
#include "net/packetbuf.h"
#include "net/ipv6/uip-ds6-nbr.h"
#include "contiki/linkaddr.h"
#include "contiki/packetbuf.h"
#include "contiki/ipv6/uip-ds6-nbr.h"
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
#ifdef UIP_CONF_DS6_NEIGHBOR_STATE_CHANGED
#define NEIGHBOR_STATE_CHANGED(n) UIP_CONF_DS6_NEIGHBOR_STATE_CHANGED(n)

View file

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

View file

@ -38,12 +38,12 @@
* \file
* Routing table manipulation
*/
#include "net/ipv6/uip-ds6.h"
#include "net/ip/uip.h"
#include "contiki/ipv6/uip-ds6.h"
#include "contiki/ip/uip.h"
#include "lib/list.h"
#include "lib/memb.h"
#include "net/nbr-table.h"
#include "contiki/nbr-table.h"
#include <string.h>
@ -74,7 +74,7 @@ static int num_routes = 0;
#undef DEBUG
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
static void rm_routelist_callback(nbr_table_item_t *ptr);
/*---------------------------------------------------------------------------*/

View file

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

View file

@ -44,12 +44,12 @@
#include <net/buf.h>
#include "net/ip/uip.h"
#include "contiki/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/ipv6/uip-nd6.h"
#include "net/ipv6/uip-ds6-route.h"
#include "net/ipv6/uip-ds6-nbr.h"
#include "contiki/ipv6/uip-nd6.h"
#include "contiki/ipv6/uip-ds6-route.h"
#include "contiki/ipv6/uip-ds6-nbr.h"
/*--------------------------------------------------*/
/** Configuration. For all tables (Neighbor cache, Prefix List, Routing Table,
@ -146,7 +146,7 @@
/*--------------------------------------------------*/
#if UIP_CONF_IPV6_QUEUE_PKT
#include "net/ip/uip-packetqueue.h"
#include "contiki/ip/uip-packetqueue.h"
#endif /*UIP_CONF_QUEUE_PKT */
/** \brief A prefix list entry */

View file

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

View file

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

View file

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

View file

@ -47,7 +47,7 @@
#include <net/ip_buf.h>
#include "net/ip/uip.h"
#include "contiki/ip/uip.h"
#include "sys/stimer.h"
/**
* \name General

View file

@ -73,12 +73,12 @@
#include <net/ip_buf.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 "net/ipv6/multicast/uip-mcast6.h"
#include "contiki/ip/uip.h"
#include "contiki/ip/uipopt.h"
#include "contiki/ipv6/uip-icmp6.h"
#include "contiki/ipv6/uip-nd6.h"
#include "contiki/ipv6/uip-ds6.h"
#include "contiki/ipv6/multicast/uip-mcast6.h"
#include <string.h>
@ -87,7 +87,7 @@
/*---------------------------------------------------------------------------*/
#define DEBUG DEBUG_FULL
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
#if UIP_CONF_IPV6_RPL
#include "rpl/rpl.h"

View file

@ -42,7 +42,7 @@
* @{
*/
#include "net/linkaddr.h"
#include "contiki/linkaddr.h"
#include <string.h>
linkaddr_t linkaddr_node_addr;

View file

@ -45,8 +45,8 @@
#include <net/l2_buf.h>
#include "net/llsec/anti-replay.h"
#include "net/packetbuf.h"
#include "contiki/llsec/anti-replay.h"
#include "contiki/packetbuf.h"
/* This node's current frame counter value */
static uint32_t counter;

View file

@ -44,9 +44,9 @@
#include <net/l2_buf.h>
#include "net/llsec/ccm-star.h"
#include "net/llsec/llsec802154.h"
#include "net/packetbuf.h"
#include "contiki/llsec/ccm-star.h"
#include "contiki/llsec/llsec802154.h"
#include "contiki/packetbuf.h"
#include "lib/aes-128.h"
#include <string.h>

View file

@ -48,7 +48,7 @@
#include <net/l2_buf.h>
#include "contiki.h"
#include "net/mac/frame802154.h"
#include "contiki/mac/frame802154.h"
/* see RFC 3610 */
#define CCM_STAR_AUTH_FLAGS(Adata, M) ((Adata ? (1 << 6) : 0) | (((M - 2) >> 1) << 3) | 1)

View file

@ -57,7 +57,7 @@
#include <stdbool.h>
#include <net/buf.h>
#include "net/mac/mac.h"
#include "contiki/mac/mac.h"
#ifndef LLSEC_H_
#define LLSEC_H_

View file

@ -53,8 +53,8 @@
#ifndef LLSEC802154_H_
#define LLSEC802154_H_
#include "net/mac/frame802154.h"
#include "net/ip/uip.h"
#include "contiki/mac/frame802154.h"
#include "contiki/ip/uip.h"
#ifdef LLSEC802154_CONF_SECURITY_LEVEL
#define LLSEC802154_SECURITY_LEVEL LLSEC802154_CONF_SECURITY_LEVEL

View file

@ -44,13 +44,13 @@
#include <net/l2_buf.h>
#include "net/llsec/nullsec.h"
#include "net/mac/frame802154.h"
#include "net/netstack.h"
#include "net/packetbuf.h"
#include "contiki/llsec/nullsec.h"
#include "contiki/mac/frame802154.h"
#include "contiki/netstack.h"
#include "contiki/packetbuf.h"
#define DEBUG 0
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
#if UIP_LOGGING
#include <stdio.h>

View file

@ -53,7 +53,7 @@
#ifndef NULLSEC_H_
#define NULLSEC_H_
#include "net/llsec/llsec.h"
#include "contiki/llsec/llsec.h"
extern const struct llsec_driver nullsec_driver;

View file

@ -39,16 +39,16 @@
#include <net/l2_buf.h>
#include "net/mac/csma.h"
#include "net/packetbuf.h"
#include "net/queuebuf.h"
#include "contiki/mac/csma.h"
#include "contiki/packetbuf.h"
#include "contiki/queuebuf.h"
#include "sys/ctimer.h"
#include "sys/clock.h"
#include "lib/random.h"
#include "net/netstack.h"
#include "contiki/netstack.h"
#include "lib/list.h"
#include "lib/memb.h"
@ -66,7 +66,7 @@ void uip_log(char *msg);
#endif
#define DEBUG 0
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
#if UIP_LOGGING
#include <stdio.h>

View file

@ -41,7 +41,7 @@
#ifndef CSMA_H_
#define CSMA_H_
#include "net/mac/mac.h"
#include "contiki/mac/mac.h"
#include "dev/radio.h"
extern const struct mac_driver csma_driver;

View file

@ -64,9 +64,9 @@
*/
#include "sys/cc.h"
#include "net/mac/frame802154.h"
#include "net/llsec/llsec802154.h"
#include "net/linkaddr.h"
#include "contiki/mac/frame802154.h"
#include "contiki/llsec/llsec802154.h"
#include "contiki/linkaddr.h"
#include <string.h>
/**

View file

@ -38,15 +38,15 @@
#include <net/l2_buf.h>
#include "net/mac/framer-802154.h"
#include "net/mac/frame802154.h"
#include "net/llsec/llsec802154.h"
#include "net/packetbuf.h"
#include "contiki/mac/framer-802154.h"
#include "contiki/mac/frame802154.h"
#include "contiki/llsec/llsec802154.h"
#include "contiki/packetbuf.h"
#include "lib/random.h"
#include <string.h>
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
/** \brief The 16-bit identifier of the PAN on which the device is
* sending to. If this value is 0xffff, the device is not

View file

@ -39,7 +39,7 @@
#ifndef FRAMER_802154_H_
#define FRAMER_802154_H_
#include "net/mac/framer.h"
#include "contiki/mac/framer.h"
extern const struct framer framer_802154;

View file

@ -36,8 +36,8 @@
* Joakim Eriksson <joakime@sics.se>
*/
#include "net/mac/framer-nullmac.h"
#include "net/packetbuf.h"
#include "contiki/mac/framer-nullmac.h"
#include "contiki/packetbuf.h"
#define DEBUG 0

View file

@ -39,7 +39,7 @@
#ifndef FRAMER_NULLMAC_H_
#define FRAMER_NULLMAC_H_
#include "net/mac/framer.h"
#include "contiki/mac/framer.h"
extern const struct framer framer_nullmac;

View file

@ -28,9 +28,9 @@
*
*/
#include "net/mac/framer.h"
#include "net/packetbuf.h"
#include "net/netstack.h"
#include "contiki/mac/framer.h"
#include "contiki/packetbuf.h"
#include "contiki/netstack.h"
/*---------------------------------------------------------------------------*/
int

View file

@ -38,11 +38,11 @@
#include <net/l2_buf.h>
#include "net/mac/framer-802154.h"
#include "net/mac/frame802154.h"
#include "net/mac/handler-802154.h"
#include "net/packetbuf.h"
#include "net/netstack.h"
#include "contiki/mac/framer-802154.h"
#include "contiki/mac/frame802154.h"
#include "contiki/mac/handler-802154.h"
#include "contiki/packetbuf.h"
#include "contiki/netstack.h"
#include "lib/random.h"
#include "sys/ctimer.h"
#include <string.h>

View file

@ -39,7 +39,7 @@
#ifndef HANDLER_802154_H_
#define HANDLER_802154_H_
#include "net/mac/frame802154.h"
#include "contiki/mac/frame802154.h"
#define BEACON_PAYLOAD_BUFFER_SIZE 128

View file

@ -47,8 +47,8 @@
#include <net/l2_buf.h>
#include "contiki-net.h"
#include "net/mac/mac-sequence.h"
#include "net/packetbuf.h"
#include "contiki/mac/mac-sequence.h"
#include "contiki/packetbuf.h"
struct seqno {
linkaddr_t sender;

View file

@ -32,10 +32,10 @@
#include <net/l2_buf.h>
#include "net/mac/mac.h"
#include "contiki/mac/mac.h"
#define DEBUG 0
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
#if UIP_LOGGING
#include <stdio.h>

View file

@ -39,12 +39,12 @@
#include <net/l2_buf.h>
#include "net/mac/nullmac.h"
#include "net/netstack.h"
#include "net/ip/uip.h"
#include "net/ip/tcpip.h"
#include "net/packetbuf.h"
#include "net/netstack.h"
#include "contiki/mac/nullmac.h"
#include "contiki/netstack.h"
#include "contiki/ip/uip.h"
#include "contiki/ip/tcpip.h"
#include "contiki/packetbuf.h"
#include "contiki/netstack.h"
/*---------------------------------------------------------------------------*/
static uint8_t

View file

@ -40,7 +40,7 @@
#ifndef NULLMAC_H_
#define NULLMAC_H_
#include "net/mac/mac.h"
#include "contiki/mac/mac.h"
#include "dev/radio.h"
extern const struct mac_driver nullmac_driver;

View file

@ -40,12 +40,12 @@
#include <net/l2_buf.h>
#include "net/mac/mac-sequence.h"
#include "net/mac/nullrdc.h"
#include "net/packetbuf.h"
#include "net/queuebuf.h"
#include "net/netstack.h"
#include "net/llsec/anti-replay.h"
#include "contiki/mac/mac-sequence.h"
#include "contiki/mac/nullrdc.h"
#include "contiki/packetbuf.h"
#include "contiki/queuebuf.h"
#include "contiki/netstack.h"
#include "contiki/llsec/anti-replay.h"
#include <string.h>
#if CONTIKI_TARGET_COOJA
@ -53,7 +53,7 @@
#endif /* CONTIKI_TARGET_COOJA */
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
#ifdef NULLRDC_CONF_ADDRESS_FILTER
#define NULLRDC_ADDRESS_FILTER NULLRDC_CONF_ADDRESS_FILTER
@ -100,7 +100,7 @@
#endif /* NULLRDC_CONF_SEND_802154_ACK */
#if NULLRDC_SEND_802154_ACK
#include "net/mac/frame802154.h"
#include "contiki/mac/frame802154.h"
#endif /* NULLRDC_SEND_802154_ACK */
#define ACK_LEN 3

View file

@ -41,7 +41,7 @@
#ifndef NULLRDC_H_
#define NULLRDC_H_
#include "net/mac/rdc.h"
#include "contiki/mac/rdc.h"
extern const struct rdc_driver nullrdc_driver;

View file

@ -44,7 +44,7 @@
#include <net/buf.h>
#include "contiki-conf.h"
#include "net/mac/mac.h"
#include "contiki/mac/mac.h"
#ifdef RDC_CONF_WITH_DUPLICATE_DETECTION
#define RDC_WITH_DUPLICATE_DETECTION RDC_CONF_WITH_DUPLICATE_DETECTION

View file

@ -47,15 +47,15 @@
#include <net/l2_buf.h>
#include "net/mac/sicslowmac/sicslowmac.h"
#include "net/mac/frame802154.h"
#include "net/packetbuf.h"
#include "net/queuebuf.h"
#include "net/netstack.h"
#include "contiki/mac/sicslowmac/sicslowmac.h"
#include "contiki/mac/frame802154.h"
#include "contiki/packetbuf.h"
#include "contiki/queuebuf.h"
#include "contiki/netstack.h"
#include "lib/random.h"
#define DEBUG 0
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
#if UIP_LOGGING
#include <stdio.h>

View file

@ -45,7 +45,7 @@
#ifndef SICSLOWMAC_H_
#define SICSLOWMAC_H_
#include "net/mac/rdc.h"
#include "contiki/mac/rdc.h"
#include "dev/radio.h"
extern const struct rdc_driver sicslowmac_driver;

View file

@ -38,7 +38,7 @@
#include <string.h>
#include "lib/memb.h"
#include "lib/list.h"
#include "net/nbr-table.h"
#include "contiki/nbr-table.h"
/* List of link-layer addresses of the neighbors, used as key in the tables */
typedef struct nbr_table_key {

View file

@ -36,8 +36,8 @@
#define NBR_TABLE_H_
#include "contiki.h"
#include "net/linkaddr.h"
#include "net/netstack.h"
#include "contiki/linkaddr.h"
#include "contiki/netstack.h"
/* Neighbor table size */
#ifdef NBR_TABLE_CONF_MAX_NEIGHBORS

View file

@ -37,7 +37,7 @@
* Adam Dunkels <adam@sics.se>
*/
#include "net/netstack.h"
#include "contiki/netstack.h"
/*---------------------------------------------------------------------------*/
void
netstack_init(void)

View file

@ -115,13 +115,13 @@
#endif /* NETSTACK_CONF_FRAGMENT */
#endif /* NETSTACK_FRAGEMENT */
#include "net/llsec/llsec.h"
#include "net/mac/mac.h"
#include "net/mac/rdc.h"
#include "net/mac/framer.h"
#include "dev/radio.h"
#include "net/sicslowpan/compression.h"
#include "net/sicslowpan/fragmentation.h"
#include "contiki/llsec/llsec.h"
#include "contiki/mac/mac.h"
#include "contiki/mac/rdc.h"
#include "contiki/mac/framer.h"
#include "contiki/os/dev/radio.h"
#include "contiki/sicslowpan/compression.h"
#include "contiki/sicslowpan/fragmentation.h"
/**
* The structure of a network driver in Contiki.

View file

@ -44,7 +44,7 @@
#include "contiki.h"
#include "net/ip/uip.h"
#include "contiki/ip/uip.h"
#if !defined(CONFIG_NETWORKING_DEBUG_UART)
#undef NET_DBG

View file

@ -26,7 +26,7 @@
#endif
#define DEBUG 0
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
#if UIP_LOGGING
#include <stdio.h>

View file

@ -53,7 +53,7 @@ LIST(ctimer_list);
static char initialized;
#define DEBUG 0
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
#if UIP_LOGGING
#include <stdio.h>

View file

@ -84,7 +84,7 @@ static volatile unsigned char poll_requested;
static void call_process(struct process *p, process_event_t ev, process_data_t data, struct net_buf *buf);
#define DEBUG 0
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
#if UIP_LOGGING
#include <stdio.h>

View file

@ -47,7 +47,7 @@
#include <net/l2_buf.h>
#include "contiki-net.h"
#include "net/packetbuf.h"
#include "contiki/packetbuf.h"
#if NETSTACK_CONF_WITH_RIME
#include "net/rime/rime.h"
@ -75,7 +75,7 @@ static uint8_t *packetbufptr;
#define DEBUG 0
#define DEBUG_LEVEL DEBUG
//#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
#if UIP_LOGGING
#include <stdio.h>

View file

@ -50,8 +50,8 @@
*/
#include "contiki-conf.h"
#include "net/linkaddr.h"
#include "net/llsec/llsec802154.h"
#include "contiki/linkaddr.h"
#include "contiki/llsec/llsec802154.h"
#ifndef PACKETBUF_H_
#define PACKETBUF_H_

View file

@ -132,7 +132,7 @@ LIST(queuebuf_list);
#endif /* QUEUEBUF_DEBUG */
#define DEBUG 0
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
#if UIP_LOGGING
#include <stdio.h>

View file

@ -53,7 +53,7 @@
#ifndef QUEUEBUF_H_
#define QUEUEBUF_H_
#include "net/packetbuf.h"
#include "contiki/packetbuf.h"
/* QUEUEBUF_NUM is the total number of queuebuf */
#ifdef QUEUEBUF_CONF_NUM

View file

@ -44,12 +44,12 @@
*/
#include "contiki.h"
#include "net/rpl/rpl-private.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip-nd6.h"
#include "net/ipv6/uip-ds6-nbr.h"
#include "net/nbr-table.h"
#include "net/ipv6/multicast/uip-mcast6.h"
#include "contiki/rpl/rpl-private.h"
#include "contiki/ip/uip.h"
#include "contiki/ipv6/uip-nd6.h"
#include "contiki/ipv6/uip-ds6-nbr.h"
#include "contiki/nbr-table.h"
#include "contiki/ipv6/multicast/uip-mcast6.h"
#include "lib/list.h"
#include "lib/memb.h"
#include "sys/ctimer.h"
@ -58,7 +58,7 @@
#include <string.h>
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
/*---------------------------------------------------------------------------*/
extern rpl_of_t RPL_OF;

View file

@ -46,14 +46,14 @@
#include <net/ip_buf.h>
#include "net/ip/uip.h"
#include "net/ip/tcpip.h"
#include "net/ipv6/uip-ds6.h"
#include "net/rpl/rpl-private.h"
#include "net/packetbuf.h"
#include "contiki/ip/uip.h"
#include "contiki/ip/tcpip.h"
#include "contiki/ipv6/uip-ds6.h"
#include "contiki/rpl/rpl-private.h"
#include "contiki/packetbuf.h"
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
#include <limits.h>
#include <string.h>

View file

@ -47,20 +47,20 @@
#include <net/ip_buf.h>
#include "net/ip/tcpip.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip-ds6.h"
#include "net/ipv6/uip-nd6.h"
#include "net/ipv6/uip-icmp6.h"
#include "net/rpl/rpl-private.h"
#include "net/ipv6/multicast/uip-mcast6.h"
#include "contiki/ip/tcpip.h"
#include "contiki/ip/uip.h"
#include "contiki/ipv6/uip-ds6.h"
#include "contiki/ipv6/uip-nd6.h"
#include "contiki/ipv6/uip-icmp6.h"
#include "contiki/rpl/rpl-private.h"
#include "contiki/ipv6/multicast/uip-mcast6.h"
#include <limits.h>
#include <string.h>
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
/*---------------------------------------------------------------------------*/
#define RPL_DIO_GROUNDED 0x80

View file

@ -46,11 +46,11 @@
* @{
*/
#include "net/rpl/rpl-private.h"
#include "net/nbr-table.h"
#include "contiki/rpl/rpl-private.h"
#include "contiki/nbr-table.h"
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
static void reset(rpl_dag_t *);
static void neighbor_link_callback(rpl_parent_t *, int, int);

View file

@ -41,10 +41,10 @@
* @{
*/
#include "net/rpl/rpl-private.h"
#include "contiki/rpl/rpl-private.h"
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
static void reset(rpl_dag_t *);
static rpl_parent_t *best_parent(rpl_parent_t *, rpl_parent_t *);

View file

@ -37,14 +37,14 @@
#ifndef RPL_PRIVATE_H
#define RPL_PRIVATE_H
#include "net/rpl/rpl.h"
#include "contiki/rpl/rpl.h"
#include "lib/list.h"
#include "net/ip/uip.h"
#include "contiki/ip/uip.h"
#include "sys/clock.h"
#include "sys/ctimer.h"
#include "net/ipv6/uip-ds6.h"
#include "net/ipv6/multicast/uip-mcast6.h"
#include "contiki/ipv6/uip-ds6.h"
#include "contiki/ipv6/multicast/uip-mcast6.h"
/*---------------------------------------------------------------------------*/
/** \brief Is IPv6 address addr the link-local, all-RPL-nodes

View file

@ -42,13 +42,13 @@
*/
#include "contiki-conf.h"
#include "net/rpl/rpl-private.h"
#include "net/ipv6/multicast/uip-mcast6.h"
#include "contiki/rpl/rpl-private.h"
#include "contiki/ipv6/multicast/uip-mcast6.h"
#include "lib/random.h"
#include "sys/ctimer.h"
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
/*---------------------------------------------------------------------------*/
static struct ctimer periodic_timer;

View file

@ -42,15 +42,15 @@
* @{
*/
#include "net/ip/uip.h"
#include "net/ip/tcpip.h"
#include "net/ipv6/uip-ds6.h"
#include "net/ipv6/uip-icmp6.h"
#include "net/rpl/rpl-private.h"
#include "net/ipv6/multicast/uip-mcast6.h"
#include "contiki/ip/uip.h"
#include "contiki/ip/tcpip.h"
#include "contiki/ipv6/uip-ds6.h"
#include "contiki/ipv6/uip-icmp6.h"
#include "contiki/rpl/rpl-private.h"
#include "contiki/ipv6/multicast/uip-mcast6.h"
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
#include <limits.h>
#include <string.h>

View file

@ -43,8 +43,8 @@
#include "rpl-conf.h"
#include "lib/list.h"
#include "net/ip/uip.h"
#include "net/ipv6/uip-ds6.h"
#include "contiki/ip/uip.h"
#include "contiki/ipv6/uip-ds6.h"
#include "sys/ctimer.h"
/*---------------------------------------------------------------------------*/

View file

@ -18,7 +18,7 @@
#include "contiki-conf.h"
#include <net/buf.h>
#include <net/mac/mac.h>
#include "contiki/mac/mac.h"
#ifndef FRAGMENTATION_H_
#define FRAGMENTATION_H_

View file

@ -24,7 +24,7 @@
#include <net/netstack.h>
#define DEBUG 0
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
#if UIP_LOGGING
#include <stdio.h>

View file

@ -23,13 +23,13 @@
#include <net/l2_buf.h>
#include <net/net_core.h>
#include <net/sicslowpan/null_fragmentation.h>
#include <net/netstack.h>
#include "contiki/sicslowpan/null_fragmentation.h"
#include "contiki/netstack.h"
#include "contiki/ipv6/uip-ds6-nbr.h"
#define DEBUG 0
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
#if UIP_LOGGING
#include <stdio.h>

View file

@ -20,16 +20,16 @@
#include <string.h>
#include <net/l2_buf.h>
#include <net/sicslowpan/sicslowpan_compression.h>
#include <net/netstack.h>
#include "net/packetbuf.h"
#include "net/ip/uip.h"
#include "net/ip/tcpip.h"
#include "contiki/sicslowpan/sicslowpan_compression.h"
#include "contiki/netstack.h"
#include "contiki/packetbuf.h"
#include "contiki/ip/uip.h"
#include "contiki/ip/tcpip.h"
#include "dev/watchdog.h"
#include "contiki/ipv6/uip-ds6.h"
#define DEBUG 0
#include "net/ip/uip-debug.h"
#include "contiki/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;

View file

@ -19,7 +19,7 @@
#ifndef SICSLOWPAN_COMPRESSION_H_
#define SICSLOWPAN_COMPRESSION_H_
#include <net/sicslowpan/compression.h>
#include "contiki/sicslowpan/compression.h"
extern const struct compression sicslowpan_compression;

View file

@ -21,18 +21,18 @@
#include <net/l2_buf.h>
#include <net_driver_15_4.h>
#include <net/sicslowpan/sicslowpan_fragmentation.h>
#include <net/netstack.h>
#include "net/packetbuf.h"
#include "net/queuebuf.h"
#include "net/ip/uip.h"
#include "net/ip/tcpip.h"
#include "contiki/sicslowpan/sicslowpan_fragmentation.h"
#include "contiki/netstack.h"
#include "contiki/packetbuf.h"
#include "contiki/queuebuf.h"
#include "contiki/ip/uip.h"
#include "contiki/ip/tcpip.h"
#include "dev/watchdog.h"
#include "contiki/ipv6/uip-ds6-nbr.h"
#define DEBUG 0
#include "net/ip/uip-debug.h"
#include "contiki/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;

View file

@ -19,7 +19,7 @@
#ifndef SICSLOWPAN_FRAGMENTATION_H_
#define SICSLOWPAN_FRAGMENTATION_H_
#include <net/sicslowpan/fragmentation.h>
#include "contiki/sicslowpan/fragmentation.h"
extern const struct fragmentation sicslowpan_fragmentation;

View file

@ -21,8 +21,8 @@
#include <net/l2_buf.h>
#include <simple/uart.h>
#include "net/packetbuf.h"
#include "net/netstack.h"
#include "contiki/packetbuf.h"
#include "contiki/netstack.h"
#include "dummy_15_4_radio.h"
#include "net_driver_15_4.h"
@ -33,7 +33,7 @@
#else
#define DEBUG DEBUG_NONE
#endif
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
#if UIP_LOGGING
#include <stdio.h>

View file

@ -43,7 +43,7 @@
#include "er-coap-block1.h"
#define DEBUG 0
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
/*----------------------------------------------------------------------------*/

View file

@ -41,7 +41,7 @@
#include <errno.h>
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
#ifndef COAP_CONTEXT_CONF_MAX_CONTEXTS
#define MAX_CONTEXTS 1

View file

@ -43,7 +43,7 @@
#include "contiki-conf.h"
#include "sys/process.h"
#include "net/ip/uip.h"
#include "contiki/ip/uip.h"
#if ER_COAP_WITH_DTLS
#define WITH_DTLS 1

View file

@ -44,7 +44,7 @@
#include "er-coap-context.h"
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
PROCESS(coap_engine, "CoAP Engine");

View file

@ -47,7 +47,7 @@
#if COAP_OBSERVE_CLIENT
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
MEMB(obs_subjects_memb, coap_observee_t, COAP_MAX_OBSERVEES);
LIST(obs_subjects_list);

View file

@ -41,7 +41,7 @@
#include "er-coap-observe.h"
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
/*---------------------------------------------------------------------------*/
MEMB(observers_memb, coap_observer_t, COAP_MAX_OBSERVERS);

View file

@ -40,7 +40,7 @@
#include "er-coap-engine.h"
#define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h"
#include "contiki/ip/uip-debug.h"
#define ADD_CHAR_IF_POSSIBLE(char) \
if(strpos >= *offset && bufpos < preferred_size) { \

Some files were not shown because too many files have changed in this diff Show more