diff options
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/multiboot2.cc | 3 | ||||
| -rw-r--r-- | src/boot/trampoline.cc | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/boot/multiboot2.cc b/src/boot/multiboot2.cc index 532012e..bac1adb 100644 --- a/src/boot/multiboot2.cc +++ b/src/boot/multiboot2.cc @@ -5,7 +5,7 @@ u32* mb2_find_tag(u32 *mb2_info_addr, char type){ PAGING_MAP(mb2_info_addr); - u32 size=(u32)mb2_info_addr[0]; + u32 size=(u32)mb2_info_addr[0]; // Todo: check for size for(u64 i=0;i<size/8;i++) PAGING_MAP(mb2_info_addr+i*4096); @@ -38,6 +38,7 @@ char mb2_find_bootloader_name(u32* mb2_info_addr, char *return_name){ } return 0; } + char mb2_find_new_rsdp(u32* mb2_info_addr, u64 *return_addr, u32 *return_size){ u32* addr=mb2_find_tag(mb2_info_addr,15); if(addr){ diff --git a/src/boot/trampoline.cc b/src/boot/trampoline.cc index a75b472..68bc349 100644 --- a/src/boot/trampoline.cc +++ b/src/boot/trampoline.cc @@ -90,10 +90,6 @@ extern "C" u8* trampoline(u8* mb_infos_addr){ for(u64 i=0;i<=0x1000000;i+=4096){ trampoline_paging_allocate_addr(pml4,i,i,0x3); } - // Test - for(u64 i=0xe0000000;i<=0xef000000;i+=4096){ - trampoline_paging_allocate_addr(pml4,i,i,0x3); - } // Load new pml4 asm volatile( |