aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/main.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/kernel/main.c b/kernel/main.c
index 62fa8ca..1b80056 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -4,11 +4,14 @@
#include "idt.h"
#include "isr.h"
#include "irq.h"
+#include "multiboot.h"
+#include "pcspkr.h"
#include "ps2.h"
#include "timer.h"
#include "tty.h"
+#include "vga.h"
-void main(struct multiboot_header *hdr, uint32_t magic)
+void main(struct multiboot_info_t *hdr, uint32_t magic)
{
/* init the terminal first so we can get some output */
tty_init();
@@ -31,12 +34,13 @@ void main(struct multiboot_header *hdr, uint32_t magic)
while(1)
{
ps2_set_leds(0x01);
- for(int i=0;i<1000000;++i);
+ for(int i=0;i<5000000;++i);
ps2_set_leds(0x02);
- for(int i=0;i<1000000;++i);
+ for(int i=0;i<5000000;++i);
ps2_set_leds(0x04);
- for(int i=0;i<1000000;++i);
+ for(int i=0;i<5000000;++i);
ps2_set_leds(0x02);
- for(int i=0;i<1000000;++i);
+ for(int i=0;i<5000000;++i);
}
+
}