From 75472eddf4458bbcef98216a0db6dda3202fcd0b Mon Sep 17 00:00:00 2001 From: Hauke Petersen <hauke.petersen@fu-berlin.de> Date: Wed, 5 Aug 2015 17:59:53 +0200 Subject: [PATCH] cpu: remove transceiver defines from cpu_conf files --- cpu/k60/include/cpu_conf.h | 3 --- cpu/kw2x/include/cpu_conf.h | 2 -- cpu/mc1322x/include/cpu_conf.h | 8 -------- cpu/msp430-common/include/cpu_conf.h | 3 --- cpu/native/include/cpu_conf.h | 10 ---------- cpu/samd21/include/cpu_conf.h | 5 ----- cpu/stm32f1/include/cpu_conf.h | 2 -- cpu/stm32f4/include/cpu_conf.h | 10 ---------- cpu/stm32l1/include/cpu_conf.h | 2 -- 9 files changed, 45 deletions(-) diff --git a/cpu/k60/include/cpu_conf.h b/cpu/k60/include/cpu_conf.h index 47b1c41727..4cd698d06e 100644 --- a/cpu/k60/include/cpu_conf.h +++ b/cpu/k60/include/cpu_conf.h @@ -254,9 +254,6 @@ typedef enum llwu_wakeup_pin { #define ISR_PORT_E isr_porte_pin_detect /** @} */ -/** @brief Number of packets in transceiver queue */ -#define TRANSCEIVER_BUFFER_SIZE (3) - /** * @name Bit band macros * @{ diff --git a/cpu/kw2x/include/cpu_conf.h b/cpu/kw2x/include/cpu_conf.h index de0ccdac19..262c5e465b 100644 --- a/cpu/kw2x/include/cpu_conf.h +++ b/cpu/kw2x/include/cpu_conf.h @@ -61,8 +61,6 @@ extern "C" */ #define CPUID_ID_PTR ((void *)(&(SIM_UIDH))) -#define TRANSCEIVER_BUFFER_SIZE (3) /**< Buffer Size for Transceiver Module */ - /** * @brief MCU specific Low Power Timer settings. */ diff --git a/cpu/mc1322x/include/cpu_conf.h b/cpu/mc1322x/include/cpu_conf.h index 22a3a1e57f..83f215cd83 100644 --- a/cpu/mc1322x/include/cpu_conf.h +++ b/cpu/mc1322x/include/cpu_conf.h @@ -60,14 +60,6 @@ extern "C" { #define CC_CONF_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) /** @} */ -/** - * @brief Transceiver configuration - * @{ - */ -#define TRANSCEIVER_BUFFER_SIZE (10) -#define RX_BUF_SIZE (10) -/** @} */ - /** * @name UART0 buffer size definition for compatibility reasons * diff --git a/cpu/msp430-common/include/cpu_conf.h b/cpu/msp430-common/include/cpu_conf.h index 9ddff3d20c..71c4924a2d 100644 --- a/cpu/msp430-common/include/cpu_conf.h +++ b/cpu/msp430-common/include/cpu_conf.h @@ -27,9 +27,6 @@ extern "C" { #define THREAD_STACKSIZE_IDLE (96) #define MSP430_ISR_STACK_SIZE (256) -#define RX_BUF_SIZE (3) -#define TRANSCEIVER_BUFFER_SIZE (3) - #ifndef UART0_BUFSIZE #define UART0_BUFSIZE (32) #endif diff --git a/cpu/native/include/cpu_conf.h b/cpu/native/include/cpu_conf.h index a1a92aea74..d2c54d77d2 100644 --- a/cpu/native/include/cpu_conf.h +++ b/cpu/native/include/cpu_conf.h @@ -34,11 +34,6 @@ extern "C" { #define THREAD_EXTRA_STACKSIZE_PRINTF_FLOAT (163840) /* for core/include/thread.h */ #define THREAD_STACKSIZE_MINIMUM (163840) -/* undefine the TRANSCEIVER_STACK_SIZE (2048 or 512) defined in transceiver.h */ -#ifdef TRANSCEIVER_STACK_SIZE -#undef TRANSCEIVER_STACK_SIZE -#endif -#define TRANSCEIVER_STACK_SIZE (163840) /* native internal */ #define THREAD_STACKSIZE_MINIMUM (163840) #define NATIVE_ISR_STACKSIZE (163840) @@ -50,11 +45,6 @@ extern "C" { #define THREAD_EXTRA_STACKSIZE_PRINTF_FLOAT (8192) /* for core/include/thread.h */ #define THREAD_STACKSIZE_MINIMUM (8192) -/* undefine the TRANSCEIVER_STACK_SIZE (2048 or 512) defined in transceiver.h */ -#ifdef TRANSCEIVER_STACK_SIZE -#undef TRANSCEIVER_STACK_SIZE -#endif -#define TRANSCEIVER_STACK_SIZE (16384) /* native internal */ #define NATIVE_ISR_STACKSIZE (8192) #endif /* OS */ diff --git a/cpu/samd21/include/cpu_conf.h b/cpu/samd21/include/cpu_conf.h index 8597d2201b..edece7b3b5 100644 --- a/cpu/samd21/include/cpu_conf.h +++ b/cpu/samd21/include/cpu_conf.h @@ -33,11 +33,6 @@ extern "C" { #define CPU_FLASH_BASE FLASH_ADDR /** @} */ -/** - * @brief Buffer size to use by the transceiver - */ -#define TRANSCEIVER_BUFFER_SIZE (3) - /** * @brief CPUID_ID_LEN length of cpuid in bytes */ diff --git a/cpu/stm32f1/include/cpu_conf.h b/cpu/stm32f1/include/cpu_conf.h index f6f0d81e68..9e7aa19325 100644 --- a/cpu/stm32f1/include/cpu_conf.h +++ b/cpu/stm32f1/include/cpu_conf.h @@ -43,8 +43,6 @@ extern "C" { */ #define CPUID_ID_LEN (12) -#define TRANSCEIVER_BUFFER_SIZE (3) - /** * @brief Configure the CPU's clock system * diff --git a/cpu/stm32f4/include/cpu_conf.h b/cpu/stm32f4/include/cpu_conf.h index b11e424c45..f4703f8808 100644 --- a/cpu/stm32f4/include/cpu_conf.h +++ b/cpu/stm32f4/include/cpu_conf.h @@ -45,16 +45,6 @@ extern "C" { */ #define CPUID_ID_LEN (12) -/** - * @name CC110X buffer size definitions for the stm32f4 - * @{ - */ -#ifdef MODULE_CC110X -#define TRANSCEIVER_BUFFER_SIZE (10) -#define RX_BUF_SIZE (10) -#endif -/** @} */ - #ifdef __cplusplus } #endif diff --git a/cpu/stm32l1/include/cpu_conf.h b/cpu/stm32l1/include/cpu_conf.h index fc427df41b..8a63964b8d 100644 --- a/cpu/stm32l1/include/cpu_conf.h +++ b/cpu/stm32l1/include/cpu_conf.h @@ -41,8 +41,6 @@ extern "C" { */ #define CPUID_ID_LEN (12) -#define TRANSCEIVER_BUFFER_SIZE (3) - #ifdef __cplusplus } #endif -- GitLab