From eb5271c14e02aab956ab53f5e74290bca495e2ff Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Sat, 28 Dec 2024 05:03:47 +0100 Subject: See details of commit. IMPL: Better Bootloader architecture. FIX: Remove overcomplicated FbMgr code. IMPL: Implement the SwapMgrDisk function to dump process data to disk. FIX: Fix the format system in Boot. Signed-off-by: Amlal El Mahrouss --- dev/Boot/src/HEL/AMD64/.gitkeep | 0 dev/Boot/src/HEL/AMD64/BootMain.cc | 9 ++++----- dev/Boot/src/HEL/ARM64/BootMain.cc | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 dev/Boot/src/HEL/AMD64/.gitkeep (limited to 'dev/Boot/src/HEL') diff --git a/dev/Boot/src/HEL/AMD64/.gitkeep b/dev/Boot/src/HEL/AMD64/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/dev/Boot/src/HEL/AMD64/BootMain.cc b/dev/Boot/src/HEL/AMD64/BootMain.cc index 29238413..4609a1d3 100644 --- a/dev/Boot/src/HEL/AMD64/BootMain.cc +++ b/dev/Boot/src/HEL/AMD64/BootMain.cc @@ -147,7 +147,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle, FBDrawBitMapInRegion(zka_disk, ZKA_DISK_HEIGHT, ZKA_DISK_WIDTH, (kHandoverHeader->f_GOP.f_Width - ZKA_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - ZKA_DISK_HEIGHT) / 2); - fb_fini(); + fb_clear(); UInt32 cnt_enabled = 0; UInt32 cnt_disabled = 0; @@ -220,8 +220,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle, Boot::BDiskFormatFactory partition_factory; - if (partition_factory.IsPartitionValid() == false && - syschk_thread->Start(handover_hdr, NO) == kEfiOk) + if (syschk_thread->Start(handover_hdr, NO) != kEfiOk) { fb_init(); @@ -232,13 +231,13 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle, root.fKind = kNeFSCatalogKindDir; - partition_factory.Format("Zka HD", &root, 1); + partition_factory.Format(kMachineModel " HD", &root, 1); UI::ui_draw_background(); FBDrawBitMapInRegion(zka_has_disk, ZKA_HAS_DISK_HEIGHT, ZKA_HAS_DISK_WIDTH, (kHandoverHeader->f_GOP.f_Width - ZKA_HAS_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - ZKA_HAS_DISK_HEIGHT) / 2); - fb_fini(); + fb_clear(); } // ------------------------------------------ // diff --git a/dev/Boot/src/HEL/ARM64/BootMain.cc b/dev/Boot/src/HEL/ARM64/BootMain.cc index fe35ea1b..254301a5 100644 --- a/dev/Boot/src/HEL/ARM64/BootMain.cc +++ b/dev/Boot/src/HEL/ARM64/BootMain.cc @@ -10,11 +10,11 @@ #include #ifndef kExpectedWidth -#define kExpectedWidth 844 +#define kExpectedWidth (1280) #endif #ifndef kExpectedHeight -#define kExpectedHeight 390 +#define kExpectedHeight (720) #endif EXTERN EfiBootServices* BS; -- cgit v1.2.3