rename CFG_ macros to CONFIG_SYS

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

diff --git a/lib_mips/time.c b/lib_mips/time.c
index fe365303b4d7380f535aa44bac244debfe5a44b9..07e356d235653e031734cb0dc8c34fb4c49911f9 100644 (file)
--- a/lib_mips/time.c
+++ b/lib_mips/time.c
@@ -24,38 +24,57 @@
 #include <common.h>
 #include <asm/mipsregs.h>
 
+static unsigned long timestamp;
+
+/* how many counter cycles in a jiffy */
+#define CYCLES_PER_JIFFY       (CONFIG_SYS_MIPS_TIMER_FREQ + CONFIG_SYS_HZ / 2) / CONFIG_SYS_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)
 {
        unsigned int tmo;
 
-       tmo = read_c0_count() + (usec * (CFG_MIPS_TIMER_FREQ / 1000000));
+       tmo = read_c0_count() + (usec * (CONFIG_SYS_MIPS_TIMER_FREQ / 1000000));
        while ((tmo - read_c0_count()) < 0x7fffffff)
                /*NOP*/;
 }
@@ -66,7 +85,7 @@ void udelay(unsigned long usec)
  */
 unsigned long long get_ticks(void)
 {
-       return read_c0_count();
+       return get_timer(0);
 }
 
 /*
@@ -75,5 +94,5 @@ unsigned long long get_ticks(void)
  */
 ulong get_tbclk(void)
 {
-       return CFG_HZ;
+       return CONFIG_SYS_HZ;
 }