diff options
| -rw-r--r-- | apps/Common.h (renamed from tools/Common.h) | 0 | ||||
| -rw-r--r-- | apps/Framework.h (renamed from tools/Framework.h) | 0 | ||||
| -rw-r--r-- | apps/make_framework.json (renamed from tools/make_framework.json) | 1 | ||||
| -rw-r--r-- | apps/src/Framework.cc (renamed from tools/src/Framework.cc) | 0 | ||||
| -rw-r--r-- | dev/SCIKit/build.json | 1 | ||||
| -rw-r--r-- | dev/ZBAKit/Modules/NetBoot/build.json | 7 | ||||
| -rw-r--r-- | dev/ZBAKit/Modules/SysChk/Module.cc | 8 | ||||
| -rw-r--r-- | dev/ZBAKit/Modules/SysChk/build.json | 7 |
8 files changed, 10 insertions, 14 deletions
diff --git a/tools/Common.h b/apps/Common.h index a9439bbf..a9439bbf 100644 --- a/tools/Common.h +++ b/apps/Common.h diff --git a/tools/Framework.h b/apps/Framework.h index bc66658c..bc66658c 100644 --- a/tools/Framework.h +++ b/apps/Framework.h diff --git a/tools/make_framework.json b/apps/make_framework.json index 9709ff3a..6071ebaa 100644 --- a/tools/make_framework.json +++ b/apps/make_framework.json @@ -5,7 +5,6 @@ "sources_path": ["src/Framework.cc"], "output_name": "make_framework.o", "cpp_macros": [ - "__MKF_AMD64__", "kMKFVersion=0x0100", "kMKFVersionHighest=0x0100", "kMKFVersionLowest=0x0100" diff --git a/tools/src/Framework.cc b/apps/src/Framework.cc index 1a678ec3..1a678ec3 100644 --- a/tools/src/Framework.cc +++ b/apps/src/Framework.cc 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" ] } |