From ba8f37bef4aa16580d7caedc7c527d4043bd16dd Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Sun, 3 Dec 2017 01:02:22 +0000 Subject: [PATCH] Pull CPU-related constants from the CPU header (nrf52dk) --- arch/platform/nrf52dk/contiki-conf.h | 1 + arch/platform/nrf52dk/platform-conf.h | 29 --------------------------- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/arch/platform/nrf52dk/contiki-conf.h b/arch/platform/nrf52dk/contiki-conf.h index 2ab089856..6e1529352 100644 --- a/arch/platform/nrf52dk/contiki-conf.h +++ b/arch/platform/nrf52dk/contiki-conf.h @@ -49,6 +49,7 @@ /*---------------------------------------------------------------------------*/ /* Include platform peripherals configuration */ #include "platform-conf.h" +#include "nrf52832-def.h" /*---------------------------------------------------------------------------*/ /** * \name Network Stack Configuration diff --git a/arch/platform/nrf52dk/platform-conf.h b/arch/platform/nrf52dk/platform-conf.h index d40fd2b3e..e2fd6cac0 100644 --- a/arch/platform/nrf52dk/platform-conf.h +++ b/arch/platform/nrf52dk/platform-conf.h @@ -107,35 +107,6 @@ */ #define PLATFORM_TIMER_INSTANCE_ID 1 -/** @} */ -/*---------------------------------------------------------------------------*/ -/** - * \name Compiler configuration and platform-specific type definitions - * - * Those values are not meant to be modified by the user - * @{ - */ -#define CLOCK_CONF_SECOND 128 - -/* Compiler configurations */ -#define CCIF -#define CLIF - -/* Platform typedefs */ -typedef uint32_t clock_time_t; -typedef uint32_t uip_stats_t; - -/* Clock (time) comparison macro */ -#define CLOCK_LT(a, b) ((signed long)((a) - (b)) < 0) - -#define RTIMER_ARCH_SECOND 62500 -/* - * rtimer.h typedefs rtimer_clock_t as unsigned short. We need to define - * RTIMER_CLOCK_DIFF to override this - */ -typedef uint32_t rtimer_clock_t; -#define RTIMER_CLOCK_DIFF(a,b) ((int32_t)((a)-(b))) - /** @} */ /*---------------------------------------------------------------------------*/ /** @}