summaryrefslogtreecommitdiffhomepage
path: root/dev/BootLoader/src
diff options
context:
space:
mode:
authorAmlal <amlalelmahrouss@icloud.com>2024-12-22 08:38:32 +0100
committerAmlal <amlalelmahrouss@icloud.com>2024-12-22 08:38:32 +0100
commitbddaafedff871716a0169e9ebf1ada5851970365 (patch)
tree22fbfde6a811e49b8968eb138c83b4cce3a1df92 /dev/BootLoader/src
parent610f91d87152cbe48d3054fcf437d8239da6ef35 (diff)
META: BUMPING.
Signed-off-by: Amlal <amlalelmahrouss@icloud.com>
Diffstat (limited to 'dev/BootLoader/src')
-rw-r--r--dev/BootLoader/src/BootFileReader.cc2
-rw-r--r--dev/BootLoader/src/BootString.cc2
-rw-r--r--dev/BootLoader/src/BootSupport.cc4
-rw-r--r--dev/BootLoader/src/BootTextWriter.cc2
-rw-r--r--dev/BootLoader/src/BootThread.cc2
-rw-r--r--dev/BootLoader/src/BootloaderRsrc.rsrc4
-rw-r--r--dev/BootLoader/src/HEL/64X000/Boot64x0.S2
-rw-r--r--dev/BootLoader/src/HEL/AMD64/BootATA.cc6
-rw-r--r--dev/BootLoader/src/HEL/AMD64/BootMain.cc19
-rw-r--r--dev/BootLoader/src/HEL/AMD64/BootPlatform.cc6
-rw-r--r--dev/BootLoader/src/HEL/AMD64/BootSATA.cc8
-rw-r--r--dev/BootLoader/src/HEL/ARM64/BootMain.cc2
-rw-r--r--dev/BootLoader/src/HEL/ARM64/BootPlatform.cc6
-rw-r--r--dev/BootLoader/src/HEL/POWER/CoreBootStartup.S2
-rw-r--r--dev/BootLoader/src/New+Delete.cc6
15 files changed, 36 insertions, 37 deletions
diff --git a/dev/BootLoader/src/BootFileReader.cc b/dev/BootLoader/src/BootFileReader.cc
index d5976464..1edf1281 100644
--- a/dev/BootLoader/src/BootFileReader.cc
+++ b/dev/BootLoader/src/BootFileReader.cc
@@ -1,6 +1,6 @@
/* -------------------------------------------
- Copyright (C) 2024, TQ B.V, all rights reserved.
+ Copyright (C) 2024, Theater Quality Inc, all rights reserved.
File: FileReader.cc
Purpose: New Boot FileReader,
diff --git a/dev/BootLoader/src/BootString.cc b/dev/BootLoader/src/BootString.cc
index 6ea95173..f511f2fc 100644
--- a/dev/BootLoader/src/BootString.cc
+++ b/dev/BootLoader/src/BootString.cc
@@ -1,6 +1,6 @@
/* -------------------------------------------
- Copyright (C) 2024, TQ B.V, all rights reserved.
+ Copyright (C) 2024, Theater Quality Inc, all rights reserved.
File: BootString.cc
Purpose: BootZ string library
diff --git a/dev/BootLoader/src/BootSupport.cc b/dev/BootLoader/src/BootSupport.cc
index 521fcd8f..bcd3b185 100644
--- a/dev/BootLoader/src/BootSupport.cc
+++ b/dev/BootLoader/src/BootSupport.cc
@@ -1,6 +1,6 @@
/* -------------------------------------------
- Copyright (C) 2024, TQ B.V, all rights reserved.
+ Copyright (C) 2024, Theater Quality Inc, all rights reserved.
------------------------------------------- */
@@ -12,7 +12,7 @@
#include <KernelKit/MSDOS.h>
#include <KernelKit/PE.h>
-#ifdef __STANDALONE__
+#ifdef __BOOTLDR_STANDALONE__
/// @brief memset definition in C++.
/// @param dst destination pointer.
diff --git a/dev/BootLoader/src/BootTextWriter.cc b/dev/BootLoader/src/BootTextWriter.cc
index 69a2ad47..bbb9a961 100644
--- a/dev/BootLoader/src/BootTextWriter.cc
+++ b/dev/BootLoader/src/BootTextWriter.cc
@@ -1,6 +1,6 @@
/* -------------------------------------------
- Copyright (C) 2024, TQ B.V, all rights reserved.
+ Copyright (C) 2024, Theater Quality Inc, all rights reserved.
File: BootTextWriter.cc
Purpose: BootZ string library
diff --git a/dev/BootLoader/src/BootThread.cc b/dev/BootLoader/src/BootThread.cc
index 33b058df..32f8fd86 100644
--- a/dev/BootLoader/src/BootThread.cc
+++ b/dev/BootLoader/src/BootThread.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/BootloaderRsrc.rsrc b/dev/BootLoader/src/BootloaderRsrc.rsrc
index dd20a78c..5cef7e7c 100644
--- a/dev/BootLoader/src/BootloaderRsrc.rsrc
+++ b/dev/BootLoader/src/BootloaderRsrc.rsrc
@@ -8,11 +8,11 @@ BEGIN
BEGIN
BLOCK "080904E4"
BEGIN
- VALUE "CompanyName", "TQ B.V"
+ VALUE "CompanyName", "Theater Quality Inc"
VALUE "FileDescription", "ZKA OS Loader."
VALUE "FileVersion", BOOTLOADER_VERSION
VALUE "InternalName", "zbaosldr"
- VALUE "LegalCopyright", "Copyright (C) 2024, TQ B.V all rights reserved."
+ VALUE "LegalCopyright", "Copyright (C) 2024, Theater Quality Inc all rights reserved."
VALUE "OriginalFilename", "zbaosldr.exe"
VALUE "ProductName", "zbaosldr"
VALUE "ProductVersion", BOOTLOADER_VERSION
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<VoidPtr*>(&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<BootDeviceATA>::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 <BootKit/Protocol.h>
#include <BootKit/BootKit.h>
-#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 <BootKit/Protocol.h>
#include <BootKit/BootKit.h>
-#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.
------------------------------------------- */
diff --git a/dev/BootLoader/src/New+Delete.cc b/dev/BootLoader/src/New+Delete.cc
index b654621e..3abf0ef3 100644
--- a/dev/BootLoader/src/New+Delete.cc
+++ b/dev/BootLoader/src/New+Delete.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 <BootKit/Protocol.h>
#include <BootKit/BootKit.h>
-#ifdef __STANDALONE__
+#ifdef __BOOTLDR_STANDALONE__
EXTERN EfiBootServices* BS;
/// @brief Allocates a new object.
@@ -57,4 +57,4 @@ void operator delete(void* buf, size_t size)
BS->FreePool(buf);
}
-#endif // __STANDALONE__
+#endif // __BOOTLDR_STANDALONE__
generated by cgit v1.2.3 (git 2.39.1) at 2026-03-14 07:36:45 +0000