summaryrefslogtreecommitdiffhomepage
path: root/dev/ZKA/Sources
diff options
context:
space:
mode:
authorAmlal <amlal@el-mahrouss-logic.com>2024-09-10 18:42:15 +0200
committerAmlal <amlal@el-mahrouss-logic.com>2024-09-10 18:42:15 +0200
commit408f58b0ef54f49d894023d6753f8d27d0bfd46d (patch)
treee3a963519dc4e5f4d6966e5b0c597be622dca76e /dev/ZKA/Sources
parent5aef44da0ce752e7ac6bd9c95489942b1a0319ae (diff)
[ IMP ] Repository bump.
Signed-off-by: Amlal <amlal@el-mahrouss-logic.com>
Diffstat (limited to 'dev/ZKA/Sources')
-rw-r--r--dev/ZKA/Sources/ExeMain.cxx2
-rw-r--r--dev/ZKA/Sources/FS/NeFS.cxx8
-rw-r--r--dev/ZKA/Sources/Heap.cxx15
-rw-r--r--dev/ZKA/Sources/PageMgr.cxx4
4 files changed, 8 insertions, 21 deletions
diff --git a/dev/ZKA/Sources/ExeMain.cxx b/dev/ZKA/Sources/ExeMain.cxx
index 44dedfd7..a3fdfaa0 100644
--- a/dev/ZKA/Sources/ExeMain.cxx
+++ b/dev/ZKA/Sources/ExeMain.cxx
@@ -58,7 +58,7 @@ namespace Kernel::Detail
else
{
// Mounts a NeFS from main drive.
- fNeFS = new Kernel::NeFileSystemMgr();
+ fNeFS = Kernel::mm_new_class<Kernel::NeFileSystemMgr>();
Kernel::IFilesystemMgr::Mount(fNeFS);
diff --git a/dev/ZKA/Sources/FS/NeFS.cxx b/dev/ZKA/Sources/FS/NeFS.cxx
index ad4dd031..9c33b78c 100644
--- a/dev/ZKA/Sources/FS/NeFS.cxx
+++ b/dev/ZKA/Sources/FS/NeFS.cxx
@@ -31,12 +31,12 @@ using namespace Kernel;
/***********************************************************************************/
/// @brief get sector count.
/***********************************************************************************/
-Kernel::SizeT drv_std_get_sector_count();
+Kernel::SizeT drv_get_sector_count();
/***********************************************************************************/
/// @brief get device size.
/***********************************************************************************/
-Kernel::SizeT drv_std_get_drv_size();
+Kernel::SizeT drv_get_size();
#endif
@@ -583,8 +583,8 @@ bool NeFSParser::Format(_Input _Output DriveTrait* drive, _Input const Lba endLb
SizeT catalogCount = 0UL;
- SizeT sectorCount = drv_std_get_sector_count();
- SizeT diskSize = drv_std_get_drv_size();
+ SizeT sectorCount = drv_get_sector_count();
+ SizeT diskSize = drv_get_size();
partBlock->Kind = kNeFSPartitionTypeStandard;
partBlock->StartCatalog = kNeFSCatalogStartAddress;
diff --git a/dev/ZKA/Sources/Heap.cxx b/dev/ZKA/Sources/Heap.cxx
index cd46a80b..b415911d 100644
--- a/dev/ZKA/Sources/Heap.cxx
+++ b/dev/ZKA/Sources/Heap.cxx
@@ -14,11 +14,10 @@
//! @brief Kernel heap allocator.
#define kKernelHeapMagic (0xD4D7D5)
-#define kKernelHeapHeaderPaddingSz (16U)
+#define kKernelHeapHeaderPaddingSz (__BIGGEST_ALIGNMENT__)
namespace Kernel
{
- SizeT kHeapCount = 0UL;
PageMgr kHeapPageMgr;
Bool kHeapLock = No;
@@ -115,8 +114,6 @@ namespace Kernel
heap_info_ptr->fUser = user;
heap_info_ptr->fPresent = Yes;
- ++kHeapCount;
-
auto result = reinterpret_cast<VoidPtr>(heap_info_ptr->fHeapPtr);
kLatestAllocation = heap_info_ptr;
@@ -131,8 +128,6 @@ namespace Kernel
/// @return
Int32 mm_make_ke_page(VoidPtr heap_ptr)
{
- if (kHeapCount < 1)
- return -kErrorInternal;
if (((IntPtr)heap_ptr - sizeof(Detail::HEAP_INFORMATION_BLOCK)) <= 0)
return -kErrorInternal;
if (((IntPtr)heap_ptr - kInvalidAddress) < 0)
@@ -156,9 +151,6 @@ namespace Kernel
/// @return
Int32 mm_delete_ke_heap(VoidPtr heap_ptr)
{
- if (kHeapCount < 1)
- return -kErrorInternal;
-
if (!heap_ptr)
return -kErrorInvalidData;
@@ -203,8 +195,6 @@ namespace Kernel
kHeapPageMgr.Free(pteAddress);
- --kHeapCount;
-
Detail::mm_alloc_fini_timeout();
return 0;
@@ -218,9 +208,6 @@ namespace Kernel
/// @return if it exists.
Boolean mm_is_valid_heap(VoidPtr heap_ptr)
{
- if (kHeapCount < 1)
- return false;
-
if (heap_ptr)
{
Detail::HEAP_INFORMATION_BLOCK_PTR virtualAddress =
diff --git a/dev/ZKA/Sources/PageMgr.cxx b/dev/ZKA/Sources/PageMgr.cxx
index 78b279f3..3eefe491 100644
--- a/dev/ZKA/Sources/PageMgr.cxx
+++ b/dev/ZKA/Sources/PageMgr.cxx
@@ -8,9 +8,9 @@
#include <NewKit/PageMgr.hxx>
#ifdef __ZKA_AMD64__
-#include <HALKit/AMD64/HalPageAlloc.hxx>
+#include <HALKit/AMD64/Paging.hxx>
#elif defined(__ZKA_ARM64__)
-#include <HALKit/ARM64/HalPageAlloc.hxx>
+#include <HALKit/ARM64/Paging.hxx>
#endif // ifdef __ZKA_AMD64__ || defined(__ZKA_ARM64__)
//! null deref will throw (Page Zero detected, aborting app!)