better mboot

1 files changed, 4 insertions, 37 deletions

diff --git a/src/arch/amd64/mboot.h b/src/arch/amd64/mboot.h
index 3be3054..90ed75c 100644
--- a/src/arch/amd64/mboot.h
+++ b/src/arch/amd64/mboot.h
@@ -1,44 +1,11 @@
 #pragma once
 
-#include "memory.h"
-#include <stdint.h>
-
-#define CMDLINE_MAX 32
-
-struct mboot_tag {
-	uint8_t valid; // if the tag at this location is set
-	uint32_t type;
-	uint32_t size;
-	union {
-		char cmdline[CMDLINE_MAX + 1];
-		struct memory_map *memory_map;
-		void *rootsdp;
-	} data;
-};
-
-enum mboot_tag_type {
-	MBOOT_CMDLINE = 0,
-	MBOOT_MEMORYMAP = 6,
-	MBOOT_SYMBOLS = 9,
-	MBOOT_XSDP = 14
-};
-
-struct mboot_info {
-	uint32_t total_size;
-	uint32_t reserved;
-	struct mboot_tag tags[22];
-};
+#include <shim.h>
+#include <memory.h>
 
 /**
  * Loads the multi boot information
  * @param mboot_info - the pointer passed from multiboot2
+ * @param shim_info - the info to be collected by shim
  */
-struct mboot_info mboot_load_info(const void *mboot_info);
-
-/**
- * Gets a tag from multiboot
- * @param type - the tag type
- * @returns NULL - tag not loaded
- * @returns tag - tag was loaded
- */
-struct mboot_tag *mboot_get_tag(struct mboot_info *info, enum mboot_tag_type type);
+void mboot_load_info(const void *mboot_info, struct boot_info *shim_info);