Merge pull request #3282 from benoit-canet/timer

native: Resurect native/perif/timer and handle #715 (WIP)
RIOT-OS · Jul 9, 2015 · b2272fc · b2272fc
2 parents 70c08b8 + dfbd4f9
commit b2272fc
Show file tree

Hide file tree

Showing 8 changed files with 288 additions and 379 deletions.
diff --git a/boards/native/Makefile.features b/boards/native/Makefile.features
@@ -5,4 +5,5 @@ FEATURES_PROVIDED += config
 FEATURES_PROVIDED += cpp
 FEATURES_PROVIDED += periph_random
 FEATURES_PROVIDED += periph_rtc
+FEATURES_PROVIDED += periph_timer
 FEATURES_MCU_GROUP = x86
diff --git a/cpu/native/Makefile.include b/cpu/native/Makefile.include
@@ -5,4 +5,4 @@ ifeq ($(BUILDOSXNATIVE),1)
     export NATIVEINCLUDES += -I$(RIOTBASE)/sys/malloc/include
 endif
 
-export USEMODULE += periph
+export USEMODULE += periph hwtimer_compat
diff --git a/cpu/native/hwtimer_cpu.c b/cpu/native/hwtimer_cpu.c
diff --git a/cpu/native/include/hwtimer_cpu.h b/cpu/native/include/hwtimer_cpu.h
@@ -21,9 +21,10 @@
 extern "C" {
 #endif
 
-#define HWTIMER_MAXTIMERS 4
+#define HWTIMER_MAXTIMERS 1
 #define HWTIMER_SPEED 1000000
 #define HWTIMER_MAXTICKS (0xFFFFFFFF)
+#define HWTIMER_SPIN_BARRIER 20
 
 #ifdef __cplusplus
 }

diff --git a/cpu/native/include/periph_conf.h b/cpu/native/include/periph_conf.h
@@ -34,6 +34,17 @@
 #define RTC_NUMOF (1)
 /** @} */
 
+/**
+ * @name Timer peripheral configuration
+ * @{
+ */
+#define TIMER_NUMOF        (1U)
+#define TIMER_0_EN         1
+
+/** @def set TIMER0 for hwtimer wrapper */
+#define HW_TIMER TIMER_0
+/** @} */
+
 #ifdef __cplusplus
 }
 #endif