aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/memory/alloc.h
diff options
context:
space:
mode:
authorMarvin Borner2020-05-06 19:04:05 +0200
committerMarvin Borner2020-05-06 19:04:05 +0200
commitd94ffac4a584dc7a4f6f2ec567b8caab05ce9253 (patch)
tree559cd596a0a407d4b40c1d12d3c6a0686494da16 /src/kernel/memory/alloc.h
parent1a8563a05608b5b5e27eada44cf4790926001c68 (diff)
New build parameters and shared includes
This changes many files but I've just applied some replace commands.. So - nothing special!
Diffstat (limited to 'src/kernel/memory/alloc.h')
-rw-r--r--src/kernel/memory/alloc.h28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/kernel/memory/alloc.h b/src/kernel/memory/alloc.h
index 6739eeb..5e51195 100644
--- a/src/kernel/memory/alloc.h
+++ b/src/kernel/memory/alloc.h
@@ -1,8 +1,8 @@
#ifndef MELVIX_ALLOC_H
#define MELVIX_ALLOC_H
-#include <stddef.h>
#include <stdint.h>
+#include <stddef.h>
#include <stdbool.h>
#define KHEAP_MAGIC 0x04206969
@@ -11,31 +11,31 @@
#define MEM_END 0x8000000
struct heap_header {
- uint32_t magic;
+ u32 magic;
bool free;
- uint32_t size;
- uint32_t magic2;
+ u32 size;
+ u32 magic2;
};
struct heap_footer {
- uint32_t magic;
- uint32_t size;
- uint32_t magic2;
+ u32 magic;
+ u32 size;
+ u32 magic2;
};
void kheap_init();
-void *fmalloc(uint32_t size);
-void *kcalloc(uint32_t num, uint32_t size);
-void *kmalloc(uint32_t size);
-void *kmalloc_a(uint32_t size);
+void *fmalloc(u32 size);
+void *kcalloc(u32 num, u32 size);
+void *kmalloc(u32 size);
+void *kmalloc_a(u32 size);
void kfree(void *ptr);
-void *umalloc(size_t size);
-void *ucalloc(uint32_t num, uint32_t size);
+void *umalloc(u32 size);
+void *ucalloc(u32 num, u32 size);
void ufree(void *address);
-void init_heap(struct heap_header *heap, size_t size);
+void init_heap(struct heap_header *heap, u32 size);
#define KHEAP_SIZE 0xFFFFF
#define UHEAP_SIZE 0xFFFFF