5 files changed, 9 insertions, 26 deletions
diff --git a/dev/ddk/DDKKit/ifs.h b/dev/ddk/DDKKit/ifs.h
deleted file mode 100644
index 46c13be4..00000000
--- a/dev/ddk/DDKKit/ifs.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* -------------------------------------------
-
-  Copyright Amlal El Mahrouss.
-
-  FILE: ifs.h
-  PURPOSE: IFS model base header.
-
-------------------------------------------- */
-
-#pragma once
-
-#include <DDKKit/macros.h>
-
-struct DDK_IFS_MANIFEST;
-
-/// @brief IFS hooks to plug into the FileMgr.
-/// why? because we don't need to implement filesystem on the kernel directly.
diff --git a/dev/ddk/DDKKit/macros.h b/dev/ddk/DDKKit/macros.h
index 6de03ae0..9b7b3d50 100644
--- a/dev/ddk/DDKKit/macros.h
+++ b/dev/ddk/DDKKit/macros.h
@@ -45,4 +45,4 @@
 
 #ifndef __NEOSKRNL__
 #error !!! Do not include header in EL0/Ring 3 mode !!!
-#endif  // __MINOSKRNL__
-\ No newline at end of file
+#endif  // __NEOSKRNL__
+\ No newline at end of file
diff --git a/dev/ddk/src/ddk_alloc.c b/dev/ddk/src/ddk_alloc.c
index 6daafb7e..0b428b15 100644
--- a/dev/ddk/src/ddk_alloc.c
+++ b/dev/ddk/src/ddk_alloc.c
@@ -16,7 +16,7 @@
 DDK_EXTERN void* kalloc(size_t sz) {
   if (!sz) ++sz;
 
-  void* ptr = ke_call("mm_new_heap", 1, &sz, sizeof(size_t));
+  void* ptr = ke_call("mm_alloc_ptr", 1, &sz, sizeof(size_t));
 
   return ptr;
 }
@@ -28,5 +28,5 @@ DDK_EXTERN void* kalloc(size_t sz) {
 DDK_EXTERN void kfree(void* ptr) {
   if (!ptr) return;
 
-  ke_call("mm_delete_heap", 1, ptr, 0);
+  ke_call("mm_free_ptr", 1, ptr, 0);
 }
diff --git a/dev/ddk/src/ddk_dev.c b/dev/ddk/src/ddk_dev.c
index 281e48c7..4cd7dcdd 100644
--- a/dev/ddk/src/ddk_dev.c
+++ b/dev/ddk/src/ddk_dev.c
@@ -13,7 +13,7 @@
 DDK_EXTERN DDK_DEVICE_PTR open(const char* devicePath) {
   if (!devicePath) return nil;
 
-  return ke_call("sk_open_dev", 1, (void*) devicePath, kstrlen(devicePath));
+  return ke_call("dk_open_dev", 1, (void*) devicePath, kstrlen(devicePath));
 }
 
 /// @brief Close any device.
@@ -21,6 +21,6 @@ DDK_EXTERN DDK_DEVICE_PTR open(const char* devicePath) {
 DDK_EXTERN BOOL close(DDK_DEVICE_PTR device) {
   if (!device) return NO;
 
-  ke_call("sk_close_dev", 1, device, sizeof(DDK_DEVICE));
+  ke_call("dk_close_dev", 1, device, sizeof(DDK_DEVICE));
   return YES;
 }
diff --git a/dev/ddk/src/ddk_rt_cxx.cc b/dev/ddk/src/ddk_rt_cxx.cc
index 7daf0fcc..3d57e2b9 100644
--- a/dev/ddk/src/ddk_rt_cxx.cc
+++ b/dev/ddk/src/ddk_rt_cxx.cc
@@ -9,17 +9,17 @@
 #include <DDKKit/ddk.h>
 
 void* operator new(size_t sz) {
-  return kalloc(sz);
+  return ::kalloc(sz);
 }
 
 void operator delete(void* ptr) {
-  kfree(ptr);
+  ::kfree(ptr);
 }
 
 void* operator new[](size_t sz) {
-  return kalloc(sz);
+  return ::kalloc(sz);
 }
 
 void operator delete[](void* ptr) {
-  kfree(ptr);
+  ::kfree(ptr);
 }