diff options
| author | Amlal <amlal@nekernel.org> | 2025-05-11 01:27:29 +0200 |
|---|---|---|
| committer | Amlal <amlal@nekernel.org> | 2025-05-11 01:29:24 +0200 |
| commit | 81bcbc74da189bfe5f3b1fd70ae83fb85a2ce859 (patch) | |
| tree | 84129e8825886d69513612a079df64b216103f8e /dev/boot | |
| parent | 9a33591a431698fc7f50e1cdc97fd3c22955365c (diff) | |
dev(feat:kernel): Working Core Layer of HeFS (Write/Read)
Signed-off-by: Amlal <amlal@nekernel.org>
Diffstat (limited to 'dev/boot')
| -rw-r--r-- | dev/boot/BootKit/BootKit.h | 9 | ||||
| -rw-r--r-- | dev/boot/BootKit/HW/SATA.h | 4 | ||||
| -rw-r--r-- | dev/boot/src/BootString.cc | 2 | ||||
| -rw-r--r-- | dev/boot/src/HEL/AMD64/BootATA+Next.cc | 8 | ||||
| -rw-r--r-- | dev/boot/src/HEL/AMD64/BootATA.cc | 8 | ||||
| -rw-r--r-- | dev/boot/src/HEL/AMD64/BootSATA.cc | 4 | ||||
| -rw-r--r-- | dev/boot/src/docs/KERN_VER.md | 2 |
7 files changed, 19 insertions, 18 deletions
diff --git a/dev/boot/BootKit/BootKit.h b/dev/boot/BootKit/BootKit.h index 181be973..cc80e359 100644 --- a/dev/boot/BootKit/BootKit.h +++ b/dev/boot/BootKit/BootKit.h @@ -40,7 +40,7 @@ /***********************************************************************************/ namespace Boot { -EXTERN void ThrowError(const WideChar* errorCode, const WideChar* reason) noexcept; +void ThrowError(const WideChar* errorCode, const WideChar* reason) noexcept; class BootTextWriter; class BootFileReader; @@ -51,7 +51,8 @@ typedef Char* PEFImagePtr; typedef Char* PEImagePtr; typedef WideChar CharacterTypeUTF16; -typedef Char CharacterTypeUTF8; +typedef Char CharacterTypeASCII; +typedef char8_t CharacterTypeUTF8; using namespace Kernel; @@ -86,7 +87,7 @@ class BootTextWriter final { Kernel::SizeT BCopyMem(CharacterTypeUTF16* dest, CharacterTypeUTF16* src, const Kernel::SizeT len); -Kernel::SizeT BSetMem(CharacterTypeUTF8* src, const CharacterTypeUTF8 byte, +Kernel::SizeT BSetMem(CharacterTypeASCII* src, const CharacterTypeASCII byte, const Kernel::SizeT len); /// String length functions. @@ -151,7 +152,7 @@ typedef UInt8* BlobType; /// @brief Bootloader Version String. class BVersionString final { public: - static const CharacterTypeUTF8* The() { return BOOTLOADER_VERSION; } + static const CharacterTypeASCII* The() { return BOOTLOADER_VERSION; } }; /***********************************************************************************/ diff --git a/dev/boot/BootKit/HW/SATA.h b/dev/boot/BootKit/HW/SATA.h index 7285ceac..eecf426d 100644 --- a/dev/boot/BootKit/HW/SATA.h +++ b/dev/boot/BootKit/HW/SATA.h @@ -34,8 +34,8 @@ class BootDeviceSATA final { constexpr static auto kSectorSize = kAHCISectorSize; - BootDeviceSATA& Read(Boot::CharacterTypeUTF8* Buf, const Kernel::SizeT SecCount); - BootDeviceSATA& Write(Boot::CharacterTypeUTF8* Buf, const Kernel::SizeT SecCount); + BootDeviceSATA& Read(Boot::CharacterTypeASCII* Buf, const Kernel::SizeT SecCount); + BootDeviceSATA& Write(Boot::CharacterTypeASCII* Buf, const Kernel::SizeT SecCount); SATATrait& Leak(); diff --git a/dev/boot/src/BootString.cc b/dev/boot/src/BootString.cc index 8762a151..277f3273 100644 --- a/dev/boot/src/BootString.cc +++ b/dev/boot/src/BootString.cc @@ -62,7 +62,7 @@ Kernel::SizeT Boot::BSetMem(CharacterTypeUTF16* src, const CharacterTypeUTF16 by return cnt; } -Kernel::SizeT Boot::BSetMem(CharacterTypeUTF8* src, const CharacterTypeUTF8 byte, +Kernel::SizeT Boot::BSetMem(CharacterTypeASCII* src, const CharacterTypeASCII byte, const Kernel::SizeT len) { if (!src) return 0; diff --git a/dev/boot/src/HEL/AMD64/BootATA+Next.cc b/dev/boot/src/HEL/AMD64/BootATA+Next.cc index 723224c1..547d4f99 100644 --- a/dev/boot/src/HEL/AMD64/BootATA+Next.cc +++ b/dev/boot/src/HEL/AMD64/BootATA+Next.cc @@ -103,7 +103,7 @@ ATAInit_Retry: return true; } -Void boot_ata_read(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeUTF8* Buf, SizeT SectorSz, +Void boot_ata_read(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeASCII* Buf, SizeT SectorSz, SizeT Size) { Lba /= SectorSz; @@ -136,7 +136,7 @@ Void boot_ata_read(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeUTF8* Buf, } } -Void boot_ata_write(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeUTF8* Buf, SizeT SectorSz, +Void boot_ata_write(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeASCII* Buf, SizeT SectorSz, SizeT Size) { Lba /= SectorSz; @@ -208,7 +208,7 @@ BootDeviceATA::operator bool() { @param Sz Sector size @param Buf buffer */ -BootDeviceATA& BootDeviceATA::Read(CharacterTypeUTF8* Buf, SizeT SectorSz) { +BootDeviceATA& BootDeviceATA::Read(CharacterTypeASCII* Buf, SizeT SectorSz) { if (!boot_ata_detected()) { Leak().mErr = true; return *this; @@ -229,7 +229,7 @@ BootDeviceATA& BootDeviceATA::Read(CharacterTypeUTF8* Buf, SizeT SectorSz) { @param Sz Sector size @param Buf buffer */ -BootDeviceATA& BootDeviceATA::Write(CharacterTypeUTF8* Buf, SizeT SectorSz) { +BootDeviceATA& BootDeviceATA::Write(CharacterTypeASCII* Buf, SizeT SectorSz) { if (!boot_ata_detected()) { Leak().mErr = true; return *this; diff --git a/dev/boot/src/HEL/AMD64/BootATA.cc b/dev/boot/src/HEL/AMD64/BootATA.cc index 0fd46832..e1ccbfc3 100644 --- a/dev/boot/src/HEL/AMD64/BootATA.cc +++ b/dev/boot/src/HEL/AMD64/BootATA.cc @@ -101,7 +101,7 @@ ATAInit_Retry: return NO; } -Void boot_ata_read(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeUTF8* Buf, SizeT SectorSz, +Void boot_ata_read(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeASCII* Buf, SizeT SectorSz, SizeT Size) { Lba /= SectorSz; @@ -130,7 +130,7 @@ Void boot_ata_read(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeUTF8* Buf, } } -Void boot_ata_write(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeUTF8* Buf, SizeT SectorSz, +Void boot_ata_write(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeASCII* Buf, SizeT SectorSz, SizeT Size) { Lba /= SectorSz; @@ -196,7 +196,7 @@ BootDeviceATA::operator bool() { @param Sz Sector size @param Buf buffer */ -BootDeviceATA& BootDeviceATA::Read(CharacterTypeUTF8* Buf, SizeT SectorSz) { +BootDeviceATA& BootDeviceATA::Read(CharacterTypeASCII* Buf, SizeT SectorSz) { if (!boot_ata_detected()) { Leak().mErr = true; return *this; @@ -217,7 +217,7 @@ BootDeviceATA& BootDeviceATA::Read(CharacterTypeUTF8* Buf, SizeT SectorSz) { @param Sz Sector size @param Buf buffer */ -BootDeviceATA& BootDeviceATA::Write(CharacterTypeUTF8* Buf, SizeT SectorSz) { +BootDeviceATA& BootDeviceATA::Write(CharacterTypeASCII* Buf, SizeT SectorSz) { if (!boot_ata_detected()) { Leak().mErr = true; return *this; diff --git a/dev/boot/src/HEL/AMD64/BootSATA.cc b/dev/boot/src/HEL/AMD64/BootSATA.cc index 2b1bc78e..b0b0b52f 100644 --- a/dev/boot/src/HEL/AMD64/BootSATA.cc +++ b/dev/boot/src/HEL/AMD64/BootSATA.cc @@ -48,7 +48,7 @@ BootDeviceSATA::BootDeviceSATA() noexcept { @param Sz Sector size @param Buf buffer */ -BootDeviceSATA& BootDeviceSATA::Read(CharacterTypeUTF8* Buf, SizeT SectorSz) { +BootDeviceSATA& BootDeviceSATA::Read(CharacterTypeASCII* Buf, SizeT SectorSz) { NE_UNUSED(Buf); NE_UNUSED(SectorSz); @@ -62,7 +62,7 @@ BootDeviceSATA& BootDeviceSATA::Read(CharacterTypeUTF8* Buf, SizeT SectorSz) { @param Sz Sector size @param Buf buffer */ -BootDeviceSATA& BootDeviceSATA::Write(CharacterTypeUTF8* Buf, SizeT SectorSz) { +BootDeviceSATA& BootDeviceSATA::Write(CharacterTypeASCII* Buf, SizeT SectorSz) { NE_UNUSED(Buf); NE_UNUSED(SectorSz); diff --git a/dev/boot/src/docs/KERN_VER.md b/dev/boot/src/docs/KERN_VER.md index abe3e823..cabdb1d2 100644 --- a/dev/boot/src/docs/KERN_VER.md +++ b/dev/boot/src/docs/KERN_VER.md @@ -1,4 +1,4 @@ -# /props/kern_ver +# The `/props/kern_ver` NVRAM variable The `/props/kern_ver` variable is used to track NeKernel's current version in a BCD format. |
