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

Removed now unused per-module neighbor table size configs. Use NEIGHBOR_CONF_MAX_NEIGHBORS instead.

Browse source
This commit is contained in:
Simon Duquennoy 2013-07-03 20:17:10 +02:00
parent c3f62b24c8
commit ff093a2b50
30 changed files with 56 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/contiki-default-conf.h
View file

@ -174,6 +174,11 @@
#define UIP_CONF_TCP_SPLIT 0 #define UIP_CONF_TCP_SPLIT 0
#endif /* UIP_CONF_TCP_SPLIT */ #endif /* UIP_CONF_TCP_SPLIT */
/* NEIGHBOR_CONF_MAX_NEIGHBORS specifies the maximum number of neighbors
that each node will be able to handle. */
#ifndef NEIGHBOR_CONF_MAX_NEIGHBORS
#define NEIGHBOR_CONF_MAX_NEIGHBORS 8
#endif /* NEIGHBOR_CONF_MAX_NEIGHBORS */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* 6lowpan configuration options. /* 6lowpan configuration options.

5
core/net/uipopt.h
View file

@ -213,11 +213,6 @@
#define UIP_CONF_DS6_PREFIX_NBU 2 #define UIP_CONF_DS6_PREFIX_NBU 2
#endif #endif
#ifndef UIP_CONF_DS6_NBR_NBU
/** Default number of neighbors that can be stored in the %neighbor cache */
#define UIP_CONF_DS6_NBR_NBU 4
#endif
#ifndef UIP_CONF_DS6_DEFRT_NBU #ifndef UIP_CONF_DS6_DEFRT_NBU
/** Minimum number of default routers */ /** Minimum number of default routers */
#define UIP_CONF_DS6_DEFRT_NBU 2 #define UIP_CONF_DS6_DEFRT_NBU 2

4
examples/er-rest-example/project-conf.h
View file

@ -73,8 +73,8 @@
*/ */
/* Save some memory for the sky platform. */ /* Save some memory for the sky platform. */
#undef UIP_CONF_DS6_NBR_NBU #undef NEIGHBOR_CONF_MAX_NEIGHBORS
#define UIP_CONF_DS6_NBR_NBU 10 #define NEIGHBOR_CONF_MAX_NEIGHBORS 10
#undef UIP_CONF_MAX_ROUTES #undef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 10 #define UIP_CONF_MAX_ROUTES 10

6
examples/ipv6/json-ws/project-conf.h
View file

@ -43,8 +43,6 @@
#define NETSTACK_CONF_RDC nullrdc_driver #define NETSTACK_CONF_RDC nullrdc_driver
/* #define NETSTACK_CONF_RDC contikimac_driver */ /* #define NETSTACK_CONF_RDC contikimac_driver */
#define CONTIKIMAC_CONF_MAX_PHASE_NEIGHBORS 7
#undef NULLRDC_CONF_802154_AUTOACK #undef NULLRDC_CONF_802154_AUTOACK
#define NULLRDC_CONF_802154_AUTOACK 1 #define NULLRDC_CONF_802154_AUTOACK 1
@ -56,8 +54,8 @@
#undef QUEUEBUF_CONF_NUM #undef QUEUEBUF_CONF_NUM
#define QUEUEBUF_CONF_NUM 4 #define QUEUEBUF_CONF_NUM 4
#undef UIP_CONF_DS6_NBR_NBU #undef NEIGHBOR_CONF_MAX_NEIGHBORS
#define UIP_CONF_DS6_NBR_NBU 7 #define NEIGHBOR_CONF_MAX_NEIGHBORS 7
#undef UIP_CONF_MAX_ROUTES #undef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 7 #define UIP_CONF_MAX_ROUTES 7

4
examples/udp-stream/project-conf.h
View file

@ -33,8 +33,8 @@
/* Free some code and RAM space */ /* Free some code and RAM space */
#define UIP_CONF_TCP 0 #define UIP_CONF_TCP 0
#undef UIP_CONF_DS6_NBR_NBU #undef NEIGHBOR_CONF_MAX_NEIGHBORS
#define UIP_CONF_DS6_NBR_NBU 8 #define NEIGHBOR_CONF_MAX_NEIGHBORS 8
#undef UIP_CONF_MAX_ROUTES #undef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 8 #define UIP_CONF_MAX_ROUTES 8

6
platform/avr-atmega128rfa1/contiki-conf.h
View file

@ -221,7 +221,7 @@ typedef unsigned short uip_stats_t;
/* 25 bytes per UDP connection */ /* 25 bytes per UDP connection */
#define UIP_CONF_UDP_CONNS 10 #define UIP_CONF_UDP_CONNS 10
/* See uip-ds6.h */ /* See uip-ds6.h */
#define UIP_CONF_DS6_NBR_NBU 20 #define NEIGHBOR_CONF_MAX_NEIGHBORS 20
#define UIP_CONF_DS6_DEFRT_NBU 2 #define UIP_CONF_DS6_DEFRT_NBU 2
#define UIP_CONF_DS6_PREFIX_NBU 3 #define UIP_CONF_DS6_PREFIX_NBU 3
#define UIP_CONF_MAX_ROUTES 20 #define UIP_CONF_MAX_ROUTES 20
@ -266,7 +266,7 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_MAX_CONNECTIONS 2 #define UIP_CONF_MAX_CONNECTIONS 2
#define UIP_CONF_MAX_LISTENPORTS 4 #define UIP_CONF_MAX_LISTENPORTS 4
#define UIP_CONF_UDP_CONNS 5 #define UIP_CONF_UDP_CONNS 5
#define UIP_CONF_DS6_NBR_NBU 20 #define NEIGHBOR_CONF_MAX_NEIGHBORS 20
#define UIP_CONF_DS6_DEFRT_NBU 2 #define UIP_CONF_DS6_DEFRT_NBU 2
#define UIP_CONF_DS6_PREFIX_NBU 3 #define UIP_CONF_DS6_PREFIX_NBU 3
#define UIP_CONF_MAX_ROUTES 4 #define UIP_CONF_MAX_ROUTES 4
@ -302,7 +302,7 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_MAX_CONNECTIONS 2 #define UIP_CONF_MAX_CONNECTIONS 2
#define UIP_CONF_MAX_LISTENPORTS 4 #define UIP_CONF_MAX_LISTENPORTS 4
#define UIP_CONF_UDP_CONNS 5 #define UIP_CONF_UDP_CONNS 5
#define UIP_CONF_DS6_NBR_NBU 4 #define NEIGHBOR_CONF_MAX_NEIGHBORS 4
#define UIP_CONF_DS6_DEFRT_NBU 2 #define UIP_CONF_DS6_DEFRT_NBU 2
#define UIP_CONF_DS6_PREFIX_NBU 3 #define UIP_CONF_DS6_PREFIX_NBU 3
#define UIP_CONF_MAX_ROUTES 4 #define UIP_CONF_MAX_ROUTES 4

6
platform/avr-raven/contiki-conf.h
View file

@ -238,7 +238,7 @@ typedef unsigned short uip_stats_t;
/* 25 bytes per UDP connection */ /* 25 bytes per UDP connection */
#define UIP_CONF_UDP_CONNS 10 #define UIP_CONF_UDP_CONNS 10
/* See uip-ds6.h */ /* See uip-ds6.h */
#define UIP_CONF_DS6_NBR_NBU 20 #define NEIGHBOR_CONF_MAX_NEIGHBORS 20
#define UIP_CONF_DS6_DEFRT_NBU 2 #define UIP_CONF_DS6_DEFRT_NBU 2
#define UIP_CONF_DS6_PREFIX_NBU 3 #define UIP_CONF_DS6_PREFIX_NBU 3
#define UIP_CONF_MAX_ROUTES 20 #define UIP_CONF_MAX_ROUTES 20
@ -281,7 +281,7 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_MAX_CONNECTIONS 2 #define UIP_CONF_MAX_CONNECTIONS 2
#define UIP_CONF_MAX_LISTENPORTS 2 #define UIP_CONF_MAX_LISTENPORTS 2
#define UIP_CONF_UDP_CONNS 4 #define UIP_CONF_UDP_CONNS 4
#define UIP_CONF_DS6_NBR_NBU 10 #define NEIGHBOR_CONF_MAX_NEIGHBORS 10
#define UIP_CONF_DS6_DEFRT_NBU 2 #define UIP_CONF_DS6_DEFRT_NBU 2
#define UIP_CONF_DS6_PREFIX_NBU 2 #define UIP_CONF_DS6_PREFIX_NBU 2
#define UIP_CONF_MAX_ROUTES 4 #define UIP_CONF_MAX_ROUTES 4
@ -314,7 +314,7 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_MAX_CONNECTIONS 2 #define UIP_CONF_MAX_CONNECTIONS 2
#define UIP_CONF_MAX_LISTENPORTS 4 #define UIP_CONF_MAX_LISTENPORTS 4
#define UIP_CONF_UDP_CONNS 5 #define UIP_CONF_UDP_CONNS 5
#define UIP_CONF_DS6_NBR_NBU 4 #define NEIGHBOR_CONF_MAX_NEIGHBORS 4
#define UIP_CONF_DS6_DEFRT_NBU 2 #define UIP_CONF_DS6_DEFRT_NBU 2
#define UIP_CONF_DS6_PREFIX_NBU 3 #define UIP_CONF_DS6_PREFIX_NBU 3
#define UIP_CONF_MAX_ROUTES 4 #define UIP_CONF_MAX_ROUTES 4

12
platform/avr-ravenusb/contiki-conf.h
View file

@ -232,7 +232,7 @@ extern void mac_log_802_15_4_rx(const uint8_t* buffer, size_t total_len);
#endif /* UIP_CONF_IPV6 */ #endif /* UIP_CONF_IPV6 */
/* See uip-ds6.h */ /* See uip-ds6.h */
#define UIP_CONF_DS6_NBR_NBU 2 #define NEIGHBOR_CONF_MAX_NEIGHBORS 2
#define UIP_CONF_DS6_DEFRT_NBU 2 #define UIP_CONF_DS6_DEFRT_NBU 2
#define UIP_CONF_DS6_PREFIX_NBU 3 #define UIP_CONF_DS6_PREFIX_NBU 3
#define UIP_CONF_MAX_ROUTES 2 #define UIP_CONF_MAX_ROUTES 2
@ -360,8 +360,8 @@ typedef unsigned short uip_stats_t;
#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8 #define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8
#undef QUEUEBUF_CONF_NUM #undef QUEUEBUF_CONF_NUM
#define QUEUEBUF_CONF_NUM 8 #define QUEUEBUF_CONF_NUM 8
#undef UIP_CONF_DS6_NBR_NBU #undef NEIGHBOR_CONF_MAX_NEIGHBORS
#define UIP_CONF_DS6_NBR_NBU 5 #define NEIGHBOR_CONF_MAX_NEIGHBORS 5
#undef UIP_CONF_MAX_ROUTES #undef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 5 #define UIP_CONF_MAX_ROUTES 5
@ -409,7 +409,7 @@ typedef unsigned short uip_stats_t;
#endif #endif
#define RPL_CONF_STATS 0 #define RPL_CONF_STATS 0
#define UIP_CONF_BUFFER_SIZE 1300 #define UIP_CONF_BUFFER_SIZE 1300
//#define UIP_CONF_DS6_NBR_NBU 12 //#define NEIGHBOR_CONF_MAX_NEIGHBORS 12
//#define UIP_CONF_MAX_ROUTES 12 //#define UIP_CONF_MAX_ROUTES 12
#ifdef RPL_BORDER_ROUTER #ifdef RPL_BORDER_ROUTER
@ -446,8 +446,8 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_TCP 1 #define UIP_CONF_TCP 1
#define UIP_CONF_TCP_MSS 48 #define UIP_CONF_TCP_MSS 48
#define UIP_CONF_RECEIVE_WINDOW 48 #define UIP_CONF_RECEIVE_WINDOW 48
#undef UIP_CONF_DS6_NBR_NBU #undef NEIGHBOR_CONF_MAX_NEIGHBORS
#define UIP_CONF_DS6_NBR_NBU 5 #define NEIGHBOR_CONF_MAX_NEIGHBORS 5
#undef UIP_CONF_MAX_ROUTES #undef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 5 #define UIP_CONF_MAX_ROUTES 5
#undef UIP_CONF_MAX_CONNECTIONS #undef UIP_CONF_MAX_CONNECTIONS

1
platform/avr-rcb/contiki-conf.h
View file

@ -123,7 +123,6 @@ void clock_adjust_ticks(clock_time_t howmany);
#define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_IPV6_REASSEMBLY 0
#define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_NETIF_MAX_ADDRESSES 3
#define UIP_CONF_ND6_MAX_PREFIXES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3
#define UIP_CONF_ND6_MAX_NEIGHBORS 4
#define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_ND6_MAX_DEFROUTERS 2
#if UIP_CONF_IPV6 //tcpip.c error on ipv4 build if UIP_CONF_ICMP6 defined #if UIP_CONF_IPV6 //tcpip.c error on ipv4 build if UIP_CONF_ICMP6 defined
#define UIP_CONF_ICMP6 1 #define UIP_CONF_ICMP6 1

1
platform/avr-zigbit/contiki-conf.h
View file

@ -163,7 +163,6 @@ void clock_adjust_ticks(clock_time_t howmany);
#define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_IPV6_REASSEMBLY 0
#define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_NETIF_MAX_ADDRESSES 3
#define UIP_CONF_ND6_MAX_PREFIXES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3
#define UIP_CONF_ND6_MAX_NEIGHBORS 4
#define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_ND6_MAX_DEFROUTERS 2
#define UIP_CONF_UDP_CHECKSUMS 1 #define UIP_CONF_UDP_CHECKSUMS 1
#define UIP_CONF_TCP_SPLIT 1 #define UIP_CONF_TCP_SPLIT 1

4
platform/cc2530dk/contiki-conf.h
View file

@ -232,8 +232,8 @@
#define UIP_CONF_ND6_REACHABLE_TIME 600000 #define UIP_CONF_ND6_REACHABLE_TIME 600000
#define UIP_CONF_ND6_RETRANS_TIMER 10000 #define UIP_CONF_ND6_RETRANS_TIMER 10000
#ifndef UIP_CONF_DS6_NBR_NBU #ifndef NEIGHBOR_CONF_MAX_NEIGHBORS
#define UIP_CONF_DS6_NBR_NBU 4 /* Handle n Neighbors */ #define NEIGHBOR_CONF_MAX_NEIGHBORS 4 /* Handle n Neighbors */
#endif #endif
#ifndef UIP_CONF_MAX_ROUTES #ifndef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 4 /* Handle n Routes */ #define UIP_CONF_MAX_ROUTES 4 /* Handle n Routes */

4
platform/cc2538dk/contiki-conf.h
View file

@ -341,8 +341,8 @@ typedef uint32_t rtimer_clock_t;
#define UIP_CONF_ND6_REACHABLE_TIME 600000 #define UIP_CONF_ND6_REACHABLE_TIME 600000
#define UIP_CONF_ND6_RETRANS_TIMER 10000 #define UIP_CONF_ND6_RETRANS_TIMER 10000
#ifndef UIP_CONF_DS6_NBR_NBU #ifndef NEIGHBOR_CONF_MAX_NEIGHBORS
#define UIP_CONF_DS6_NBR_NBU 20 #define NEIGHBOR_CONF_MAX_NEIGHBORS 20
#endif #endif
#ifndef UIP_CONF_MAX_ROUTES #ifndef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 20 #define UIP_CONF_MAX_ROUTES 20

8
platform/cooja/contiki-conf.h
View file

@ -129,9 +129,9 @@
#endif /* UIP_CONF_IPV6_RPL */ #endif /* UIP_CONF_IPV6_RPL */
/* configure number of neighbors and routes */ /* configure number of neighbors and routes */
#ifndef UIP_CONF_DS6_NBR_NBU #ifndef NEIGHBOR_CONF_MAX_NEIGHBORS
#define UIP_CONF_DS6_NBR_NBU 300 #define NEIGHBOR_CONF_MAX_NEIGHBORS 300
#endif /* UIP_CONF_DS6_NBR_NBU */ #endif /* NEIGHBOR_CONF_MAX_NEIGHBORS */
#ifndef UIP_CONF_MAX_ROUTES #ifndef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 300 #define UIP_CONF_MAX_ROUTES 300
#endif /* UIP_CONF_MAX_ROUTES */ #endif /* UIP_CONF_MAX_ROUTES */
@ -145,7 +145,6 @@
#define RIMEADDR_CONF_SIZE 8 #define RIMEADDR_CONF_SIZE 8
#define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_NETIF_MAX_ADDRESSES 3
#define UIP_CONF_ND6_MAX_PREFIXES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3
#define UIP_CONF_ND6_MAX_NEIGHBORS 4
#define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_ND6_MAX_DEFROUTERS 2
#ifndef UIP_CONF_IPV6_QUEUE_PKT #ifndef UIP_CONF_IPV6_QUEUE_PKT
@ -155,7 +154,6 @@
#define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_IPV6_REASSEMBLY 0
#define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_NETIF_MAX_ADDRESSES 3
#define UIP_CONF_ND6_MAX_PREFIXES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3
#define UIP_CONF_ND6_MAX_NEIGHBORS 4
#define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_ND6_MAX_DEFROUTERS 2
#define UIP_CONF_IP_FORWARD 0 #define UIP_CONF_IP_FORWARD 0
#ifndef UIP_CONF_BUFFER_SIZE #ifndef UIP_CONF_BUFFER_SIZE

3
platform/econotag/contiki-conf.h
View file

@ -184,7 +184,7 @@
#define UIP_CONF_IPV6_RPL 1 #define UIP_CONF_IPV6_RPL 1
#endif #endif
#define UIP_CONF_DS6_NBR_NBU 30 #define NEIGHBOR_CONF_MAX_NEIGHBORS 30
#define UIP_CONF_MAX_ROUTES 30 #define UIP_CONF_MAX_ROUTES 30
#define UIP_CONF_ND6_SEND_RA 0 #define UIP_CONF_ND6_SEND_RA 0
@ -197,7 +197,6 @@
#define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_IPV6_REASSEMBLY 0
#define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_NETIF_MAX_ADDRESSES 3
#define UIP_CONF_ND6_MAX_PREFIXES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3
#define UIP_CONF_ND6_MAX_NEIGHBORS 4
#define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_ND6_MAX_DEFROUTERS 2
#define UIP_CONF_IP_FORWARD 0 #define UIP_CONF_IP_FORWARD 0
#define UIP_CONF_BUFFER_SIZE 1300 #define UIP_CONF_BUFFER_SIZE 1300

7
platform/exp5438/contiki-conf.h
View file

@ -137,9 +137,9 @@
#endif /* UIP_CONF_IPV6_RPL */ #endif /* UIP_CONF_IPV6_RPL */
/* configure number of neighbors and routes */ /* configure number of neighbors and routes */
#ifndef UIP_CONF_DS6_NBR_NBU #ifndef NEIGHBOR_CONF_MAX_NEIGHBORS
#define UIP_CONF_DS6_NBR_NBU 30 #define NEIGHBOR_CONF_MAX_NEIGHBORS 30
#endif /* UIP_CONF_DS6_NBR_NBU */ #endif /* NEIGHBOR_CONF_MAX_NEIGHBORS */
#ifndef UIP_CONF_MAX_ROUTES #ifndef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 30 #define UIP_CONF_MAX_ROUTES 30
#endif /* UIP_CONF_MAX_ROUTES */ #endif /* UIP_CONF_MAX_ROUTES */
@ -156,7 +156,6 @@
#define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_IPV6_REASSEMBLY 0
#define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_NETIF_MAX_ADDRESSES 3
#define UIP_CONF_ND6_MAX_PREFIXES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3
#define UIP_CONF_ND6_MAX_NEIGHBORS 4
#define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_ND6_MAX_DEFROUTERS 2
#define UIP_CONF_IP_FORWARD 0 #define UIP_CONF_IP_FORWARD 0
#ifndef UIP_CONF_BUFFER_SIZE #ifndef UIP_CONF_BUFFER_SIZE

3
platform/iris/contiki-conf.h
View file

@ -113,7 +113,7 @@
#define UIP_CONF_IPV6_RPL 1 #define UIP_CONF_IPV6_RPL 1
/* configure number of neighbors and routes */ /* configure number of neighbors and routes */
#define UIP_CONF_DS6_NBR_NBU 5 #define NEIGHBOR_CONF_MAX_NEIGHBORS 5
#define UIP_CONF_MAX_ROUTES 5 #define UIP_CONF_MAX_ROUTES 5
#define RPL_CONF_MAX_PARENTS 4 #define RPL_CONF_MAX_PARENTS 4
@ -129,7 +129,6 @@
#define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_IPV6_REASSEMBLY 0
#define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_NETIF_MAX_ADDRESSES 3
#define UIP_CONF_ND6_MAX_PREFIXES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3
#define UIP_CONF_ND6_MAX_NEIGHBORS 4
#define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_ND6_MAX_DEFROUTERS 2
#define UIP_CONF_IP_FORWARD 0 #define UIP_CONF_IP_FORWARD 0
#define UIP_CONF_BUFFER_SIZE 240 #define UIP_CONF_BUFFER_SIZE 240

3
platform/mbxxx/contiki-conf.h
View file

@ -108,7 +108,7 @@
#define ENERGEST_CONF_ON 0 #define ENERGEST_CONF_ON 0
#define QUEUEBUF_CONF_NUM 2 #define QUEUEBUF_CONF_NUM 2
#define QUEUEBUF_CONF_REF_NUM 0 #define QUEUEBUF_CONF_REF_NUM 0
#define UIP_CONF_DS6_NBR_NBU 4 #define NEIGHBOR_CONF_MAX_NEIGHBORS 4
#define UIP_CONF_DS6_ROUTE_NBU 4 #define UIP_CONF_DS6_ROUTE_NBU 4
#define RPL_CONF_MAX_PARENTS_PER_DAG 4 #define RPL_CONF_MAX_PARENTS_PER_DAG 4
#define RPL_CONF_MAX_INSTANCES 1 #define RPL_CONF_MAX_INSTANCES 1
@ -144,7 +144,6 @@
#define UIP_CONF_IPV6_CHECKS 1 #define UIP_CONF_IPV6_CHECKS 1
#define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_IPV6_REASSEMBLY 0
#define UIP_CONF_ND6_MAX_PREFIXES 2 #define UIP_CONF_ND6_MAX_PREFIXES 2
#define UIP_CONF_ND6_MAX_NEIGHBORS 2
#define UIP_CONF_ND6_MAX_DEFROUTERS 1 #define UIP_CONF_ND6_MAX_DEFROUTERS 1
#define UIP_CONF_IP_FORWARD 0 #define UIP_CONF_IP_FORWARD 0
#define UIP_CONF_BUFFER_SIZE 140 #define UIP_CONF_BUFFER_SIZE 140

3
platform/micaz/contiki-conf.h
View file

@ -118,7 +118,7 @@
#define UIP_CONF_IPV6_RPL 1 #define UIP_CONF_IPV6_RPL 1
/* configure number of neighbors and routes */ /* configure number of neighbors and routes */
#define UIP_CONF_DS6_NBR_NBU 5 #define NEIGHBOR_CONF_MAX_NEIGHBORS 5
#define UIP_CONF_MAX_ROUTES 5 #define UIP_CONF_MAX_ROUTES 5
#define RPL_CONF_MAX_PARENTS 4 #define RPL_CONF_MAX_PARENTS 4
@ -134,7 +134,6 @@
#define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_IPV6_REASSEMBLY 0
#define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_NETIF_MAX_ADDRESSES 3
#define UIP_CONF_ND6_MAX_PREFIXES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3
#define UIP_CONF_ND6_MAX_NEIGHBORS 4
#define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_ND6_MAX_DEFROUTERS 2
#define UIP_CONF_IP_FORWARD 0 #define UIP_CONF_IP_FORWARD 0
#define UIP_CONF_BUFFER_SIZE 240 #define UIP_CONF_BUFFER_SIZE 240

3
platform/minimal-net/contiki-conf.h
View file

@ -160,9 +160,8 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_IPV6_REASSEMBLY 1 #define UIP_CONF_IPV6_REASSEMBLY 1
//#define UIP_CONF_NETIF_MAX_ADDRESSES 5 //#define UIP_CONF_NETIF_MAX_ADDRESSES 5
//#define UIP_CONF_ND6_MAX_PREFIXES 3 //#define UIP_CONF_ND6_MAX_PREFIXES 3
//#define UIP_CONF_ND6_MAX_NEIGHBORS 40
//#define UIP_CONF_ND6_MAX_DEFROUTERS 2 //#define UIP_CONF_ND6_MAX_DEFROUTERS 2
#define UIP_CONF_DS6_NBR_NBU 100 #define NEIGHBOR_CONF_MAX_NEIGHBORS 100
#define UIP_CONF_DS6_DEFRT_NBU 2 #define UIP_CONF_DS6_DEFRT_NBU 2
#define UIP_CONF_DS6_PREFIX_NBU 5 #define UIP_CONF_DS6_PREFIX_NBU 5
#define UIP_CONF_MAX_ROUTES 100 #define UIP_CONF_MAX_ROUTES 100

7
platform/native/contiki-conf.h
View file

@ -125,14 +125,13 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_IPV6_REASSEMBLY 0
#define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_NETIF_MAX_ADDRESSES 3
#define UIP_CONF_ND6_MAX_PREFIXES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3
#define UIP_CONF_ND6_MAX_NEIGHBORS 4
#define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_ND6_MAX_DEFROUTERS 2
#define UIP_CONF_ICMP6 1 #define UIP_CONF_ICMP6 1
/* configure number of neighbors and routes */ /* configure number of neighbors and routes */
#ifndef UIP_CONF_DS6_NBR_NBU #ifndef NEIGHBOR_CONF_MAX_NEIGHBORS
#define UIP_CONF_DS6_NBR_NBU 30 #define NEIGHBOR_CONF_MAX_NEIGHBORS 30
#endif /* UIP_CONF_DS6_NBR_NBU */ #endif /* NEIGHBOR_CONF_MAX_NEIGHBORS */
#ifndef UIP_CONF_MAX_ROUTES #ifndef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 30 #define UIP_CONF_MAX_ROUTES 30
#endif /* UIP_CONF_MAX_ROUTES */ #endif /* UIP_CONF_MAX_ROUTES */

3
platform/redbee-dev/contiki-conf.h
View file

@ -178,7 +178,7 @@ typedef unsigned long rtimer_clock_t;
#define UIP_CONF_ROUTER 1 #define UIP_CONF_ROUTER 1
#define UIP_CONF_IPV6_RPL 1 #define UIP_CONF_IPV6_RPL 1
#define UIP_CONF_DS6_NBR_NBU 30 #define NEIGHBOR_CONF_MAX_NEIGHBORS 30
#define UIP_CONF_MAX_ROUTES 30 #define UIP_CONF_MAX_ROUTES 30
#define UIP_CONF_ND6_SEND_RA 0 #define UIP_CONF_ND6_SEND_RA 0
@ -191,7 +191,6 @@ typedef unsigned long rtimer_clock_t;
#define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_IPV6_REASSEMBLY 0
#define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_NETIF_MAX_ADDRESSES 3
#define UIP_CONF_ND6_MAX_PREFIXES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3
#define UIP_CONF_ND6_MAX_NEIGHBORS 4
#define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_ND6_MAX_DEFROUTERS 2
#define UIP_CONF_IP_FORWARD 0 #define UIP_CONF_IP_FORWARD 0
#define UIP_CONF_BUFFER_SIZE 1300 #define UIP_CONF_BUFFER_SIZE 1300

3
platform/redbee-econotag/contiki-conf.h
View file

@ -196,7 +196,7 @@ typedef unsigned long rtimer_clock_t;
#define UIP_CONF_ROUTER 1 #define UIP_CONF_ROUTER 1
#define UIP_CONF_IPV6_RPL 1 #define UIP_CONF_IPV6_RPL 1
#define UIP_CONF_DS6_NBR_NBU 30 #define NEIGHBOR_CONF_MAX_NEIGHBORS 30
#define UIP_CONF_MAX_ROUTES 30 #define UIP_CONF_MAX_ROUTES 30
#define UIP_CONF_ND6_SEND_RA 0 #define UIP_CONF_ND6_SEND_RA 0
@ -209,7 +209,6 @@ typedef unsigned long rtimer_clock_t;
#define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_IPV6_REASSEMBLY 0
#define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_NETIF_MAX_ADDRESSES 3
#define UIP_CONF_ND6_MAX_PREFIXES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3
#define UIP_CONF_ND6_MAX_NEIGHBORS 4
#define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_ND6_MAX_DEFROUTERS 2
#define UIP_CONF_IP_FORWARD 0 #define UIP_CONF_IP_FORWARD 0
#define UIP_CONF_BUFFER_SIZE 1300 #define UIP_CONF_BUFFER_SIZE 1300

2
platform/seedeye/contiki-conf.h
View file

@ -97,7 +97,7 @@ typedef uint32_t rtimer_clock_t;
/* IPv6 configuration options */ /* IPv6 configuration options */
#define UIP_CONF_IPV6 1 #define UIP_CONF_IPV6 1
#define UIP_CONF_DS6_NBR_NBU 20 /* number of neighbors */ #define NEIGHBOR_CONF_MAX_NEIGHBORS 20 /* number of neighbors */
#define UIP_CONF_DS6_ROUTE_NBU 20 /* number of routes */ #define UIP_CONF_DS6_ROUTE_NBU 20 /* number of routes */
#define UIP_CONF_ND6_SEND_RA 0 #define UIP_CONF_ND6_SEND_RA 0
#define UIP_CONF_ND6_REACHABLE_TIME 600000 #define UIP_CONF_ND6_REACHABLE_TIME 600000

4
platform/sensinode/contiki-conf.h
View file

@ -230,8 +230,8 @@
#define UIP_CONF_ND6_REACHABLE_TIME 600000 #define UIP_CONF_ND6_REACHABLE_TIME 600000
#define UIP_CONF_ND6_RETRANS_TIMER 10000 #define UIP_CONF_ND6_RETRANS_TIMER 10000
#ifndef UIP_CONF_DS6_NBR_NBU #ifndef NEIGHBOR_CONF_MAX_NEIGHBORS
#define UIP_CONF_DS6_NBR_NBU 4 /* Handle n Neighbors */ #define NEIGHBOR_CONF_MAX_NEIGHBORS 4 /* Handle n Neighbors */
#endif #endif
#ifndef UIP_CONF_MAX_ROUTES #ifndef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 4 /* Handle n Routes */ #define UIP_CONF_MAX_ROUTES 4 /* Handle n Routes */

7
platform/sky/contiki-conf.h
View file

@ -137,9 +137,9 @@
#endif /* UIP_CONF_IPV6_RPL */ #endif /* UIP_CONF_IPV6_RPL */
/* configure number of neighbors and routes */ /* configure number of neighbors and routes */
#ifndef UIP_CONF_DS6_NBR_NBU #ifndef NEIGHBOR_CONF_MAX_NEIGHBORS
#define UIP_CONF_DS6_NBR_NBU 20 #define NEIGHBOR_CONF_MAX_NEIGHBORS 20
#endif /* UIP_CONF_DS6_NBR_NBU */ #endif /* NEIGHBOR_CONF_MAX_NEIGHBORS */
#ifndef UIP_CONF_MAX_ROUTES #ifndef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 20 #define UIP_CONF_MAX_ROUTES 20
#endif /* UIP_CONF_MAX_ROUTES */ #endif /* UIP_CONF_MAX_ROUTES */
@ -156,7 +156,6 @@
#define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_IPV6_REASSEMBLY 0
#define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_NETIF_MAX_ADDRESSES 3
#define UIP_CONF_ND6_MAX_PREFIXES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3
#define UIP_CONF_ND6_MAX_NEIGHBORS 4
#define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_ND6_MAX_DEFROUTERS 2
#define UIP_CONF_IP_FORWARD 0 #define UIP_CONF_IP_FORWARD 0
#ifndef UIP_CONF_BUFFER_SIZE #ifndef UIP_CONF_BUFFER_SIZE

2
platform/stk500/contiki-conf.h
View file

@ -45,7 +45,7 @@ void clock_adjust_ticks(clock_time_t howmany);
//#define UIP_CONF_IPV6_RPL 0 //#define UIP_CONF_IPV6_RPL 0
/* See uip-ds6.h */ /* See uip-ds6.h */
#define UIP_CONF_DS6_NBR_NBU 20 #define NEIGHBOR_CONF_MAX_NEIGHBORS 20
#define UIP_CONF_DS6_DEFRT_NBU 2 #define UIP_CONF_DS6_DEFRT_NBU 2
#define UIP_CONF_DS6_PREFIX_NBU 3 #define UIP_CONF_DS6_PREFIX_NBU 3
#define UIP_CONF_MAX_ROUTES 20 #define UIP_CONF_MAX_ROUTES 20

2
platform/win32/contiki-conf.h
View file

@ -63,7 +63,7 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_TCP_SPLIT 1 #define UIP_CONF_TCP_SPLIT 1
#if UIP_CONF_IPV6 #if UIP_CONF_IPV6
#define UIP_CONF_IP_FORWARD 0 #define UIP_CONF_IP_FORWARD 0
#define UIP_CONF_DS6_NBR_NBU 100 #define NEIGHBOR_CONF_MAX_NEIGHBORS 100
#define UIP_CONF_DS6_DEFRT_NBU 2 #define UIP_CONF_DS6_DEFRT_NBU 2
#define UIP_CONF_DS6_PREFIX_NBU 5 #define UIP_CONF_DS6_PREFIX_NBU 5
#define UIP_CONF_MAX_ROUTES 100 #define UIP_CONF_MAX_ROUTES 100

7
platform/wismote/contiki-conf.h
View file

@ -133,9 +133,9 @@
#endif /* UIP_CONF_IPV6_RPL */ #endif /* UIP_CONF_IPV6_RPL */
/* configure number of neighbors and routes */ /* configure number of neighbors and routes */
#ifndef UIP_CONF_DS6_NBR_NBU #ifndef NEIGHBOR_CONF_MAX_NEIGHBORS
#define UIP_CONF_DS6_NBR_NBU 30 #define NEIGHBOR_CONF_MAX_NEIGHBORS 30
#endif /* UIP_CONF_DS6_NBR_NBU */ #endif /* NEIGHBOR_CONF_MAX_NEIGHBORS */
#ifndef UIP_CONF_MAX_ROUTES #ifndef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 30 #define UIP_CONF_MAX_ROUTES 30
#endif /* UIP_CONF_MAX_ROUTES */ #endif /* UIP_CONF_MAX_ROUTES */
@ -152,7 +152,6 @@
#define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_IPV6_REASSEMBLY 0
#define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_NETIF_MAX_ADDRESSES 3
#define UIP_CONF_ND6_MAX_PREFIXES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3
#define UIP_CONF_ND6_MAX_NEIGHBORS 4
#define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_ND6_MAX_DEFROUTERS 2
#define UIP_CONF_IP_FORWARD 0 #define UIP_CONF_IP_FORWARD 0
#ifndef UIP_CONF_BUFFER_SIZE #ifndef UIP_CONF_BUFFER_SIZE

3
platform/z1/contiki-conf.h
View file

@ -134,7 +134,7 @@
#define UIP_CONF_IPV6_RPL 1 #define UIP_CONF_IPV6_RPL 1
/* Handle 10 neighbors */ /* Handle 10 neighbors */
#define UIP_CONF_DS6_NBR_NBU 15 #define NEIGHBOR_CONF_MAX_NEIGHBORS 15
/* Handle 10 routes */ /* Handle 10 routes */
#define UIP_CONF_MAX_ROUTES 15 #define UIP_CONF_MAX_ROUTES 15
@ -148,7 +148,6 @@
#define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_IPV6_REASSEMBLY 0
#define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_NETIF_MAX_ADDRESSES 3
#define UIP_CONF_ND6_MAX_PREFIXES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3
#define UIP_CONF_ND6_MAX_NEIGHBORS 4
#define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_ND6_MAX_DEFROUTERS 2
#define UIP_CONF_IP_FORWARD 0 #define UIP_CONF_IP_FORWARD 0
#define UIP_CONF_BUFFER_SIZE 140 #define UIP_CONF_BUFFER_SIZE 140

3
platform/z1sp/contiki-conf.h
View file

@ -133,7 +133,7 @@
#define UIP_CONF_IPV6_RPL 1 #define UIP_CONF_IPV6_RPL 1
/* Handle 10 neighbors */ /* Handle 10 neighbors */
#define UIP_CONF_DS6_NBR_NBU 15 #define NEIGHBOR_CONF_MAX_NEIGHBORS 15
/* Handle 10 routes */ /* Handle 10 routes */
#define UIP_CONF_MAX_ROUTES 15 #define UIP_CONF_MAX_ROUTES 15
@ -147,7 +147,6 @@
#define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_IPV6_REASSEMBLY 0
#define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_NETIF_MAX_ADDRESSES 3
#define UIP_CONF_ND6_MAX_PREFIXES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3
#define UIP_CONF_ND6_MAX_NEIGHBORS 4
#define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_ND6_MAX_DEFROUTERS 2
#define UIP_CONF_IP_FORWARD 0 #define UIP_CONF_IP_FORWARD 0
#define UIP_CONF_BUFFER_SIZE 140 #define UIP_CONF_BUFFER_SIZE 140