aboutsummaryrefslogtreecommitdiff
path: root/kernel/main.c
diff options
context:
space:
mode:
authorFranklin Wei <frankhwei536@gmail.com>2015-02-07 11:03:48 -0500
committerFranklin Wei <frankhwei536@gmail.com>2015-02-07 11:03:48 -0500
commitc0df0ee6437aa2786b1a92bc6af1284958d104c7 (patch)
tree5c6392aa761ba5028387bee72cc73149893ea508 /kernel/main.c
parent873a103fb71d6b7b1993a64535a7fa150317ca3c (diff)
downloadkappa-c0df0ee6437aa2786b1a92bc6af1284958d104c7.zip
kappa-c0df0ee6437aa2786b1a92bc6af1284958d104c7.tar.gz
kappa-c0df0ee6437aa2786b1a92bc6af1284958d104c7.tar.bz2
kappa-c0df0ee6437aa2786b1a92bc6af1284958d104c7.tar.xz
new rng, some rework of I/O
Diffstat (limited to 'kernel/main.c')
-rw-r--r--kernel/main.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/kernel/main.c b/kernel/main.c
index 9082859..d791da1 100644
--- a/kernel/main.c
+++ b/kernel/main.c
@@ -1,11 +1,13 @@
#include <stdint.h>
#include <stdio.h>
+#include <stdlib.h>
#include "gdt.h"
#include "idt.h"
#include "isr.h"
#include "irq.h"
#include "log.h"
#include "multiboot.h"
+#include "panic.h"
#include "pcspkr.h"
#include "ps2.h"
#include "timer.h"
@@ -36,15 +38,18 @@ void main(struct multiboot_info_t *hdr, uint32_t magic)
irq_init();
/* initialize other drivers */
- timer_init();
+ timer_init(HZ);
ps2_init();
asm("sti");
printf("Boot finished.\n");
- for(int i=0;i<50;++i)
- vga_drawpixel(i, i, VGA_RGBPACK(255, 0, 0));
+ printf("Testing RNG...\n");
+ srand(*current_tick);
+
+ for(int i=0;i>=0;++i)
+ vga_drawpixel(rand() % *vga_width, rand() % *vga_height, rand() % 0xFFFFFF);
printf("Testing keyboard LED's...\n");