diff options
| author | Franklin Wei <frankhwei536@gmail.com> | 2015-02-11 21:42:22 -0500 |
|---|---|---|
| committer | Franklin Wei <frankhwei536@gmail.com> | 2015-02-11 21:42:22 -0500 |
| commit | b39f7a0657b8147d6a58a0222a61bfb0f9e2b061 (patch) | |
| tree | fd4b6d1f12d32a20e021a142d92bc3766afa5f99 /kernel/main.c | |
| parent | a03f4e798eba196b614024f814e6db7f6795c2f8 (diff) | |
| download | kappa-b39f7a0657b8147d6a58a0222a61bfb0f9e2b061.zip kappa-b39f7a0657b8147d6a58a0222a61bfb0f9e2b061.tar.gz kappa-b39f7a0657b8147d6a58a0222a61bfb0f9e2b061.tar.bz2 kappa-b39f7a0657b8147d6a58a0222a61bfb0f9e2b061.tar.xz | |
Stuff
Diffstat (limited to 'kernel/main.c')
| -rw-r--r-- | kernel/main.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/kernel/main.c b/kernel/main.c index f0cc0d8..b5cc193 100644 --- a/kernel/main.c +++ b/kernel/main.c @@ -16,6 +16,7 @@ #include "fpu.h" #include "timer.h" #include "tty.h" +#include "version.h" void gpf(struct regs_t *regs) { @@ -29,7 +30,9 @@ void gpf(struct regs_t *regs) void main(struct multiboot_info_t *hdr, uint32_t magic) { fpu_enable(); + asm("movq %xmm0, %xmm0"); + /* this should go to port e9, which is the Bochs debug port */ printf("Testing early I/O\n"); @@ -66,9 +69,13 @@ void main(struct multiboot_info_t *hdr, uint32_t magic) printf("Boot finished.\n"); + printf("Kernel version %s: \"%s\"\n", KAPPA_KERNEL_VERSION, KAPPA_KERNEL_CODENAME); + printf("Running graphics benchmark...\n"); srand(42); + while(1); + if(gfx_status) { const int width = *gfx_width; @@ -171,10 +178,10 @@ void main(struct multiboot_info_t *hdr, uint32_t magic) printf("Resolution: %dx%dx%d\n", *gfx_width, *gfx_height, *gfx_bpp * 8); } - printf("Testing keyboard LED's..."); + printf("Testing keyboard LED's"); - int n = 3; - int s = -1; + int n = 0; + int s = 1; while(1) { |