diff options
Diffstat (limited to 'dev/ddk/src')
| -rw-r--r-- | dev/ddk/src/ddk_alloc.c | 4 | ||||
| -rw-r--r-- | dev/ddk/src/ddk_dev.c | 4 | ||||
| -rw-r--r-- | dev/ddk/src/ddk_rt_cxx.cc | 8 |
3 files changed, 8 insertions, 8 deletions
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); } |
