refactor: decouple i386 specific instruction invocation

[lunaix-os.git] / lunaix-os / kernel / time / timer.c

diff --git a/lunaix-os/kernel/time/timer.c b/lunaix-os/kernel/time/timer.c
index 989256feb9052bc980c349aa8149ef6f42d3e348..2aca8d588014eba5517808863523226651958c58 100644 (file)
--- a/lunaix-os/kernel/time/timer.c
+++ b/lunaix-os/kernel/time/timer.c
@@ -9,7 +9,7 @@
  * @copyright Copyright (c) 2022
  *
  */
  * @copyright Copyright (c) 2022
  *
  */

-#include <arch/x86/interrupts.h>
+#include <arch/i386/interrupts.h>

 #include <hal/apic.h>
 #include <hal/rtc.h>
 
 #include <hal/apic.h>
 #include <hal/rtc.h>
 


@@ -40,11 +40,11 @@ static volatile struct lx_timer_context* timer_ctx = NULL;
 
 // Don't optimize them! Took me an half hour to figure that out...
 
 
 // Don't optimize them! Took me an half hour to figure that out...
 

-static volatile uint32_t rtc_counter = 0;
-static volatile uint8_t apic_timer_done = 0;
+static volatile u32_t rtc_counter = 0;
+static volatile u8_t apic_timer_done = 0;

 
 

-static volatile uint32_t sched_ticks = 0;
-static volatile uint32_t sched_ticks_counter = 0;
+static volatile u32_t sched_ticks = 0;
+static volatile u32_t sched_ticks_counter = 0;

 
 static struct cake_pile* timer_pile;
 
 
 static struct cake_pile* timer_pile;
 


@@ -64,7 +64,7 @@ timer_init_context()
 }
 
 void
 }
 
 void

-timer_init(uint32_t frequency)
+timer_init(u32_t frequency)

 {
     timer_init_context();
 
 {
     timer_init_context();
 


@@ -79,8 +79,8 @@ timer_init(uint32_t frequency)
     //       mapping config.
 
     // grab ourselves these irq numbers
     //       mapping config.
 
     // grab ourselves these irq numbers

-    uint32_t iv_rtc = isrm_bindirq(PC_AT_IRQ_RTC, temp_intr_routine_rtc_tick);
-    uint32_t iv_timer = isrm_ivexalloc(temp_intr_routine_apic_timer);
+    u32_t iv_rtc = isrm_bindirq(PC_AT_IRQ_RTC, temp_intr_routine_rtc_tick);
+    u32_t iv_timer = isrm_ivexalloc(temp_intr_routine_apic_timer);

 
     // Setup a one-shot timer, we will use this to measure the bus speed. So we
     // can then calibrate apic timer to work at *nearly* accurate hz
 
     // Setup a one-shot timer, we will use this to measure the bus speed. So we
     // can then calibrate apic timer to work at *nearly* accurate hz


@@ -154,20 +154,20 @@ timer_init(uint32_t frequency)
 }
 
 struct lx_timer*
 }
 
 struct lx_timer*

-timer_run_second(uint32_t second,
+timer_run_second(u32_t second,

                  void (*callback)(void*),
                  void* payload,
                  void (*callback)(void*),
                  void* payload,

-                 uint8_t flags)
+                 u8_t flags)

 {
     return timer_run(
       second * timer_ctx->running_frequency, callback, payload, flags);
 }
 
 struct lx_timer*
 {
     return timer_run(
       second * timer_ctx->running_frequency, callback, payload, flags);
 }
 
 struct lx_timer*

-timer_run_ms(uint32_t millisecond,
+timer_run_ms(u32_t millisecond,

              void (*callback)(void*),
              void* payload,
              void (*callback)(void*),
              void* payload,

-             uint8_t flags)
+             u8_t flags)

 {
     return timer_run(timer_ctx->running_frequency / 1000 * millisecond,
                      callback,
 {
     return timer_run(timer_ctx->running_frequency / 1000 * millisecond,
                      callback,


@@ -176,7 +176,7 @@ timer_run_ms(uint32_t millisecond,
 }
 
 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* timer = (struct lx_timer*)cake_grab(timer_pile);
 
 {
     struct lx_timer* timer = (struct lx_timer*)cake_grab(timer_pile);
 


@@ -247,5 +247,5 @@ temp_intr_routine_apic_timer(const isr_param* param)
 struct lx_timer_context*
 timer_context()
 {
 struct lx_timer_context*
 timer_context()
 {

-    return timer_ctx;
+    return (struct lx_timer_context*)timer_ctx;

 }
\ No newline at end of file
 }
\ No newline at end of file