diff --git a/lib/objgfx40/ogFont.cpp b/lib/objgfx40/ogFont.cpp index aa5af28..38f74dc 100644 --- a/lib/objgfx40/ogFont.cpp +++ b/lib/objgfx40/ogFont.cpp @@ -142,6 +142,7 @@ startingChar = header.startingChar; + memset(fontDataIdx, 0, sizeof(fontDataIdx)); memset(charWidthTable, 0, sizeof(charWidthTable)); memset(charHeightTable, 0, sizeof(charHeightTable)); @@ -153,11 +154,11 @@ charWidthTable[tmp] = width; charHeightTable[tmp] = height; fontDataIdx[tmp] = (size * (tmp - startingChar)); - //kprintf("fontDataIdx[%i]", tmp); } // for tmp fontData = new uint8_t[fontDataSize]; + fseek(infile, 16, 0); lresult = fread(fontData, fontDataSize, 1, infile); fclose(infile); diff --git a/sys/fs/vfs/file.c b/sys/fs/vfs/file.c index d8c828f..21a3793 100644 --- a/sys/fs/vfs/file.c +++ b/sys/fs/vfs/file.c @@ -261,7 +261,7 @@ i = fd->mp->fs->vfsRead( fd, ptr, fd->offset, size * nmemb ); - fd->offset += size * nmemb; + //fd->offset += size * nmemb; return (i); } diff --git a/sys/i386/sched.c b/sys/i386/sched.c index c987b0d..069868d 100644 --- a/sys/i386/sched.c +++ b/sys/i386/sched.c @@ -269,7 +269,6 @@ ************************************************************************/ void sched_yield() { - kprintf("sy %i", _current->id); sched(); } diff --git a/sys/i386/systemtask.c b/sys/i386/systemtask.c index cea9e5c..194da6c 100644 --- a/sys/i386/systemtask.c +++ b/sys/i386/systemtask.c @@ -116,8 +116,10 @@ } if (ogprintOff == 1) videoBuffer[0] = systemVitals->sysTicks; + /* else ogPrintf(buf); + */ sched_yield(); } diff --git a/sys/init/main.c b/sys/init/main.c index 09b70ec..7fbb04e 100644 --- a/sys/init/main.c +++ b/sys/init/main.c @@ -144,7 +144,7 @@ execThread(systemTask, 0x2000, 0x0); kprintf("Thread Start!\n"); - //execFile("sys:/bin/init", argv_init, envp_init, 0x0); /* OS Initializer */ + execFile("sys:/bin/init", argv_init, envp_init, 0x0); /* OS Initializer */ //kprintf("File Start!\n"); kprintf("SDE Thread Start! [0x%X]\n", &sdeThread); diff --git a/sys/sde/main.cc b/sys/sde/main.cc index b6c2476..cbd7eb1 100644 --- a/sys/sde/main.cc +++ b/sys/sde/main.cc @@ -63,7 +63,7 @@ printOff = 0x1; - screen->ogCreate(800, 600, OG_PIXFMT_16BPP); + screen->ogCreate(800, 600, OG_PIXFMT_24BPP); screen->ogClear(screen->ogPack(122, 140, 163)); systemVitals->screen = screen; @@ -78,6 +78,9 @@ //ogSurface::RawLine(100, 100, 200, 200, 0xDEADBEEF) screen->RawLine(100, 100, 200, 200, 0xDEADBEEF); + font->PutChar(*screen, 100, 100, 'A' - 2); + font->PutChar(*screen, 100, 120, 'a'); + while (1) { for (tmp = windows; tmp; tmp = tmp->next) { switch (tmp->status) {