timer fix

1 files changed, 5 insertions, 10 deletions

diff --git a/code/ecp/fe310/time.c b/code/ecp/fe310/time.c
index 8458a2d..3c74933 100644
--- a/code/ecp/fe310/time.c
+++ b/code/ecp/fe310/time.c
@@ -6,15 +6,12 @@
 #include <eos/event.h>
 #include <eos/timer.h>
 
-#include "encoding.h"
-#include "platform.h"
-
 extern ECPSocket *_ecp_tr_sock;
 
 static void timer_handler(unsigned char type) {
     ecp_cts_t next = ecp_timer_exe(_ecp_tr_sock);
     if (next) {
-        eos_timer_set(next, EOS_TIMER_ETYPE_ECP, 0);
+        eos_timer_set(next, EOS_TIMER_ETYPE_ECP);
     }
 }
 
@@ -25,16 +22,14 @@ int ecp_tm_init(ECPContext *ctx) {
 }
 
 ecp_cts_t ecp_tm_abstime_ms(ecp_cts_t msec) {
-    volatile uint64_t *mtime = (uint64_t *) (CLINT_CTRL_ADDR + CLINT_MTIME);
-
-    uint64_t now_ms = *mtime * 1000 / RTC_FREQ;
-    return now_ms + msec;
+    return eos_time_get_tick() * 1000 / EOS_TIMER_RTC_FREQ + msec;
 }
 
 void ecp_tm_sleep_ms(ecp_cts_t msec) {
-    eos_timer_sleep(msec);
+    eos_time_sleep(msec);
 }
 
 void ecp_tm_timer_set(ecp_cts_t next) {
-    eos_timer_set(next, EOS_TIMER_ETYPE_ECP, 1);
+    uint32_t _next = eos_timer_get(EOS_TIMER_ETYPE_ECP);
+    if ((_next == EOS_TIMER_NONE) || (next < _next)) eos_timer_set(next, EOS_TIMER_ETYPE_ECP);
 }