diff options
| author | Michal Idziorek <m.i@gmx.at> | 2014-08-30 20:19:35 +0200 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2014-08-30 20:19:35 +0200 |
| commit | 07f3883a25dc4a7bdbd52c7bd97741ccc7df13f7 (patch) | |
| tree | e75e4f45d731d2fe992b692e6ca95b1881b1e6ae /kernel/kernel.c | |
| parent | 4c6017d0d21cb085bf3757c2949e435481840fe6 (diff) | |
fixed bug in multitasking code
Diffstat (limited to 'kernel/kernel.c')
| -rw-r--r-- | kernel/kernel.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c index 3eebef6..287a62a 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -24,12 +24,6 @@ void int_floppy_handler(); uint32_t read_eip(); -void int_unhandled() -{ - X86_IRQ_BEGIN - panic(FOOLOS_MODULE_NAME,"unhandled EXCEPTION!"); - X86_IRQ_END -} void int_irq0(){ X86_IRQ_BEGIN panic(FOOLOS_MODULE_NAME,"Divide by 0"); X86_IRQ_END } void int_irq1(){ X86_IRQ_BEGIN panic(FOOLOS_MODULE_NAME,"Single step (debugger)"); X86_IRQ_END } @@ -99,11 +93,11 @@ void kernel_main(uint32_t initial_stack) // uint32_t vesa_physbase=vesa_init(0x8300,0x8400,0x7200); + // initial stack log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"initial esp: 0x%08X",initial_stack); // PIT config (timer) timer_init(); - // we know that here, the bootloader placed the mamory map! mem_init(0x7c00+0x400,*((uint16_t *)(0x7c00+0x600))); @@ -134,8 +128,6 @@ void kernel_main(uint32_t initial_stack) // install floppy interrupt handler int_install_ir(38, 0b10001110, 0x08,&int_floppy_handler); - // install test software interrupt handler - int_install_ir(88, 0b10001110, 0x08,&int_unhandled); // exceptions int_install_ir(0, 0b10001110, 0x08,&int_irq0); @@ -167,14 +159,14 @@ void kernel_main(uint32_t initial_stack) pci_init(); // floppy - floppy_init(); - + floppy_init(); //init shell shell_init(); // multitasking task_init(); + /* log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"test mem"); |