From d48cbe75ef29a9c67c9d176bf58e56ea6448fb9e Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Mon, 21 Oct 2024 20:23:36 +0200 Subject: IMP: Major refactor of header and source files extensions. Signed-off-by: Amlal El Mahrouss --- dev/zba/Modules/NetBoot/Module.cc | 16 ++++++++++++++++ dev/zba/Modules/NetBoot/Module.cxx | 16 ---------------- dev/zba/Modules/NetBoot/NetBoot.h | 26 ++++++++++++++++++++++++++ dev/zba/Modules/NetBoot/NetBoot.hxx | 26 -------------------------- dev/zba/Modules/NetBoot/build.json | 2 +- dev/zba/Modules/SysChk/Module.cc | 22 ++++++++++++++++++++++ dev/zba/Modules/SysChk/Module.cxx | 22 ---------------------- dev/zba/Modules/SysChk/build.json | 2 +- 8 files changed, 66 insertions(+), 66 deletions(-) create mode 100644 dev/zba/Modules/NetBoot/Module.cc delete mode 100644 dev/zba/Modules/NetBoot/Module.cxx create mode 100644 dev/zba/Modules/NetBoot/NetBoot.h delete mode 100644 dev/zba/Modules/NetBoot/NetBoot.hxx create mode 100644 dev/zba/Modules/SysChk/Module.cc delete mode 100644 dev/zba/Modules/SysChk/Module.cxx (limited to 'dev/zba/Modules') diff --git a/dev/zba/Modules/NetBoot/Module.cc b/dev/zba/Modules/NetBoot/Module.cc new file mode 100644 index 00000000..15e63f83 --- /dev/null +++ b/dev/zba/Modules/NetBoot/Module.cc @@ -0,0 +1,16 @@ +/* + * ======================================================== + * + * NetBoot + * Copyright ZKA Web Services Co., all rights reserved. + * + * ======================================================== + */ + +#include +#include + +EXTERN_C Int32 main(Kernel::HEL::HANDOVER_INFO_HEADER* Handover) +{ + return kEfiOk; +} diff --git a/dev/zba/Modules/NetBoot/Module.cxx b/dev/zba/Modules/NetBoot/Module.cxx deleted file mode 100644 index 3b75b3b2..00000000 --- a/dev/zba/Modules/NetBoot/Module.cxx +++ /dev/null @@ -1,16 +0,0 @@ -/* - * ======================================================== - * - * NetBoot - * Copyright ZKA Web Services Co., all rights reserved. - * - * ======================================================== - */ - -#include -#include - -EXTERN_C Int32 main(Kernel::HEL::HANDOVER_INFO_HEADER* Handover) -{ - return kEfiOk; -} diff --git a/dev/zba/Modules/NetBoot/NetBoot.h b/dev/zba/Modules/NetBoot/NetBoot.h new file mode 100644 index 00000000..8645a822 --- /dev/null +++ b/dev/zba/Modules/NetBoot/NetBoot.h @@ -0,0 +1,26 @@ +/* + * ======================================================== + * + * NetBoot + * Copyright ZKA Web Services Co., 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/zba/Modules/NetBoot/NetBoot.hxx b/dev/zba/Modules/NetBoot/NetBoot.hxx deleted file mode 100644 index bb0127a2..00000000 --- a/dev/zba/Modules/NetBoot/NetBoot.hxx +++ /dev/null @@ -1,26 +0,0 @@ -/* - * ======================================================== - * - * NetBoot - * Copyright ZKA Web Services Co., 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/zba/Modules/NetBoot/build.json b/dev/zba/Modules/NetBoot/build.json index f03fc06c..dfa39ac5 100644 --- a/dev/zba/Modules/NetBoot/build.json +++ b/dev/zba/Modules/NetBoot/build.json @@ -2,7 +2,7 @@ "compiler_path": "x86_64-w64-mingw32-g++", "compiler_std": "c++20", "headers_path": ["../", "../../", "../../../zka", "../../../", "./"], - "sources_path": ["*.cxx", "*.S"], + "sources_path": [".cc", "*.S"], "output_name": "netboot.sys", "compiler_flags": [ "-ffreestanding", diff --git a/dev/zba/Modules/SysChk/Module.cc b/dev/zba/Modules/SysChk/Module.cc new file mode 100644 index 00000000..74f7c661 --- /dev/null +++ b/dev/zba/Modules/SysChk/Module.cc @@ -0,0 +1,22 @@ +/* + * ======================================================== + * + * NetBoot + * Copyright ZKA Web Services Co., all rights reserved. + * + * ======================================================== + */ + +#include + +EXTERN_C Int32 ModuleMain(Kernel::HEL::HANDOVER_INFO_HEADER* Handover) +{ + EfiSystemTable* cST = (EfiSystemTable*)Handover->f_FirmwareCustomTables[1]; + + cST->ConOut->ClearScreen(cST->ConOut); + + cST->ConOut->OutputString(cST->ConOut, L"SYSCHK: CHECKING FOR VALID NEFS OR HPFS PARTITIONS...\r\n"); + cST->ConOut->OutputString(cST->ConOut, L"SYSCHK: GOOD TO GO!\r\n"); + + return kEfiOk; +} diff --git a/dev/zba/Modules/SysChk/Module.cxx b/dev/zba/Modules/SysChk/Module.cxx deleted file mode 100644 index f8770686..00000000 --- a/dev/zba/Modules/SysChk/Module.cxx +++ /dev/null @@ -1,22 +0,0 @@ -/* - * ======================================================== - * - * NetBoot - * Copyright ZKA Web Services Co., all rights reserved. - * - * ======================================================== - */ - -#include - -EXTERN_C Int32 ModuleMain(Kernel::HEL::HANDOVER_INFO_HEADER* Handover) -{ - EfiSystemTable* cST = (EfiSystemTable*)Handover->f_FirmwareCustomTables[1]; - - cST->ConOut->ClearScreen(cST->ConOut); - - cST->ConOut->OutputString(cST->ConOut, L"SYSCHK: CHECKING FOR VALID NEFS OR HPFS PARTITIONS...\r\n"); - cST->ConOut->OutputString(cST->ConOut, L"SYSCHK: GOOD TO GO!\r\n"); - - return kEfiOk; -} diff --git a/dev/zba/Modules/SysChk/build.json b/dev/zba/Modules/SysChk/build.json index 477a3ae5..7587d0a2 100644 --- a/dev/zba/Modules/SysChk/build.json +++ b/dev/zba/Modules/SysChk/build.json @@ -2,7 +2,7 @@ "compiler_path": "x86_64-w64-mingw32-g++", "compiler_std": "c++20", "headers_path": ["../", "../../", "../../../zka", "../../../", "./"], - "sources_path": ["*.cxx", "*.S"], + "sources_path": [".cc", "*.S"], "output_name": "syschk.sys", "compiler_flags": [ "-ffreestanding", -- cgit v1.2.3