mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-12-22 10:30:13 +00:00
Use cxmac for IP, xmac for non-IP. Increased uIP buffer size for IPv6 to accomodate ICMP packets
This commit is contained in:
parent
14ddf7450d
commit
a9c742402c
@ -1,21 +1,40 @@
|
||||
/* -*- C -*- */
|
||||
/* @(#)$Id: contiki-conf.h,v 1.68 2010/01/31 18:48:41 adamdunkels Exp $ */
|
||||
/* @(#)$Id: contiki-conf.h,v 1.69 2010/02/03 16:48:04 adamdunkels Exp $ */
|
||||
|
||||
#ifndef CONTIKI_CONF_H
|
||||
#define CONTIKI_CONF_H
|
||||
|
||||
/* Specifies the default MAC driver */
|
||||
#define MAC_CONF_CSMA 1
|
||||
#define MAC_CONF_DRIVER xmac_driver
|
||||
|
||||
#define XMAC_CONF_COMPOWER 1
|
||||
#define XMAC_CONF_ANNOUNCEMENTS 1
|
||||
#define CXMAC_CONF_COMPOWER 1
|
||||
|
||||
|
||||
#if WITH_UIP6
|
||||
#define MAC_CONF_DRIVER cxmac_driver
|
||||
#define MAC_CONF_CHANNEL_CHECK_RATE 8
|
||||
#define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0
|
||||
#define CXMAC_CONF_ANNOUNCEMENTS 0
|
||||
#define XMAC_CONF_ANNOUNCEMENTS 0
|
||||
#else /* WITH_UIP6 */
|
||||
#define MAC_CONF_DRIVER xmac_driver
|
||||
#define MAC_CONF_CHANNEL_CHECK_RATE 4
|
||||
#define TIMESYNCH_CONF_ENABLED 1
|
||||
#define CC2420_CONF_TIMESTAMPS 1
|
||||
#define CC2420_CONF_CHECKSUM 0
|
||||
#define RIME_CONF_NO_POLITE_ANNOUCEMENTS 1
|
||||
#define XMAC_CONF_ANNOUNCEMENTS 1
|
||||
#define CXMAC_CONF_ANNOUNCEMENTS 1
|
||||
#endif /* WITH_UIP6 */
|
||||
|
||||
#define QUEUEBUF_CONF_NUM 16
|
||||
|
||||
#define PACKETBUF_CONF_ATTRS_INLINE 1
|
||||
|
||||
#define QUEUEBUF_CONF_NUM 16
|
||||
#ifndef RF_CHANNEL
|
||||
#define RF_CHANNEL 26
|
||||
#endif /* RF_CHANNEL */
|
||||
|
||||
#define IEEE802154_CONF_PANID 0xABCD
|
||||
|
||||
@ -26,14 +45,6 @@
|
||||
#define DCOSYNCH_CONF_ENABLED 1
|
||||
#define DCOSYNCH_CONF_PERIOD 30
|
||||
|
||||
#ifndef WITH_UIP6
|
||||
#define TIMESYNCH_CONF_ENABLED 1
|
||||
#define CC2420_CONF_TIMESTAMPS 1
|
||||
#define CC2420_CONF_CHECKSUM 0
|
||||
#define RIME_CONF_NO_POLITE_ANNOUCEMENTS 1
|
||||
#else
|
||||
#define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0
|
||||
#endif /* !WITH_UIP6 */
|
||||
|
||||
#define CFS_CONF_OFFSET_TYPE long
|
||||
|
||||
@ -44,10 +55,6 @@
|
||||
#define MSP430_MEMCPY_WORKAROUND 1
|
||||
#include "msp430def.h"
|
||||
|
||||
#ifndef RF_CHANNEL
|
||||
#define RF_CHANNEL 26
|
||||
#endif /* RF_CHANNEL */
|
||||
|
||||
#define ELFLOADER_CONF_TEXT_IN_ROM 0
|
||||
#define ELFLOADER_CONF_DATAMEMORY_SIZE 0x400
|
||||
#define ELFLOADER_CONF_TEXTMEMORY_SIZE 0x800
|
||||
@ -99,7 +106,7 @@
|
||||
#define UIP_CONF_ND6_MAX_NEIGHBORS 4
|
||||
#define UIP_CONF_ND6_MAX_DEFROUTERS 2
|
||||
#define UIP_CONF_IP_FORWARD 0
|
||||
#define UIP_CONF_BUFFER_SIZE 108
|
||||
#define UIP_CONF_BUFFER_SIZE 140
|
||||
|
||||
#define SICSLOWPAN_CONF_COMPRESSION_IPV6 0
|
||||
#define SICSLOWPAN_CONF_COMPRESSION_HC1 1
|
||||
@ -108,7 +115,7 @@
|
||||
#define SICSLOWPAN_CONF_FRAG 0
|
||||
#define SICSLOWPAN_CONF_CONVENTIONAL_MAC 1
|
||||
#define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 2
|
||||
#else
|
||||
#else /* WITH_UIP6 */
|
||||
#define UIP_CONF_IP_FORWARD 1
|
||||
#define UIP_CONF_BUFFER_SIZE 108
|
||||
#endif /* WITH_UIP6 */
|
||||
|
Loading…
Reference in New Issue
Block a user