From 704879ab7f080ce60bcffda02e3dda6330a4f1fd Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Sun, 20 Oct 2024 07:07:08 +0000 Subject: NeFS: Officialize minimum disk size into the specs. HPFS: Start implementing it. UPS: Check PTime, and decrementing it when it isn't our time yet, also added new Subsystem entries. FSKit: Better documentation and provide 256U instead of only 256. EBS: Fixed HPFS magic number, which wasn't correctly bound to 8 bytes. BUILD: Fixed blob.json for epm.asm --- dev/zka/FSKit/HPFS.hxx | 10 +++++++++- dev/zka/FSKit/NeFS.hxx | 2 ++ dev/zka/HALKit/ARM64/HalKernelMain.cxx | 9 +++++++++ dev/zka/KernelKit/UserProcessScheduler.hxx | 16 +++++++++------- dev/zka/src/IndexableProperty.cxx | 12 +++++------- dev/zka/src/UserProcessScheduler.cxx | 12 ++++++++---- 6 files changed, 42 insertions(+), 19 deletions(-) (limited to 'dev/zka') diff --git a/dev/zka/FSKit/HPFS.hxx b/dev/zka/FSKit/HPFS.hxx index b8aebd71..6ff49f1f 100644 --- a/dev/zka/FSKit/HPFS.hxx +++ b/dev/zka/FSKit/HPFS.hxx @@ -9,4 +9,12 @@ #include /// @file HPFS.hxx -/// @brief HPFS support. +/// @brief HPFS filesystem support. + +#define kHPFSVersion 0x01000 +#define kHPFSMagic " HPFS" +#define kHPFSMagicLen 8 + +#define kHPFSMinimumDiskSize (gib_cast(64)) + +struct HPFS_EXPLICIT_BOOT_SECTOR; diff --git a/dev/zka/FSKit/NeFS.hxx b/dev/zka/FSKit/NeFS.hxx index d391f5b5..4696df57 100644 --- a/dev/zka/FSKit/NeFS.hxx +++ b/dev/zka/FSKit/NeFS.hxx @@ -30,6 +30,8 @@ default. #define kNeFSInvalidCatalog (-1) #define kNeFSNodeNameLen (256) +#define kNeFSMinimumDiskSize (gib_cast(4)) + #define kNeFSSectorSz (512) #define kNeFSForkDataSz (mib_cast(16)) diff --git a/dev/zka/HALKit/ARM64/HalKernelMain.cxx b/dev/zka/HALKit/ARM64/HalKernelMain.cxx index 706106c0..4e445a21 100644 --- a/dev/zka/HALKit/ARM64/HalKernelMain.cxx +++ b/dev/zka/HALKit/ARM64/HalKernelMain.cxx @@ -23,6 +23,11 @@ EXTERN_C Kernel::Void ke_dll_entrypoint(Kernel::Void); EXTERN_C void hal_init_platform( Kernel::HEL::HANDOVER_INFO_HEADER* HandoverHeader) { + + /************************************************** */ + /* INITIALIZE AND VALIDATE HEADER. */ + /************************************************** */ + kHandoverHeader = HandoverHeader; if (kHandoverHeader->f_Magic != kHandoverMagic && @@ -31,5 +36,9 @@ EXTERN_C void hal_init_platform( return; } + /************************************** */ + /* INITIALIZE BIT MAP. */ + /************************************** */ + while (Yes) {} } diff --git a/dev/zka/KernelKit/UserProcessScheduler.hxx b/dev/zka/KernelKit/UserProcessScheduler.hxx index a83027b2..bd07a88e 100644 --- a/dev/zka/KernelKit/UserProcessScheduler.hxx +++ b/dev/zka/KernelKit/UserProcessScheduler.hxx @@ -99,12 +99,14 @@ namespace Kernel // end of operator overloading. - enum ProcessSubsystemEnum + enum ProcessSubsystemEnum : Int32 { - eProcessSubsystemSecurity, - eProcessSubsystemNative, - eProcessSubsystemInvalid, - eProcessSubsystemCount, + kProcessSubsystemSecurity = 100, + kProcessSubsystemApplication, + kProcessSubsystemService, + kProcessSubsystemDriver, + kProcessSubsystemInvalid = 255, + kProcessSubsystemCount = 4, }; using ProcessSubsystem = ProcessSubsystemEnum; @@ -144,8 +146,8 @@ namespace Kernel const UInt32& GetExitCode() noexcept; public: - Char Name[kProcessLen] = {"PROCESS #0 (TEAM 0)"}; - ProcessSubsystem SubSystem{ProcessSubsystem::eProcessSubsystemInvalid}; + Char Name[kProcessLen] = {"ZKA Process"}; + ProcessSubsystem SubSystem{ProcessSubsystem::kProcessSubsystemInvalid}; User* Owner{nullptr}; HAL::StackFramePtr StackFrame{nullptr}; AffinityKind Affinity{AffinityKind::kStandard}; diff --git a/dev/zka/src/IndexableProperty.cxx b/dev/zka/src/IndexableProperty.cxx index fb3a6313..7595291c 100644 --- a/dev/zka/src/IndexableProperty.cxx +++ b/dev/zka/src/IndexableProperty.cxx @@ -4,17 +4,15 @@ ------------------------------------------- */ -//! @brief Filesystem Indexer. - #include #include #include #include -/// @brief File Indexer. +/// @brief File indexer API for fast path access. /// BUGS: 0 -#define kMaxLenIndexer 256 +#define kMaxLenIndexer (256U) namespace Kernel { @@ -41,10 +39,10 @@ namespace Kernel } /// @brief Index a file into the indexer instance. - /// @param filename path + /// @param filename filesystem path to access. /// @param filenameLen used bytes in path. /// @param indexer the filesystem indexer. - /// @return none. + /// @return none, check before if indexer can be claimed (using indexer.HasFlag(kIndexerClaimed)). Void fs_index_file(const Char* filename, SizeT filenameLen, IndexableProperty& indexer) { if (!indexer.HasFlag(kIndexerClaimed)) @@ -52,7 +50,7 @@ namespace Kernel indexer.AddFlag(kIndexerClaimed); rt_copy_memory((VoidPtr)indexer.Leak().Path, (VoidPtr)filename, filenameLen); - kcout << "filesystem: index new file: " << filename << endl; + kcout << "FSKit: Indexed new file: " << filename << endl; } } } // namespace Indexer diff --git a/dev/zka/src/UserProcessScheduler.cxx b/dev/zka/src/UserProcessScheduler.cxx index ed2cfa17..d0236578 100644 --- a/dev/zka/src/UserProcessScheduler.cxx +++ b/dev/zka/src/UserProcessScheduler.cxx @@ -441,6 +441,10 @@ namespace Kernel continue; } } + else + { + --process.PTime; + } } kcout << "Scheduled Process Count: " << number(process_index) << endl; @@ -476,9 +480,9 @@ namespace Kernel /// @param process the process reference. /// @retval true can be schedulded. /// @retval false cannot be schedulded. - bool UserProcessHelper::CanBeScheduled(const UserProcess& process) + Bool UserProcessHelper::CanBeScheduled(const UserProcess& process) { - kcout << "Checking process status...\r"; + kcout << "Checking UserProcess status...\r"; if (process.Status == ProcessStatusKind::kFrozen || process.Status == ProcessStatusKind::kDead) @@ -488,7 +492,7 @@ namespace Kernel process.Kind == UserProcess::kExectuableKind) return No; - return Yes; + return process.PTime < 1 && process.Status == ProcessStatusKind::kRunning; } /***********************************************************************************/ @@ -502,7 +506,7 @@ namespace Kernel if (!cProcessScheduler) { cProcessScheduler = mm_new_class(); - return cProcessScheduler; + return Yes; } return No; -- cgit v1.2.3