diff options
Diffstat (limited to 'dev/Boot/src')
| -rw-r--r-- | dev/Boot/src/HEL/AMD64/EFIBootStartup.cc | 21 | ||||
| -rw-r--r-- | dev/Boot/src/HEL/ARM64/EFIBootStartup.cc | 2 | ||||
| -rw-r--r-- | dev/Boot/src/Root/TQ/OSFont.ttf | bin | 42752 -> 0 bytes |
3 files changed, 2 insertions, 21 deletions
diff --git a/dev/Boot/src/HEL/AMD64/EFIBootStartup.cc b/dev/Boot/src/HEL/AMD64/EFIBootStartup.cc index 81d57ea2..1cf3cb29 100644 --- a/dev/Boot/src/HEL/AMD64/EFIBootStartup.cc +++ b/dev/Boot/src/HEL/AMD64/EFIBootStartup.cc @@ -294,32 +294,13 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr image_handle, EFI::Stop(); } - Boot::BFileReader ttf_font(L"TQ\\OSFont.ttf", image_handle); - - ttf_font.ReadAll(0); - - if (ttf_font.Blob()) - { - handover_hdr->f_KernelImage = reader_kernel.Blob(); - handover_hdr->f_KernelSz = reader_kernel.Size(); - handover_hdr->f_FontImage = ttf_font.Blob(); - handover_hdr->f_FontSz = ttf_font.Size(); - } - else - { - fb_init(); - FBDrawBitMapInRegion(zka_no_disk, ZKA_NO_DISK_HEIGHT, ZKA_NO_DISK_WIDTH, (kHandoverHeader->f_GOP.f_Width - ZKA_NO_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - ZKA_NO_DISK_HEIGHT) / 2); - - EFI::Stop(); - } - EFI::ExitBootServices(map_key, image_handle); // ---------------------------------------------------- // // Finally load the OS kernel. // ---------------------------------------------------- // - kernel_thread->Start(handover_hdr, NO); + kernel_thread->Start(handover_hdr, YES); CANT_REACH(); } diff --git a/dev/Boot/src/HEL/ARM64/EFIBootStartup.cc b/dev/Boot/src/HEL/ARM64/EFIBootStartup.cc index 87b2dc34..93de9a59 100644 --- a/dev/Boot/src/HEL/ARM64/EFIBootStartup.cc +++ b/dev/Boot/src/HEL/ARM64/EFIBootStartup.cc @@ -213,7 +213,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr image_handle, EFI::ExitBootServices(map_key, image_handle); - kernel_thread.Start(handover_hdr, NO); + kernel_thread.Start(handover_hdr, YES); } CANT_REACH(); diff --git a/dev/Boot/src/Root/TQ/OSFont.ttf b/dev/Boot/src/Root/TQ/OSFont.ttf Binary files differdeleted file mode 100644 index e9a6dbb0..00000000 --- a/dev/Boot/src/Root/TQ/OSFont.ttf +++ /dev/null |