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

Changed the name of the IPv6 number of route entries configuration from UIP_CONF_DS6_ROUTE_NBU to UIP_CONF_MAX_ROUTES.

Browse source
This commit is contained in:
Adam Dunkels 2013-03-18 00:00:15 +01:00
parent 2d50a40643
commit 277a348f60
24 changed files with 48 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -75,8 +75,8 @@
/* Save some memory for the sky platform. */
#undef UIP_CONF_DS6_NBR_NBU
#define UIP_CONF_DS6_NBR_NBU 10
#undef UIP_CONF_DS6_ROUTE_NBU
#define UIP_CONF_DS6_ROUTE_NBU 10
#undef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 10
/* Reduce 802.15.4 frame queue to save RAM. */
#undef QUEUEBUF_CONF_NUM

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

@ -58,8 +58,8 @@
#undef UIP_CONF_DS6_NBR_NBU
#define UIP_CONF_DS6_NBR_NBU 7
#undef UIP_CONF_DS6_ROUTE_NBU
#define UIP_CONF_DS6_ROUTE_NBU 7
#undef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 7
#undef UIP_CONF_BUFFER_SIZE
#define UIP_CONF_BUFFER_SIZE 140

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

@ -35,8 +35,8 @@
#define UIP_CONF_TCP 0
#undef UIP_CONF_DS6_NBR_NBU
#define UIP_CONF_DS6_NBR_NBU 8
#undef UIP_CONF_DS6_ROUTE_NBU
#define UIP_CONF_DS6_ROUTE_NBU 8
#undef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 8
/* The total number of queuebuf */
#undef QUEUEBUF_CONF_NUM

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

@ -224,7 +224,7 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_DS6_NBR_NBU 20
#define UIP_CONF_DS6_DEFRT_NBU 2
#define UIP_CONF_DS6_PREFIX_NBU 3
#define UIP_CONF_DS6_ROUTE_NBU 20
#define UIP_CONF_MAX_ROUTES 20
#define UIP_CONF_DS6_ADDR_NBU 3
#define UIP_CONF_DS6_MADDR_NBU 0
#define UIP_CONF_DS6_AADDR_NBU 0
@ -269,7 +269,7 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_DS6_NBR_NBU 20
#define UIP_CONF_DS6_DEFRT_NBU 2
#define UIP_CONF_DS6_PREFIX_NBU 3
#define UIP_CONF_DS6_ROUTE_NBU 4
#define UIP_CONF_MAX_ROUTES 4
#define UIP_CONF_DS6_ADDR_NBU 3
#define UIP_CONF_DS6_MADDR_NBU 0
#define UIP_CONF_DS6_AADDR_NBU 0
@ -305,7 +305,7 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_DS6_NBR_NBU 4
#define UIP_CONF_DS6_DEFRT_NBU 2
#define UIP_CONF_DS6_PREFIX_NBU 3
#define UIP_CONF_DS6_ROUTE_NBU 4
#define UIP_CONF_MAX_ROUTES 4
#define UIP_CONF_DS6_ADDR_NBU 3
#define UIP_CONF_DS6_MADDR_NBU 0
#define UIP_CONF_DS6_AADDR_NBU 0

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

@ -235,7 +235,7 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_DS6_NBR_NBU 20
#define UIP_CONF_DS6_DEFRT_NBU 2
#define UIP_CONF_DS6_PREFIX_NBU 3
#define UIP_CONF_DS6_ROUTE_NBU 20
#define UIP_CONF_MAX_ROUTES 20
#define UIP_CONF_DS6_ADDR_NBU 3
#define UIP_CONF_DS6_MADDR_NBU 0
#define UIP_CONF_DS6_AADDR_NBU 0
@ -278,7 +278,7 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_DS6_NBR_NBU 10
#define UIP_CONF_DS6_DEFRT_NBU 2
#define UIP_CONF_DS6_PREFIX_NBU 2
#define UIP_CONF_DS6_ROUTE_NBU 4
#define UIP_CONF_MAX_ROUTES 4
#define UIP_CONF_DS6_ADDR_NBU 3
#define UIP_CONF_DS6_MADDR_NBU 0
#define UIP_CONF_DS6_AADDR_NBU 0
@ -311,7 +311,7 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_DS6_NBR_NBU 4
#define UIP_CONF_DS6_DEFRT_NBU 2
#define UIP_CONF_DS6_PREFIX_NBU 3
#define UIP_CONF_DS6_ROUTE_NBU 4
#define UIP_CONF_MAX_ROUTES 4
#define UIP_CONF_DS6_ADDR_NBU 3
#define UIP_CONF_DS6_MADDR_NBU 0
#define UIP_CONF_DS6_AADDR_NBU 0

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

@ -229,7 +229,7 @@ extern void mac_log_802_15_4_rx(const uint8_t* buffer, size_t total_len);
#define UIP_CONF_DS6_NBR_NBU 2
#define UIP_CONF_DS6_DEFRT_NBU 2
#define UIP_CONF_DS6_PREFIX_NBU 3
#define UIP_CONF_DS6_ROUTE_NBU 2
#define UIP_CONF_MAX_ROUTES 2
#define UIP_CONF_DS6_ADDR_NBU 3
#define UIP_CONF_DS6_MADDR_NBU 0
#define UIP_CONF_DS6_AADDR_NBU 0
@ -356,8 +356,8 @@ typedef unsigned short uip_stats_t;
#define QUEUEBUF_CONF_NUM 8
#undef UIP_CONF_DS6_NBR_NBU
#define UIP_CONF_DS6_NBR_NBU 5
#undef UIP_CONF_DS6_ROUTE_NBU
#define UIP_CONF_DS6_ROUTE_NBU 5
#undef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 5
#else
#error Network configuration not specified!
@ -404,7 +404,7 @@ typedef unsigned short uip_stats_t;
#define RPL_CONF_STATS 0
#define UIP_CONF_BUFFER_SIZE 1300
//#define UIP_CONF_DS6_NBR_NBU 12
//#define UIP_CONF_DS6_ROUTE_NBU 12
//#define UIP_CONF_MAX_ROUTES 12
#ifdef RPL_BORDER_ROUTER
#undef UIP_FALLBACK_INTERFACE
@ -442,8 +442,8 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_RECEIVE_WINDOW 48
#undef UIP_CONF_DS6_NBR_NBU
#define UIP_CONF_DS6_NBR_NBU 5
#undef UIP_CONF_DS6_ROUTE_NBU
#define UIP_CONF_DS6_ROUTE_NBU 5
#undef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 5
#undef UIP_CONF_MAX_CONNECTIONS
#define UIP_CONF_MAX_CONNECTIONS 2
#endif

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

@ -222,8 +222,8 @@
#ifndef UIP_CONF_DS6_NBR_NBU
#define UIP_CONF_DS6_NBR_NBU 4 /* Handle n Neighbors */
#endif
#ifndef UIP_CONF_DS6_ROUTE_NBU
#define UIP_CONF_DS6_ROUTE_NBU 4 /* Handle n Routes */
#ifndef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 4 /* Handle n Routes */
#endif
/* uIP */

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

@ -126,9 +126,9 @@
#ifndef UIP_CONF_DS6_NBR_NBU
#define UIP_CONF_DS6_NBR_NBU 300
#endif /* UIP_CONF_DS6_NBR_NBU */
#ifndef UIP_CONF_DS6_ROUTE_NBU
#define UIP_CONF_DS6_ROUTE_NBU 300
#endif /* UIP_CONF_DS6_ROUTE_NBU */
#ifndef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 300
#endif /* UIP_CONF_MAX_ROUTES */
#define TCPIP_CONF_ANNOTATE_TRANSMISSIONS 1

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

@ -180,7 +180,7 @@
#define UIP_CONF_IPV6_RPL 1
#define UIP_CONF_DS6_NBR_NBU 30
#define UIP_CONF_DS6_ROUTE_NBU 30
#define UIP_CONF_MAX_ROUTES 30
#define UIP_CONF_ND6_SEND_RA 0
#define UIP_CONF_ND6_REACHABLE_TIME 600000

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

@ -140,9 +140,9 @@
#ifndef UIP_CONF_DS6_NBR_NBU
#define UIP_CONF_DS6_NBR_NBU 30
#endif /* UIP_CONF_DS6_NBR_NBU */
#ifndef UIP_CONF_DS6_ROUTE_NBU
#define UIP_CONF_DS6_ROUTE_NBU 30
#endif /* UIP_CONF_DS6_ROUTE_NBU */
#ifndef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 30
#endif /* UIP_CONF_MAX_ROUTES */
#define UIP_CONF_ND6_SEND_RA 0
#define UIP_CONF_ND6_REACHABLE_TIME 600000

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

@ -114,7 +114,7 @@
/* configure number of neighbors and routes */
#define UIP_CONF_DS6_NBR_NBU 5
#define UIP_CONF_DS6_ROUTE_NBU 5
#define UIP_CONF_MAX_ROUTES 5
#define RPL_CONF_MAX_PARENTS 4
#define NEIGHBOR_CONF_MAX_NEIGHBORS 8

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

@ -100,7 +100,7 @@
#define QUEUEBUF_CONF_NUM 2
#define QUEUEBUF_CONF_REF_NUM 0
#define UIP_CONF_DS6_NBR_NBU 4
#define UIP_CONF_DS6_ROUTE_NBU 4
#define UIP_CONF_MAX_ROUTES 4
#define RPL_CONF_MAX_PARENTS_PER_DAG 4
#define RPL_CONF_MAX_INSTANCES 1
#define RPL_CONF_MAX_DAG_PER_INSTANCE 1

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

@ -119,7 +119,7 @@
/* configure number of neighbors and routes */
#define UIP_CONF_DS6_NBR_NBU 5
#define UIP_CONF_DS6_ROUTE_NBU 5
#define UIP_CONF_MAX_ROUTES 5
#define RPL_CONF_MAX_PARENTS 4
#define NEIGHBOR_CONF_MAX_NEIGHBORS 8

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

@ -161,7 +161,7 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_DS6_NBR_NBU 100
#define UIP_CONF_DS6_DEFRT_NBU 2
#define UIP_CONF_DS6_PREFIX_NBU 5
#define UIP_CONF_DS6_ROUTE_NBU 100
#define UIP_CONF_MAX_ROUTES 100
#define UIP_CONF_DS6_ADDR_NBU 10
#define UIP_CONF_DS6_MADDR_NBU 0
#define UIP_CONF_DS6_AADDR_NBU 0

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

@ -130,9 +130,9 @@ typedef unsigned short uip_stats_t;
#ifndef UIP_CONF_DS6_NBR_NBU
#define UIP_CONF_DS6_NBR_NBU 30
#endif /* UIP_CONF_DS6_NBR_NBU */
#ifndef UIP_CONF_DS6_ROUTE_NBU
#define UIP_CONF_DS6_ROUTE_NBU 30
#endif /* UIP_CONF_DS6_ROUTE_NBU */
#ifndef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 30
#endif /* UIP_CONF_MAX_ROUTES */
#define UIP_CONF_ND6_SEND_RA 0
#define UIP_CONF_ND6_REACHABLE_TIME 600000

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

@ -179,7 +179,7 @@ typedef unsigned long rtimer_clock_t;
#define UIP_CONF_IPV6_RPL 1
#define UIP_CONF_DS6_NBR_NBU 30
#define UIP_CONF_DS6_ROUTE_NBU 30
#define UIP_CONF_MAX_ROUTES 30
#define UIP_CONF_ND6_SEND_RA 0
#define UIP_CONF_ND6_REACHABLE_TIME 600000

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

@ -197,7 +197,7 @@ typedef unsigned long rtimer_clock_t;
#define UIP_CONF_IPV6_RPL 1
#define UIP_CONF_DS6_NBR_NBU 30
#define UIP_CONF_DS6_ROUTE_NBU 30
#define UIP_CONF_MAX_ROUTES 30
#define UIP_CONF_ND6_SEND_RA 0
#define UIP_CONF_ND6_REACHABLE_TIME 600000

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

@ -228,8 +228,8 @@
#ifndef UIP_CONF_DS6_NBR_NBU
#define UIP_CONF_DS6_NBR_NBU 4 /* Handle n Neighbors */
#endif
#ifndef UIP_CONF_DS6_ROUTE_NBU
#define UIP_CONF_DS6_ROUTE_NBU 4 /* Handle n Routes */
#ifndef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 4 /* Handle n Routes */
#endif
/* uIP */

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

@ -140,9 +140,9 @@
#ifndef UIP_CONF_DS6_NBR_NBU
#define UIP_CONF_DS6_NBR_NBU 20
#endif /* UIP_CONF_DS6_NBR_NBU */
#ifndef UIP_CONF_DS6_ROUTE_NBU
#define UIP_CONF_DS6_ROUTE_NBU 20
#endif /* UIP_CONF_DS6_ROUTE_NBU */
#ifndef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 20
#endif /* UIP_CONF_MAX_ROUTES */
#define UIP_CONF_ND6_SEND_RA 0
#define UIP_CONF_ND6_REACHABLE_TIME 600000

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

@ -48,7 +48,7 @@ void clock_adjust_ticks(clock_time_t howmany);
#define UIP_CONF_DS6_NBR_NBU 20
#define UIP_CONF_DS6_DEFRT_NBU 2
#define UIP_CONF_DS6_PREFIX_NBU 3
#define UIP_CONF_DS6_ROUTE_NBU 20
#define UIP_CONF_MAX_ROUTES 20
#define UIP_CONF_DS6_ADDR_NBU 3
#define UIP_CONF_DS6_MADDR_NBU 0
#define UIP_CONF_DS6_AADDR_NBU 0

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

@ -62,7 +62,7 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_DS6_NBR_NBU 100
#define UIP_CONF_DS6_DEFRT_NBU 2
#define UIP_CONF_DS6_PREFIX_NBU 5
#define UIP_CONF_DS6_ROUTE_NBU 100
#define UIP_CONF_MAX_ROUTES 100
#define UIP_CONF_DS6_ADDR_NBU 10
#define UIP_CONF_DS6_MADDR_NBU 0 //VC++ does not allow zero length arrays
#define UIP_CONF_DS6_AADDR_NBU 0 //inside a struct

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

@ -136,9 +136,9 @@
#ifndef UIP_CONF_DS6_NBR_NBU
#define UIP_CONF_DS6_NBR_NBU 30
#endif /* UIP_CONF_DS6_NBR_NBU */
#ifndef UIP_CONF_DS6_ROUTE_NBU
#define UIP_CONF_DS6_ROUTE_NBU 30
#endif /* UIP_CONF_DS6_ROUTE_NBU */
#ifndef UIP_CONF_MAX_ROUTES
#define UIP_CONF_MAX_ROUTES 30
#endif /* UIP_CONF_MAX_ROUTES */
#define UIP_CONF_ND6_SEND_RA 0
#define UIP_CONF_ND6_REACHABLE_TIME 600000

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

@ -136,7 +136,7 @@
/* Handle 10 neighbors */
#define UIP_CONF_DS6_NBR_NBU 15
/* Handle 10 routes */
#define UIP_CONF_DS6_ROUTE_NBU 15
#define UIP_CONF_MAX_ROUTES 15
#define UIP_CONF_ND6_SEND_RA 0
#define UIP_CONF_ND6_REACHABLE_TIME 600000

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

@ -135,7 +135,7 @@
/* Handle 10 neighbors */
#define UIP_CONF_DS6_NBR_NBU 15
/* Handle 10 routes */
#define UIP_CONF_DS6_ROUTE_NBU 15
#define UIP_CONF_MAX_ROUTES 15
#define UIP_CONF_ND6_SEND_RA 0
#define UIP_CONF_ND6_REACHABLE_TIME 600000