From 9c8cfc2e52b0446f7cab14325028075760869b45 Mon Sep 17 00:00:00 2001 From: Michal Idziorek Date: Wed, 26 Nov 2014 17:42:33 +0100 Subject: further cleanup --- kernel/kernel.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) (limited to 'kernel/kernel.c') diff --git a/kernel/kernel.c b/kernel/kernel.c index 0c14e56..ecb42eb 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -29,7 +29,6 @@ #include #include - // CODE FOR Stack Smashing Protector, TODO: MOVE / and do not duplicate // with sys.c // http://wiki.osdev.org/Stack_Smashing_Protector @@ -47,10 +46,16 @@ void __stack_chk_fail(void) { panic(FOOLOS_MODULE_NAME,"Stack smashing detected"); } +// // mp informs us if this if this is the main processor void kernel_main(uint32_t initial_stack, int mp) { + // + // Configuring the PIT timer. + // + timer_init(); + // // Memory Init // @@ -62,11 +67,6 @@ void kernel_main(uint32_t initial_stack, int mp) // mem_init(0xa001,*((uint16_t *)(0xa000))); - // - // Configuring the PIT timer. - // - timer_init(); - // // Activate Virtual Memory (paging) // @@ -84,19 +84,14 @@ void kernel_main(uint32_t initial_stack, int mp) // // Setup PIC (interrupts) - // + // TODO: log! pic_setup(); - - // mouse and kb driver init (before interrupts) - // mouse_init(); - keyboard_init(); - - // // Setup Interrupts (code segment: 0x08) // int_init(0x08); + // // Gather Info about other processors. (APs) @@ -112,12 +107,6 @@ void kernel_main(uint32_t initial_stack, int mp) panic(FOOLOS_MODULE_NAME,"ACPI and MP search failed! I do not want to continue!"); */ - // init spinlocks - init_spinlocks(); - - - // ringbuffer for stdin! - ringbuffer_init(); // load and run foolshell // we will come back into the kernel only on interrupts... -- cgit v1.2.3