Espresso 0.0.2a

include/mm/heap.h

@@ -1,19 +1,13 @@
 #ifndef _HEAP_H
 #define _HEAP_H
 
-#include <types.h>
-
-#define HEAP_START 0xC0000000
-#define HEAP_SIZE  (1024 * 4096) /* 1MB heap */
-
-void heap_init(void);
+#include <stddef.h>
+#include <stdint.h>
 
+void  heap_init(uint32_t start, uint32_t size);
 void* malloc(size_t size);
-void* malloc_aligned(size_t size, size_t alignment);
-
+void  free(void* ptr);
 void* calloc(size_t nmemb, size_t size);
 void* realloc(void* ptr, size_t size);
 
-void free(void* ptr);
-
 #endif

include/mm/paging.h

@@ -1,9 +1,9 @@
 #ifndef _PAGING_H
 #define _PAGING_H
 
-#include <types.h>
+#include <stdint.h>
 
 void paging_init(void);
-void map_page(void* phys, void* virt);
+void map_page(void* phys_addr, void* virt_addr);
 
 #endif

include/mm/pmm.h

@@ -4,8 +4,8 @@
 #include <types.h>
 #include <multiboot.h>
 
-void pmm_init(multiboot_info_t* mb_info);
-void* alloc_page(void);
-void free_page(void* ptr);
+void pmm_init(multiboot_info_t* mb);
+void* pmm_alloc_page(void);
+void  pmm_free_page(void* addr);
 
 #endif