summaryrefslogtreecommitdiff
path: root/Source/Kernel/SyscallManager
diff options
context:
space:
mode:
authorAlexis211 <alexis211@gmail.com>2009-10-18 18:46:59 +0200
committerAlexis211 <alexis211@gmail.com>2009-10-18 18:46:59 +0200
commit776753bfa0c411f4b1a5680409104904961fcbeb (patch)
tree8e1d90bbc91a6925b86adbda9d91f6be50fd2388 /Source/Kernel/SyscallManager
parentccf807eb4ff541bb849c4f370d34123cb23d7d76 (diff)
downloadMelon-776753bfa0c411f4b1a5680409104904961fcbeb.tar.gz
Melon-776753bfa0c411f4b1a5680409104904961fcbeb.zip
Mem::kalloc and Mem::kfree renamed to Mem::alloc and Mem::kfree
I renamed them so that they could have the same name in userland and in kernel space. We'll just know that if we're writing kernel code then we are allocating stuff in kernel memory, and if we're writing user code then we're allocating userland memory.
Diffstat (limited to 'Source/Kernel/SyscallManager')
-rw-r--r--Source/Kernel/SyscallManager/Res.ns.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Kernel/SyscallManager/Res.ns.cpp b/Source/Kernel/SyscallManager/Res.ns.cpp
index 274f6f1..1779a00 100644
--- a/Source/Kernel/SyscallManager/Res.ns.cpp
+++ b/Source/Kernel/SyscallManager/Res.ns.cpp
@@ -12,18 +12,18 @@ u32int size = 0;
void expand() { //Expands size of ressources array of 20 entries
size += 20;
- Ressource** tmp = (Ressource**)Mem::kalloc(size * sizeof(Ressource*));
+ Ressource** tmp = (Ressource**)Mem::alloc(size * sizeof(Ressource*));
for (u32int i = 0; i < size; i++) {
if (i < size - 20) tmp[i] = ressources[i];
else tmp[i] = 0;
}
- Mem::kfree(ressources);
+ Mem::free(ressources);
ressources = tmp;
}
u32int registerRes(Ressource* r) {
if (ressources == 0 or size == 0) {
- ressources = (Ressource**)Mem::kalloc(20 * sizeof(Ressource*));
+ ressources = (Ressource**)Mem::alloc(20 * sizeof(Ressource*));
size = 20;
for (u32int i = 0; i < 20; i++) ressources[i] = 0;
}