Merge pull request #1398 from haukepetersen/fix_hwtimer_arch

core: removed duplicated hwtimer_arch.h

boards/mbed_lpc1768/hwtimer_board.c

@@ -19,7 +19,7 @@
 
 #include <inttypes.h>
 
-#include "hwtimer_arch.h"
+#include "arch/hwtimer_arch.h"
 
 #define ENABLE_DEBUG (1)
 #include "debug.h"

core/hwtimer.c

@@ -36,7 +36,7 @@
 
 #include "hwtimer.h"
 #include "hwtimer_cpu.h"
-#include "hwtimer_arch.h"
+#include "arch/hwtimer_arch.h"
 
 /*---------------------------------------------------------------------------*/
 

core/include/arch/hwtimer_arch.h

@@ -13,10 +13,9 @@
  * @file        hwtimer_arch.h
  * @brief       The kernel's hardware timer abstraction interface
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author      Heiko Will <hwill@inf.fu-berlin.de>
- * @author      Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
+ * @author      Kaspar Schleiser <kaspar@schleiser.de>
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
@@ -28,8 +27,8 @@
 /**
  * @brief Initialize architecture dependent kernel timer support
  *
- * @brief[in] handler   callback that is called when timer offset is reached
- * @brief[in] fcpu      the core CPU-frequency for tick interval calculation
+ * @param[in] handler   callback that is called when timer offset is reached
+ * @param[in] fcpu      the core CPU-frequency for tick interval calculation
  */
 void hwtimer_arch_init(void (*handler)(int), uint32_t fcpu);
 
@@ -52,6 +51,14 @@ void hwtimer_arch_disable_interrupt(void);
  */
 void hwtimer_arch_set(unsigned long offset, short timer);
 
+/**
+ * @brief Set a kernel timer to raise an interrupt at specified system time.
+ *
+ * @param[in] value     absolute timer tick value to set a timer channel to
+ * @param[in] timer     the channel to set
+ */
+void hwtimer_arch_set_absolute(unsigned long value, short timer);
+
 /**
  * @brief Unset the kernel timer with the given timer ID
  *

core/include/hwtimer_arch.h

@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2013 Freie Universität Berlin
- *
- * This file is subject to the terms and conditions of the GNU Lesser General
- * Public License. See the file LICENSE in the top level directory for more
- * details.
- */
-
-/**
- * @addtogroup  core_hwtimer
- * @{
- *
- * @file        hwtimer_arch.h
- * @brief       Architecture specific hwtimer API
- *
- * @author      Freie Universität Berlin, Computer Systems & Telematics
- * @author      Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
- * @author      Heiko Will <hwill@inf.fu-berlin.de>
- * @author      Kaspar Schleiser <kaspar@schleiser.de>
- * @}
- */
-
-#ifndef HWTIMER_ARCH_H_
-#define HWTIMER_ARCH_H_
-
-#include <stdint.h>
-
-/**
- * @brief Initialize architecture dependent kernel timer support.
- *
- * @param[in] handler   callback function for the interrupt handler
- * @param[in] fcpu      cpu frequency
- */
-void hwtimer_arch_init(void (*handler)(int), uint32_t fcpu);
-
-/**
- * @brief Enable interrupts of hardware timers.
- */
-void hwtimer_arch_enable_interrupt(void);
-
-/**
- * @brief Disable interrupts of hardware timers.
- */
-void hwtimer_arch_disable_interrupt(void);
-
-/**
- * @brief Set a kernel timer to raise an interrupt after `offset` kernel timer
- * ticks from now.
- *
- * @param[in] offset    number of ticks
- * @param[in] timer     hardware timer identifier
- */
-void hwtimer_arch_set(unsigned long offset, short timer);
-
-/**
- * @brief Set a kernel timer to raise an interrupt at specified system time.
- *
- * @param[in] value     system time
- * @param[in] timer     hardware timer identifier
- */
-void hwtimer_arch_set_absolute(unsigned long value, short timer);
-
-/**
- * @brief Unset the kernel timer with the given timer ID.
- *
- * @param[in] timer     hardware timer identifier
- */
-void hwtimer_arch_unset(short timer);
-
-/**
- * Get the current tick count of the default hardware timer.
- *
- * @return  The current tick count of the hardware timer
- */
-unsigned long hwtimer_arch_now(void);
-
-#endif /* HWTIMER_ARCH_H_ */

cpu/cc430/hwtimer_cc430.c

@@ -22,7 +22,7 @@
 
 #include "cpu.h"
 #include "hwtimer.h"
-#include "hwtimer_arch.h"
+#include "arch/hwtimer_arch.h"
 
 #define ENABLE_DEBUG (0)
 #include "debug.h"

cpu/lpc_common/hwtimer_cpu.c

@@ -21,7 +21,7 @@
 #include "cpu.h"
 #include "bitarithm.h"
 #include "hwtimer_cpu.h"
-#include "hwtimer_arch.h"
+#include "arch/hwtimer_arch.h"
 #include "irq.h"
 
 #define VULP(x) ((volatile unsigned long*) (x))

cpu/mc1322x/hwtimer_cpu.c

@@ -12,7 +12,7 @@
 #include <stdint.h>
 #include "mc1322x.h"
 #include "cpu.h"
-#include "hwtimer_arch.h"
+#include "arch/hwtimer_arch.h"
 #include "irq.h"
 
 #include <stdio.h>

cpu/msp430-common/hwtimer_cpu.c

@@ -14,7 +14,7 @@ See the file LICENSE in the top level directory for more details.
 
 #include "cpu.h"
 #include "hwtimer.h"
-#include "hwtimer_arch.h"
+#include "arch/hwtimer_arch.h"
 
 #define ENABLE_DEBUG (0)
 #include "debug.h"

cpu/msp430x16x/hwtimer_msp430.c

@@ -22,7 +22,7 @@
 
 #include "cpu.h"
 #include "hwtimer.h"
-#include "hwtimer_arch.h"
+#include "arch/hwtimer_arch.h"
 
 #define ENABLE_DEBUG (0)
 #include "debug.h"

cpu/native/hwtimer_cpu.c

@@ -35,7 +35,7 @@
 #include <err.h>
 
 #include "hwtimer.h"
-#include "hwtimer_arch.h"
+#include "arch/hwtimer_arch.h"
 
 #include "hwtimer_cpu.h"
 #include "cpu.h"

cpu/sam3x8e/hwtimer_arch.c

@@ -20,7 +20,7 @@
  * @}
  */
 
-#include "hwtimer_arch.h"
+#include "arch/hwtimer_arch.h"
 #include "board.h"
 #include "periph/timer.h"
 #include "thread.h"

cpu/x86/x86_hwtimer.c

@@ -32,7 +32,7 @@
 #include "x86_hwtimer.h"
 #include "x86_rtc.h"
 #include "x86_threading.h"
-#include "hwtimer_arch.h"
+#include "arch/hwtimer_arch.h"
 #include "irq.h"
 #include "thread.h"
 

pkg/openwsn/patches/opentimers.c.patch

@@ -36,7 +36,7 @@
 ! #include "leds_ow.h"
 !
 ! #include "hwtimer_cpu.h"
-! #include "hwtimer_arch.h"
+! #include "arch/hwtimer_arch.h"
 ! // #include "hwtimer.h"
 
   //=========================== define ==========================================

pkg/openwsn/patches/scheduler.c.patch

@@ -42,7 +42,7 @@
 ! #include "board_ow.h"
   #include "debugpins.h"
 ! #include "leds_ow.h"
-! #include "hwtimer_arch.h"
+! #include "arch/hwtimer_arch.h"
 ! #include "thread.h"
 
 ! #define ENABLE_DEBUG (0)