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

Harmonise platform configuration files (Sky)

Browse Source
This commit is contained in:
George Oikonomou 2017-12-08 16:49:33 +00:00
parent df54d30a2a
commit 0a76ff8ee7
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,12 +7,8 @@
#ifdef PROJECT_CONF_PATH #ifdef PROJECT_CONF_PATH
#include PROJECT_CONF_PATH #include PROJECT_CONF_PATH
#endif /* PROJECT_CONF_PATH */ #endif /* PROJECT_CONF_PATH */
/*---------------------------------------------------------------------------*/
#ifdef PLATFORM_CONF_H #include "sky-def.h"
#include PLATFORM_CONF_H
#else
#include "platform-conf.h"
#endif /* PLATFORM_CONF_H */
#include "msp430-def.h" #include "msp430-def.h"
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Map RF_CHANNEL to cc2420 default channel */ /* Map RF_CHANNEL to cc2420 default channel */

6
arch/platform/sky/platform-conf.h → arch/platform/sky/sky-def.h
View File

@ -36,8 +36,8 @@
* Joakim Eriksson <joakime@sics.se> * Joakim Eriksson <joakime@sics.se>
*/ */
#ifndef PLATFORM_CONF_H_ #ifndef SKY_DEF_H_
#define PLATFORM_CONF_H_ #define SKY_DEF_H_
/* /*
* Definitions below are dictated by the hardware and not really * Definitions below are dictated by the hardware and not really
@ -208,4 +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)
#endif /* PLATFORM_CONF_H_ */ #endif /* SKY_DEF_H_ */