From 697d8c0d23411860b91c5d78db895c40a5f41ffb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Tue, 24 Mar 2015 11:38:18 +0100 Subject: [PATCH] Remove siclowpan compressions define in platforms Several platforms defined compressions modes values: SICSLOWPAN_CONF_COMPRESSION_IPV6 SICSLOWPAN_CONF_COMPRESSION_HC1 SICSLOWPAN_CONF_COMPRESSION_HC01 instead of using the global SICSLOWPAN_COMPRESSION_LEVEL definitions --- doc/tutorial-raven.txt | 14 +++++++------- platform/avr-rcb/contiki-conf.h | 6 +----- platform/avr-zigbit/contiki-conf.h | 12 ++++-------- platform/cooja/contiki-conf.h | 3 --- platform/econotag/contiki-conf.h | 3 --- platform/ev-aducrf101mkxz/contiki-conf.h | 3 --- platform/eval-adf7xxxmb4z/contiki-conf.h | 3 --- platform/exp5438/contiki-conf.h | 3 --- platform/micaz/contiki-conf.h | 3 --- platform/native/contiki-conf.h | 3 --- platform/sky/contiki-conf.h | 3 --- platform/wismote/contiki-conf.h | 3 --- platform/z1/contiki-conf.h | 3 --- 13 files changed, 12 insertions(+), 50 deletions(-) diff --git a/doc/tutorial-raven.txt b/doc/tutorial-raven.txt index 57e696cf3..1cc4bfe9d 100644 --- a/doc/tutorial-raven.txt +++ b/doc/tutorial-raven.txt @@ -454,24 +454,24 @@ See the \ref usbstick documentation for more details about using Wireshark. One can use avrdude to load the binaries in Linux. -\subsection advanced_hc01 Using HC01 Header Compression Scheme -IETF Internet Draft draft-hui-6lowpan-hc-01 defines a stateful -header compression mechanism (called HC01) which will soon +\subsection advanced_hc06 Using HC06 Header Compression Scheme +IETF Internet Draft draft-hui-6lowpan-hc-06 defines a stateful +header compression mechanism (called HC06) which will soon deprecate the stateless header compression mechanism (called -HC1) defined in RFC4944. HC01 is much more powerfull and flexible, +HC1) defined in RFC4944. HC06 is much more powerfull and flexible, in particular it allows compression of some multicast addresses and of all global unicast addresses. -Contiki is compiled by default with HC1 support. To use HC01 +Contiki is compiled by default with HC1 support. To use HC06 instead, edit platform/xxx/contiki-conf.h (replace xxx with avr-raven, then avr-ravenusb.) and replace the line
\code -#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_CONF_COMPRESSION_HC1 +#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC1 \endcode with \code -#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_CONF_COMPRESSION_HC01 +#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06 \endcode Recompile and load Contiki for both the RAVEN ATmega1284P and RZ USB diff --git a/platform/avr-rcb/contiki-conf.h b/platform/avr-rcb/contiki-conf.h index 3ecb788db..477083fc8 100644 --- a/platform/avr-rcb/contiki-conf.h +++ b/platform/avr-rcb/contiki-conf.h @@ -110,12 +110,8 @@ void clock_adjust_ticks(clock_time_t howmany); #define QUEUEBUF_CONF_NUM 15 /* 54 bytes per queue ref buffer */ #define QUEUEBUF_CONF_REF_NUM 2 -/* 0 for IPv6, or 1 for HC1, 2 for HC01 */ -#define SICSLOWPAN_CONF_COMPRESSION_IPV6 0 -#define SICSLOWPAN_CONF_COMPRESSION_HC1 1 -#define SICSLOWPAN_CONF_COMPRESSION_HC01 2 -#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_CONF_COMPRESSION_HC01 +#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06 #define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2 #define SICSLOWPAN_CONF_FRAG 1 diff --git a/platform/avr-zigbit/contiki-conf.h b/platform/avr-zigbit/contiki-conf.h index 7d12484b9..58005cfae 100644 --- a/platform/avr-zigbit/contiki-conf.h +++ b/platform/avr-zigbit/contiki-conf.h @@ -135,20 +135,16 @@ void clock_adjust_ticks(clock_time_t howmany); #else /* Original combined RF230/mac code will not compile with current contiki stack */ //#define PACKETBUF_CONF_HDR_SIZE 0 //RF230 handles headers internally -/* 0 for IPv6, or 1 for HC1, 2 for HC01 */ -#define SICSLOWPAN_CONF_COMPRESSION_IPV6 0 -#define SICSLOWPAN_CONF_COMPRESSION_HC1 1 -#define SICSLOWPAN_CONF_COMPRESSION_HC01 2 //NB '2' is now HC06 in the core mac! //FTH081105 -#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_CONF_COMPRESSION_HC01 +#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06 #define SICSLOWPAN_CONF_MAXAGE 5 #define UIP_CONF_LLH_LEN 14 #endif /*RF230BB */ #define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2 -#define SICSLOWPAN_CONF_FRAG 1 +#define SICSLOWPAN_CONF_FRAG 1 -#define UIP_CONF_LL_802154 1 +#define UIP_CONF_LL_802154 1 #define UIP_CONF_MAX_CONNECTIONS 2 #define UIP_CONF_MAX_LISTENPORTS 2 @@ -158,7 +154,7 @@ void clock_adjust_ticks(clock_time_t howmany); #define UIP_CONF_FWCACHE_SIZE 0 #define UIP_CONF_IPV6_CHECKS 1 -#define UIP_CONF_IPV6_QUEUE_PKT 0 +#define UIP_CONF_IPV6_QUEUE_PKT 0 #define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3 diff --git a/platform/cooja/contiki-conf.h b/platform/cooja/contiki-conf.h index 433ec5557..f92826d1f 100644 --- a/platform/cooja/contiki-conf.h +++ b/platform/cooja/contiki-conf.h @@ -157,9 +157,6 @@ #define UIP_CONF_BUFFER_SIZE 240 #endif -#define SICSLOWPAN_CONF_COMPRESSION_IPV6 0 -#define SICSLOWPAN_CONF_COMPRESSION_HC1 1 -#define SICSLOWPAN_CONF_COMPRESSION_HC01 2 #define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06 #ifndef SICSLOWPAN_CONF_FRAG #define SICSLOWPAN_CONF_FRAG 1 diff --git a/platform/econotag/contiki-conf.h b/platform/econotag/contiki-conf.h index 2c0777d39..3fda3e915 100644 --- a/platform/econotag/contiki-conf.h +++ b/platform/econotag/contiki-conf.h @@ -199,9 +199,6 @@ #define SICSLOWPAN_CONF_FRAG 1 #define SICSLOWPAN_CONF_MAXAGE 8 -#define SICSLOWPAN_CONF_COMPRESSION_IPV6 0 -#define SICSLOWPAN_CONF_COMPRESSION_HC1 1 -#define SICSLOWPAN_CONF_COMPRESSION_HC01 2 #define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06 #ifndef SICSLOWPAN_CONF_FRAG #define SICSLOWPAN_CONF_FRAG 1 diff --git a/platform/ev-aducrf101mkxz/contiki-conf.h b/platform/ev-aducrf101mkxz/contiki-conf.h index a3632c44e..d8b8849dc 100644 --- a/platform/ev-aducrf101mkxz/contiki-conf.h +++ b/platform/ev-aducrf101mkxz/contiki-conf.h @@ -146,9 +146,6 @@ #define SICSLOWPAN_CONF_FRAG 1 #define SICSLOWPAN_CONF_MAXAGE 8 -#define SICSLOWPAN_CONF_COMPRESSION_IPV6 0 -#define SICSLOWPAN_CONF_COMPRESSION_HC1 1 -#define SICSLOWPAN_CONF_COMPRESSION_HC01 2 #define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06 #ifndef SICSLOWPAN_CONF_FRAG #define SICSLOWPAN_CONF_FRAG 1 diff --git a/platform/eval-adf7xxxmb4z/contiki-conf.h b/platform/eval-adf7xxxmb4z/contiki-conf.h index e9114a8dd..b0b0e5dbe 100644 --- a/platform/eval-adf7xxxmb4z/contiki-conf.h +++ b/platform/eval-adf7xxxmb4z/contiki-conf.h @@ -149,9 +149,6 @@ #define SICSLOWPAN_CONF_FRAG 1 #define SICSLOWPAN_CONF_MAXAGE 8 -#define SICSLOWPAN_CONF_COMPRESSION_IPV6 0 -#define SICSLOWPAN_CONF_COMPRESSION_HC1 1 -#define SICSLOWPAN_CONF_COMPRESSION_HC01 2 #define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06 #ifndef SICSLOWPAN_CONF_FRAG #define SICSLOWPAN_CONF_FRAG 1 diff --git a/platform/exp5438/contiki-conf.h b/platform/exp5438/contiki-conf.h index 020e910fc..319833faa 100644 --- a/platform/exp5438/contiki-conf.h +++ b/platform/exp5438/contiki-conf.h @@ -170,9 +170,6 @@ #define UIP_CONF_BUFFER_SIZE 240 #endif -#define SICSLOWPAN_CONF_COMPRESSION_IPV6 0 -#define SICSLOWPAN_CONF_COMPRESSION_HC1 1 -#define SICSLOWPAN_CONF_COMPRESSION_HC01 2 #define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06 #ifndef SICSLOWPAN_CONF_FRAG #define SICSLOWPAN_CONF_FRAG 1 diff --git a/platform/micaz/contiki-conf.h b/platform/micaz/contiki-conf.h index 56fd511a4..84b9ae115 100644 --- a/platform/micaz/contiki-conf.h +++ b/platform/micaz/contiki-conf.h @@ -144,9 +144,6 @@ #define UIP_CONF_IP_FORWARD 0 #define UIP_CONF_BUFFER_SIZE 240 -#define SICSLOWPAN_CONF_COMPRESSION_IPV6 0 -#define SICSLOWPAN_CONF_COMPRESSION_HC1 1 -#define SICSLOWPAN_CONF_COMPRESSION_HC01 2 #define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06 #ifndef SICSLOWPAN_CONF_FRAG #define SICSLOWPAN_CONF_FRAG 1 diff --git a/platform/native/contiki-conf.h b/platform/native/contiki-conf.h index cfa88d801..e4ac7d587 100644 --- a/platform/native/contiki-conf.h +++ b/platform/native/contiki-conf.h @@ -103,9 +103,6 @@ typedef unsigned short uip_stats_t; #define UIP_CONF_ROUTER 1 -#define SICSLOWPAN_CONF_COMPRESSION_IPV6 0 -#define SICSLOWPAN_CONF_COMPRESSION_HC1 1 -#define SICSLOWPAN_CONF_COMPRESSION_HC01 2 #define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06 #ifndef SICSLOWPAN_CONF_FRAG #define SICSLOWPAN_CONF_FRAG 1 diff --git a/platform/sky/contiki-conf.h b/platform/sky/contiki-conf.h index 2f6088ff5..018970aa0 100644 --- a/platform/sky/contiki-conf.h +++ b/platform/sky/contiki-conf.h @@ -171,9 +171,6 @@ #define UIP_CONF_BUFFER_SIZE 240 #endif -#define SICSLOWPAN_CONF_COMPRESSION_IPV6 0 -#define SICSLOWPAN_CONF_COMPRESSION_HC1 1 -#define SICSLOWPAN_CONF_COMPRESSION_HC01 2 #define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06 #ifndef SICSLOWPAN_CONF_FRAG #define SICSLOWPAN_CONF_FRAG 1 diff --git a/platform/wismote/contiki-conf.h b/platform/wismote/contiki-conf.h index 176e9f62c..18588ddb0 100644 --- a/platform/wismote/contiki-conf.h +++ b/platform/wismote/contiki-conf.h @@ -154,9 +154,6 @@ #define UIP_CONF_BUFFER_SIZE 240 #endif -#define SICSLOWPAN_CONF_COMPRESSION_IPV6 0 -#define SICSLOWPAN_CONF_COMPRESSION_HC1 1 -#define SICSLOWPAN_CONF_COMPRESSION_HC01 2 #define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06 #ifndef SICSLOWPAN_CONF_FRAG #define SICSLOWPAN_CONF_FRAG 1 diff --git a/platform/z1/contiki-conf.h b/platform/z1/contiki-conf.h index 227ca1deb..457adaa39 100644 --- a/platform/z1/contiki-conf.h +++ b/platform/z1/contiki-conf.h @@ -158,9 +158,6 @@ #define UIP_CONF_IP_FORWARD 0 #define UIP_CONF_BUFFER_SIZE 140 -#define SICSLOWPAN_CONF_COMPRESSION_IPV6 0 -#define SICSLOWPAN_CONF_COMPRESSION_HC1 1 -#define SICSLOWPAN_CONF_COMPRESSION_HC01 2 #define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06 #ifndef SICSLOWPAN_CONF_FRAG #define SICSLOWPAN_CONF_FRAG 1