summaryrefslogtreecommitdiff
path: root/kernel/kernel.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/kernel.c')
-rw-r--r--kernel/kernel.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c
index 3c7b578..7118706 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -17,7 +17,6 @@ void int_test_handler()
scr_put_string("inside software interrupt handler 88");
-
__asm__("popa");
__asm__("leave");
__asm__("iret");
@@ -48,19 +47,22 @@ void kernel_main()
// keyboard = 22 (irq 1)
// etc..
- // install pit handler (programmable timer interrupt channel0)
+ // install PIT interrupt handler
int_install_ir(32, 0b10001110, 0x08,&int_clock_handler);
- // install keyboard handler
+ // install keyboard interrupt handler
int_install_ir(33, 0b10001110, 0x08,&int_kb_handler);
- // install test handler
+ // install test software interrupt handler
int_install_ir(88, 0b10001110, 0x08,&int_test_handler);
// now we can enable interrupts back again
int_enable();
scr_put_string_nl("Interrupts are up and running");
+ //init shell
+ shell_init();
+
// kernel main loop
while(1)
{