Remove unused SICSLOWPAN_CONF_CONVENTIONAL_MAC
This commit is contained in:
parent
c76316adf2
commit
60719b8239
|
@ -108,7 +108,6 @@ void clock_adjust_ticks(clock_time_t howmany);
|
||||||
/* The new NETSTACK interface requires RF230BB */
|
/* The new NETSTACK interface requires RF230BB */
|
||||||
#if RF230BB
|
#if RF230BB
|
||||||
#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06
|
#define SICSLOWPAN_CONF_COMPRESSION SICSLOWPAN_COMPRESSION_HC06
|
||||||
#define SICSLOWPAN_CONF_CONVENTIONAL_MAC 1 //for barebones driver, sicslowpan calls radio->read function
|
|
||||||
#undef PACKETBUF_CONF_HDR_SIZE //RF230BB takes the packetbuf default for header size
|
#undef PACKETBUF_CONF_HDR_SIZE //RF230BB takes the packetbuf default for header size
|
||||||
#define UIP_CONF_LLH_LEN 0
|
#define UIP_CONF_LLH_LEN 0
|
||||||
|
|
||||||
|
|
|
@ -165,7 +165,6 @@
|
||||||
#define SICSLOWPAN_CONF_FRAG 1
|
#define SICSLOWPAN_CONF_FRAG 1
|
||||||
#define SICSLOWPAN_CONF_MAXAGE 8
|
#define SICSLOWPAN_CONF_MAXAGE 8
|
||||||
#endif /* SICSLOWPAN_CONF_FRAG */
|
#endif /* SICSLOWPAN_CONF_FRAG */
|
||||||
#define SICSLOWPAN_CONF_CONVENTIONAL_MAC 1
|
|
||||||
#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2
|
#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2
|
||||||
#ifndef SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS
|
#ifndef SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS
|
||||||
#define SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS 8
|
#define SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS 8
|
||||||
|
|
|
@ -207,7 +207,6 @@
|
||||||
#define SICSLOWPAN_CONF_FRAG 1
|
#define SICSLOWPAN_CONF_FRAG 1
|
||||||
#define SICSLOWPAN_CONF_MAXAGE 8
|
#define SICSLOWPAN_CONF_MAXAGE 8
|
||||||
#endif /* SICSLOWPAN_CONF_FRAG */
|
#endif /* SICSLOWPAN_CONF_FRAG */
|
||||||
#define SICSLOWPAN_CONF_CONVENTIONAL_MAC 1
|
|
||||||
#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2
|
#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2
|
||||||
#else /* NETSTACK_CONF_WITH_IPV6 */
|
#else /* NETSTACK_CONF_WITH_IPV6 */
|
||||||
#define UIP_CONF_IP_FORWARD 1
|
#define UIP_CONF_IP_FORWARD 1
|
||||||
|
|
|
@ -154,7 +154,6 @@
|
||||||
#define SICSLOWPAN_CONF_FRAG 1
|
#define SICSLOWPAN_CONF_FRAG 1
|
||||||
#define SICSLOWPAN_CONF_MAXAGE 8
|
#define SICSLOWPAN_CONF_MAXAGE 8
|
||||||
#endif /* SICSLOWPAN_CONF_FRAG */
|
#endif /* SICSLOWPAN_CONF_FRAG */
|
||||||
#define SICSLOWPAN_CONF_CONVENTIONAL_MAC 1
|
|
||||||
#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2
|
#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2
|
||||||
#else /* NETSTACK_CONF_WITH_IPV6 */
|
#else /* NETSTACK_CONF_WITH_IPV6 */
|
||||||
#define UIP_CONF_IP_FORWARD 1
|
#define UIP_CONF_IP_FORWARD 1
|
||||||
|
|
|
@ -157,7 +157,6 @@
|
||||||
#define SICSLOWPAN_CONF_FRAG 1
|
#define SICSLOWPAN_CONF_FRAG 1
|
||||||
#define SICSLOWPAN_CONF_MAXAGE 8
|
#define SICSLOWPAN_CONF_MAXAGE 8
|
||||||
#endif /* SICSLOWPAN_CONF_FRAG */
|
#endif /* SICSLOWPAN_CONF_FRAG */
|
||||||
#define SICSLOWPAN_CONF_CONVENTIONAL_MAC 1
|
|
||||||
#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2
|
#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2
|
||||||
#else /* NETSTACK_CONF_WITH_IPV6 */
|
#else /* NETSTACK_CONF_WITH_IPV6 */
|
||||||
#define UIP_CONF_IP_FORWARD 1
|
#define UIP_CONF_IP_FORWARD 1
|
||||||
|
|
|
@ -178,7 +178,6 @@
|
||||||
#define SICSLOWPAN_CONF_FRAG 1
|
#define SICSLOWPAN_CONF_FRAG 1
|
||||||
#define SICSLOWPAN_CONF_MAXAGE 8
|
#define SICSLOWPAN_CONF_MAXAGE 8
|
||||||
#endif /* SICSLOWPAN_CONF_FRAG */
|
#endif /* SICSLOWPAN_CONF_FRAG */
|
||||||
#define SICSLOWPAN_CONF_CONVENTIONAL_MAC 1
|
|
||||||
#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2
|
#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2
|
||||||
#ifndef SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS
|
#ifndef SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS
|
||||||
#define SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS 5
|
#define SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS 5
|
||||||
|
|
|
@ -152,7 +152,6 @@
|
||||||
#define SICSLOWPAN_CONF_FRAG 1
|
#define SICSLOWPAN_CONF_FRAG 1
|
||||||
#define SICSLOWPAN_CONF_MAXAGE 8
|
#define SICSLOWPAN_CONF_MAXAGE 8
|
||||||
#endif /* SICSLOWPAN_CONF_FRAG */
|
#endif /* SICSLOWPAN_CONF_FRAG */
|
||||||
#define SICSLOWPAN_CONF_CONVENTIONAL_MAC 1
|
|
||||||
#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2
|
#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2
|
||||||
#else /* NETSTACK_CONF_WITH_IPV6 */
|
#else /* NETSTACK_CONF_WITH_IPV6 */
|
||||||
#define UIP_CONF_IP_FORWARD 1
|
#define UIP_CONF_IP_FORWARD 1
|
||||||
|
|
|
@ -111,7 +111,6 @@ typedef unsigned short uip_stats_t;
|
||||||
#define SICSLOWPAN_CONF_FRAG 1
|
#define SICSLOWPAN_CONF_FRAG 1
|
||||||
#define SICSLOWPAN_CONF_MAXAGE 8
|
#define SICSLOWPAN_CONF_MAXAGE 8
|
||||||
#endif /* SICSLOWPAN_CONF_FRAG */
|
#endif /* SICSLOWPAN_CONF_FRAG */
|
||||||
#define SICSLOWPAN_CONF_CONVENTIONAL_MAC 1
|
|
||||||
#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2
|
#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2
|
||||||
#ifndef SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS
|
#ifndef SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS
|
||||||
#define SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS 5
|
#define SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS 5
|
||||||
|
|
|
@ -179,7 +179,6 @@
|
||||||
#define SICSLOWPAN_CONF_FRAG 1
|
#define SICSLOWPAN_CONF_FRAG 1
|
||||||
#define SICSLOWPAN_CONF_MAXAGE 8
|
#define SICSLOWPAN_CONF_MAXAGE 8
|
||||||
#endif /* SICSLOWPAN_CONF_FRAG */
|
#endif /* SICSLOWPAN_CONF_FRAG */
|
||||||
#define SICSLOWPAN_CONF_CONVENTIONAL_MAC 1
|
|
||||||
#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2
|
#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2
|
||||||
#ifndef SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS
|
#ifndef SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS
|
||||||
#define SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS 5
|
#define SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS 5
|
||||||
|
|
|
@ -162,7 +162,6 @@
|
||||||
#define SICSLOWPAN_CONF_FRAG 1
|
#define SICSLOWPAN_CONF_FRAG 1
|
||||||
#define SICSLOWPAN_CONF_MAXAGE 8
|
#define SICSLOWPAN_CONF_MAXAGE 8
|
||||||
#endif /* SICSLOWPAN_CONF_FRAG */
|
#endif /* SICSLOWPAN_CONF_FRAG */
|
||||||
#define SICSLOWPAN_CONF_CONVENTIONAL_MAC 1
|
|
||||||
#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2
|
#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2
|
||||||
#ifndef SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS
|
#ifndef SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS
|
||||||
#define SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS 5
|
#define SICSLOWPAN_CONF_MAX_MAC_TRANSMISSIONS 5
|
||||||
|
|
|
@ -166,7 +166,6 @@
|
||||||
#define SICSLOWPAN_CONF_FRAG 1
|
#define SICSLOWPAN_CONF_FRAG 1
|
||||||
#define SICSLOWPAN_CONF_MAXAGE 8
|
#define SICSLOWPAN_CONF_MAXAGE 8
|
||||||
#endif /* SICSLOWPAN_CONF_FRAG */
|
#endif /* SICSLOWPAN_CONF_FRAG */
|
||||||
#define SICSLOWPAN_CONF_CONVENTIONAL_MAC 1
|
|
||||||
#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2
|
#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2
|
||||||
#else /* NETSTACK_CONF_WITH_IPV6 */
|
#else /* NETSTACK_CONF_WITH_IPV6 */
|
||||||
#define UIP_CONF_IP_FORWARD 1
|
#define UIP_CONF_IP_FORWARD 1
|
||||||
|
|
Loading…
Reference in a new issue