changed loader allocation, preparing for boot data revamp

1 files changed, 14 insertions, 5 deletions

diff --git a/api/loader/data.h b/api/loader/data_efi.h
index 5bbf2a9..f159de6 100644
--- a/api/loader/data.h
+++ b/api/loader/data_efi.h
@@ -1,10 +1,20 @@
 #pragma once
 
+#include <kernel/memory/range.h>
+
 #include <efi.h>
 
+#include <stddef.h>
+
 #define EfiUserMemoryType (EFI_MEMORY_TYPE)0x80000000
 #define SystemMemoryType EfiUserMemoryType | 0x01
 
+enum efi_boot_data_type
+{
+    MEMORY_MAP_DATA,
+    FRAMEBUFFER_DATA,
+};
+
 struct efi_memory_map_data
 {
     UINTN size;
@@ -16,14 +26,13 @@ struct efi_memory_map_data
 
 struct efi_framebuffer_data
 {
-    EFI_PIXEL_BITMASK bitmask;
-    EFI_PHYSICAL_ADDRESS base;
-    UINTN size;
+    struct memory_range buffer;
     UINT32 width;
     UINT32 height;
     UINT32 pitch;
-    EFI_GRAPHICS_PIXEL_FORMAT pixel_format;
-    UINT8 pixel_size;
+    UINT8 pxsize;
+    EFI_PIXEL_BITMASK bitmask;
+    EFI_GRAPHICS_PIXEL_FORMAT pxformat;
 };
 
 struct efi_boot_data