Support to multi-threading and pthread interface (POSIX.1-2008) (#23)

[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 78976a579759501390b5a1d5bf52fa05e6c5d115..d64d6288878aeca07c875de2c9f3a218a2579742 100644 (file)
--- a/lunaix-os/includes/lunaix/timer.h
+++ b/lunaix-os/includes/lunaix/timer.h
@@ -2,59 +2,73 @@
 #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/pcontext.h>

 
 

-#define SYS_TIMER_FREQUENCY_HZ      2048
+#define SYS_TIMER_FREQUENCY_HZ 1000

 
 

-#define TIMER_MODE_PERIODIC   0x1
+#define TIMER_MODE_PERIODIC 0x1

 
 

-typedef uint32_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;
     /**
      * @brief Desired system running frequency
      */
     ticks_t base_frequency;
     /**
      * @brief Desired system running frequency

-     * 
+     *

      */
      */

-    uint32_t running_frequency;
+    ticks_t running_frequency;

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

-     * 
+     *

      */
     ticks_t tphz;
 };
 
      */
     ticks_t tphz;
 };
 

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

     struct llist_header link;
     ticks_t deadline;
     ticks_t counter;
     void* payload;
     void (*callback)(void*);
     struct llist_header link;
     ticks_t deadline;
     ticks_t counter;
     void* payload;
     void (*callback)(void*);

-    uint8_t flags;
+    u8_t flags;

 };
 
 };
 

-

 /**
  * @brief Initialize the system timer that runs at specified frequency
 /**
  * @brief Initialize the system timer that runs at specified frequency

- * 
+ *

  * @param frequency The frequency that timer should run in Hz.
  */
 void
  * @param frequency The frequency that timer should run in Hz.
  */
 void

-timer_init(uint32_t frequency);
+timer_init();
+
+struct lx_timer*
+timer_run_second(u32_t second,
+                 void (*callback)(void*),
+                 void* payload,
+                 u8_t flags);

 
 

-int
-timer_run_second(uint32_t second, void (*callback)(void*), void* payload, uint8_t flags);
-timer_run_ms(uint32_t millisecond, void (*callback)(void*), void* payload, uint8_t flags);
+struct lx_timer*
+timer_run_ms(u32_t millisecond,
+             void (*callback)(void*),
+             void* payload,
+             u8_t flags);

 
 

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

 
 

-struct lx_timer_context* 
+struct lx_timer_context*

 timer_context();
 
 #endif /* __LUNAIX_TIMER_H */
 timer_context();
 
 #endif /* __LUNAIX_TIMER_H */