diff options
| author | Franklin Wei <frankhwei536@gmail.com> | 2015-02-07 19:10:04 -0500 |
|---|---|---|
| committer | Franklin Wei <frankhwei536@gmail.com> | 2015-02-07 19:10:04 -0500 |
| commit | c3b4bab880c9b3426db6252240ea3ab7838fa17b (patch) | |
| tree | 97fce02a1d40cae6ad9d5080c7f14bb805d8d9dc /kernel | |
| parent | 0dc446980d8ede518a356ab2c2f165cb08ce444a (diff) | |
| download | kappa-c3b4bab880c9b3426db6252240ea3ab7838fa17b.zip kappa-c3b4bab880c9b3426db6252240ea3ab7838fa17b.tar.gz kappa-c3b4bab880c9b3426db6252240ea3ab7838fa17b.tar.bz2 kappa-c3b4bab880c9b3426db6252240ea3ab7838fa17b.tar.xz | |
fix
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/main.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/kernel/main.c b/kernel/main.c index e4cf47d..dd05880 100644 --- a/kernel/main.c +++ b/kernel/main.c @@ -22,14 +22,6 @@ void main(struct multiboot_info_t *hdr, uint32_t magic) printf("GFX init\n"); bool gfx_status = gfx_init((struct vbe_info_t*)hdr->vbe_mode_info); - puts("test123\n"); - putchar('1'); - putchar('2'); - putchar('\n'); - putchar('1'); - putchar('2'); - gfx_drawchar(0, 12, 'a', 0xffffff, 0); - /* if graphical initialization fails, fall back to text mode */ if(!gfx_status) { @@ -56,14 +48,13 @@ void main(struct multiboot_info_t *hdr, uint32_t magic) asm("sti"); - //printf("Boot finished.\n"); + printf("Boot finished.\n"); - //printf("Testing RNG...\n"); + printf("Testing RNG...\n"); srand(*current_tick); if(gfx_status) { - /* for(int i=0;i<100000;++i) { int rx = rand() % *gfx_width; @@ -76,10 +67,9 @@ void main(struct multiboot_info_t *hdr, uint32_t magic) gfx_clear(0xff00ff); int end = *current_tick; printf("ticks for 1000 fills: %x\n", end-start); - */ } - // printf("Testing keyboard LED's...\n"); + printf("Testing keyboard LED's...\n"); while(1) { |