From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Wed, 4 Jul 2007 23:46:02 +0000 (+0200)
Subject: Merge branch 'master' of git.dolda2000.com:/srv/git/r/kokare
X-Git-Url: http://dolda2000.com/gitweb/?p=kokare.git;a=commitdiff_plain;h=d776f08c024659d4972e2e22f7374929dc288b99;hp=a33bf3b7cd7c135bd3b93209aa9f60ba09879bdd

Merge branch 'master' of git.dolda2000.com:/srv/git/r/kokare
---

diff --git a/kokare.c b/kokare.c
index 64c3754..38662bb 100644
--- a/kokare.c
+++ b/kokare.c
@@ -149,7 +149,16 @@ void disphex(unsigned char num)
 
 unsigned long getticks(void)
 {
-    return(TCNT1 + (((unsigned long)oticks) << 16));
+    uint16_t v;
+    unsigned long r;
+    
+    cli();
+    v = TCNT1;
+    r = v + (((unsigned long)oticks) << 16);
+    if((TIFR1 & 0x01) && !(v & 0x8000))
+	r += 0x10000;
+    sei();
+    return(r);
 }
 
 void ledcycle(void)