diff options
| author | Amlal EL Mahrouss <amlalelmahrouss@icloud.com> | 2024-08-14 17:10:37 +0200 |
|---|---|---|
| committer | Amlal EL Mahrouss <amlalelmahrouss@icloud.com> | 2024-08-14 17:10:37 +0200 |
| commit | 69d31491b5d671ed4b4c041e10b05c20d543bd9e (patch) | |
| tree | 85f66a33a03717c07c8cb1d1a54d2f68b10a0baf | |
| parent | 682763126fe9e293b9db75369fe01e228168561b (diff) | |
[META] BUMP.
Signed-off-by: Amlal EL Mahrouss <amlalelmahrouss@icloud.com>
| -rw-r--r-- | Boot/Modules/BootScr/.hgkeep | 0 | ||||
| -rw-r--r-- | Boot/Modules/BootScr/Module.cxx | 19 | ||||
| -rw-r--r-- | Boot/Modules/BootScr/compile_flags.txt | 8 | ||||
| -rw-r--r-- | Boot/Modules/NetBoot/Module.cxx | 7 | ||||
| -rw-r--r-- | Boot/Modules/NetBoot/manifest.json | 4 | ||||
| -rw-r--r-- | Boot/Sources/HEL/AMD64/BootMain.cxx | 4 | ||||
| -rw-r--r-- | Boot/Sources/Root/ZKA/boot-scr.bmp | bin | 0 -> 11059254 bytes | |||
| -rw-r--r-- | Boot/Sources/Root/ZKA/cmd.json | 5 | ||||
| -rw-r--r-- | Boot/Sources/Root/ZKA/fonts.json | 2 |
9 files changed, 36 insertions, 13 deletions
diff --git a/Boot/Modules/BootScr/.hgkeep b/Boot/Modules/BootScr/.hgkeep new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/Boot/Modules/BootScr/.hgkeep diff --git a/Boot/Modules/BootScr/Module.cxx b/Boot/Modules/BootScr/Module.cxx new file mode 100644 index 00000000..11bbb6c0 --- /dev/null +++ b/Boot/Modules/BootScr/Module.cxx @@ -0,0 +1,19 @@ +/* + * ======================================================== + * + * NetBoot + * Copyright ZKA Technologies., all rights reserved. + * + * ======================================================== + */ + +#include <BootKit/BootKit.hxx> + +EXTERN EfiSystemTable* ST; + +EXTERN_C Int32 ModuleMain(Void) +{ + ST->ConOut->ClearScreen(ST->ConOut); + + return kEfiOk; +} diff --git a/Boot/Modules/BootScr/compile_flags.txt b/Boot/Modules/BootScr/compile_flags.txt new file mode 100644 index 00000000..f9ca281f --- /dev/null +++ b/Boot/Modules/BootScr/compile_flags.txt @@ -0,0 +1,8 @@ +-std=c++20 +-I../ +-I../../ +-I../../Kernel +-D__NEWOS_AMD64__ +-std=c++20 +-D__x86_64__ +-D__NEWOS_OTA__ diff --git a/Boot/Modules/NetBoot/Module.cxx b/Boot/Modules/NetBoot/Module.cxx index a39755bc..9bc65eda 100644 --- a/Boot/Modules/NetBoot/Module.cxx +++ b/Boot/Modules/NetBoot/Module.cxx @@ -10,9 +10,14 @@ #include <BootKit/BootKit.hxx> #include <NetBoot/NetBoot.hxx> +EXTERN EfiSystemTable* ST; + EXTERN_C Int32 ModuleMain(Void) { - /// - Find a network drive called "\\Remote\\newoskrnl" with fork 'From-NetBoot' + ST->ConOut->ClearScreen(ST->ConOut); + + /// @todo + /// - Find a network drive called "\.\newoskrnl.dll" with fork 'For-NewOSLdr' in the network path. (NewFS formatted disk as well!) /// - Download our image /// - Boot from it. diff --git a/Boot/Modules/NetBoot/manifest.json b/Boot/Modules/NetBoot/manifest.json deleted file mode 100644 index bb3a509e..00000000 --- a/Boot/Modules/NetBoot/manifest.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "pluginName": "NetBoot", - "description": "Boot NewOS from a network volume." -} diff --git a/Boot/Sources/HEL/AMD64/BootMain.cxx b/Boot/Sources/HEL/AMD64/BootMain.cxx index d47b23a3..a1d5ab07 100644 --- a/Boot/Sources/HEL/AMD64/BootMain.cxx +++ b/Boot/Sources/HEL/AMD64/BootMain.cxx @@ -208,7 +208,7 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle, root.fKind = kNewFSCatalogKindDir; - checkPart.Format("NewOS (ZKA:)", &root, 1); + checkPart.Format("ZKA (C:)", &root, 1); EFI::Stop(); } @@ -232,7 +232,7 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle, if (readerKernel.Blob()) { loader = new Boot::Thread(readerKernel.Blob()); - loader->SetName("\"newoskrnl.dll\" (64-bit SMP DLL)"); + loader->SetName("64-bit Kernel SMP DLL."); } writer.Write("newosldr: Running: ").Write(loader->GetName()).Write("\r"); diff --git a/Boot/Sources/Root/ZKA/boot-scr.bmp b/Boot/Sources/Root/ZKA/boot-scr.bmp Binary files differnew file mode 100644 index 00000000..f901bb28 --- /dev/null +++ b/Boot/Sources/Root/ZKA/boot-scr.bmp diff --git a/Boot/Sources/Root/ZKA/cmd.json b/Boot/Sources/Root/ZKA/cmd.json deleted file mode 100644 index 213974f5..00000000 --- a/Boot/Sources/Root/ZKA/cmd.json +++ /dev/null @@ -1,5 +0,0 @@ -{
- "SMP": true,
- "GUI": true
- }
-
\ No newline at end of file diff --git a/Boot/Sources/Root/ZKA/fonts.json b/Boot/Sources/Root/ZKA/fonts.json index e804c2e7..05487cec 100644 --- a/Boot/Sources/Root/ZKA/fonts.json +++ b/Boot/Sources/Root/ZKA/fonts.json @@ -1,4 +1,4 @@ { "font_pkg_src": "*.ttf", - "font_pkg_name": "ZKA Fonts." + "font_pkg_name": "ZKA Standard Fonts." } |
