X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Fcortex-m3%2Fdrv%2Ftimer_cm3.h;h=80ec8eb7d67edb2a3d4eba060ac9dce0942ac021;hb=666f80bddb3d83383dee8f572b626690e81e3b18;hp=3e47d294912bacc447ad4b1bc628001ed79a24b5;hpb=51157819d281eeca3d8afa8c27e22353c301e2ca;p=bertos.git

diff --git a/bertos/cpu/cortex-m3/drv/timer_cm3.h b/bertos/cpu/cortex-m3/drv/timer_cm3.h
index 3e47d294..80ec8eb7 100644
--- a/bertos/cpu/cortex-m3/drv/timer_cm3.h
+++ b/bertos/cpu/cortex-m3/drv/timer_cm3.h
@@ -40,10 +40,15 @@
 
 #include "cfg/cfg_timer.h"     /* CONFIG_TIMER */
 
+#include <cpu/detect.h>
+#include <cpu/irq.h>
+
 #if CPU_CM3_LM3S
 	#include <io/lm3s.h>
 #elif CPU_CM3_STM32
 	#include <io/stm32.h>
+#elif CPU_CM3_AT91SAM3
+	#include <io/sam3.h>
 /*#elif  Add other families here */
 #else
 	#error Unknown CPU
@@ -90,12 +95,7 @@
 
 	INLINE hptime_t timer_hw_hpread(void)
 	{
-		return NVIC_ST_CURRENT_R;
-	}
-
-	INLINE hptime_t timer_hw_hpticks(ticks_t clock)
-	{
-		return (TIMER_HW_CNT - timer_hw_hpread()) + clock * TIMER_HW_CNT;
+		return (TIMER_HW_CNT - NVIC_ST_CURRENT_R);
 	}
 
 #else