giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move user configuration to contiki-conf.h

Browse Source
This commit is contained in:
George Oikonomou 2017-12-08 16:45:46 +00:00
parent ddd15692e1
commit d7b426c105
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/platform/sky/contiki-conf.h
View File

@ -13,6 +13,10 @@
#else #else
#include "platform-conf.h" #include "platform-conf.h"
#endif /* PLATFORM_CONF_H */ #endif /* PLATFORM_CONF_H */
/* Map RF_CHANNEL to cc2420 default channel */
#ifdef RF_CHANNEL
#define CC2420_CONF_CHANNEL RF_CHANNEL
#endif /* RF_CHANNEL */
/* Configure radio driver */ /* Configure radio driver */
#ifndef NETSTACK_CONF_RADIO #ifndef NETSTACK_CONF_RADIO
@ -35,4 +39,8 @@
#define AES_128_CONF cc2420_aes_128_driver #define AES_128_CONF cc2420_aes_128_driver
#endif /* AES_128_CONF */ #endif /* AES_128_CONF */
/* Disable the stack check library by default: .rom overflow otherwise */
#ifndef STACK_CHECK_CONF_ENABLED
#define STACK_CHECK_CONF_ENABLED 0
#endif
#endif /* CONTIKI_CONF_H */ #endif /* CONTIKI_CONF_H */

10
arch/platform/sky/platform-conf.h
View File

@ -59,11 +59,6 @@
#define PLATFORM_HAS_SHT11 1 #define PLATFORM_HAS_SHT11 1
#define PLATFORM_HAS_RADIO 1 #define PLATFORM_HAS_RADIO 1
/* Map RF_CHANNEL to cc2420 default channel */
#ifdef RF_CHANNEL
#define CC2420_CONF_CHANNEL RF_CHANNEL
#endif /* RF_CHANNEL */
/* CPU target speed in Hz */ /* CPU target speed in Hz */
#define F_CPU 3900000uL /*2457600uL*/ #define F_CPU 3900000uL /*2457600uL*/
@ -213,9 +208,4 @@ for SFD timestamping */
/* Platform-specific define for the end of the stack region */ /* Platform-specific define for the end of the stack region */
#define STACK_CONF_ORIGIN ((void *)0x3900) #define STACK_CONF_ORIGIN ((void *)0x3900)
/* Disable the stack check library by default: .rom overflow otherwise */
#ifndef STACK_CHECK_CONF_ENABLED
#define STACK_CHECK_CONF_ENABLED 0
#endif
#endif /* PLATFORM_CONF_H_ */ #endif /* PLATFORM_CONF_H_ */