summaryrefslogtreecommitdiff
path: root/kernel/kernel.c
diff options
context:
space:
mode:
authorMichal Idziorek <m.i@gmx.at>2014-08-27 14:24:42 +0200
committerMichal Idziorek <m.i@gmx.at>2014-08-27 14:24:42 +0200
commit5e48d8259fb2857ad4441de77cbacddd50a21ec0 (patch)
treeec10871a799b6d1ab1c3fff7d275714b5af22632 /kernel/kernel.c
parentced08dbfa11aee29a2f6f6801de243f4a160e5a1 (diff)
added bitmap fonts and put string for vesa modes
Diffstat (limited to 'kernel/kernel.c')
-rw-r--r--kernel/kernel.c29
1 files changed, 9 insertions, 20 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c
index 5af172e..05a4f9f 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -24,13 +24,11 @@ void int_test_handler()
X86_IRQ_END
-
}
void kernel_main()
{
-
// clear console
scr_clear();
@@ -83,7 +81,7 @@ void kernel_main()
vesa_init(0x8300,0x8400);
// floppy
- //floppy_init();
+ floppy_init();
scr_put_string_nl("");
@@ -98,26 +96,17 @@ void kernel_main()
// {
//}
+ //uint8_t rawfont[]={0xff,0xff,0xc3,0xc3,0xff,0xff,0xc3,0xc3};
+ //uint8_t rawfont[]={0xf0,0xf0,0xf0,0xf0,0xf0,0xf0,0xff,0xff,};
+ uint8_t *rawfont=0xb000; // here the floppy_init puts first sector
+ // after 0x8000 (font data :))
- while(1)
- {
-
- int i;
- int j;
- for(i=0;i<1024;i++)
+ PutString(rawfont,"Welcome to Fool OS 001",10,10,0xff00);
+ PutString(rawfont,"Welcome to Fool OS 001",20,20,0xf00);
+ PutString(rawfont,"Welcome to Fool OS 001",30,30,0xfff00);
- for(j=0;j<768;j++)
- {
- if(o<2)PutPixel(i,j,0xff);
- else if(o<4)PutPixel(i,j,0x5f0);
- else PutPixel(i,j,0xf0000);
-
- }
- t+=125;
- o++;
- if(o>8)o=0;
- }
+ while(1); // never ending loop
}