deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki

Browse source
This commit is contained in:
nvt 2011-09-05 21:25:17 +02:00
commit 7397e86f9c
7 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/net/netstack.h
View file

@ -71,7 +71,7 @@
#ifdef NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE #ifdef NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE
#define NETSTACK_RDC_CHANNEL_CHECK_RATE NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE #define NETSTACK_RDC_CHANNEL_CHECK_RATE NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE
#else /* NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE */ #else /* NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE */
#define NETSTACK_RDC_CHANNEL_CHECK_RATE 4 #define NETSTACK_RDC_CHANNEL_CHECK_RATE 8
#endif /* NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE */ #endif /* NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE */
#endif /* NETSTACK_RDC_CHANNEL_CHECK_RATE */ #endif /* NETSTACK_RDC_CHANNEL_CHECK_RATE */

1
cpu/6502/6502def.h
View file

@ -68,7 +68,6 @@ typedef unsigned short uip_stats_t;
#define UIP_ARCH_ADD32 1 #define UIP_ARCH_ADD32 1
#define UIP_ARCH_CHKSUM 1 #define UIP_ARCH_CHKSUM 1
#define MAC_CONF_CHANNEL_CHECK_RATE 1
#define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 1 #define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 1
#define LOADER_CONF_ARCH "lib/unload.h" #define LOADER_CONF_ARCH "lib/unload.h"

4
platform/iris/contiki-conf.h
View file

@ -56,7 +56,7 @@
#define NETSTACK_CONF_FRAMER framer_802154 #define NETSTACK_CONF_FRAMER framer_802154
#define RF230_CONF_AUTOACK 1 #define RF230_CONF_AUTOACK 1
#define MAC_CONF_CHANNEL_CHECK_RATE 8 #define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8
#define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0 #define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0
#define CXMAC_CONF_ANNOUNCEMENTS 0 #define CXMAC_CONF_ANNOUNCEMENTS 0
@ -70,7 +70,7 @@
#define NETSTACK_CONF_FRAMER framer_802154 #define NETSTACK_CONF_FRAMER framer_802154
#define RF230_CONF_AUTOACK 1 #define RF230_CONF_AUTOACK 1
#define MAC_CONF_CHANNEL_CHECK_RATE 8 #define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8
#define COLLECT_CONF_ANNOUNCEMENTS 1 #define COLLECT_CONF_ANNOUNCEMENTS 1
#define RIME_CONF_NO_POLITE_ANNOUCEMENTS 1 #define RIME_CONF_NO_POLITE_ANNOUCEMENTS 1

4
platform/micaz/contiki-conf.h
View file

@ -56,7 +56,7 @@
#define NETSTACK_CONF_FRAMER framer_802154 #define NETSTACK_CONF_FRAMER framer_802154
#define CC2420_CONF_AUTOACK 1 #define CC2420_CONF_AUTOACK 1
#define MAC_CONF_CHANNEL_CHECK_RATE 8 #define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8
#define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0 #define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0
#define CXMAC_CONF_ANNOUNCEMENTS 0 #define CXMAC_CONF_ANNOUNCEMENTS 0
@ -70,7 +70,7 @@
#define NETSTACK_CONF_FRAMER framer_802154 #define NETSTACK_CONF_FRAMER framer_802154
#define CC2420_CONF_AUTOACK 1 #define CC2420_CONF_AUTOACK 1
#define MAC_CONF_CHANNEL_CHECK_RATE 8 #define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8
#define COLLECT_CONF_ANNOUNCEMENTS 1 #define COLLECT_CONF_ANNOUNCEMENTS 1
#define RIME_CONF_NO_POLITE_ANNOUCEMENTS 1 #define RIME_CONF_NO_POLITE_ANNOUCEMENTS 1

2
platform/msb430/contiki-conf.h
View file

@ -12,7 +12,7 @@
#define NETSTACK_CONF_NETWORK rime_driver #define NETSTACK_CONF_NETWORK rime_driver
#define NETSTACK_CONF_FRAMER framer_nullmac #define NETSTACK_CONF_FRAMER framer_nullmac
#define MAC_CONF_CHANNEL_CHECK_RATE 8 #define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8
#define ENERGEST_CONF_ON 1 #define ENERGEST_CONF_ON 1

1
platform/z1/contiki-conf.h
View file

@ -73,7 +73,6 @@
#define NETSTACK_CONF_FRAMER framer_802154 #define NETSTACK_CONF_FRAMER framer_802154
#define CC2420_CONF_AUTOACK 1 #define CC2420_CONF_AUTOACK 1
#define MAC_CONF_CHANNEL_CHECK_RATE 8
#define COLLECT_CONF_ANNOUNCEMENTS 1 #define COLLECT_CONF_ANNOUNCEMENTS 1
#define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0 #define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0

1
platform/z1sp/contiki-conf.h
View file

@ -67,7 +67,6 @@
#define NETSTACK_CONF_FRAMER framer_802154 #define NETSTACK_CONF_FRAMER framer_802154
#define CC2420_CONF_AUTOACK 0 #define CC2420_CONF_AUTOACK 0
#define MAC_CONF_CHANNEL_CHECK_RATE 8
#define COLLECT_CONF_ANNOUNCEMENTS 1 #define COLLECT_CONF_ANNOUNCEMENTS 1
#define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0 #define RIME_CONF_NO_POLITE_ANNOUCEMENTS 0