diff --git a/sys/fs/vfs/file.c b/sys/fs/vfs/file.c index 498c235..9c44aab 100644 --- a/sys/fs/vfs/file.c +++ b/sys/fs/vfs/file.c @@ -237,27 +237,15 @@ size_t i = 0x0; - asm("nop"); - asm("nop"); if ( fd == 0x0 ) return (0x0); - asm("nop"); - asm("nop"); if ( nmemb == 0x0 ) nmemb = 1; //Temp Fix - asm("nop"); - asm("nop"); assert( fd ); - asm("nop"); - asm("nop"); assert( fd->mp ); - asm("nop"); - asm("nop"); assert( fd->mp->fs ); - asm("nop"); - asm("nop"); i = fd->mp->fs->vfsRead( fd, ptr, fd->offset, size * nmemb ); diff --git a/sys/sde/colours.cc b/sys/sde/colours.cc index 3a487a7..59acc92 100644 --- a/sys/sde/colours.cc +++ b/sys/sde/colours.cc @@ -40,6 +40,35 @@ #include void sdeTestThread() { + ogSurface *screen = 0x0; + while (screen == 0x0) { + screen = (ogDisplay_UbixOS *) systemVitals->screen; + } + while (!screen->ogAvail()) + ; + +ogSurface* background = new ogSurface(); +background->ogClone(*screen); // same res and pixel format +for (int x = 0; x < 255; x++) { + for (int y = 0; y < 255; y++) { + for (int z = 0; z < 255; z++) { + //background->ogSetPixel((x+100-(z/2)) + g, (y+100) - g, background->ogPack(x, y, z)); +//background->ogSetPixel(x+500-(z/2), y+z+25, background->ogPack(x, y, z)); +//background->ogSetPixel(x+-(z/2)+(800-(256+128)), y+(z/2)+600-(256+128), background->ogPack(x, y, z)); +background->ogSetPixel(x-(z/2)+(800-(256+128))/2, y+(z/2)+(600-(256+128))/2, background->ogPack(x, 255-y, z)); + } // for z + } // for y +} // for x +screen->ogCopy(*background); + +while (1) { + sched_yield(); +} + +} + + +void sdeTestThreadOld() { // uInt32 count, i = 0x0; uInt8 r, g, b; ogSurface *screen = 0x0; diff --git a/sys/sde/main.cc b/sys/sde/main.cc index 9963a5e..71e3584 100644 --- a/sys/sde/main.cc +++ b/sys/sde/main.cc @@ -77,10 +77,10 @@ execThread(&sdeTestThread, 0x2000, 0x0); //ogSurface::RawLine(100, 100, 200, 200, 0xDEADBEEF) - screen->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'); + //font->PutChar(*screen, 100, 100, 'A' - 2); + //font->PutChar(*screen, 100, 120, 'a'); while (1) { for (tmp = windows; tmp; tmp = tmp->next) {