From 4e7ea02ed492a1fc0b167392361673244f957cce Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Sun, 3 Nov 2024 19:58:43 +0100 Subject: IMP: Refactor btb rules of SysChk, NetBoot and MakeFramework/MakeApp. IMP: Rename tools directory to apps. Signed-off-by: Amlal El Mahrouss --- dev/SCIKit/build.json | 1 - dev/ZBAKit/Modules/NetBoot/build.json | 7 +++---- dev/ZBAKit/Modules/SysChk/Module.cc | 8 ++++---- dev/ZBAKit/Modules/SysChk/build.json | 7 +++---- 4 files changed, 10 insertions(+), 13 deletions(-) (limited to 'dev') diff --git a/dev/SCIKit/build.json b/dev/SCIKit/build.json index cc5cf796..12390d73 100644 --- a/dev/SCIKit/build.json +++ b/dev/SCIKit/build.json @@ -13,7 +13,6 @@ "-Wl,--subsystem=17" ], "cpp_macros": [ - "__SCI_IMPL__", "kSCIVersion=0x0100", "kSCIVersionHighest=0x0100", "kSCIVersionLowest=0x0100" diff --git a/dev/ZBAKit/Modules/NetBoot/build.json b/dev/ZBAKit/Modules/NetBoot/build.json index 0f86ed86..df033057 100644 --- a/dev/ZBAKit/Modules/NetBoot/build.json +++ b/dev/ZBAKit/Modules/NetBoot/build.json @@ -17,9 +17,8 @@ "__NEWOSKRNL__", "__NEWOSLDR__", "__ZKA_AMD64__", - "__BOOTSCR__", - "cSCRVersionHighest=0x0100", - "cSCRVersionLowest=0x0100", - "cSCRVersion=0x0100" + "kNetBootVersionHighest=0x0100", + "kNetBootVersionLowest=0x0100", + "kNetBootVersion=0x0100" ] } diff --git a/dev/ZBAKit/Modules/SysChk/Module.cc b/dev/ZBAKit/Modules/SysChk/Module.cc index 2b82b2f1..c8a01050 100644 --- a/dev/ZBAKit/Modules/SysChk/Module.cc +++ b/dev/ZBAKit/Modules/SysChk/Module.cc @@ -11,12 +11,12 @@ EXTERN_C Int32 ModuleMain(Kernel::HEL::HANDOVER_INFO_HEADER* Handover) { - EfiSystemTable* cST = (EfiSystemTable*)Handover->f_FirmwareCustomTables[1]; + EfiSystemTable* system_table = (EfiSystemTable*)Handover->f_FirmwareCustomTables[1]; - cST->ConOut->ClearScreen(cST->ConOut); + system_table->ConOut->ClearScreen(system_table->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"); + system_table->ConOut->OutputString(system_table->ConOut, L"SYSCHK: CHECKING FOR VALID NEFS OR HPFS PARTITIONS...\r\n"); + system_table->ConOut->OutputString(system_table->ConOut, L"SYSCHK: GOOD TO GO!\r\n"); return kEfiOk; } diff --git a/dev/ZBAKit/Modules/SysChk/build.json b/dev/ZBAKit/Modules/SysChk/build.json index 524fc0ff..59edff16 100644 --- a/dev/ZBAKit/Modules/SysChk/build.json +++ b/dev/ZBAKit/Modules/SysChk/build.json @@ -17,9 +17,8 @@ "__NEWOSKRNL__", "__NEWOSLDR__", "__ZKA_AMD64__", - "__BOOTSCR__", - "cSCRVersionHighest=0x0100", - "cSCRVersionLowest=0x0100", - "cSCRVersion=0x0100" + "kChkVersionHighest=0x0100", + "kChkVersionLowest=0x0100", + "kChkVersion=0x0100" ] } -- cgit v1.2.3