diff options
| author | Amlal El Mahrouss <amlal@el-mahrouss-logic.com> | 2024-03-28 13:05:28 +0100 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal@el-mahrouss-logic.com> | 2024-03-28 13:05:28 +0100 |
| commit | 84cc6ff6f43b48383248282743efc514946db641 (patch) | |
| tree | fa7f9099b87e235ba122d17b6a3b39234cd39883 /Private/FSKit | |
| parent | 3d798c5fc738768493df925d1f5d72256f2dec4e (diff) | |
Kernel: :boom: breaking changes, Update API and the HCORE based
macros, rename HCore to NewOS.
Signed-off-by: Amlal El Mahrouss <amlal@el-mahrouss-logic.com>
Diffstat (limited to 'Private/FSKit')
| -rw-r--r-- | Private/FSKit/HCFS.hxx | 46 | ||||
| -rw-r--r-- | Private/FSKit/IndexableProperty.hxx | 4 | ||||
| -rw-r--r-- | Private/FSKit/NewFS.hxx | 58 | ||||
| -rw-r--r-- | Private/FSKit/NewFSIteratorInterface.hxx | 4 |
4 files changed, 56 insertions, 56 deletions
diff --git a/Private/FSKit/HCFS.hxx b/Private/FSKit/HCFS.hxx index 2d7e5627..6386a84d 100644 --- a/Private/FSKit/HCFS.hxx +++ b/Private/FSKit/HCFS.hxx @@ -9,7 +9,7 @@ #pragma once /** - @brief HCore File System. + @brief NewOS File System. @author Amlal EL Mahrouss */ @@ -32,21 +32,21 @@ typedef struct HCFSBTree final { /// @brief The Catalog Data record. struct PACKED { - HCore::Lba fDataCatalog; - HCore::Lba fRsrcCatalog; - HCore::SizeT fDataCatalogSize; - HCore::SizeT fRsrcCatalogSize; + NewOS::Lba fDataCatalog; + NewOS::Lba fRsrcCatalog; + NewOS::SizeT fDataCatalogSize; + NewOS::SizeT fRsrcCatalogSize; } fCatalogData; - HCore::Lba fRelatedTrees[12]; - HCore::Char fReserved[384]; + NewOS::Lba fRelatedTrees[12]; + NewOS::Char fReserved[384]; } PACKED HCFSBTree; /// @brief Catalog file for HCFS. typedef struct HCFSCatalog { - HCore::Char fCatalogName[kHCFSNameLen]; - HCore::UInt32 fCatalogKind; - HCore::UInt32 fCatalogFlags; + NewOS::Char fCatalogName[kHCFSNameLen]; + NewOS::UInt32 fCatalogKind; + NewOS::UInt32 fCatalogFlags; /// @brief Tree information structure. /// 0: BTree LBA. @@ -54,9 +54,9 @@ typedef struct HCFSCatalog { /// 3: Last BTree LBA. /// 4: First BTree LBA. /// Everything else is reserved. - HCore::Lba fTreeInfo[12]; + NewOS::Lba fTreeInfo[12]; - HCore::Char fReserved[152]; + NewOS::Char fReserved[152]; } HCFSCatalog; #define kHCFSCatalogKindFile 1 @@ -74,21 +74,21 @@ enum { /// @brief This is a boot block, used by HCFS to boot the system (if formated using this filesystem.) typedef struct HCFSBootBlock final { - HCore::Char Ident[kHCFSIdentLen]; - HCore::Char Shell[kHCFSNameLen]; + NewOS::Char Ident[kHCFSIdentLen]; + NewOS::Char Shell[kHCFSNameLen]; - HCore::Int64 NumParts; // number of sub-partitions. - HCore::Int64 FreeSectors; - HCore::Int64 SectorCount; - HCore::Int64 SectorSz; + NewOS::Int64 NumParts; // number of sub-partitions. + NewOS::Int64 FreeSectors; + NewOS::Int64 SectorCount; + NewOS::Int64 SectorSz; - HCore::Int64 DiskSize; // size of media. - HCore::Int32 DiskKind; // kind of disk. + NewOS::Int64 DiskSize; // size of media. + NewOS::Int32 DiskKind; // kind of disk. - HCore::Lba FirstPartBlock; - HCore::Lba LastPartBlock; + NewOS::Lba FirstPartBlock; + NewOS::Lba LastPartBlock; - HCore::Char Pad[kHCFSPadLen]; + NewOS::Char Pad[kHCFSPadLen]; } PACKED HCFSBootBlock; // EOF. diff --git a/Private/FSKit/IndexableProperty.hxx b/Private/FSKit/IndexableProperty.hxx index 86bacfdf..ab034bc6 100644 --- a/Private/FSKit/IndexableProperty.hxx +++ b/Private/FSKit/IndexableProperty.hxx @@ -10,7 +10,7 @@ #include <CompilerKit/CompilerKit.hxx> #include <KernelKit/DriveManager.hxx> -namespace HCore { +namespace NewOS { namespace Indexer { struct IndexProperty final { public: @@ -40,4 +40,4 @@ class IndexableProperty final : public Property { UInt32 fFlags; }; } // namespace Indexer -} // namespace HCore +} // namespace NewOS diff --git a/Private/FSKit/NewFS.hxx b/Private/FSKit/NewFS.hxx index 70ea0881..43596d62 100644 --- a/Private/FSKit/NewFS.hxx +++ b/Private/FSKit/NewFS.hxx @@ -74,7 +74,7 @@ #define kNewFSEOF (-1) #define kNewFSBitWidth (sizeof(NewCharType)) -#define kNewFSLbaType (HCore::Lba) +#define kNewFSLbaType (NewOS::Lba) /// Start After the PM headers, pad 1024 bytes. #define kNewFSAddressAsLba (1024U) @@ -90,7 +90,7 @@ #define kNewFSFlagUnallocated 0x0F #define kNewFSFlagCatalog 0xFF -typedef HCore::Char NewCharType; +typedef NewOS::Char NewCharType; enum { kNewFSHardDrive = 0xC0, // Hard Drive (SSD, HDD) @@ -105,32 +105,32 @@ enum { struct PACKED NewCatalog final { NewCharType Name[kNewFSNodeNameLen]; - HCore::Int32 Flags; - HCore::Int32 Kind; + NewOS::Int32 Flags; + NewOS::Int32 Kind; - HCore::Lba FirstFork; - HCore::Lba LastFork; + NewOS::Lba FirstFork; + NewOS::Lba LastFork; - HCore::Lba NextSibling; - HCore::Lba PrevSibling; + NewOS::Lba NextSibling; + NewOS::Lba PrevSibling; }; /// @brief Fork type. struct PACKED NewFork final { NewCharType Name[kNewFSNodeNameLen]; - HCore::Int32 Flags; - HCore::Int32 Kind; + NewOS::Int32 Flags; + NewOS::Int32 Kind; - HCore::Int64 ResourceId; - HCore::Int32 ResourceKind; - HCore::Int32 ResourceFlags; + NewOS::Int64 ResourceId; + NewOS::Int32 ResourceKind; + NewOS::Int32 ResourceFlags; - HCore::Lba DataOffset; //8 Where to look for this data? - HCore::SizeT DataSize; /// Data size according using sector count. + NewOS::Lba DataOffset; //8 Where to look for this data? + NewOS::SizeT DataSize; /// Data size according using sector count. - HCore::Lba NextSibling; - HCore::Lba PreviousSibling; + NewOS::Lba NextSibling; + NewOS::Lba PreviousSibling; }; /// @brief Partition block type @@ -138,24 +138,24 @@ struct PACKED NewPartitionBlock final { NewCharType Ident[kNewFSIdentLen]; NewCharType PartitionName[kPartLen]; - HCore::Int32 Flags; - HCore::Int32 Kind; + NewOS::Int32 Flags; + NewOS::Int32 Kind; - HCore::Lba StartCatalog; - HCore::SizeT CatalogCount; + NewOS::Lba StartCatalog; + NewOS::SizeT CatalogCount; - HCore::SizeT DiskSize; + NewOS::SizeT DiskSize; - HCore::SizeT FreeCatalog; - HCore::SizeT FreeSectors; + NewOS::SizeT FreeCatalog; + NewOS::SizeT FreeSectors; - HCore::SizeT SectorCount; - HCore::SizeT SectorSize; + NewOS::SizeT SectorCount; + NewOS::SizeT SectorSize; - HCore::Char Pad[kNewFSPadLen]; + NewOS::Char Pad[kNewFSPadLen]; }; -namespace HCore { +namespace NewOS { /// /// \name NewFSParser /// \brief NewFS parser class. (catalog creation, remove removal, root, forks...) @@ -213,7 +213,7 @@ class NewFilesystemHelper final { static const char* UpDir(); static const char Separator(); }; -} // namespace HCore +} // namespace NewOS enum { kNewFSPartGPT, diff --git a/Private/FSKit/NewFSIteratorInterface.hxx b/Private/FSKit/NewFSIteratorInterface.hxx index 0c7a6743..7e1d8652 100644 --- a/Private/FSKit/NewFSIteratorInterface.hxx +++ b/Private/FSKit/NewFSIteratorInterface.hxx @@ -9,7 +9,7 @@ #include <FSKit/IndexableProperty.hxx> #include <NewKit/MutableArray.hpp> -namespace HCore { +namespace NewOS { namespace Indexer { class NewFSIteratorInterface; @@ -48,4 +48,4 @@ class NewFSIteratorInterface { MutableArray<IndexableProperty> fProps; }; } // namespace Indexer -} // namespace HCore +} // namespace NewOS |
