X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=common%2Ftimer.h;h=fe23f87aecd6c684bdf9f23e2a6a86669efb91d7;hb=fa545c87f74833856761572ef631d20accc1d026;hp=f9e8181e6f5b22b3b3ec3920f3a3d30b137f1767;hpb=f4125707399d11a7d80587659c464b9bcddb8c56;p=tmk_firmware.git

diff --git a/common/timer.h b/common/timer.h
index f9e8181..fe23f87 100644
--- a/common/timer.h
+++ b/common/timer.h
@@ -20,34 +20,34 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <stdint.h>
 
-#ifndef TIMER_PRESCALER
-#   if F_CPU > 16000000
-#       define TIMER_PRESCALER      256
-#   elif F_CPU >= 4000000
-#       define TIMER_PRESCALER      64
-#   else
-#       define TIMER_PRESCALER      8
-#   endif
+#if defined(__AVR__)
+#include "avr/timer_avr.h"
 #endif
-#define TIMER_RAW_FREQ      (F_CPU/TIMER_PRESCALER)
-#define TIMER_RAW           TCNT0
-#define TIMER_RAW_TOP       (TIMER_RAW_FREQ/1000)
 
-#if (TIMER_RAW_TOP > 255)
-#   error "Timer0 can't count 1ms at this clock freq. Use larger prescaler."
-#endif
 
 #define TIMER_DIFF(a, b, max)   ((a) >= (b) ?  (a) - (b) : (max) - (b) + (a))
-#define TIMER_DIFF_RAW(a, b)    TIMER_DIFF(a, b, UINT8_MAX)
-#define TIMER_DIFF_MS(a, b)     TIMER_DIFF(a, b, UINT16_MAX)
+#define TIMER_DIFF_8(a, b)      TIMER_DIFF(a, b, UINT8_MAX)
+#define TIMER_DIFF_16(a, b)     TIMER_DIFF(a, b, UINT16_MAX)
+#define TIMER_DIFF_32(a, b)     TIMER_DIFF(a, b, UINT32_MAX)
+#define TIMER_DIFF_RAW(a, b)    TIMER_DIFF_8(a, b)
+
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-extern volatile uint16_t timer_count;
+extern volatile uint32_t timer_count;
 
 
 void timer_init(void);
 void timer_clear(void);
 uint16_t timer_read(void);
+uint32_t timer_read32(void);
 uint16_t timer_elapsed(uint16_t last);
+uint32_t timer_elapsed32(uint32_t last);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif