summaryrefslogtreecommitdiff
path: root/kernel/kernel.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/kernel.c')
-rw-r--r--kernel/kernel.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c
index 2dd57fd..517c9d5 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -1,3 +1,7 @@
+//
+// http://www.jamesmolloy.co.uk/tutorial_html/9.-Multitasking.html
+//
+
#include "kernel.h" // general kernel config & includes
#include "console.h" // this will allow us to write to screen
#include "x86.h"
@@ -18,6 +22,8 @@ void int_floppy_handler();
////////// KERNEL MAIN///// /////
//
+uint32_t read_eip();
+
// just a test handler for software interrupt 88, todo: remove and
// implement some syscalls!
//
@@ -37,7 +43,7 @@ void int_test_handler()
}
// heart of our operating system.
-void kernel_main()
+void kernel_main(uint32_t initial_stack)
{
//
@@ -61,6 +67,7 @@ void kernel_main()
//
uint32_t vesa_physbase=vesa_init(0x8300,0x8400,0x7200);
+ log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"initial esp: 0x%08X",initial_stack);
//
// PIT config (timer)
timer_init();
@@ -136,10 +143,10 @@ void kernel_main()
esp--;
}
*/
-
-
-
- while(1); // never ending loop
+ while(1)
+ {
+
+ }
}