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
This commit is contained in:
Gaëtan Harter
parent
60719b8239
commit
697d8c0d23
|
|
@ -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<BR>
|
||||
\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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -135,12 +135,8 @@ 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 */
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue