diff options
Diffstat (limited to 'kernel/interrupts.c')
| -rw-r--r-- | kernel/interrupts.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/interrupts.c b/kernel/interrupts.c index 74599c3..41d0a9c 100644 --- a/kernel/interrupts.c +++ b/kernel/interrupts.c @@ -5,7 +5,7 @@ #include "asm/asm.h" #include "driver/mouse.h" #include "interrupts.h" -#include "x86.h" +#include "asm/x86.h" void errlog(uint32_t error_code) { @@ -90,7 +90,7 @@ void exception_handle_14(uint32_t error_code,uint32_t eip,uint16_t cs,uint16_t u log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"error_code_U/S: %d",error_code&4?1:0); log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"error_code_RSVD: %d",error_code&8?1:0); log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"error_code_I/D: %d",error_code&16?1:0); - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"at addr: 0x%08X",x86_get_cr2()); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"at addr: 0x%08X",x86_get_cr(2)); deflog(eip,cs,flags); panic(FOOLOS_MODULE_NAME,"Exception: Fault: Page Fault"); @@ -166,8 +166,8 @@ void int_init(uint16_t sel) int_install(); // now we can enable interrupts back again - // x86_int_enable(); - x86_int_disable(); + // x86_sti(); + x86_cli(); } void int_install() |