Merge branch 'master' of git://www.denx.de/git/u-boot-mips

[people/ms/u-boot.git] / lib_mips / time.c

diff --git a/lib_mips/time.c b/lib_mips/time.c
index 2c696b709d298d30bc9198aa4ea3d41e6bd01213..1e9278996e54d2f43589106e9a52c48f3349ef24 100644 (file)
--- a/lib_mips/time.c
+++ b/lib_mips/time.c
@@ -24,40 +24,58 @@
 #include <common.h>
 #include <asm/mipsregs.h>
 
+static unsigned long timestamp;
+
+/* how many counter cycles in a jiffy */
+#define CYCLES_PER_JIFFY       (CFG_MIPS_TIMER_FREQ + CFG_HZ / 2) / CFG_HZ
+
 /*
  * timer without interrupts
  */
 
 int timer_init(void)
 {
-       write_c0_compare(0);
-       write_c0_count(0);
+       /* Set up the timer for the first expiration. */
+       timestamp = 0;
+       write_c0_compare(read_c0_count() + CYCLES_PER_JIFFY);
 
        return 0;
 }
 
 void reset_timer(void)
 {
-       write_c0_count(0);
+       timestamp = 0;
+       write_c0_compare(read_c0_count() + CYCLES_PER_JIFFY);
 }
 
 ulong get_timer(ulong base)
 {
-       return read_c0_count() - base;
+       unsigned int count;
+       unsigned int expirelo = read_c0_compare();
+
+       /* Check to see if we have missed any timestamps. */
+       count = read_c0_count();
+       while ((count - expirelo) < 0x7fffffff) {
+               expirelo += CYCLES_PER_JIFFY;
+               timestamp++;
+       }
+       write_c0_compare(expirelo);
+
+       return (timestamp - base);
 }
 
 void set_timer(ulong t)
 {
-       write_c0_count(t);
+       timestamp = t;
+       write_c0_compare(read_c0_count() + CYCLES_PER_JIFFY);
 }
 
-void udelay (unsigned long usec)
+void udelay(unsigned long usec)
 {
-       ulong tmo;
-       ulong start = get_timer(0);
+       unsigned int tmo;
 
-       tmo = usec * (CFG_HZ / 1000000);
-       while ((ulong)((read_c0_count() - start)) < tmo)
+       tmo = read_c0_count() + (usec * (CFG_MIPS_TIMER_FREQ / 1000000));
+       while ((tmo - read_c0_count()) < 0x7fffffff)
                /*NOP*/;
 }
 
@@ -67,7 +85,7 @@ void udelay (unsigned long usec)
  */
 unsigned long long get_ticks(void)
 {
-       return read_c0_count();
+       return get_timer(0);
 }
 
 /*