Merge pull request #1893 from LudwigOrtmann/purge_allthefeuerware

Remove all feuerware occurrences
RIOT-OS · Oct 28, 2014 · 7301a89 · 7301a89
2 parents cf8cf3b + 245df3f
commit 7301a89
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 122 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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 <msp430x16x.h>
-#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
@@ -62,7 +62,6 @@ extern "C" {
  */
 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