rewrite the device subsystem interfaces (#48)

[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..fbbe2b78150c285898ce4f6d29926991481aab84 100644 (file)
--- a/lunaix-os/includes/lunaix/timer.h
+++ b/lunaix-os/includes/lunaix/timer.h
@@ -2,34 +2,13 @@
 #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;
-    /**
-     * @brief APIC timer base frequency (ticks per seconds)
-     *
-     */
-    ticks_t base_frequency;
-    /**
-     * @brief Desired system running frequency
-     *
-     */
-    u32_t running_frequency;
-    /**
-     * @brief Ticks per hertz
-     *
-     */
-    ticks_t tphz;
-};
-

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


@@ -37,7 +16,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,24 +25,21 @@ 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);
-
-struct lx_timer_context*
-timer_context();
+timer_run(ticks_t ticks, void (*callback)(void*), void* payload, u8_t flags);

 
 #endif /* __LUNAIX_TIMER_H */
 
 #endif /* __LUNAIX_TIMER_H */