From 0a76ff8ee78c7ec06887fba9ac7c846491c15109 Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Fri, 8 Dec 2017 16:49:33 +0000 Subject: [PATCH] Harmonise platform configuration files (Sky) --- arch/platform/sky/contiki-conf.h | 8 ++------ arch/platform/sky/{platform-conf.h => sky-def.h} | 6 +++--- 2 files changed, 5 insertions(+), 9 deletions(-) rename arch/platform/sky/{platform-conf.h => sky-def.h} (98%) diff --git a/arch/platform/sky/contiki-conf.h b/arch/platform/sky/contiki-conf.h index 18b687500..500e00e08 100644 --- a/arch/platform/sky/contiki-conf.h +++ b/arch/platform/sky/contiki-conf.h @@ -7,12 +7,8 @@ #ifdef PROJECT_CONF_PATH #include PROJECT_CONF_PATH #endif /* PROJECT_CONF_PATH */ - -#ifdef PLATFORM_CONF_H -#include PLATFORM_CONF_H -#else -#include "platform-conf.h" -#endif /* PLATFORM_CONF_H */ +/*---------------------------------------------------------------------------*/ +#include "sky-def.h" #include "msp430-def.h" /*---------------------------------------------------------------------------*/ /* Map RF_CHANNEL to cc2420 default channel */ diff --git a/arch/platform/sky/platform-conf.h b/arch/platform/sky/sky-def.h similarity index 98% rename from arch/platform/sky/platform-conf.h rename to arch/platform/sky/sky-def.h index 8e7b5c069..8640892af 100644 --- a/arch/platform/sky/platform-conf.h +++ b/arch/platform/sky/sky-def.h @@ -36,8 +36,8 @@ * Joakim Eriksson */ -#ifndef PLATFORM_CONF_H_ -#define PLATFORM_CONF_H_ +#ifndef SKY_DEF_H_ +#define SKY_DEF_H_ /* * 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 */ #define STACK_CONF_ORIGIN ((void *)0x3900) -#endif /* PLATFORM_CONF_H_ */ +#endif /* SKY_DEF_H_ */