From 0923203d8bf6a9ca4195d35660cf7a56e0361cf0 Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Mon, 27 Oct 2014 18:26:13 +0100 Subject: [PATCH 01/10] boards/avsextrem: purge FEUERWARE_CONF_BOARD_NAME --- boards/avsextrem/include/board.h | 2 -- boards/avsextrem/include/configure.h | 5 ----- 2 files changed, 7 deletions(-) diff --git a/boards/avsextrem/include/board.h b/boards/avsextrem/include/board.h index f74e0479b6..7b1877ddb5 100644 --- a/boards/avsextrem/include/board.h +++ b/boards/avsextrem/include/board.h @@ -27,8 +27,6 @@ #include "bitarithm.h" #include "msba2_common.h" -#define FEUERWARE_CONF_BOARD_NAME "FU Berlin AVSEXTREM BOARD" - #define LED_RED_PIN (BIT25) #define LED_GREEN_PIN (BIT26) diff --git a/boards/avsextrem/include/configure.h b/boards/avsextrem/include/configure.h index de985a83fc..170e094be6 100644 --- a/boards/avsextrem/include/configure.h +++ b/boards/avsextrem/include/configure.h @@ -55,11 +55,6 @@ * documentation of defines that do not belong to a specific module: */ -/** - * @def FEUERWARE_CONF_BOARD_NAME - * @brief Defines the name of the board as a string - */ - /** * @def FEUERWARE_CONF_CPU_NAME * @brief Defines the name of the cpu as a string From b397cbfd5a256fb23c57fc87a92b50cb5de6b8bb Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Mon, 27 Oct 2014 18:28:00 +0100 Subject: [PATCH 02/10] boards/avsextrem: purge FEUERWARE_CONF_CORE_SUPPORTS_FILES --- boards/avsextrem/include/board.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/boards/avsextrem/include/board.h b/boards/avsextrem/include/board.h index 7b1877ddb5..a25ce20208 100644 --- a/boards/avsextrem/include/board.h +++ b/boards/avsextrem/include/board.h @@ -38,9 +38,6 @@ #define LED_RED_ON (FIO3CLR = LED_RED_PIN) #define LED_RED_TOGGLE (FIO3PIN ^= LED_RED_PIN) -// if FAT is enabled this board supports files -#define FEUERWARE_CONF_CORE_SUPPORTS_FILES defined(MODULE_FAT) - #ifdef MODULE_FAT #define CFG_CONF_MEM_SIZE 0x7FFFFFFF #define SYSLOG_CONF_NUM_INTERFACES 2 From c006c69218924f8f66e0510de0a04b40c4b51622 Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Tue, 28 Oct 2014 11:43:19 +0100 Subject: [PATCH 03/10] cpu/lpc2387: purge FEUERWARE_CONF_CORE_SUPPORTS_TIME --- cpu/lpc2387/include/cpu-conf.h | 1 - 1 file changed, 1 deletion(-) diff --git a/cpu/lpc2387/include/cpu-conf.h b/cpu/lpc2387/include/cpu-conf.h index 20fa323187..ab37cd4fa7 100644 --- a/cpu/lpc2387/include/cpu-conf.h +++ b/cpu/lpc2387/include/cpu-conf.h @@ -34,7 +34,6 @@ * @{ */ #define FEUERWARE_CPU_LPC2387 1 -#define FEUERWARE_CONF_CORE_SUPPORTS_TIME 1 /** @} */ /** From f30ce433fc68333a74d4c9861a5731a1c202efda Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Tue, 28 Oct 2014 11:51:21 +0100 Subject: [PATCH 04/10] board/avsextrem, cpu/lpc2387: purge FEUERWARE_CONF_CPU_NAME --- boards/avsextrem/include/configure.h | 5 ----- cpu/lpc2387/include/cpu-conf.h | 2 -- 2 files changed, 7 deletions(-) diff --git a/boards/avsextrem/include/configure.h b/boards/avsextrem/include/configure.h index 170e094be6..640e67d25b 100644 --- a/boards/avsextrem/include/configure.h +++ b/boards/avsextrem/include/configure.h @@ -55,11 +55,6 @@ * documentation of defines that do not belong to a specific module: */ -/** - * @def FEUERWARE_CONF_CPU_NAME - * @brief Defines the name of the cpu as a string - */ - /** * @def FEUERWARE_CONF_SUPPORTS_FILES * @brief Defines if standard library file functions are available diff --git a/cpu/lpc2387/include/cpu-conf.h b/cpu/lpc2387/include/cpu-conf.h index ab37cd4fa7..aea78fef3e 100644 --- a/cpu/lpc2387/include/cpu-conf.h +++ b/cpu/lpc2387/include/cpu-conf.h @@ -27,8 +27,6 @@ * @note $Id$ */ -#define FEUERWARE_CONF_CPU_NAME "NXP LPC2387" - /** * @name CPU capabilities * @{ From ebc122bff15a4fe38f502e786278d3b5dfde9fe0 Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Tue, 28 Oct 2014 11:52:45 +0100 Subject: [PATCH 05/10] cpu/arm_common: purge FEUERWARE_CONF_ENABLE_HAL --- cpu/arm_common/syscalls.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/cpu/arm_common/syscalls.c b/cpu/arm_common/syscalls.c index 335ea0f0c9..564926dfa3 100644 --- a/cpu/arm_common/syscalls.c +++ b/cpu/arm_common/syscalls.c @@ -36,14 +36,6 @@ #include "vtimer.h" #endif -/* When using the HAL standard in and out are handled by HAL - devices. */ -#if FEUERWARE_CONF_ENABLE_HAL -#include "hal.h" -#include "interface-chardevice.h" -#include "hal-syscalls.h" -#endif - #define DEBUG_SYSCALLS 0 #if DEBUG_SYSCALLS #define PRINTF(...) printf(__VA_ARGS__) @@ -177,17 +169,7 @@ int _write_r(struct _reent *r, int fd, const void *data, unsigned int count) switch(fd) { case STDOUT_FILENO: case STDERR_FILENO: -#if FEUERWARE_CONF_ENABLE_HAL - if (stdio != NULL) { - result = chardevice_write(stdio, (char *)data, count); - } - else if (hal_state == HAL_NOT_INITIALIZED) { - result = fw_puts((char *)data, count); - } - -#else result = fw_puts((char *)data, count); -#endif break; default: From ff2ca855fa6c94c7ce7a5f7a12168c697ebde010 Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Tue, 28 Oct 2014 11:53:47 +0100 Subject: [PATCH 06/10] boards/avsextrem: purge FEUERWARE_CONF_SUPPORTS_FILES --- boards/avsextrem/include/configure.h | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/boards/avsextrem/include/configure.h b/boards/avsextrem/include/configure.h index 640e67d25b..df1a5bad75 100644 --- a/boards/avsextrem/include/configure.h +++ b/boards/avsextrem/include/configure.h @@ -49,19 +49,5 @@ #undef TRACELOG_CONF_NUM_ENTRIES #endif - -/* ------------------------------------------------------------------------- */ -/* - * documentation of defines that do not belong to a specific module: - */ - -/** - * @def FEUERWARE_CONF_SUPPORTS_FILES - * @brief Defines if standard library file functions are available - */ -#ifndef FEUERWARE_CONF_SUPPORTS_FILES -#define FEUERWARE_CONF_SUPPORTS_FILES 0 -#endif - /** @} */ #endif /* CONFIGURE_H_ */ From 07d9dc4448ed9e619dc0f923fe05c82ab5fb50a8 Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Tue, 28 Oct 2014 11:55:14 +0100 Subject: [PATCH 07/10] boards/avsextrem: remove configure.h, it's unused --- boards/avsextrem/include/configure.h | 53 ---------------------------- 1 file changed, 53 deletions(-) delete mode 100644 boards/avsextrem/include/configure.h diff --git a/boards/avsextrem/include/configure.h b/boards/avsextrem/include/configure.h deleted file mode 100644 index df1a5bad75..0000000000 --- a/boards/avsextrem/include/configure.h +++ /dev/null @@ -1,53 +0,0 @@ -/* -* configure.h - Configuration file for the avsextrem board. -* Copyright (C) 2013 Zakaria Kasmi -* - * This file is subject to the terms and conditions of the GNU Lesser - * General Public License v2.1. See the file LICENSE in the top level - * directory for more details. -* -*/ - -/** - * @file - * @brief definitions for the avsextrem board configuration - * - * @author baar - * @author Zakaria Kasmi - * @version $Revision: 1127 $ - * - * @note $Id: board-conf.h 1127 2013-08-20 17:15:29 kasmi $ - */ - -#ifndef CONFIGURE_H_ -#define CONFIGURE_H_ - -/** - * - * The offline configuration file "configure.h" is automatically - * included in every file by the build system and allows to configure - * all neccessary defines on cpu, board and application level. - * - * The configuration is built of - * \li a application specific file (project-conf.h) - * \li a board specific file (board-conf.h) and - * \li a cpu specific file (cpu-conf.h). - * All of which are chosen by the build system depending on your arguments. - * - * @{ - */ - -//#include "project-conf.h" -//#include "board-conf.h" -#include "cpu-conf.h" - -#ifdef MODULE_SYSMON -#ifndef TRACELOG_CONF_NUM_ENTRIES -#define TRACELOG_CONF_NUM_ENTRIES 10 -#endif -#else -#undef TRACELOG_CONF_NUM_ENTRIES -#endif - -/** @} */ -#endif /* CONFIGURE_H_ */ From e7eda3b54ab9f1e13489436f9b738cbe4a3b9e1f Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Tue, 28 Oct 2014 11:58:40 +0100 Subject: [PATCH 08/10] drivers/cc110x: remove unused FEUERWARE_CPU_MSP430 include --- drivers/cc110x_legacy_csma/cc1100.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/cc110x_legacy_csma/cc1100.c b/drivers/cc110x_legacy_csma/cc1100.c index 6ccafc8927..9d00340d63 100644 --- a/drivers/cc110x_legacy_csma/cc1100.c +++ b/drivers/cc110x_legacy_csma/cc1100.c @@ -46,9 +46,7 @@ //#include "cpu/lpc2387/lpc2387-timer2.h" #endif -#if defined(FEUERWARE_CPU_MSP430) -#include -#elif defined(FEUERWARE_CPU_LPC2387) +#if defined(FEUERWARE_CPU_LPC2387) #include "lpc2387.h" #endif From 57daf9d7d2fa282bc7b57c433e7fb05b99c7d019 Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Tue, 28 Oct 2014 13:37:11 +0100 Subject: [PATCH 09/10] drivers/cc110x: fix duplicate length member --- drivers/cc110x_legacy_csma/cc1100_phy.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/cc110x_legacy_csma/cc1100_phy.h b/drivers/cc110x_legacy_csma/cc1100_phy.h index e36fbae76d..e118796597 100644 --- a/drivers/cc110x_legacy_csma/cc1100_phy.h +++ b/drivers/cc110x_legacy_csma/cc1100_phy.h @@ -62,7 +62,6 @@ Notes: */ typedef struct __attribute__((packed)) cc1100_packet_layer0_t { radio_packet_length_t length; ///< Length of the packet (without length byte) - uint8_t length; ///< Length of the packet (without length byte) uint8_t address; ///< Destination address uint8_t phy_src; ///< Source address (physical source) uint8_t flags; ///< Flags From 245df3f02840a91654b3f76b6612c5c7e6d80797 Mon Sep 17 00:00:00 2001 From: Ludwig Ortmann Date: Tue, 28 Oct 2014 13:41:03 +0100 Subject: [PATCH 10/10] cpu/lpc2387, drivers/cc110x: purge FEUERWARE_CPU_LPC2387 * includes were superfluous * unused otherwise --- cpu/lpc2387/include/cpu-conf.h | 7 ------- drivers/cc110x_legacy_csma/cc1100.c | 9 --------- 2 files changed, 16 deletions(-) diff --git a/cpu/lpc2387/include/cpu-conf.h b/cpu/lpc2387/include/cpu-conf.h index aea78fef3e..60cfd7ef71 100644 --- a/cpu/lpc2387/include/cpu-conf.h +++ b/cpu/lpc2387/include/cpu-conf.h @@ -27,13 +27,6 @@ * @note $Id$ */ -/** - * @name CPU capabilities - * @{ - */ -#define FEUERWARE_CPU_LPC2387 1 -/** @} */ - /** * @name Stdlib configuration * @{ diff --git a/drivers/cc110x_legacy_csma/cc1100.c b/drivers/cc110x_legacy_csma/cc1100.c index 9d00340d63..4decf00cd5 100644 --- a/drivers/cc110x_legacy_csma/cc1100.c +++ b/drivers/cc110x_legacy_csma/cc1100.c @@ -41,15 +41,6 @@ #include "hwtimer.h" #include "bitarithm.h" -/* TODO: cc1100 port timer */ -#ifdef FEUERWARE_CPU_LPC2387 -//#include "cpu/lpc2387/lpc2387-timer2.h" -#endif - -#if defined(FEUERWARE_CPU_LPC2387) -#include "lpc2387.h" -#endif - #define PACKET_LENGTH (0x3E) ///< Packet length = 62 Bytes. #define CC1100_SYNC_WORD_TX_TIME (90000) /* loop count (max. timeout ~ 15 ms) to wait for */ /* sync word to be transmitted (GDO2 from low to high) */