Decoupling Architectural-specific Code (#35)

[lunaix-os.git] / lunaix-os / includes / lunaix / timer.h

diff --git a/lunaix-os/includes/lunaix/timer.h b/lunaix-os/includes/lunaix/timer.h
index cdf9ef477846bb31541e897c79eb6cfa3d57261d..08718adc474a1d8147476b739bb35be9b92d8fc4 100644 (file)
--- a/lunaix-os/includes/lunaix/timer.h
+++ b/lunaix-os/includes/lunaix/timer.h
@@ -2,19 +2,18 @@
 #define __LUNAIX_TIMER_H
 
 #include <lunaix/ds/llist.h>
 #define __LUNAIX_TIMER_H
 
 #include <lunaix/ds/llist.h>

-#include <stdint.h>
+#include <lunaix/time.h>
+#include <lunaix/hart_state.h>

 
 

-#define SYS_TIMER_FREQUENCY_HZ 1024
+#define SYS_TIMER_FREQUENCY_HZ 1000

 
 #define TIMER_MODE_PERIODIC 0x1
 
 
 #define TIMER_MODE_PERIODIC 0x1
 

-typedef u32_t ticks_t;
-

 struct lx_timer_context
 {
     struct lx_timer* active_timers;
     /**
 struct lx_timer_context
 {
     struct lx_timer* active_timers;
     /**

-     * @brief APIC timer base frequency (ticks per seconds)
+     * @brief timer hardware base frequency (ticks per seconds)

      *
      */
     ticks_t base_frequency;
      *
      */
     ticks_t base_frequency;


@@ -22,7 +21,7 @@ struct lx_timer_context
      * @brief Desired system running frequency
      *
      */
      * @brief Desired system running frequency
      *
      */

-    u32_t running_frequency;
+    ticks_t running_frequency;

     /**
      * @brief Ticks per hertz
      *
     /**
      * @brief Ticks per hertz
      *


@@ -30,6 +29,12 @@ struct lx_timer_context
     ticks_t tphz;
 };
 
     ticks_t tphz;
 };
 

+struct timer_init_param
+{
+    struct lx_timer_context* context;
+    void* timer_update_isr;
+};
+

 struct lx_timer
 {
     struct llist_header link;
 struct lx_timer
 {
     struct llist_header link;


@@ -37,7 +42,7 @@ struct lx_timer
     ticks_t counter;
     void* payload;
     void (*callback)(void*);
     ticks_t counter;
     void* payload;
     void (*callback)(void*);

-    uint8_t flags;
+    u8_t flags;

 };
 
 /**
 };
 
 /**


@@ -46,22 +51,22 @@ struct lx_timer
  * @param frequency The frequency that timer should run in Hz.
  */
 void
  * @param frequency The frequency that timer should run in Hz.
  */
 void

-timer_init(u32_t frequency);
+timer_init();

 
 struct lx_timer*
 timer_run_second(u32_t second,
                  void (*callback)(void*),
                  void* payload,
 
 struct lx_timer*
 timer_run_second(u32_t second,
                  void (*callback)(void*),
                  void* payload,

-                 uint8_t flags);
+                 u8_t flags);

 
 struct lx_timer*
 timer_run_ms(u32_t millisecond,
              void (*callback)(void*),
              void* payload,
 
 struct lx_timer*
 timer_run_ms(u32_t millisecond,
              void (*callback)(void*),
              void* payload,

-             uint8_t flags);
+             u8_t flags);

 
 struct lx_timer*
 
 struct lx_timer*

-timer_run(ticks_t ticks, void (*callback)(void*), void* payload, uint8_t flags);
+timer_run(ticks_t ticks, void (*callback)(void*), void* payload, u8_t flags);

 
 struct lx_timer_context*
 timer_context();
 
 struct lx_timer_context*
 timer_context();