1 files changed, 18 insertions, 8 deletions

diff --git a/src/arch/amd64/mboot.c b/src/arch/amd64/mboot.c
index a6ee465..fbaaa92 100644
--- a/src/arch/amd64/mboot.c
+++ b/src/arch/amd64/mboot.c
@@ -1,24 +1,28 @@
 #include "mboot.h"
+#include "serial.h"
 
 #include <stddef.h>
 #include <lib.h>
 
-static void read_cmdline(struct mboot_info *info, struct mboot_tag *tag, char *data, uint8_t len) {
+static void read_cmdline(struct mboot_tag *tag, char *data, uint8_t len) {
     if (len >= CMDLINE_MAX)
 		len = CMDLINE_MAX; // truncate :(
     memcpy(tag->data.cmdline, data, len);
     tag->data.cmdline[len] = '\0';
-    info->tags[MBOOT_CMDLINE] = *tag;
 }
 
-static void read_xsdp(struct mboot_info *info, struct mboot_tag *tag, char *data) {
+static void read_memorymap(struct mboot_tag *tag, uint64_t size, uint32_t *data) {
+    tag->data.memory_map = (struct memory_map *) data;
+    tag->data.memory_map->size = size;
+}
+
+static void read_xsdp(struct mboot_tag *tag, char *data) {
 	tag->data.rootsdp = (void *) data;
-    info->tags[MBOOT_XSDP] = *tag;
 }
 
 static uint32_t *read_tag(struct mboot_info *info, uint32_t *data) {
     struct mboot_tag tag;
-    tag.type = ((uint16_t*)data)[0];
+    tag.type = *((uint16_t *)data);
     tag.size = data[1];
     tag.valid = 1;
 
@@ -26,15 +30,20 @@ static uint32_t *read_tag(struct mboot_info *info, uint32_t *data) {
 
     switch (tag.type) {
         case MBOOT_CMDLINE:
-            read_cmdline(info, &tag, (char *)(data + 2), data_len);
+            read_cmdline(&tag, (char *)(data + 2), data_len);
+            break;
+        case MBOOT_MEMORYMAP:
+            read_memorymap(&tag, tag.size, data + 2);
             break;
         case MBOOT_XSDP:
-            read_xsdp(info, &tag, (char *) (data + 2));
+            read_xsdp(&tag, (char *) (data + 2));
             break;
         default:
             break;
     }
 
+    info->tags[tag.type] = tag;
+
     if(tag.size % 8 != 0) {
 		tag.size += 8 - (tag.size % 8);
 	}
@@ -42,12 +51,13 @@ static uint32_t *read_tag(struct mboot_info *info, uint32_t *data) {
     return data + tag.size / sizeof(uint32_t);
 }
 
-struct mboot_info mboot_load_info(void *mboot_info) {
+struct mboot_info mboot_load_info(const void *mboot_info) {
 	struct mboot_info info = {0};
 
     uint32_t* data = (uint32_t*) mboot_info;
     info.total_size = *data++;
     info.reserved = *data++;
+	
 
     while((uint8_t*) data < (uint8_t*) mboot_info + info.total_size) {
         data = read_tag(&info, data);