summaryrefslogtreecommitdiff
path: root/kernel/kernel.c
diff options
context:
space:
mode:
authorMiguel <m.i@gmx.at>2018-09-10 22:31:48 +0200
committerMiguel <m.i@gmx.at>2018-09-10 22:31:48 +0200
commita7ca82133bcb8139bb9d11aa717657ef42ab6cfe (patch)
treebefef8186e0adb819ae77b9fc89c9a37b900859f /kernel/kernel.c
parentfe83c82693ae231368d1e8c196fb975c3df1dd30 (diff)
fixed bug in asm_pit_rate_
Diffstat (limited to 'kernel/kernel.c')
-rw-r--r--kernel/kernel.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c
index 4c7227b..ccc7446 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -29,6 +29,7 @@
#include "fs/fs.h"
#include "kmalloc.h"
#include "driver/vesa.h"
+#include "asm_pit.h"
/* F00L 0S Entry point (called directly from asm/multiboot.asm */
void kernel_main(uint32_t eax,uint32_t ebx)
@@ -132,11 +133,14 @@ void kernel_main(uint32_t eax,uint32_t ebx)
klog("Unlock application processors ... ");
asm_smp_unlock();
- PutFont('X', 100,200, 0x00ffff,0xff00ff); // TODO temporary!
+ //PutFont('X', 100,200, 0x00ffff,0xff00ff); // TODO temporary!
klog("Enable Interrupts ... ");
x86_sti(); // this will start processing hardware interrupts
// now just wait until our scheduler kicks in.
- while(1)asm("hlt");
+ while(1){
+ asm("hlt");
+ PutString("pit cnt: %d",10,10,0xff00ff,asm_pit_get_ticks()/25);
+ }
}