summaryrefslogtreecommitdiff
path: root/kernel/kernel.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/kernel.c')
-rw-r--r--kernel/kernel.c26
1 files changed, 23 insertions, 3 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c
index 16028fd..f1ba6b7 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -42,7 +42,8 @@ void kernel_main()
//timer_init();
// we know that here the bootloader placed the mamory map!
- mem_init(0x7c00+0x140);
+ mem_init(0x7c00+0x400,*((uint16_t *)(0x7c00+0x600)));
+ //mem_init(0x9000);
// we know that here the bootloader placed the mamory map!
vmem_init();
@@ -78,8 +79,11 @@ void kernel_main()
// pci
pci_init();
+ // vesa init
+ vesa_init(0x8300,0x8400);
+
// floppy
- floppy_init();
+ //floppy_init();
scr_put_string_nl("");
@@ -87,11 +91,27 @@ void kernel_main()
shell_init();
// kernel main loop
+ uint8_t t=0;
+
+// while(1)
+ // {
+ //}
+
+
while(1)
{
-
+ int i;
+ int j;
+ for(i=0;i<1024;i++)
+
+ for(j=0;j<768;j++)
+ {
+ PutPixel(i,j,t);
+ }
+ t+=125;
}
+
}