Merge pull request #1745 from alignan/pull/z1-contiki-conf

Minor changes to z1/contiki-conf.h

platform/z1/contiki-conf.h

@@ -33,17 +33,33 @@
 
 #include "platform-conf.h"
 
+#ifdef PROJECT_CONF_H
+#include PROJECT_CONF_H
+#endif /* PROJECT_CONF_H */
+
 #define XMAC_CONF_COMPOWER          1
 #define CXMAC_CONF_COMPOWER         1
 
 #if NETSTACK_CONF_WITH_IPV6
 
 /* Network setup for IPv6 */
-#define NETSTACK_CONF_NETWORK sicslowpan_driver
-#define NETSTACK_CONF_MAC     csma_driver
-#define NETSTACK_CONF_RDC     contikimac_driver
-#define NETSTACK_CONF_RADIO   cc2420_driver
-#define NETSTACK_CONF_FRAMER  framer_802154
+#ifndef NETSTACK_CONF_NETWORK
+#define NETSTACK_CONF_NETWORK       sicslowpan_driver
+#endif
+
+#ifndef NETSTACK_CONF_MAC
+#define NETSTACK_CONF_MAC           csma_driver
+#endif
+
+#ifndef NETSTACK_CONF_RDC
+#define NETSTACK_CONF_RDC           contikimac_driver
+#endif
+
+#ifndef NETSTACK_CONF_FRAMER
+#define NETSTACK_CONF_FRAMER        framer_802154
+#endif
+
+#define NETSTACK_CONF_RADIO         cc2420_driver
 
 /* Specify a minimum packet size for 6lowpan compression to be
    enabled. This is needed for ContikiMAC, which needs packets to be
@@ -51,112 +67,141 @@
    used. */
 #define SICSLOWPAN_CONF_COMPRESSION_THRESHOLD 63
 
-#define CC2420_CONF_AUTOACK              1
-#define NETSTACK_RDC_CHANNEL_CHECK_RATE  8
-#define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0
-#define CXMAC_CONF_ANNOUNCEMENTS         0
-#define XMAC_CONF_ANNOUNCEMENTS          0
+#define CC2420_CONF_AUTOACK                   1
+#define NETSTACK_RDC_CHANNEL_CHECK_RATE       8
+#define RIME_CONF_NO_POLITE_ANNOUCEMENTS      0
+#define CXMAC_CONF_ANNOUNCEMENTS              0
+#define XMAC_CONF_ANNOUNCEMENTS               0
 
-#define QUEUEBUF_CONF_NUM                4
+#ifndef QUEUEBUF_CONF_NUM
+#define QUEUEBUF_CONF_NUM                     4
+#endif
 
 #else /* NETSTACK_CONF_WITH_IPV6 */
 
 /* Network setup for non-IPv6 (rime). */
+#ifndef NETSTACK_CONF_NETWORK
+#define NETSTACK_CONF_NETWORK        rime_driver
+#endif
 
-#define NETSTACK_CONF_NETWORK rime_driver
-#define NETSTACK_CONF_MAC     csma_driver
-#define NETSTACK_CONF_RDC     contikimac_driver
+#ifndef NETSTACK_CONF_MAC
+#define NETSTACK_CONF_MAC            csma_driver
+#endif
+
+#ifndef NETSTACK_CONF_RDC
+#define NETSTACK_CONF_RDC            contikimac_driver
+#endif
+
+#ifndef NETSTACK_CONF_FRAMER
+#define NETSTACK_CONF_FRAMER         contikimac_framer
+#endif
+
+#ifndef NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE
 #define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8
-#define NETSTACK_CONF_FRAMER  contikimac_framer
+#endif
 
-#define CC2420_CONF_AUTOACK              1
+#define CC2420_CONF_AUTOACK                  1
 
-#define COLLECT_CONF_ANNOUNCEMENTS       1
-#define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0
-#define CXMAC_CONF_ANNOUNCEMENTS         0
-#define XMAC_CONF_ANNOUNCEMENTS          0
-#define CONTIKIMAC_CONF_ANNOUNCEMENTS    0
+#define COLLECT_CONF_ANNOUNCEMENTS           1
+#define RIME_CONF_NO_POLITE_ANNOUCEMENTS     0
+#define CXMAC_CONF_ANNOUNCEMENTS             0
+#define XMAC_CONF_ANNOUNCEMENTS              0
+#define CONTIKIMAC_CONF_ANNOUNCEMENTS        0
 
-#define CONTIKIMAC_CONF_COMPOWER         1
-#define XMAC_CONF_COMPOWER               1
-#define CXMAC_CONF_COMPOWER              1
+#define CONTIKIMAC_CONF_COMPOWER             1
+#define XMAC_CONF_COMPOWER                   1
+#define CXMAC_CONF_COMPOWER                  1
 
-#define COLLECT_NBR_TABLE_CONF_MAX_NEIGHBORS      32
+#define COLLECT_NBR_TABLE_CONF_MAX_NEIGHBORS 32
 
-#define QUEUEBUF_CONF_NUM          8
+#ifndef QUEUEBUF_CONF_NUM
+#define QUEUEBUF_CONF_NUM                    8
+#endif
 
 #endif /* NETSTACK_CONF_WITH_IPV6 */
 
-#define PACKETBUF_CONF_ATTRS_INLINE 1
+#define PACKETBUF_CONF_ATTRS_INLINE       1
 
 #ifdef RF_CHANNEL
-#define CC2420_CONF_CHANNEL RF_CHANNEL
+#define CC2420_CONF_CHANNEL               RF_CHANNEL
 #endif
 
 #ifndef CC2420_CONF_CHANNEL
-#define CC2420_CONF_CHANNEL              26
+#define CC2420_CONF_CHANNEL               26
 #endif /* CC2420_CONF_CHANNEL */
 
 #ifndef CC2420_CONF_CCA_THRESH
-#define CC2420_CONF_CCA_THRESH              -45
+#define CC2420_CONF_CCA_THRESH            -45
 #endif /* CC2420_CONF_CCA_THRESH */
 
-#define IEEE802154_CONF_PANID       0xABCD
+#ifndef IEEE802154_CONF_PANID
+#define IEEE802154_CONF_PANID             0xABCD
+#endif
 
 /* The TSCH default slot length of 10ms is a bit too short for this platform,
  * use 15ms instead. */
+#ifndef TSCH_CONF_DEFAULT_TIMESLOT_LENGTH
 #define TSCH_CONF_DEFAULT_TIMESLOT_LENGTH 15000
+#endif
 
-#define SHELL_VARS_CONF_RAM_BEGIN 0x1100
-#define SHELL_VARS_CONF_RAM_END 0x2000
+#define SHELL_VARS_CONF_RAM_BEGIN         0x1100
+#define SHELL_VARS_CONF_RAM_END           0x2000
 
-#define CFS_CONF_OFFSET_TYPE  long
+#define CFS_CONF_OFFSET_TYPE              long
 
-#define PROFILE_CONF_ON 0
-#define ENERGEST_CONF_ON 1
+#define PROFILE_CONF_ON                   0
+#define ENERGEST_CONF_ON                  1
 
-#define ELFLOADER_CONF_TEXT_IN_ROM 0
-#define ELFLOADER_CONF_DATAMEMORY_SIZE 0x400
-#define ELFLOADER_CONF_TEXTMEMORY_SIZE 0x800
+#define ELFLOADER_CONF_TEXT_IN_ROM        0
+#define ELFLOADER_CONF_DATAMEMORY_SIZE    0x400
+#define ELFLOADER_CONF_TEXTMEMORY_SIZE    0x800
 
 #define AODV_COMPLIANCE
-#define AODV_NUM_RT_ENTRIES 32
+#define AODV_NUM_RT_ENTRIES          32
 
-#define WITH_ASCII 1
+#define WITH_ASCII                   1
 
-#define PROCESS_CONF_NUMEVENTS 8
-#define PROCESS_CONF_STATS 1
-/*#define PROCESS_CONF_FASTPOLL    4*/
+#define PROCESS_CONF_NUMEVENTS       8
+#define PROCESS_CONF_STATS           1
+/*#define PROCESS_CONF_FASTPOLL      4*/
 
 #define UART0_CONF_TX_WITH_INTERRUPT 0 /* So far, printfs without interrupt. */
 
-#define UART0_CONF_RX_WITH_DMA 0
+#define UART0_CONF_RX_WITH_DMA       0
 
 #ifdef NETSTACK_CONF_WITH_IPV6
 
-#define LINKADDR_CONF_SIZE              8
+#define LINKADDR_CONF_SIZE           8
 
-#define UIP_CONF_LL_802154              1
-#define UIP_CONF_LLH_LEN                0
+#define UIP_CONF_LL_802154           1
+#define UIP_CONF_LLH_LEN             0
 
-#define UIP_CONF_ROUTER                 1
+#define UIP_CONF_ROUTER              1
 
 /* Handle 10 neighbors */
-#define NBR_TABLE_CONF_MAX_NEIGHBORS     15
-/* Handle 10 routes    */
-#define UIP_CONF_MAX_ROUTES   15
+#ifndef NBR_TABLE_CONF_MAX_NEIGHBORS
+#define NBR_TABLE_CONF_MAX_NEIGHBORS    15
+#endif
 
-#define UIP_CONF_ND6_SEND_RA    0
+/* Handle 10 routes    */
+#ifndef UIP_CONF_MAX_ROUTES
+#define UIP_CONF_MAX_ROUTES             15
+#endif
+
+#define UIP_CONF_ND6_SEND_RA            0
 #define UIP_CONF_ND6_REACHABLE_TIME     600000
 #define UIP_CONF_ND6_RETRANS_TIMER      10000
 
-#define NETSTACK_CONF_WITH_IPV6                   1
+#define NETSTACK_CONF_WITH_IPV6         1
 #define UIP_CONF_IPV6_QUEUE_PKT         0
 #define UIP_CONF_IPV6_CHECKS            1
 #define UIP_CONF_IPV6_REASSEMBLY        0
 #define UIP_CONF_NETIF_MAX_ADDRESSES    3
 #define UIP_CONF_IP_FORWARD             0
-#define UIP_CONF_BUFFER_SIZE    140
+
+#ifndef UIP_CONF_BUFFER_SIZE
+#define UIP_CONF_BUFFER_SIZE            140
+#endif
 
 #define SICSLOWPAN_CONF_COMPRESSION             SICSLOWPAN_COMPRESSION_HC06
 #ifndef SICSLOWPAN_CONF_FRAG
@@ -165,31 +210,33 @@
 #endif /* SICSLOWPAN_CONF_FRAG */
 #define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS       2
 #else /* NETSTACK_CONF_WITH_IPV6 */
-#define UIP_CONF_IP_FORWARD      1
-#define UIP_CONF_BUFFER_SIZE     108
+#define UIP_CONF_IP_FORWARD                     1
+
+#ifndef UIP_CONF_BUFFER_SIZE
+#define UIP_CONF_BUFFER_SIZE                    108
+#endif
+
 #endif /* NETSTACK_CONF_WITH_IPV6 */
 
-#define UIP_CONF_ICMP_DEST_UNREACH 1
+#define UIP_CONF_ICMP_DEST_UNREACH              1
 
 #define UIP_CONF_DHCP_LIGHT
-#define UIP_CONF_LLH_LEN         0
-#define UIP_CONF_RECEIVE_WINDOW  48
-#define UIP_CONF_TCP_MSS         48
-#define UIP_CONF_MAX_CONNECTIONS 4
-#define UIP_CONF_MAX_LISTENPORTS 8
-#define UIP_CONF_UDP_CONNS       12
-#define UIP_CONF_FWCACHE_SIZE    30
-#define UIP_CONF_BROADCAST       1
-#define UIP_ARCH_IPCHKSUM        1
-#define UIP_CONF_UDP             1
-#define UIP_CONF_UDP_CHECKSUMS   1
-#define UIP_CONF_PINGADDRCONF    0
-#define UIP_CONF_LOGGING         0
+#define UIP_CONF_LLH_LEN                        0
+#define UIP_CONF_RECEIVE_WINDOW                 48
+#define UIP_CONF_TCP_MSS                        48
+#define UIP_CONF_MAX_CONNECTIONS                4
+#define UIP_CONF_MAX_LISTENPORTS                8
+#define UIP_CONF_UDP_CONNS                      12
+#define UIP_CONF_FWCACHE_SIZE                   30
+#define UIP_CONF_BROADCAST                      1
+#define UIP_ARCH_IPCHKSUM                       1
+#define UIP_CONF_UDP                            1
+#define UIP_CONF_UDP_CHECKSUMS                  1
+#define UIP_CONF_PINGADDRCONF                   0
+#define UIP_CONF_LOGGING                        0
 
-#define UIP_CONF_TCP_SPLIT       0
+#define UIP_CONF_TCP_SPLIT                      0
 
-#ifdef PROJECT_CONF_H
-#include PROJECT_CONF_H
-#endif /* PROJECT_CONF_H */
+#define BOARD_STRING        "Zolertia Z1 platform"
 
 #endif /* CONTIKI_CONF_H */