From 4fffc7eb44a6d85fdc5627a71cff4f392068f5e7 Mon Sep 17 00:00:00 2001
From: Ada Christine <adachristine18@gmail.com>
Date: Wed, 28 Apr 2021 15:35:03 +0000
Subject: changed loader allocation, preparing for boot data revamp

---
 api/loader/data.h     | 36 ------------------------------------
 api/loader/data_efi.h | 45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 36 deletions(-)
 delete mode 100644 api/loader/data.h
 create mode 100644 api/loader/data_efi.h

(limited to 'api')

diff --git a/api/loader/data.h b/api/loader/data.h
deleted file mode 100644
index 5bbf2a9..0000000
--- a/api/loader/data.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-#include <efi.h>
-
-#define EfiUserMemoryType (EFI_MEMORY_TYPE)0x80000000
-#define SystemMemoryType EfiUserMemoryType | 0x01
-
-struct efi_memory_map_data
-{
-    UINTN size;
-    UINTN key;
-    UINTN descsize;
-    UINT32 descver;
-    EFI_MEMORY_DESCRIPTOR data[];
-};
-
-struct efi_framebuffer_data
-{
-    EFI_PIXEL_BITMASK bitmask;
-    EFI_PHYSICAL_ADDRESS base;
-    UINTN size;
-    UINT32 width;
-    UINT32 height;
-    UINT32 pitch;
-    EFI_GRAPHICS_PIXEL_FORMAT pixel_format;
-    UINT8 pixel_size;
-};
-
-struct efi_boot_data
-{
-    EFI_SYSTEM_TABLE *system_table;
-    struct efi_memory_map_data *memory_map;
-    struct efi_framebuffer_data *framebuffer;
-    void *acpi_rsdp;
-};
-
diff --git a/api/loader/data_efi.h b/api/loader/data_efi.h
new file mode 100644
index 0000000..f159de6
--- /dev/null
+++ b/api/loader/data_efi.h
@@ -0,0 +1,45 @@
+#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;
+    UINTN key;
+    UINTN descsize;
+    UINT32 descver;
+    EFI_MEMORY_DESCRIPTOR data[];
+};
+
+struct efi_framebuffer_data
+{
+    struct memory_range buffer;
+    UINT32 width;
+    UINT32 height;
+    UINT32 pitch;
+    UINT8 pxsize;
+    EFI_PIXEL_BITMASK bitmask;
+    EFI_GRAPHICS_PIXEL_FORMAT pxformat;
+};
+
+struct efi_boot_data
+{
+    EFI_SYSTEM_TABLE *system_table;
+    struct efi_memory_map_data *memory_map;
+    struct efi_framebuffer_data *framebuffer;
+    void *acpi_rsdp;
+};
+
-- 
cgit v1.3.1-1-g115d