git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
feat: disk read/write support for both ATA and ATAPI device
[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 793ab3f8218cc1218737f4033262dbbe0ac2d907..0a79cdc07ba75d7a5c4a25c5972905a84481ad6e 100644
(file)
--- a/
lunaix-os/includes/lunaix/mm/dmm.h
+++ b/
lunaix-os/includes/lunaix/mm/dmm.h
@@
-2,9
+2,9
@@
#define __LUNAIX_DMM_H
// Dynamic Memory (i.e., heap) Manager
#define __LUNAIX_DMM_H
// Dynamic Memory (i.e., heap) Manager
-#include <stddef.h>
#include <lunaix/mm/mm.h>
#include <lunaix/process.h>
#include <lunaix/mm/mm.h>
#include <lunaix/process.h>
+#include <stddef.h>
#define M_ALLOCATED 0x1
#define M_PREV_FREE 0x2
#define M_ALLOCATED 0x1
#define M_PREV_FREE 0x2
@@
-31,14
+31,14
@@
#define HEAP_INIT_SIZE 4096
#define HEAP_INIT_SIZE 4096
-
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*
-lx
brk(heap_context_t* heap, size_t size
);
+lx
sbrk(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);