diff --git a/boards/avsextrem/include/board.h b/boards/avsextrem/include/board.h index f74e0479b6..a25ce20208 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) @@ -40,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 diff --git a/boards/avsextrem/include/configure.h b/boards/avsextrem/include/configure.h deleted file mode 100644 index de985a83fc..0000000000 --- a/boards/avsextrem/include/configure.h +++ /dev/null @@ -1,77 +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 - - -/* ------------------------------------------------------------------------- */ -/* - * 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 - */ - -/** - * @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_ */ 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: diff --git a/cpu/lpc2387/include/cpu-conf.h b/cpu/lpc2387/include/cpu-conf.h index 20fa323187..60cfd7ef71 100644 --- a/cpu/lpc2387/include/cpu-conf.h +++ b/cpu/lpc2387/include/cpu-conf.h @@ -27,16 +27,6 @@ * @note $Id$ */ -#define FEUERWARE_CONF_CPU_NAME "NXP LPC2387" - -/** - * @name CPU capabilities - * @{ - */ -#define FEUERWARE_CPU_LPC2387 1 -#define FEUERWARE_CONF_CORE_SUPPORTS_TIME 1 -/** @} */ - /** * @name Stdlib configuration * @{ diff --git a/drivers/cc110x_legacy_csma/cc1100.c b/drivers/cc110x_legacy_csma/cc1100.c index 6ccafc8927..4decf00cd5 100644 --- a/drivers/cc110x_legacy_csma/cc1100.c +++ b/drivers/cc110x_legacy_csma/cc1100.c @@ -41,17 +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_MSP430) -#include -#elif 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) */ 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