diff --git a/Asuro.iso b/Asuro.iso index f30be34b..f1c102e3 100644 Binary files a/Asuro.iso and b/Asuro.iso differ diff --git a/bin/kernel.bin b/bin/kernel.bin index 4c1436d7..77cb7444 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 4c1436d7..77cb7444 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 b0c72778..2b929945 100644 Binary files a/lib/kernel.ppu and b/lib/kernel.ppu differ diff --git a/lib/libpconsole.a b/lib/libpconsole.a index 930a437f..8e91c7a3 100644 Binary files a/lib/libpconsole.a and b/lib/libpconsole.a differ diff --git a/lib/libpmultiboot.a b/lib/libpmultiboot.a index 4a29ede8..17772f39 100644 Binary files a/lib/libpmultiboot.a and b/lib/libpmultiboot.a differ diff --git a/lib/libpsystem.a b/lib/libpsystem.a index 8bb3dd67..340f4c9e 100644 Binary files a/lib/libpsystem.a and b/lib/libpsystem.a differ diff --git a/src/kernel.pas b/src/kernel.pas index e06577b8..86d2e72f 100644 --- a/src/kernel.pas +++ b/src/kernel.pas @@ -104,6 +104,7 @@ begin console.setdefaultattribute(console.combinecolors(Red, Black)); console.outputln('KERNEL', 'Multiboot Compliant Boot-Loader Needed!'); console.outputln('KERNEL', 'HALTING.'); + BSOD('Multiboot Error', 'Multiboot Compliant Boot-Loader Needed!'); util.halt_and_catch_fire; end; @@ -116,7 +117,7 @@ begin end else begin console.outputln('KERNEL', 'GDT: LOAD FAIL.'); console.outputln('KERNEL', 'HALTING.'); - halt_and_catch_fire; + BSOD('GDT', 'Failed to load the GDT correctly.'); end; idt.init(); @@ -133,25 +134,29 @@ begin drivermanagement.init(); storagemanagement.init(); - //asm INT 13 end; STI; isr32.hook(uint32(@bios_data_area.tick_update)); - //drivers - console.outputln('KERNEL', 'DRIVERS: INIT BEGIN.'); + //Device Drivers + console.outputln('KERNEL', 'DEVICE DRIVERS: INIT BEGIN.'); keyboard.init(keyboard_layout); mouse.init(); testdriver.init(); E1000.init(); //IDE.init(); + console.outputln('KERNEL', 'DEVICE DRIVERS: INIT END.'); - //Nothing beyond here + //Bus Drivers + console.outputln('KERNEL', 'BUS DRIVERS: INIT BEGIN.'); USB.init(); pci.init(); - console.outputln('KERNEL', 'DRIVERS: INIT END.'); + console.outputln('KERNEL', 'BUS DRIVERS: INIT END.'); + - //ipv4.register(); + //Network Stack + ipv4.register(); + //End of Boot console.writestringln(''); console.setdefaultattribute(console.combinecolors(Green, Black)); console.writestringln('Asuro Booted Correctly!');