git-svn-id: https://spexeah.com:8443/svn/Asuro@513 6dbc8c32-bb84-406f-8558-d1cf31a0ab0c

2018-04-12 20:32:56 +00:00
parent c514e7dc83
commit aae55ef2ec
10 changed files with 15 additions and 5 deletions
--- a/Asuro.iso
+++ b/Asuro.iso
--- a/bin/kernel.bin
+++ b/bin/kernel.bin
--- a/iso/boot/asuro.bin
+++ b/iso/boot/asuro.bin
--- a/lib/fat32.ppu
+++ b/lib/fat32.ppu
--- a/lib/libpconsole.a
+++ b/lib/libpconsole.a
--- a/lib/libpmultiboot.a
+++ b/lib/libpmultiboot.a
--- a/lib/libpsystem.a
+++ b/lib/libpsystem.a
--- a/lib/stub.o
+++ b/lib/stub.o
--- 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));

--- 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