Merge pull request #3779 from haukepetersen/add_lpc2387_timer

cpu/lpc2387: added periph timer implementation
RIOT-OS · Sep 4, 2015 · ea4fb69 · ea4fb69
2 parents 2d23161 + 84d6112
commit ea4fb69
Show file tree

Hide file tree

Showing 15 changed files with 337 additions and 262 deletions.
diff --git a/boards/avsextrem/Makefile.features b/boards/avsextrem/Makefile.features
@@ -1,4 +1,5 @@
 FEATURES_PROVIDED += periph_gpio
 FEATURES_PROVIDED += periph_rtc
 FEATURES_PROVIDED += periph_spi
+FEATURES_PROVIDED += periph_timer
 FEATURES_MCU_GROUP = arm7
diff --git a/boards/avsextrem/include/board.h b/boards/avsextrem/include/board.h
@@ -56,6 +56,11 @@ extern "C" {
 #define STDIO_RX_BUFSIZE    (64U)
 /** @} */
 
+/**
+ * @brief Deprecated HW_TIMER definition (to be removed)
+ */
+#define HW_TIMER             TIMER_DEV(0)
+
 /**
  * @brief Initialize the board's clock system
  */

diff --git a/boards/avsextrem/include/periph_conf.h b/boards/avsextrem/include/periph_conf.h
@@ -25,6 +25,22 @@
 extern "C" {
 #endif
 
+/**
+ * @brief   Clock configuration
+ * @{
+ */
+#define CLOCK_CORECLOCK     (72000000U)         /* this board runs with 72MHz */
+
+#define CLOCK_PCLK          (CLOCK_CORECLOCK)
+/** @} */
+
+/**
+ * @brief   Timer configuration, select a number from 1 to 4
+ * @{
+ */
+#define TIMER_NUMOF         (1U)
+/** @} */
+
 /**
  * @brief PWM device and pinout configuration
  */

diff --git a/boards/msba2-common/lpc2387-timer3.c b/boards/msba2-common/lpc2387-timer3.c
diff --git a/boards/msba2/Makefile.features b/boards/msba2/Makefile.features
@@ -2,6 +2,7 @@ FEATURES_PROVIDED += periph_gpio
 FEATURES_PROVIDED += periph_pwm
 FEATURES_PROVIDED += periph_rtc
 FEATURES_PROVIDED += periph_spi
+FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += cpp
 FEATURES_PROVIDED += config
 FEATURES_MCU_GROUP = arm7
diff --git a/boards/msba2/include/board.h b/boards/msba2/include/board.h
@@ -53,6 +53,11 @@ extern "C" {
 #define STDIO_RX_BUFSIZE    (64U)
 /** @} */
 
+/**
+ * @brief Deprecated HW_TIMER definition (to be removed)
+ */
+#define HW_TIMER             TIMER_DEV(0)
+
 /**
  * @brief initialize the board's clock system
  */

diff --git a/boards/msba2/include/periph_conf.h b/boards/msba2/include/periph_conf.h
@@ -25,6 +25,22 @@
 extern "C" {
 #endif
 
+/**
+ * @brief   Clock configuration
+ * @{
+ */
+#define CLOCK_CORECLOCK     (72000000U)         /* the msba2 runs with 72MHz */
+
+#define CLOCK_PCLK          (CLOCK_CORECLOCK)
+/** @} */
+
+/**
+ * @brief   Timer configuration, select a number from 1 to 4
+ * @{
+ */
+#define TIMER_NUMOF         (1U)
+/** @} */
+
 /**
  * @brief PWM device and pinout configuration
  */

diff --git a/boards/pttu/Makefile.features b/boards/pttu/Makefile.features
@@ -1,4 +1,5 @@
 FEATURES_PROVIDED += periph_gpio
 FEATURES_PROVIDED += periph_rtc
 FEATURES_PROVIDED += periph_spi
+FEATURES_PROVIDED += periph_timer
 FEATURES_MCU_GROUP = arm7
diff --git a/boards/pttu/include/board.h b/boards/pttu/include/board.h
@@ -59,6 +59,11 @@ void bl_init_clks(void);
 #define STDIO_RX_BUFSIZE    (64U)
 /** @} */
 
+/**
+ * @brief Deprecated HW_TIMER definition (to be removed)
+ */
+#define HW_TIMER             TIMER_DEV(0)
+
 /**
  * @name dummy-defines for LEDs
  * @{

diff --git a/boards/pttu/include/periph_conf.h b/boards/pttu/include/periph_conf.h
@@ -25,6 +25,22 @@
 extern "C" {
 #endif
 
+/**
+ * @brief   Clock configuration
+ * @{
+ */
+#define CLOCK_CORECLOCK     (72000000U)         /* the msba2 runs with 72MHz */
+
+#define CLOCK_PCLK          (CLOCK_CORECLOCK)
+/** @} */
+
+/**
+ * @brief   Timer configuration, select a number from 1 to 4
+ * @{
+ */
+#define TIMER_NUMOF         (1U)
+/** @} */
+
 /**
  * @brief PWM device and pinout configuration
  */

diff --git a/cpu/lpc2387/Makefile.include b/cpu/lpc2387/Makefile.include
@@ -2,4 +2,4 @@ INCLUDES += -I$(RIOTCPU)/lpc2387/include
 
 include $(RIOTCPU)/arm7_common/Makefile.include
 
-USEMODULE += arm7_common periph periph_common bitfield newlib
+USEMODULE += arm7_common periph periph_common bitfield newlib hwtimer_compat
diff --git a/cpu/lpc2387/hwtimer_cpu.c b/cpu/lpc2387/hwtimer_cpu.c