Awesome new multitasking system and scheduler

2 files changed, 9 insertions, 4 deletions

diff --git a/src/kernel/timer/timer.c b/src/kernel/timer/timer.c
index f1a296a..29017a5 100644
--- a/src/kernel/timer/timer.c
+++ b/src/kernel/timer/timer.c
@@ -1,3 +1,4 @@
+#include <stdint.h>
 #include <kernel/interrupts/interrupts.h>
 #include <kernel/io/io.h>
 #include <kernel/system.h>
@@ -16,13 +17,12 @@ void timer_phase(int hz)
 void timer_handler(struct regs *r)
 {
 	timer_ticks++;
-	// switch_task();
 }
 
 // "Delay" function with CPU sleep
 void timer_wait(int ticks)
 {
-	unsigned int eticks;
+	uint32_t eticks;
 
 	eticks = timer_ticks + ticks;
 	while (timer_ticks < eticks) {
@@ -30,7 +30,7 @@ void timer_wait(int ticks)
 	}
 }
 
-unsigned int get_time()
+uint32_t get_time()
 {
 	return timer_ticks;
 }
diff --git a/src/kernel/timer/timer.h b/src/kernel/timer/timer.h
index 389da6b..2315b62 100644
--- a/src/kernel/timer/timer.h
+++ b/src/kernel/timer/timer.h
@@ -1,6 +1,11 @@
 #ifndef MELVIX_TIMER_H
 #define MELVIX_TIMER_H
 
+#include <stdint.h>
+#include <kernel/interrupts/interrupts.h>
+
+void timer_handler(struct regs *r);
+
 /**
  * Install the timer and set the timer phase to 100
  */
@@ -16,6 +21,6 @@ void timer_wait(int ticks);
  * Get the current timer ticks
  * @return The current timer ticks (1000 ticks = 1 second)
  */
-unsigned int get_time();
+uint32_t get_time();
 
 #endif
\ No newline at end of file