summaryrefslogtreecommitdiffhomepage
path: root/Private/NewBoot
diff options
context:
space:
mode:
Diffstat (limited to 'Private/NewBoot')
-rw-r--r--Private/NewBoot/BootKit/Arch/ATA.hxx2
-rw-r--r--Private/NewBoot/BootKit/Arch/SATA.hxx10
-rw-r--r--Private/NewBoot/BootKit/BootKit.hxx16
-rw-r--r--Private/NewBoot/Source/HEL/AMD64/BootEPM.cxx6
-rw-r--r--Private/NewBoot/Source/HEL/AMD64/BootString.cxx20
-rw-r--r--Private/NewBoot/Source/makefile2
6 files changed, 28 insertions, 28 deletions
diff --git a/Private/NewBoot/BootKit/Arch/ATA.hxx b/Private/NewBoot/BootKit/Arch/ATA.hxx
index 8e0a15eb..4defc0aa 100644
--- a/Private/NewBoot/BootKit/Arch/ATA.hxx
+++ b/Private/NewBoot/BootKit/Arch/ATA.hxx
@@ -8,7 +8,7 @@
#include <Builtins/ATA/Defines.hxx>
-using namespace HCore;
+using namespace NewOS;
class BDeviceATA final {
public:
diff --git a/Private/NewBoot/BootKit/Arch/SATA.hxx b/Private/NewBoot/BootKit/Arch/SATA.hxx
index dc48c3ea..8bd8f2cb 100644
--- a/Private/NewBoot/BootKit/Arch/SATA.hxx
+++ b/Private/NewBoot/BootKit/Arch/SATA.hxx
@@ -17,17 +17,17 @@ class BDeviceSATA final {
HCORE_COPY_DEFAULT(BDeviceSATA);
struct SATATrait final {
- HCore::SizeT mBase{1024};
- HCore::Boolean mErr{false};
- HCore::Boolean mDetected{false};
+ NewOS::SizeT mBase{1024};
+ NewOS::Boolean mErr{false};
+ NewOS::Boolean mDetected{false};
operator bool() { return !this->mErr; }
};
operator bool() { return this->Leak().mDetected; }
- BDeviceSATA& Read(HCore::WideChar* Buf, const HCore::SizeT& SecCount);
- BDeviceSATA& Write(HCore::WideChar* Buf, const HCore::SizeT& SecCount);
+ BDeviceSATA& Read(NewOS::WideChar* Buf, const NewOS::SizeT& SecCount);
+ BDeviceSATA& Write(NewOS::WideChar* Buf, const NewOS::SizeT& SecCount);
SATATrait& Leak();
diff --git a/Private/NewBoot/BootKit/BootKit.hxx b/Private/NewBoot/BootKit/BootKit.hxx
index 75934ed2..a0e8309c 100644
--- a/Private/NewBoot/BootKit/BootKit.hxx
+++ b/Private/NewBoot/BootKit/BootKit.hxx
@@ -22,7 +22,7 @@ class BVersionString;
#include <NewKit/Defines.hpp>
#include <FirmwareKit/EPM.hxx>
-using namespace HCore;
+using namespace NewOS;
typedef Char *PEFImagePtr;
typedef Char *PEImagePtr;
@@ -57,18 +57,18 @@ class BTextWriter final {
BTextWriter(const BTextWriter &) = default;
};
-HCore::SizeT BCopyMem(CharacterTypeUTF16 *dest, CharacterTypeUTF16 *src,
- const HCore::SizeT len);
+NewOS::SizeT BCopyMem(CharacterTypeUTF16 *dest, CharacterTypeUTF16 *src,
+ const NewOS::SizeT len);
-HCore::SizeT BSetMem(CharacterTypeUTF8 *src, const CharacterTypeUTF8 byte,
- const HCore::SizeT len);
+NewOS::SizeT BSetMem(CharacterTypeUTF8 *src, const CharacterTypeUTF8 byte,
+ const NewOS::SizeT len);
/// String length functions.
-HCore::SizeT BStrLen(const CharacterTypeUTF16 *ptr);
+NewOS::SizeT BStrLen(const CharacterTypeUTF16 *ptr);
-HCore::SizeT BSetMem(CharacterTypeUTF16 *src, const CharacterTypeUTF16 byte,
- const HCore::SizeT len);
+NewOS::SizeT BSetMem(CharacterTypeUTF16 *src, const CharacterTypeUTF16 byte,
+ const NewOS::SizeT len);
/**
* @brief BootKit File Reader class
diff --git a/Private/NewBoot/Source/HEL/AMD64/BootEPM.cxx b/Private/NewBoot/Source/HEL/AMD64/BootEPM.cxx
index b8df12a0..da8e6107 100644
--- a/Private/NewBoot/Source/HEL/AMD64/BootEPM.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/BootEPM.cxx
@@ -36,7 +36,7 @@ EXTERN_C Boolean boot_write_newfs_partition(const Char* namePart, SizeT namePart
BootBlockType* bootBlock = (BootBlockType*)buf;
- bootBlock->Version = kEPMHCore;
+ bootBlock->Version = kEPMNewOS;
bootBlock->NumBlocks = kEPMMaxBlks;
for (SizeT i = 0; i < kEPMNameLength; i++) {
@@ -63,7 +63,7 @@ EXTERN_C Boolean boot_write_newfs_partition(const Char* namePart, SizeT namePart
partBlock->Fs[i] = fsName[i];
}
- partBlock->Magic = kEPMHCore;
+ partBlock->Magic = kEPMNewOS;
char* partName = "System HD";
int partNameLength = 10;
@@ -84,7 +84,7 @@ EXTERN_C Boolean boot_write_newfs_partition(const Char* namePart, SizeT namePart
swapBlock->Fs[i] = fsName[i];
}
- swapBlock->Magic = kEPMHCore;
+ swapBlock->Magic = kEPMNewOS;
partName = "Swap HD";
partNameLength = 8;
diff --git a/Private/NewBoot/Source/HEL/AMD64/BootString.cxx b/Private/NewBoot/Source/HEL/AMD64/BootString.cxx
index 52633fe2..1c6b528e 100644
--- a/Private/NewBoot/Source/HEL/AMD64/BootString.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/BootString.cxx
@@ -17,8 +17,8 @@
/////////////////////////////////////////////////////////////////////////////////////////////////////////
-HCore::SizeT BCopyMem(CharacterTypeUTF16 *dest, CharacterTypeUTF16 *src,
- const HCore::SizeT len) {
+NewOS::SizeT BCopyMem(CharacterTypeUTF16 *dest, CharacterTypeUTF16 *src,
+ const NewOS::SizeT len) {
if (!dest || !src) return 0;
SizeT index = 0UL;
@@ -29,10 +29,10 @@ HCore::SizeT BCopyMem(CharacterTypeUTF16 *dest, CharacterTypeUTF16 *src,
return index;
}
-HCore::SizeT BStrLen(const CharacterTypeUTF16 *ptr) {
+NewOS::SizeT BStrLen(const CharacterTypeUTF16 *ptr) {
if (!ptr) return 0;
- HCore::SizeT cnt = 0;
+ NewOS::SizeT cnt = 0;
while (*ptr != (CharacterTypeUTF16)0) {
++ptr;
@@ -42,11 +42,11 @@ HCore::SizeT BStrLen(const CharacterTypeUTF16 *ptr) {
return cnt;
}
-HCore::SizeT BSetMem(CharacterTypeUTF16 *src, const CharacterTypeUTF16 byte,
- const HCore::SizeT len) {
+NewOS::SizeT BSetMem(CharacterTypeUTF16 *src, const CharacterTypeUTF16 byte,
+ const NewOS::SizeT len) {
if (!src) return 0;
- HCore::SizeT cnt = 0UL;
+ NewOS::SizeT cnt = 0UL;
while (*src != 0) {
if (cnt > len) break;
@@ -60,11 +60,11 @@ HCore::SizeT BSetMem(CharacterTypeUTF16 *src, const CharacterTypeUTF16 byte,
return cnt;
}
-HCore::SizeT BSetMem(CharacterTypeUTF8 *src, const CharacterTypeUTF8 byte,
- const HCore::SizeT len) {
+NewOS::SizeT BSetMem(CharacterTypeUTF8 *src, const CharacterTypeUTF8 byte,
+ const NewOS::SizeT len) {
if (!src) return 0;
- HCore::SizeT cnt = 0UL;
+ NewOS::SizeT cnt = 0UL;
while (*src != 0) {
if (cnt > len) break;
diff --git a/Private/NewBoot/Source/makefile b/Private/NewBoot/Source/makefile
index 35c473ec..9e2dbca6 100644
--- a/Private/NewBoot/Source/makefile
+++ b/Private/NewBoot/Source/makefile
@@ -26,7 +26,7 @@ REM=rm
REM_FLAG=-f
FLAG_ASM=-f win64
-FLAG_GNU=-fshort-wchar -mgeneral-regs-only -mno-red-zone -D__KERNEL__ -DEFI_FUNCTION_WRAPPER -I../ -I../../ -I./ -c -ffreestanding -fno-rtti -fno-exceptions -std=c++20 -D__HAVE_HCORE_APIS__ -D__HCORE__ -D__BOOTLOADER__ -I./
+FLAG_GNU=-fshort-wchar -mgeneral-regs-only -mno-red-zone -D__KERNEL__ -DEFI_FUNCTION_WRAPPER -I../ -I../../ -I./ -c -ffreestanding -fno-rtti -fno-exceptions -std=c++20 -D__HAVE_MAHROUSS_APIS__ -D__MAHROUSS__ -D__BOOTLOADER__ -I./
.PHONY: invalid-recipe
invalid-recipe:
generated by cgit v1.2.3 (git 2.39.1) at 2026-03-16 08:01:54 +0000