Merge branch 'master' into sata-ahci-dev

[lunaix-os.git] / lunaix-os / includes / lunaix / mm / dmm.h

diff --git a/lunaix-os/includes/lunaix/mm/dmm.h b/lunaix-os/includes/lunaix/mm/dmm.h
index 22b0539391248ba746236e7f9422f821654c2e68..0a79cdc07ba75d7a5c4a25c5972905a84481ad6e 100644 (file)
--- a/lunaix-os/includes/lunaix/mm/dmm.h
+++ b/lunaix-os/includes/lunaix/mm/dmm.h
@@ -2,6 +2,8 @@
 #define __LUNAIX_DMM_H
 // Dynamic Memory (i.e., heap) Manager
 
 #define __LUNAIX_DMM_H
 // Dynamic Memory (i.e., heap) Manager
 

+#include <lunaix/mm/mm.h>
+#include <lunaix/process.h>

 #include <stddef.h>
 
 #define M_ALLOCATED 0x1
 #include <stddef.h>
 
 #define M_ALLOCATED 0x1


@@ -29,21 +31,14 @@
 
 #define HEAP_INIT_SIZE 4096
 
 
 #define HEAP_INIT_SIZE 4096
 

-typedef struct 
-{
-    void* start;
-    void* brk;
-    void* max_addr;
-} heap_context_t;
-
-

 int
 dmm_init(heap_context_t* heap);
 
 int
 int
 dmm_init(heap_context_t* heap);
 
 int

-lxsbrk(heap_context_t* heap, void* addr);
+lxbrk(heap_context_t* heap, void* addr, int user);
+

 void*
 void*

-lxbrk(heap_context_t* heap, size_t size);
+lxsbrk(heap_context_t* heap, size_t size, int user);

 
 void*
 lx_malloc_internal(heap_context_t* heap, size_t size);
 
 void*
 lx_malloc_internal(heap_context_t* heap, size_t size);