summaryrefslogtreecommitdiffhomepage
path: root/dev/ZKA/HALKit
diff options
context:
space:
mode:
Diffstat (limited to 'dev/ZKA/HALKit')
-rw-r--r--dev/ZKA/HALKit/AMD64/HalBMPMgr.cxx2
-rw-r--r--dev/ZKA/HALKit/AMD64/HalKernelMain.cxx5
2 files changed, 4 insertions, 3 deletions
diff --git a/dev/ZKA/HALKit/AMD64/HalBMPMgr.cxx b/dev/ZKA/HALKit/AMD64/HalBMPMgr.cxx
index 83fa2af3..b788902a 100644
--- a/dev/ZKA/HALKit/AMD64/HalBMPMgr.cxx
+++ b/dev/ZKA/HALKit/AMD64/HalBMPMgr.cxx
@@ -73,7 +73,7 @@ namespace Kernel
/// @return The new address which was found.
auto FindBitMap(VoidPtr base_ptr, SizeT size, Bool rw, Bool user) -> VoidPtr
{
- VoidPtr base = base_ptr + kPageSize;
+ VoidPtr base = reinterpret_cast<VoidPtr>(((UIntPtr)base_ptr) + kPageSize);
while (base && size)
{
diff --git a/dev/ZKA/HALKit/AMD64/HalKernelMain.cxx b/dev/ZKA/HALKit/AMD64/HalKernelMain.cxx
index ef743c20..b11d0701 100644
--- a/dev/ZKA/HALKit/AMD64/HalKernelMain.cxx
+++ b/dev/ZKA/HALKit/AMD64/HalKernelMain.cxx
@@ -89,8 +89,9 @@ EXTERN_C Kernel::Void hal_real_init(Kernel::Void) noexcept
Kernel::NeFileSystemMgr* mgr = (Kernel::mm_new_class<Kernel::NeFileSystemMgr>());
Kernel::NeFileSystemMgr::Mount(mgr);
- delete (NFS_CATALOG_STRUCT*)mgr->CreateDirectory("\\Boot\\");
- delete (NFS_CATALOG_STRUCT*)mgr->CreateDirectory("\\Support\\");
+ /// Do filesystem stuff here... (TODO)
+
+ Kernel::mm_delete_class(mgr);
mp_do_user_switch();