diff options
| author | Michal Idziorek <m.i@gmx.at> | 2014-11-26 17:42:33 +0100 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2014-11-26 17:42:33 +0100 |
| commit | 9c8cfc2e52b0446f7cab14325028075760869b45 (patch) | |
| tree | b85a0f9403bd38ac7947cdf709de787241509533 /kernel/kernel.c | |
| parent | 786bd02b01d80e335d4445698d721213a1884ff5 (diff) | |
further cleanup
Diffstat (limited to 'kernel/kernel.c')
| -rw-r--r-- | kernel/kernel.c | 27 |
1 files changed, 8 insertions, 19 deletions
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 <stdint.h> #include <stdlib.h> - // CODE FOR Stack Smashing Protector, TODO: MOVE / and do not duplicate // with sys.c // http://wiki.osdev.org/Stack_Smashing_Protector @@ -47,11 +46,17 @@ 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 // // after this is set up we will be able to allocate and deallocate @@ -63,11 +68,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) // vmem_init(); @@ -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... |