From 7601f3d93bb1b61dd129589b4917c8b89064ce4f Mon Sep 17 00:00:00 2001 From: Curle Date: Wed, 14 Aug 2019 19:25:38 +0100 Subject: [PATCH] Three very minor changes. The bootloader is now functionally complete. Some minor bugs may remain, but it now properly loads the Sync kernel on hardware. --- src/bootloader.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/bootloader.c b/src/bootloader.c index d493114..6a265bb 100644 --- a/src/bootloader.c +++ b/src/bootloader.c @@ -45,12 +45,9 @@ EFI_STATUS LoadKernel(EFI_HANDLE ImageHandle, GFX_INFO* Graphics, EFI_CONFIGURAT } Print(L"Syncboot loaded at 0x%llx\n", LoadedImage->ImageBase); + Print(L"BootServices start at 0x%llx, ExitBootServices at %llx.\r\n", BS, BS->ExitBootServices); AwaitKey("\0"); - int Loop = 1; - while (Loop) { - __asm volatile("pause"); - } /* Get the path to the device */ CHAR16* ESPRootTemp = DevicePathToStr(DevicePathFromHandle(LoadedImage->DeviceHandle)); @@ -1460,7 +1457,7 @@ EFI_STATUS LoadKernel(EFI_HANDLE ImageHandle, GFX_INFO* Graphics, EFI_CONFIGURAT FILELOADER_PARAMS* LoaderBlock; - KernelStatus = BS->AllocatePool(EfiLoaderData, sizeof(FILELOADER_PARAMS), (void**)LoaderBlock); + KernelStatus = BS->AllocatePool(EfiLoaderData, sizeof(FILELOADER_PARAMS), (void**)&LoaderBlock); if (EFI_ERROR(KernelStatus)) { Print(L"Error allocating loaderblock pool. Code 0x%llx\r\n", KernelStatus); return KernelStatus; @@ -1525,7 +1522,7 @@ EFI_STATUS LoadKernel(EFI_HANDLE ImageHandle, GFX_INFO* Graphics, EFI_CONFIGURAT } } - AwaitKey(L"Done! Next step is jumping to kernel.\r\n"); + // AwaitKey(L"Done! Next step is jumping to kernel.\r\n"); // Call the kernel! LoaderBlock->UEFI_Version = UEFIVer;