diff options
| author | Franklin Wei <frankhwei536@gmail.com> | 2015-02-03 18:23:04 -0500 |
|---|---|---|
| committer | Franklin Wei <frankhwei536@gmail.com> | 2015-02-03 18:23:04 -0500 |
| commit | e065a7048aa98d253cdcc9298c934bb7af7feaa9 (patch) | |
| tree | 99768597eda705f9ea1947c96c899a74e3bdc97c /kernel | |
| parent | c8a195e1eb19d346c03c1dfa6ed66c6215caefa2 (diff) | |
| download | kappa-e065a7048aa98d253cdcc9298c934bb7af7feaa9.zip kappa-e065a7048aa98d253cdcc9298c934bb7af7feaa9.tar.gz kappa-e065a7048aa98d253cdcc9298c934bb7af7feaa9.tar.bz2 kappa-e065a7048aa98d253cdcc9298c934bb7af7feaa9.tar.xz | |
some work
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/main.c | 12 | ||||
| -rw-r--r-- | kernel/timer.c | 1 |
2 files changed, 8 insertions, 5 deletions
diff --git a/kernel/main.c b/kernel/main.c index 119cf15..62fa8ca 100644 --- a/kernel/main.c +++ b/kernel/main.c @@ -1,3 +1,4 @@ +#include <stdint.h> #include <stdio.h> #include "gdt.h" #include "idt.h" @@ -26,15 +27,16 @@ void main(struct multiboot_header *hdr, uint32_t magic) asm("sti"); - for(;;) + printf("Boot finished.\n"); + while(1) { ps2_set_leds(0x01); + for(int i=0;i<1000000;++i); ps2_set_leds(0x02); + for(int i=0;i<1000000;++i); ps2_set_leds(0x04); + for(int i=0;i<1000000;++i); ps2_set_leds(0x02); + for(int i=0;i<1000000;++i); } - - printf("Boot finished.\n"); - while(1) - ; } diff --git a/kernel/timer.c b/kernel/timer.c index 4b700d7..571fcbe 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -8,6 +8,7 @@ const uint64_t *current_tick = ¤t_tick_data; static void timer_callback(struct regs_t regs) { + (void) regs; ++current_tick_data; } |