summaryrefslogtreecommitdiff
path: root/kernel/src/memory/memory.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--kernel/src/arch/i686/memory.c (renamed from kernel/src/memory/memory.c)15
1 files changed, 5 insertions, 10 deletions
diff --git a/kernel/src/memory/memory.c b/kernel/src/arch/i686/memory.c
index 30da0fc..29f1f56 100644
--- a/kernel/src/memory/memory.c
+++ b/kernel/src/arch/i686/memory.c
@@ -1,11 +1,10 @@
+#include <stdbool.h>
#include <stdint.h>
#include <string.h>
#include <sys.h>
#include <panic.h>
-
-#include "memory.h"
-#include "boot/tag.h"
-#include "print.h"
+#include <arch/i686/memory.h>
+#include <arch/i686/mboot.h>
struct MemoryArea {
uint32_t len;
@@ -25,12 +24,12 @@ static uint32_t page_free_start;
static struct MemoryArea *page_start;
int memory_lock(void) {
- int_disable();
+ // int_disable();
return 0;
}
int memory_unlock(void) {
- int_enable();
+ // int_enable();
return 0;
}
@@ -114,8 +113,6 @@ int memory_free_page(void *ptr, int pages) {
void memory_init(void) {
- debugk("Loading memory pages");
-
memory_lock();
bitmap = NULL;
@@ -185,8 +182,6 @@ void memory_init(void) {
memory_unlock();
- succek("Memory loaded. %k total %k free", total_memory, free_memory);
-
}
uint32_t memory_total(void) {