From bddaafedff871716a0169e9ebf1ada5851970365 Mon Sep 17 00:00:00 2001 From: Amlal Date: Sun, 22 Dec 2024 08:38:32 +0100 Subject: META: BUMPING. Signed-off-by: Amlal --- dev/BootLoader/src/HEL/64X000/Boot64x0.S | 2 +- dev/BootLoader/src/HEL/AMD64/BootATA.cc | 6 +++--- dev/BootLoader/src/HEL/AMD64/BootMain.cc | 19 +++++++++---------- dev/BootLoader/src/HEL/AMD64/BootPlatform.cc | 6 +++--- dev/BootLoader/src/HEL/AMD64/BootSATA.cc | 8 ++++---- dev/BootLoader/src/HEL/ARM64/BootMain.cc | 2 +- dev/BootLoader/src/HEL/ARM64/BootPlatform.cc | 6 +++--- dev/BootLoader/src/HEL/POWER/CoreBootStartup.S | 2 +- 8 files changed, 25 insertions(+), 26 deletions(-) (limited to 'dev/BootLoader/src/HEL') diff --git a/dev/BootLoader/src/HEL/64X000/Boot64x0.S b/dev/BootLoader/src/HEL/64X000/Boot64x0.S index e79f97ef..a9ca1a2d 100644 --- a/dev/BootLoader/src/HEL/64X000/Boot64x0.S +++ b/dev/BootLoader/src/HEL/64X000/Boot64x0.S @@ -1,6 +1,6 @@ /* ------------------------------------------- - Copyright (C) 2024, TQ B.V, all rights reserved. + Copyright (C) 2024, Theater Quality Inc, all rights reserved. ------------------------------------------- */ diff --git a/dev/BootLoader/src/HEL/AMD64/BootATA.cc b/dev/BootLoader/src/HEL/AMD64/BootATA.cc index 52df1b2b..ff92bf48 100644 --- a/dev/BootLoader/src/HEL/AMD64/BootATA.cc +++ b/dev/BootLoader/src/HEL/AMD64/BootATA.cc @@ -1,17 +1,17 @@ /* ------------------------------------------- - Copyright (C) 2024, TQ B.V, all rights reserved. + Copyright (C) 2024, Theater Quality Inc, all rights reserved. ------------------------------------------- */ /** * @file BootATA.cc - * @author TQ B.V (amlalelmahrouss@icloud.com) + * @author Amlal EL Mahrouss (amlalelmahrouss@icloud.com) * @brief ATA driver. * @version 0.1 * @date 2024-02-02 * - * @copyright Copyright (c) TQ B.V + * @copyright Copyright (c) Theater Quality Inc * */ diff --git a/dev/BootLoader/src/HEL/AMD64/BootMain.cc b/dev/BootLoader/src/HEL/AMD64/BootMain.cc index 4d0190c0..dd8fb345 100644 --- a/dev/BootLoader/src/HEL/AMD64/BootMain.cc +++ b/dev/BootLoader/src/HEL/AMD64/BootMain.cc @@ -1,6 +1,6 @@ /* ------------------------------------------- - Copyright (C) 2024, TQ B.V, all rights reserved. + Copyright (C) 2024, Theater Quality Inc, all rights reserved. ------------------------------------------- */ @@ -24,11 +24,11 @@ #endif // !kMachineModel #ifndef kExpectedWidth -#define kExpectedWidth 1920 +#define kExpectedWidth (1920) #endif #ifndef kExpectedHeight -#define kExpectedHeight 1080 +#define kExpectedHeight (1080) #endif /** Graphics related. */ @@ -132,7 +132,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle, // Grab MP services, extended to runtime. // // ------------------------------------------- // - auto guid_mp = EfiGUID(EFI_MP_SERVICES_PROTOCOL_GUID); + EfiGUID guid_mp = EfiGUID(EFI_MP_SERVICES_PROTOCOL_GUID); EfiMpServicesProtocol* mp = nullptr; BS->LocateProtocol(&guid_mp, nullptr, reinterpret_cast(&mp)); @@ -174,8 +174,6 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle, cg_fini(); - CGDrawString("Formatting EPM disk...", 30, 10, RGB(0xFF, 0xFF, 0xFF)); - Boot::BDiskFormatFactory::BFileDescriptor root; root.fFileName[0] = kNeFSRoot[0]; @@ -250,7 +248,9 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle, syschk_thread->Start(handover_hdr, NO); - // nullify these fields, to avoid being reused later. + // ------------------------------------------ // + // null these fields, to avoid being reused later. + // ------------------------------------------ // handover_hdr->f_FirmwareCustomTables[0] = nullptr; handover_hdr->f_FirmwareCustomTables[1] = nullptr; @@ -288,9 +288,8 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle, } else { -#ifdef ZBA_USE_FB - CGDrawString("BootZ: Please recover your kernel image.", 30, 10, RGB(0xFF, 0xFF, 0xFF)); -#endif // ZBA_USE_FB + cg_init(); + CGDrawBitMapInRegion(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(); } diff --git a/dev/BootLoader/src/HEL/AMD64/BootPlatform.cc b/dev/BootLoader/src/HEL/AMD64/BootPlatform.cc index 83e37a02..5fe7d41f 100644 --- a/dev/BootLoader/src/HEL/AMD64/BootPlatform.cc +++ b/dev/BootLoader/src/HEL/AMD64/BootPlatform.cc @@ -1,7 +1,7 @@ /* ------------------------------------------- - Copyright (C) 2024, TQ B.V, all rights reserved. + Copyright (C) 2024, Theater Quality Inc, all rights reserved. ------------------------------------------- */ @@ -9,7 +9,7 @@ #include #include -#ifdef __STANDALONE__ +#ifdef __BOOTLDR_STANDALONE__ using namespace Boot; @@ -103,4 +103,4 @@ void rt_hlt() Kernel::HAL::rt_halt(); } -#endif // __STANDALONE__ +#endif // __BOOTLDR_STANDALONE__ diff --git a/dev/BootLoader/src/HEL/AMD64/BootSATA.cc b/dev/BootLoader/src/HEL/AMD64/BootSATA.cc index 5118d865..229ce7e3 100644 --- a/dev/BootLoader/src/HEL/AMD64/BootSATA.cc +++ b/dev/BootLoader/src/HEL/AMD64/BootSATA.cc @@ -1,17 +1,17 @@ /* ------------------------------------------- - Copyright (C) 2024, TQ B.V, all rights reserved. + Copyright (C) 2024, Theater Quality Inc, all rights reserved. ------------------------------------------- */ /** * @file BootAHCI.cc - * @author TQ B.V (amlalelmahrouss@icloud.com) - * @brief AHCI support for BootZ. + * @author Amlal EL Mahrouss (amlalelmahrouss@icloud.com) + * @brief SATA support for BootZ. * @version 0.1 * @date 2024-02-02 * - * @copyright Copyright (c) TQ B.V + * @copyright Copyright (c) Theater Quality Inc * */ diff --git a/dev/BootLoader/src/HEL/ARM64/BootMain.cc b/dev/BootLoader/src/HEL/ARM64/BootMain.cc index 7f3ba6cf..fe35ea1b 100644 --- a/dev/BootLoader/src/HEL/ARM64/BootMain.cc +++ b/dev/BootLoader/src/HEL/ARM64/BootMain.cc @@ -1,6 +1,6 @@ /* ------------------------------------------- - Copyright (C) 2024, TQ B.V, all rights reserved. + Copyright (C) 2024, Theater Quality Inc, all rights reserved. ------------------------------------------- */ diff --git a/dev/BootLoader/src/HEL/ARM64/BootPlatform.cc b/dev/BootLoader/src/HEL/ARM64/BootPlatform.cc index 75a69998..df16bd40 100644 --- a/dev/BootLoader/src/HEL/ARM64/BootPlatform.cc +++ b/dev/BootLoader/src/HEL/ARM64/BootPlatform.cc @@ -1,6 +1,6 @@ /* ------------------------------------------- - Copyright (C) 2024, TQ B.V, all rights reserved. + Copyright (C) 2024, Theater Quality Inc, all rights reserved. ------------------------------------------- */ @@ -8,7 +8,7 @@ #include #include -#ifdef __STANDALONE__ +#ifdef __BOOTLDR_STANDALONE__ using namespace Boot; @@ -34,4 +34,4 @@ EXTERN_C void rt_std() { } -#endif // __STANDALONE__ +#endif // __BOOTLDR_STANDALONE__ diff --git a/dev/BootLoader/src/HEL/POWER/CoreBootStartup.S b/dev/BootLoader/src/HEL/POWER/CoreBootStartup.S index 0948711d..e4964c59 100644 --- a/dev/BootLoader/src/HEL/POWER/CoreBootStartup.S +++ b/dev/BootLoader/src/HEL/POWER/CoreBootStartup.S @@ -1,6 +1,6 @@ /* ------------------------------------------- - Copyright (C) 2024, TQ B.V, all rights reserved. + Copyright (C) 2024, Theater Quality Inc, all rights reserved. ------------------------------------------- */ -- cgit v1.2.3