From bce9420fb8dd066188900d44248453a11a3d08d5 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Thu, 26 Dec 2024 21:49:37 +0100 Subject: META: Overall improvements and fixes to ZkaOS. Signed-off-by: Amlal El Mahrouss --- dev/Boot/Mod/.keep | 0 dev/Boot/Mod/NetBoot/.hgkeep | 0 dev/Boot/Mod/NetBoot/Boot.S | 28 ++++++++++++++++++++++ dev/Boot/Mod/NetBoot/Module.cc | 16 +++++++++++++ dev/Boot/Mod/NetBoot/NetBoot.h | 26 ++++++++++++++++++++ dev/Boot/Mod/NetBoot/build.json | 24 +++++++++++++++++++ dev/Boot/Mod/SysChk/.hgkeep | 0 dev/Boot/Mod/SysChk/Boot.S | 20 ++++++++++++++++ dev/Boot/Mod/SysChk/Module.cc | 47 +++++++++++++++++++++++++++++++++++++ dev/Boot/Mod/SysChk/build.json | 24 +++++++++++++++++++ dev/Boot/Modules/.keep | 0 dev/Boot/Modules/NetBoot/.hgkeep | 0 dev/Boot/Modules/NetBoot/Boot.S | 28 ---------------------- dev/Boot/Modules/NetBoot/Module.cc | 16 ------------- dev/Boot/Modules/NetBoot/NetBoot.h | 26 -------------------- dev/Boot/Modules/NetBoot/build.json | 24 ------------------- dev/Boot/Modules/SysChk/.hgkeep | 0 dev/Boot/Modules/SysChk/Boot.S | 20 ---------------- dev/Boot/Modules/SysChk/Module.cc | 47 ------------------------------------- dev/Boot/Modules/SysChk/build.json | 24 ------------------- dev/Boot/src/HEL/AMD64/BootMain.cc | 2 +- 21 files changed, 186 insertions(+), 186 deletions(-) create mode 100644 dev/Boot/Mod/.keep create mode 100644 dev/Boot/Mod/NetBoot/.hgkeep create mode 100644 dev/Boot/Mod/NetBoot/Boot.S create mode 100644 dev/Boot/Mod/NetBoot/Module.cc create mode 100644 dev/Boot/Mod/NetBoot/NetBoot.h create mode 100644 dev/Boot/Mod/NetBoot/build.json create mode 100644 dev/Boot/Mod/SysChk/.hgkeep create mode 100644 dev/Boot/Mod/SysChk/Boot.S create mode 100644 dev/Boot/Mod/SysChk/Module.cc create mode 100644 dev/Boot/Mod/SysChk/build.json delete mode 100644 dev/Boot/Modules/.keep delete mode 100644 dev/Boot/Modules/NetBoot/.hgkeep delete mode 100644 dev/Boot/Modules/NetBoot/Boot.S delete mode 100644 dev/Boot/Modules/NetBoot/Module.cc delete mode 100644 dev/Boot/Modules/NetBoot/NetBoot.h delete mode 100644 dev/Boot/Modules/NetBoot/build.json delete mode 100644 dev/Boot/Modules/SysChk/.hgkeep delete mode 100644 dev/Boot/Modules/SysChk/Boot.S delete mode 100644 dev/Boot/Modules/SysChk/Module.cc delete mode 100644 dev/Boot/Modules/SysChk/build.json (limited to 'dev/Boot') diff --git a/dev/Boot/Mod/.keep b/dev/Boot/Mod/.keep new file mode 100644 index 00000000..e69de29b diff --git a/dev/Boot/Mod/NetBoot/.hgkeep b/dev/Boot/Mod/NetBoot/.hgkeep new file mode 100644 index 00000000..e69de29b diff --git a/dev/Boot/Mod/NetBoot/Boot.S b/dev/Boot/Mod/NetBoot/Boot.S new file mode 100644 index 00000000..0527e509 --- /dev/null +++ b/dev/Boot/Mod/NetBoot/Boot.S @@ -0,0 +1,28 @@ +;; /* +;; * ======================================================== +;; * +;; * BootZ +;; * Copyright (C) 2024, Theater Quality Inc, all rights reserved., all rights reserved. +;; * +;; * ======================================================== +;; */ + +.code64 +.intel_syntax noprefix + +#define kTypeDriver 101 +#define kArchAmd64 122 +#define kHandoverMagic 0xBADCC + +.section .ldr + +.quad kHandoverMagic +.word kTypeDriver + +.text + +.extern main +.global __main + +__main: + ret diff --git a/dev/Boot/Mod/NetBoot/Module.cc b/dev/Boot/Mod/NetBoot/Module.cc new file mode 100644 index 00000000..6277da70 --- /dev/null +++ b/dev/Boot/Mod/NetBoot/Module.cc @@ -0,0 +1,16 @@ +/* + * ======================================================== + * + * NetBoot + * Copyright (C) 2024, Theater Quality Inc, all rights reserved., all rights reserved. + * + * ======================================================== + */ + +#include +#include + +EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* Handover) +{ + return kEfiOk; +} diff --git a/dev/Boot/Mod/NetBoot/NetBoot.h b/dev/Boot/Mod/NetBoot/NetBoot.h new file mode 100644 index 00000000..cdfe17f9 --- /dev/null +++ b/dev/Boot/Mod/NetBoot/NetBoot.h @@ -0,0 +1,26 @@ +/* + * ======================================================== + * + * NetBoot + * Copyright (C) 2024, Theater Quality Inc, all rights reserved., all rights reserved. + * + * ======================================================== + */ + +#pragma once + +#include + +/// @brief the internet header is used to download updates OTA. +typedef struct NetBootInternetHeader +{ + Kernel::Char NB1; /// magic char 1 'N' + Kernel::Char NB2; /// magic char 2 'E' + Kernel::Char NB3; /// magic char 3 'T' + Kernel::Char NB4; /// magic char 4 'B' + + Kernel::Char PatchName[255]; /// example: ColdChoco + Kernel::Int32 PatchLength; /// the patch length. + Kernel::Char PatchTarget[255]; /// the target file. + Kernel::Boolean ImpliesROM; /// does it imply an EEPROM reprogram? +} NetBootInternetHeader; diff --git a/dev/Boot/Mod/NetBoot/build.json b/dev/Boot/Mod/NetBoot/build.json new file mode 100644 index 00000000..9df27b3c --- /dev/null +++ b/dev/Boot/Mod/NetBoot/build.json @@ -0,0 +1,24 @@ +{ + "compiler_path": "x86_64-w64-mingw32-g++", + "compiler_std": "c++20", + "headers_path": ["../", "../../", "../../../Kernel", "../../../", "./"], + "sources_path": [".cc", "*.S"], + "output_name": "netboot.sys", + "compiler_flags": [ + "-ffreestanding", + "-nostdlib", + "-std=c++20", + "-fPIC", + "-fno-rtti", + "-fno-exceptions", + "-Wl,--subsystem=17,--image-base,0x10000000,-e,ModuleMain" + ], + "cpp_macros": [ + "__MINOSKRNL__", + "__ZBAOSLDR__", + "__ZKA_AMD64__", + "kNetBootVersionHighest=0x0100", + "kNetBootVersionLowest=0x0100", + "kNetBootVersion=0x0100" + ] +} diff --git a/dev/Boot/Mod/SysChk/.hgkeep b/dev/Boot/Mod/SysChk/.hgkeep new file mode 100644 index 00000000..e69de29b diff --git a/dev/Boot/Mod/SysChk/Boot.S b/dev/Boot/Mod/SysChk/Boot.S new file mode 100644 index 00000000..9fdf4428 --- /dev/null +++ b/dev/Boot/Mod/SysChk/Boot.S @@ -0,0 +1,20 @@ +;; /* +;; * ======================================================== +;; * +;; * BootZ +;; * Copyright (C) 2024, Theater Quality Inc, all rights reserved., all rights reserved. +;; * +;; * ======================================================== +;; */ + +.code64 +.intel_syntax noprefix + +#define kTypeDriver 101 +#define kArchAmd64 122 +#define kHandoverMagic 0xBADCC + +.section .ldr + +.quad kHandoverMagic +.word kTypeDriver diff --git a/dev/Boot/Mod/SysChk/Module.cc b/dev/Boot/Mod/SysChk/Module.cc new file mode 100644 index 00000000..a48e524c --- /dev/null +++ b/dev/Boot/Mod/SysChk/Module.cc @@ -0,0 +1,47 @@ +/* + * ======================================================== + * + * NetBoot + * Copyright (C) 2024, Theater Quality Inc, all rights reserved., all rights reserved. + * + * ======================================================== + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* Handover) +{ + EfiSystemTable* system_table = (EfiSystemTable*)Handover->f_FirmwareCustomTables[1]; + + EfiInputKey key{}; + + system_table->ConIn->ReadKeyStroke(system_table->ConIn, &key); + + if (key.UnicodeChar == 'F' || + key.UnicodeChar == 'f') + { + UI::ui_draw_background(); + + 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); + + fb_fini(); + + return kEfiOk; + } + + return kEfiFail; +} diff --git a/dev/Boot/Mod/SysChk/build.json b/dev/Boot/Mod/SysChk/build.json new file mode 100644 index 00000000..cd21e269 --- /dev/null +++ b/dev/Boot/Mod/SysChk/build.json @@ -0,0 +1,24 @@ +{ + "compiler_path": "x86_64-w64-mingw32-g++", + "compiler_std": "c++20", + "headers_path": ["../", "../../", "../../../Kernel", "../../../", "./"], + "sources_path": ["*.cc", "*.S"], + "output_name": "syschk.sys", + "compiler_flags": [ + "-ffreestanding", + "-nostdlib", + "-std=c++20", + "-fPIC", + "-fno-rtti", + "-fno-exceptions", + "-Wl,--subsystem=17,--image-base,0x10000000,-e,ModuleMain" + ], + "cpp_macros": [ + "__MINOSKRNL__", + "__ZBAOSLDR__", + "__ZKA_AMD64__", + "kChkVersionHighest=0x0100", + "kChkVersionLowest=0x0100", + "kChkVersion=0x0100" + ] +} diff --git a/dev/Boot/Modules/.keep b/dev/Boot/Modules/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/dev/Boot/Modules/NetBoot/.hgkeep b/dev/Boot/Modules/NetBoot/.hgkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/dev/Boot/Modules/NetBoot/Boot.S b/dev/Boot/Modules/NetBoot/Boot.S deleted file mode 100644 index 0527e509..00000000 --- a/dev/Boot/Modules/NetBoot/Boot.S +++ /dev/null @@ -1,28 +0,0 @@ -;; /* -;; * ======================================================== -;; * -;; * BootZ -;; * Copyright (C) 2024, Theater Quality Inc, all rights reserved., all rights reserved. -;; * -;; * ======================================================== -;; */ - -.code64 -.intel_syntax noprefix - -#define kTypeDriver 101 -#define kArchAmd64 122 -#define kHandoverMagic 0xBADCC - -.section .ldr - -.quad kHandoverMagic -.word kTypeDriver - -.text - -.extern main -.global __main - -__main: - ret diff --git a/dev/Boot/Modules/NetBoot/Module.cc b/dev/Boot/Modules/NetBoot/Module.cc deleted file mode 100644 index 6277da70..00000000 --- a/dev/Boot/Modules/NetBoot/Module.cc +++ /dev/null @@ -1,16 +0,0 @@ -/* - * ======================================================== - * - * NetBoot - * Copyright (C) 2024, Theater Quality Inc, all rights reserved., all rights reserved. - * - * ======================================================== - */ - -#include -#include - -EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* Handover) -{ - return kEfiOk; -} diff --git a/dev/Boot/Modules/NetBoot/NetBoot.h b/dev/Boot/Modules/NetBoot/NetBoot.h deleted file mode 100644 index cdfe17f9..00000000 --- a/dev/Boot/Modules/NetBoot/NetBoot.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * ======================================================== - * - * NetBoot - * Copyright (C) 2024, Theater Quality Inc, all rights reserved., all rights reserved. - * - * ======================================================== - */ - -#pragma once - -#include - -/// @brief the internet header is used to download updates OTA. -typedef struct NetBootInternetHeader -{ - Kernel::Char NB1; /// magic char 1 'N' - Kernel::Char NB2; /// magic char 2 'E' - Kernel::Char NB3; /// magic char 3 'T' - Kernel::Char NB4; /// magic char 4 'B' - - Kernel::Char PatchName[255]; /// example: ColdChoco - Kernel::Int32 PatchLength; /// the patch length. - Kernel::Char PatchTarget[255]; /// the target file. - Kernel::Boolean ImpliesROM; /// does it imply an EEPROM reprogram? -} NetBootInternetHeader; diff --git a/dev/Boot/Modules/NetBoot/build.json b/dev/Boot/Modules/NetBoot/build.json deleted file mode 100644 index 9df27b3c..00000000 --- a/dev/Boot/Modules/NetBoot/build.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "compiler_path": "x86_64-w64-mingw32-g++", - "compiler_std": "c++20", - "headers_path": ["../", "../../", "../../../Kernel", "../../../", "./"], - "sources_path": [".cc", "*.S"], - "output_name": "netboot.sys", - "compiler_flags": [ - "-ffreestanding", - "-nostdlib", - "-std=c++20", - "-fPIC", - "-fno-rtti", - "-fno-exceptions", - "-Wl,--subsystem=17,--image-base,0x10000000,-e,ModuleMain" - ], - "cpp_macros": [ - "__MINOSKRNL__", - "__ZBAOSLDR__", - "__ZKA_AMD64__", - "kNetBootVersionHighest=0x0100", - "kNetBootVersionLowest=0x0100", - "kNetBootVersion=0x0100" - ] -} diff --git a/dev/Boot/Modules/SysChk/.hgkeep b/dev/Boot/Modules/SysChk/.hgkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/dev/Boot/Modules/SysChk/Boot.S b/dev/Boot/Modules/SysChk/Boot.S deleted file mode 100644 index 9fdf4428..00000000 --- a/dev/Boot/Modules/SysChk/Boot.S +++ /dev/null @@ -1,20 +0,0 @@ -;; /* -;; * ======================================================== -;; * -;; * BootZ -;; * Copyright (C) 2024, Theater Quality Inc, all rights reserved., all rights reserved. -;; * -;; * ======================================================== -;; */ - -.code64 -.intel_syntax noprefix - -#define kTypeDriver 101 -#define kArchAmd64 122 -#define kHandoverMagic 0xBADCC - -.section .ldr - -.quad kHandoverMagic -.word kTypeDriver diff --git a/dev/Boot/Modules/SysChk/Module.cc b/dev/Boot/Modules/SysChk/Module.cc deleted file mode 100644 index a48e524c..00000000 --- a/dev/Boot/Modules/SysChk/Module.cc +++ /dev/null @@ -1,47 +0,0 @@ -/* - * ======================================================== - * - * NetBoot - * Copyright (C) 2024, Theater Quality Inc, all rights reserved., all rights reserved. - * - * ======================================================== - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* Handover) -{ - EfiSystemTable* system_table = (EfiSystemTable*)Handover->f_FirmwareCustomTables[1]; - - EfiInputKey key{}; - - system_table->ConIn->ReadKeyStroke(system_table->ConIn, &key); - - if (key.UnicodeChar == 'F' || - key.UnicodeChar == 'f') - { - UI::ui_draw_background(); - - 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); - - fb_fini(); - - return kEfiOk; - } - - return kEfiFail; -} diff --git a/dev/Boot/Modules/SysChk/build.json b/dev/Boot/Modules/SysChk/build.json deleted file mode 100644 index cd21e269..00000000 --- a/dev/Boot/Modules/SysChk/build.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "compiler_path": "x86_64-w64-mingw32-g++", - "compiler_std": "c++20", - "headers_path": ["../", "../../", "../../../Kernel", "../../../", "./"], - "sources_path": ["*.cc", "*.S"], - "output_name": "syschk.sys", - "compiler_flags": [ - "-ffreestanding", - "-nostdlib", - "-std=c++20", - "-fPIC", - "-fno-rtti", - "-fno-exceptions", - "-Wl,--subsystem=17,--image-base,0x10000000,-e,ModuleMain" - ], - "cpp_macros": [ - "__MINOSKRNL__", - "__ZBAOSLDR__", - "__ZKA_AMD64__", - "kChkVersionHighest=0x0100", - "kChkVersionLowest=0x0100", - "kChkVersion=0x0100" - ] -} diff --git a/dev/Boot/src/HEL/AMD64/BootMain.cc b/dev/Boot/src/HEL/AMD64/BootMain.cc index 51a49d0f..29238413 100644 --- a/dev/Boot/src/HEL/AMD64/BootMain.cc +++ b/dev/Boot/src/HEL/AMD64/BootMain.cc @@ -232,7 +232,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle, root.fKind = kNeFSCatalogKindDir; - partition_factory.Format("FileSystem (A:) ", &root, 1); + partition_factory.Format("Zka HD", &root, 1); UI::ui_draw_background(); -- cgit v1.2.3