From e065a7048aa98d253cdcc9298c934bb7af7feaa9 Mon Sep 17 00:00:00 2001 From: Franklin Wei Date: Tue, 3 Feb 2015 18:23:04 -0500 Subject: some work --- kernel/main.c | 12 +++++++----- kernel/timer.c | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'kernel') 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 #include #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; } -- cgit v1.1