Fixing timer

lupyuen2 · Dec 25, 2023 · 57ea5f0 · 57ea5f0
1 parent 50e66d8
commit 57ea5f0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/arch/risc-v/src/bl808/bl808_timerisr.c b/arch/risc-v/src/bl808/bl808_timerisr.c
@@ -41,6 +41,12 @@
 #include "riscv_percpu.h"
 #include "hardware/bl808_memorymap.h"
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define MTIMER_FREQ 10000000
+
 /****************************************************************************
  * Private Data
  ****************************************************************************/
@@ -101,6 +107,10 @@ static int bl808_ssoft_interrupt(int irq, void *context, void *arg)
 
 void up_timer_initialize(void)
 {
-  irq_attach(RISCV_IRQ_SSOFT, bl808_ssoft_interrupt, NULL);
-  up_enable_irq(RISCV_IRQ_SSOFT);
+  struct oneshot_lowerhalf_s *lower = riscv_mtimer_initialize(
+    0, 0, RISCV_IRQ_STIMER, MTIMER_FREQ);
+
+  DEBUGASSERT(lower);
+
+  up_alarm_set_lowerhalf(lower);
 }
diff --git a/arch/risc-v/src/common/riscv_mtimer.c b/arch/risc-v/src/common/riscv_mtimer.c
@@ -42,8 +42,8 @@
 struct riscv_mtimer_lowerhalf_s
 {
   struct oneshot_lowerhalf_s lower;
-  uintptr_t                  mtime;
-  uintptr_t                  mtimecmp;
+  ////uintptr_t                  mtime;
+  ////uintptr_t                  mtimecmp;
   uint64_t                   freq;
   uint64_t                   alarm;
   oneshot_callback_t         callback;
@@ -325,8 +325,8 @@ riscv_mtimer_initialize(uintptr_t mtime, uintptr_t mtimecmp,
   if (priv != NULL)
     {
       priv->lower.ops = &g_riscv_mtimer_ops;
-      priv->mtime     = mtime;
-      priv->mtimecmp  = mtimecmp;
+      ////priv->mtime     = mtime;
+      ////priv->mtimecmp  = mtimecmp;
       priv->freq      = freq;
 
       riscv_mtimer_set_mtimecmp(priv, UINT64_MAX);