better mboot and kalloc

1 files changed, 2 insertions, 26 deletions

diff --git a/src/kmain.c b/src/kmain.c
index 6424b95..54ed506 100644
--- a/src/kmain.c
+++ b/src/kmain.c
@@ -1,36 +1,12 @@
-#include "acpi.h"
+#include <acpi.h>
 #include <memory.h>
 #include <lib.h>
 #include <serial.h>
 #include <fb.h>
 #include <shim.h>
 
-void print_memory() {
-	size_t WIDTH = 64;
-
-	for(size_t i = 0;; i += WIDTH) {
-		char buf[20];
-		ultoa(i, buf, 16);
-		serial_out_str("0x");
-		for(size_t k = 0; k < 6 - strlen(buf); k++) {
-			serial_out('0');
-		}
-		serial_out_str(buf);
-		serial_out_str(": ");
-		for(size_t j = 0; j < WIDTH; j++) {
-			char x = *(char *)(i + j);
-			if(x < 0x20 || x >= 0x7f) {
-				serial_out('.');
-			} else {
-				serial_out(x);
-			}
-		}
-		serial_out('\n');
-	}
-}
-
 void kmain(struct boot_info *info) {
-	memory_init(info->map);
+	memory_init(&info->map);
 	//acpi_init(info->acpi_table);
 	//fb_init(1024, 768);