From 1227cb30f6d4a70eb17551fd7057d4468c4e4fb4 Mon Sep 17 00:00:00 2001 From: Rakendra Thapa Date: Sat, 18 Jul 2015 11:10:03 +0530 Subject: [PATCH] Including CPU_MODEL_ guard in cpu config file. Remove CC110X definitions. Changes to be committed: modified: cpu/lm4f120/include/cpu_conf.h --- cpu/lm4f120/include/cpu_conf.h | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/cpu/lm4f120/include/cpu_conf.h b/cpu/lm4f120/include/cpu_conf.h index 78eb1abd46..ca4f57653d 100644 --- a/cpu/lm4f120/include/cpu_conf.h +++ b/cpu/lm4f120/include/cpu_conf.h @@ -27,7 +27,6 @@ #include "hw_nvic.h" #include "hw_sysctl.h" #include "hw_types.h" -#include "lm4f120h5qr.h" #include "cortex-m4-def.h" #include "stellaris_periph/cpu.h" #include "stellaris_periph/debug.h" @@ -43,6 +42,10 @@ #include "hwtimer_cpu.h" #include "periph/uart.h" +#ifdef CPU_MODEL_LM4F120H5QR +#include "lm4f120h5qr.h" +#endif + #ifdef __cplusplus extern "C" { #endif @@ -64,16 +67,6 @@ extern "C" { #define CPUID_ADDR NVIC_CPUID /** @} */ -/** - * @name CC110X buffer size definitions for the stm32f4 - * @{ - */ -#ifdef MODULE_CC110X -#define TRANSCEIVER_BUFFER_SIZE (10) -#define RX_BUF_SIZE (10) -#endif -/** @} */ - /** * @name cpu functions * @{