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 5c406967a150cb1c4950e606be24f96a6e781632..fbbe2b78150c285898ce4f6d29926991481aab84 100644 (file)
--- a/lunaix-os/includes/lunaix/timer.h
+++ b/lunaix-os/includes/lunaix/timer.h
@@ -2,41 +2,44 @@
 #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      2048UL
+#define SYS_TIMER_FREQUENCY_HZ 1000

 
 

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

 
 

-struct lx_timer_context {
-    struct lx_timer *active_timers;
-    uint32_t base_frequency;
-    uint32_t running_frequency;
-    uint32_t tick_interval;
-};
-
-struct lx_timer {
+struct lx_timer
+{

     struct llist_header link;
     struct llist_header link;

-    uint32_t deadline;
-    uint32_t counter;
+    ticks_t deadline;
+    ticks_t counter;

     void* payload;
     void (*callback)(void*);
     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);
-
-int
-timer_run_second(uint32_t second, void (*callback)(void*), void* payload, uint8_t flags);
-
-int
-timer_run(uint32_t ticks, void (*callback)(void*), void* payload, uint8_t flags);
+timer_init();
+
+struct lx_timer*
+timer_run_second(u32_t second,
+                 void (*callback)(void*),
+                 void* payload,
+                 u8_t flags);
+
+struct lx_timer*
+timer_run_ms(u32_t millisecond,
+             void (*callback)(void*),
+             void* payload,
+             u8_t flags);
+
+struct lx_timer*
+timer_run(ticks_t ticks, void (*callback)(void*), void* payload, u8_t flags);

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