diff options
| author | Marvin Borner | 2020-04-29 19:21:29 +0200 |
|---|---|---|
| committer | Marvin Borner | 2020-04-29 19:21:29 +0200 |
| commit | 4546c75d685475d8b9f215b588364e1d1bbd0b79 (patch) | |
| tree | 2077f72ad46dfe877f7febdd0692edc139fd7937 /src/kernel/interrupts | |
| parent | 396d7d303d3bf0e796d0c817883ec1dec928352a (diff) | |
MUCH work in libc
Also cleaned up some syscalls etc
Diffstat (limited to 'src/kernel/interrupts')
| -rw-r--r-- | src/kernel/interrupts/idt.c | 2 | ||||
| -rw-r--r-- | src/kernel/interrupts/irq.c | 2 | ||||
| -rw-r--r-- | src/kernel/interrupts/isr.c | 9 |
3 files changed, 9 insertions, 4 deletions
diff --git a/src/kernel/interrupts/idt.c b/src/kernel/interrupts/idt.c index 7c762b3..4be3d7c 100644 --- a/src/kernel/interrupts/idt.c +++ b/src/kernel/interrupts/idt.c @@ -44,5 +44,5 @@ void idt_install() memset(&idt, 0, sizeof(struct idt_entry) * 256); idt_load(); - vga_log("Installed Interrupt Descriptor Table"); + info("Installed Interrupt Descriptor Table"); }
\ No newline at end of file diff --git a/src/kernel/interrupts/irq.c b/src/kernel/interrupts/irq.c index f23e14a..ad35346 100644 --- a/src/kernel/interrupts/irq.c +++ b/src/kernel/interrupts/irq.c @@ -89,7 +89,7 @@ void irq_install() idt_set_gate(45, (unsigned)irq13, 0x08, 0x8E); idt_set_gate(46, (unsigned)irq14, 0x08, 0x8E); idt_set_gate(47, (unsigned)irq15, 0x08, 0x8E); - vga_log("Installed Interrupt Requests"); + info("Installed Interrupt Requests"); } // Handle IRQ ISRs diff --git a/src/kernel/interrupts/isr.c b/src/kernel/interrupts/isr.c index 9d92529..880c23a 100644 --- a/src/kernel/interrupts/isr.c +++ b/src/kernel/interrupts/isr.c @@ -49,7 +49,7 @@ void isrs_install() idt_set_gate(0x80, (unsigned)isr128, 0x08, 0xEE); - vga_log("Installed Interrupt Service Routines"); + info("Installed Interrupt Service Routines"); } irq_handler_t isr_routines[256] = { 0 }; @@ -133,7 +133,12 @@ void fault_handler(struct regs *r) scheduler(r); sti(); } else { - panic("Page fault before multitasking started!"); + if (faulting_address != (uint32_t)fb) { + panic("Page fault before multitasking started!"); + } else { + debug(RED "Fatal video error!" RES); + halt_loop(); + } } } }
\ No newline at end of file |