From 4185fcc698e237225902646736c6b23f6b5e54be Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Sat, 24 Aug 2024 08:51:21 +0200 Subject: [IMP+REFACTORS] See below. + Add SysChk driver instead of BootScr. + Working on AHCI driver, did progress on detection, need to find out why the signature are set to zero. + Refactor PE loader structures. Add BecomeBusMaster call when probing AHCI disk. + Alongside some other modifications. Signed-off-by: Amlal El Mahrouss --- dev/ZBA/Modules/BootScr/.hgkeep | 0 dev/ZBA/Modules/BootScr/Boot.S | 28 ---------------------------- dev/ZBA/Modules/BootScr/Module.cxx | 15 --------------- dev/ZBA/Modules/BootScr/build.json | 25 ------------------------- dev/ZBA/Modules/BootScr/compile_flags.txt | 8 -------- dev/ZBA/Modules/SysChk/.hgkeep | 0 dev/ZBA/Modules/SysChk/Boot.S | 28 ++++++++++++++++++++++++++++ dev/ZBA/Modules/SysChk/Module.cxx | 15 +++++++++++++++ dev/ZBA/Modules/SysChk/build.json | 25 +++++++++++++++++++++++++ dev/ZBA/Modules/SysChk/compile_flags.txt | 8 ++++++++ 10 files changed, 76 insertions(+), 76 deletions(-) delete mode 100644 dev/ZBA/Modules/BootScr/.hgkeep delete mode 100644 dev/ZBA/Modules/BootScr/Boot.S delete mode 100644 dev/ZBA/Modules/BootScr/Module.cxx delete mode 100644 dev/ZBA/Modules/BootScr/build.json delete mode 100644 dev/ZBA/Modules/BootScr/compile_flags.txt create mode 100644 dev/ZBA/Modules/SysChk/.hgkeep create mode 100644 dev/ZBA/Modules/SysChk/Boot.S create mode 100644 dev/ZBA/Modules/SysChk/Module.cxx create mode 100644 dev/ZBA/Modules/SysChk/build.json create mode 100644 dev/ZBA/Modules/SysChk/compile_flags.txt (limited to 'dev/ZBA/Modules') diff --git a/dev/ZBA/Modules/BootScr/.hgkeep b/dev/ZBA/Modules/BootScr/.hgkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/dev/ZBA/Modules/BootScr/Boot.S b/dev/ZBA/Modules/BootScr/Boot.S deleted file mode 100644 index ce9f36b1..00000000 --- a/dev/ZBA/Modules/BootScr/Boot.S +++ /dev/null @@ -1,28 +0,0 @@ -;; /* -;; * ======================================================== -;; * -;; * ZKA -;; * Copyright ZKA Technologies., 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/ZBA/Modules/BootScr/Module.cxx b/dev/ZBA/Modules/BootScr/Module.cxx deleted file mode 100644 index 15758599..00000000 --- a/dev/ZBA/Modules/BootScr/Module.cxx +++ /dev/null @@ -1,15 +0,0 @@ -/* - * ======================================================== - * - * NetBoot - * Copyright ZKA Technologies., all rights reserved. - * - * ======================================================== - */ - -#include - -EXTERN_C Int32 main(Kernel::HEL::HandoverInformationHeader* Handover) -{ - return kEfiOk; -} diff --git a/dev/ZBA/Modules/BootScr/build.json b/dev/ZBA/Modules/BootScr/build.json deleted file mode 100644 index c53c6faa..00000000 --- a/dev/ZBA/Modules/BootScr/build.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "compiler_path": "x86_64-w64-mingw32-g++", - "compiler_std": "c++20", - "headers_path": ["../", "../../", "../../../ZKA", "../../../", "./"], - "sources_path": ["*.cxx", "*.S"], - "output_name": "bootscr.sys", - "compiler_flags": [ - "-ffreestanding", - "-nostdlib", - "-std=c++20", - "-fPIC", - "-fno-rtti", - "-fno-exceptions", - "-Wl,--subsystem=17,--image-base 0x10000000" - ], - "cpp_macros": [ - "__NEWOSKRNL__", - "__NEWOSLDR__", - "__ZKA_AMD64__", - "__BOOTSCR__", - "cSCRVersionHighest=0x0100", - "cSCRVersionLowest=0x0100", - "cSCRVersion=0x0100" - ] -} diff --git a/dev/ZBA/Modules/BootScr/compile_flags.txt b/dev/ZBA/Modules/BootScr/compile_flags.txt deleted file mode 100644 index 6ab76da0..00000000 --- a/dev/ZBA/Modules/BootScr/compile_flags.txt +++ /dev/null @@ -1,8 +0,0 @@ --std=c++20 --I../ --I../../ --I../../Kernel --D__ZKA_AMD64__ --std=c++20 --D__x86_64__ --D__ZKA_OTA__ diff --git a/dev/ZBA/Modules/SysChk/.hgkeep b/dev/ZBA/Modules/SysChk/.hgkeep new file mode 100644 index 00000000..e69de29b diff --git a/dev/ZBA/Modules/SysChk/Boot.S b/dev/ZBA/Modules/SysChk/Boot.S new file mode 100644 index 00000000..ce9f36b1 --- /dev/null +++ b/dev/ZBA/Modules/SysChk/Boot.S @@ -0,0 +1,28 @@ +;; /* +;; * ======================================================== +;; * +;; * ZKA +;; * Copyright ZKA Technologies., 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/ZBA/Modules/SysChk/Module.cxx b/dev/ZBA/Modules/SysChk/Module.cxx new file mode 100644 index 00000000..15758599 --- /dev/null +++ b/dev/ZBA/Modules/SysChk/Module.cxx @@ -0,0 +1,15 @@ +/* + * ======================================================== + * + * NetBoot + * Copyright ZKA Technologies., all rights reserved. + * + * ======================================================== + */ + +#include + +EXTERN_C Int32 main(Kernel::HEL::HandoverInformationHeader* Handover) +{ + return kEfiOk; +} diff --git a/dev/ZBA/Modules/SysChk/build.json b/dev/ZBA/Modules/SysChk/build.json new file mode 100644 index 00000000..aff1e78a --- /dev/null +++ b/dev/ZBA/Modules/SysChk/build.json @@ -0,0 +1,25 @@ +{ + "compiler_path": "x86_64-w64-mingw32-g++", + "compiler_std": "c++20", + "headers_path": ["../", "../../", "../../../ZKA", "../../../", "./"], + "sources_path": ["*.cxx", "*.S"], + "output_name": "syschk.sys", + "compiler_flags": [ + "-ffreestanding", + "-nostdlib", + "-std=c++20", + "-fPIC", + "-fno-rtti", + "-fno-exceptions", + "-Wl,--subsystem=17,--image-base 0x10000000" + ], + "cpp_macros": [ + "__NEWOSKRNL__", + "__NEWOSLDR__", + "__ZKA_AMD64__", + "__BOOTSCR__", + "cSCRVersionHighest=0x0100", + "cSCRVersionLowest=0x0100", + "cSCRVersion=0x0100" + ] +} diff --git a/dev/ZBA/Modules/SysChk/compile_flags.txt b/dev/ZBA/Modules/SysChk/compile_flags.txt new file mode 100644 index 00000000..6ab76da0 --- /dev/null +++ b/dev/ZBA/Modules/SysChk/compile_flags.txt @@ -0,0 +1,8 @@ +-std=c++20 +-I../ +-I../../ +-I../../Kernel +-D__ZKA_AMD64__ +-std=c++20 +-D__x86_64__ +-D__ZKA_OTA__ -- cgit v1.2.3