diff --git a/Asuro.iso b/Asuro.iso index 3219fd7f..97a90f28 100644 Binary files a/Asuro.iso and b/Asuro.iso differ diff --git a/bin/kernel.bin b/bin/kernel.bin index 8001af70..c723efc4 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 8001af70..c723efc4 100755 Binary files a/iso/boot/asuro.bin and b/iso/boot/asuro.bin differ diff --git a/lib/fat32.ppu b/lib/fat32.ppu index 15ee60e1..25f75818 100644 Binary files a/lib/fat32.ppu and b/lib/fat32.ppu differ diff --git a/lib/libpconsole.a b/lib/libpconsole.a index 964b54fb..316f507b 100644 Binary files a/lib/libpconsole.a and b/lib/libpconsole.a differ diff --git a/lib/libpmultiboot.a b/lib/libpmultiboot.a index 3bdbfc90..031a2f06 100644 Binary files a/lib/libpmultiboot.a and b/lib/libpmultiboot.a differ diff --git a/lib/libpsystem.a b/lib/libpsystem.a index ecbe748c..5b103189 100644 Binary files a/lib/libpsystem.a and b/lib/libpsystem.a differ diff --git a/lib/stub.o b/lib/stub.o index 51bd074b..11f36fa5 100644 Binary files a/lib/stub.o and b/lib/stub.o differ diff --git a/src/driver/storage/fat32.pas b/src/driver/storage/fat32.pas index 9bcca5d7..52fba8b6 100644 --- a/src/driver/storage/fat32.pas +++ b/src/driver/storage/fat32.pas @@ -121,6 +121,7 @@ var fatStart : uint32; dataStart: uint32; + begin buffer:= puint32(kalloc(512)); diff --git a/src/stub/stub.asm b/src/stub/stub.asm index ce536f12..2c4da001 100644 --- a/src/stub/stub.asm +++ b/src/stub/stub.asm @@ -29,13 +29,13 @@ MULTIBOOT_ADDRESS_FIELDS equ 1<<16 ; Multiboot header defines ; MULTIBOOT_HEADER_MAGIC equ 0x1BADB002 -MULTIBOOT_HEADER_FLAGS equ MULTIBOOT_MODULE_ALIGN | MULTIBOOT_MEMORY_MAP +MULTIBOOT_HEADER_FLAGS equ MULTIBOOT_MODULE_ALIGN | MULTIBOOT_MEMORY_MAP | MULTIBOOT_GRAPHICS_FIELDS MULTIBOOT_HEADER_CHECKSUM equ -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS) ; ; Kernel stack size ; -KERNEL_STACKSIZE equ 0x4000 +KERNEL_STACKSIZE equ 0x4000 KERNEL_VIRTUAL_BASE equ 0xC0000000 KERNEL_PAGE_NUMBER equ (KERNEL_VIRTUAL_BASE >> 22) @@ -57,7 +57,16 @@ align 4 dd MULTIBOOT_HEADER_MAGIC dd MULTIBOOT_HEADER_FLAGS dd MULTIBOOT_HEADER_CHECKSUM - +dd 0 +dd 0 +dd 0 +dd 0 +dd 0 +dd 0 +dd 1920 +dd 1600 +dd 8 + ; ; Entrypoint ; @@ -81,8 +90,8 @@ _loader: jmp ecx kstart: - mov dword [BootPageDirectory], 0 - invlpg [0] + mov dword [BootPageDirectory], 0 + invlpg [0] mov esp, KERNEL_STACK+KERNEL_STACKSIZE ;Create kernel stack push eax ;Multiboot magic number add ebx, KERNEL_VIRTUAL_BASE