diff --git a/Asuro.iso b/Asuro.iso index 5e505a77..2f4dfa87 100644 Binary files a/Asuro.iso and b/Asuro.iso differ diff --git a/bin/kernel.bin b/bin/kernel.bin index d091c1f9..41676538 100755 Binary files a/bin/kernel.bin and b/bin/kernel.bin differ diff --git a/iso/boot/asuro.bin b/iso/boot/asuro.bin index d091c1f9..41676538 100755 Binary files a/iso/boot/asuro.bin and b/iso/boot/asuro.bin differ diff --git a/lib/kernel.ppu b/lib/kernel.ppu index d4b36172..95d51fbd 100644 Binary files a/lib/kernel.ppu and b/lib/kernel.ppu differ diff --git a/lib/libpconsole.a b/lib/libpconsole.a index 1c5539c6..e22efbf6 100644 Binary files a/lib/libpconsole.a and b/lib/libpconsole.a differ diff --git a/lib/libpmultiboot.a b/lib/libpmultiboot.a index 769778ba..87f90a75 100644 Binary files a/lib/libpmultiboot.a and b/lib/libpmultiboot.a differ diff --git a/lib/libpsystem.a b/lib/libpsystem.a index bd355b94..e8f8ebf4 100644 Binary files a/lib/libpsystem.a and b/lib/libpsystem.a differ diff --git a/src/kernel.pas b/src/kernel.pas index a0e72fe2..2aa94357 100644 --- a/src/kernel.pas +++ b/src/kernel.pas @@ -84,6 +84,49 @@ begin pop_trace; end; +procedure GraphicsTesting(); +var + i : uint32; + z : uint32; + atmp : puint32; + fb : puint16; + val : uint16; + AChar : Array[0..15] of uint8 = ( %00000000, + %00000000, + %00000000, + %00010000, + %00111000, + %01101100, + %11000110, + %11000110, + %11111110, + %11000110, + %11000110, + %11000110, + %11000110, + %00000000, + %00000000, + %00000000 ); + //AChar : uint8 = %00000000; + +begin + i:= $2000000; + kpalloc(i); + atmp:= puint32(i); + fb:= puint16(uint32(multibootinfo^.framebuffer_addr)); + kpalloc(uint32(fb)); + atmp^:= multibootinfo^.framebuffer_bpp; + for z:=0 to 15 do begin + for i:=0 to 8 do begin + val:= $0000; + if ((AChar[z] SHR i) AND $1) = $1 then val:= $FFFF; + if val <> 0 then fb[(z * 1280)+i]:= val; + end; + end; + while true do begin + end; +end; + procedure kmain(mbinfo: Pmultiboot_info_t; mbmagic: uint32); stdcall; [public, alias: 'kmain']; var c : uint8; @@ -97,7 +140,7 @@ var temp : uint32; atmp : puint32; test : puint8; - fb : puint8; + fb : puint16; begin { Store Multiboot info } @@ -150,15 +193,8 @@ begin tss.init(); scheduler.init(); - i:= $2000000; - kpalloc(i); - atmp:= puint32(i); - fb:= puint8(uint32(multibootinfo^.framebuffer_addr)); - kpalloc(uint32(fb)); - atmp^:= uint32(fb); - for i:=0 to (1280 * 1024 * 2)-5000 do begin - fb[i]:= $FF; - end; + { Graphics Mode Test Stuff } + GraphicsTesting(); { Call Tracer } tracer.init();