1 files changed, 38 insertions, 46 deletions

diff --git a/src/arch/amd64/mboot.c b/src/arch/amd64/mboot.c
index 9d06fd0..68c9383 100644
--- a/src/arch/amd64/mboot.c
+++ b/src/arch/amd64/mboot.c
@@ -1,80 +1,72 @@
 #include "mboot.h"
 #include "serial.h"
+#include "shim.h"
 
-#include <stddef.h>
 #include <lib.h>
 
-static void read_cmdline(struct mboot_tag *tag, char *data, uint8_t len) {
+enum mboot_tag_type {
+	MBOOT_CMDLINE = 0,
+	MBOOT_MEMORYMAP = 6,
+	MBOOT_SYMBOLS = 9,
+	MBOOT_XSDP = 14
+};
+
+static void read_cmdline(struct boot_info *shim_info, char *data, uint8_t len) {
     if (len >= CMDLINE_MAX)
 		len = CMDLINE_MAX; // truncate :(
-    memcpy(tag->data.cmdline, data, len);
-    tag->data.cmdline[len] = '\0';
+    memcpy(shim_info->cmdline, data, len);
+    shim_info->cmdline[len] = '\0';
 }
 
-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_memorymap(struct boot_info *shim_info, uint64_t size, uint32_t *data) {
+    shim_info->map = (struct memory_map *) data;
+    shim_info->map->size = size;
 }
 
-static void read_xsdp(struct mboot_tag *tag, char *data) {
-	tag->data.rootsdp = (void *) data;
+static void read_xsdp(struct boot_info *shim_info, char *data) {
+    shim_info->acpi_table = (void *) data;
 }
 
-static uint32_t *read_tag(struct mboot_info *info, uint32_t *data) {
-    struct mboot_tag tag;
-    tag.type = *((uint16_t *)data);
-    tag.size = data[1];
-    tag.valid = 1;
+static uint32_t *read_tag(uint32_t *data, struct boot_info *shim_info) {
+
+    uint16_t type = *((uint16_t *)data);
+    uint32_t size = data[1];
 
-    uint8_t data_len = tag.size - 2 * sizeof(uint32_t);
+    uint8_t data_len = size - 2 * sizeof(uint32_t);
 
-    switch (tag.type) {
+    switch (type) {
         case MBOOT_CMDLINE:
-            read_cmdline(&tag, (char *)(data + 2), data_len);
+            read_cmdline(shim_info, (char *)(data + 2), data_len);
             break;
         case MBOOT_MEMORYMAP:
-            read_memorymap(&tag, tag.size, data + 2);
+            read_memorymap(shim_info, size, data + 2);
             break;
         case MBOOT_SYMBOLS:
             // TODO:
-            goto done;
+            break;
         case MBOOT_XSDP:
-            read_xsdp(&tag, (char *) (data + 2));
+            read_xsdp(shim_info, (char *) (data + 2));
             break;
         default:
-            goto done;
+            break;
     }
 
-done:
-
-    info->tags[tag.type] = tag;
-
-    if(tag.size % 8 != 0) {
-		tag.size += 8 - (tag.size % 8);
+    if(size % 8 != 0) {
+		size += 8 - (size % 8);
 	}
 
-    return data + tag.size / sizeof(uint32_t);
+    return data + size / sizeof(uint32_t);
 }
 
-struct mboot_info mboot_load_info(const void *mboot_info) {
-	struct mboot_info info = {0};
-
+void mboot_load_info(
+        const void *mboot_info,
+        struct boot_info *shim_info
+) {
     uint32_t* data = (uint32_t*) mboot_info;
-    info.total_size = *data++;
-    info.reserved = *data++;
-	
+    uint32_t total_size = *data++;
+    data++; //reserved
 
-    while((uint8_t*) data < (uint8_t*) mboot_info + info.total_size) {
-        data = read_tag(&info, data);
+    while((uint8_t*) data < (uint8_t*) mboot_info + total_size) {
+        data = read_tag(data, shim_info);
     }
-	
-	return info;
-}
-
-struct mboot_tag *mboot_get_tag(struct mboot_info *info, enum mboot_tag_type type) {
-	if (info->tags[type].valid) {
-		return &info->tags[type];
-	} else {
-		return NULL;
-	}
 }