diff options
| author | Ada Christine <adachristine18@gmail.com> | 2023-01-04 21:45:32 +0000 |
|---|---|---|
| committer | Ada Christine <adachristine18@gmail.com> | 2023-01-04 21:45:32 +0000 |
| commit | f82465735f0ba37c4ba202875936562c02538d5b (patch) | |
| tree | d39de345ca87228d870465e4f28a4e22e3bf7c79 /kc/boot/kc_main.c | |
| parent | 26f81e50066e5bb7aeae218094e0f834c405a8c1 (diff) | |
| parent | fcd3e818a9f1b7009c9c027a69b2ef0e7ef71293 (diff) | |
Merge branch 'gnu-efi-gone'
Diffstat (limited to 'kc/boot/kc_main.c')
| -rw-r--r-- | kc/boot/kc_main.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kc/boot/kc_main.c b/kc/boot/kc_main.c index fe670b0..ca4ba8b 100644 --- a/kc/boot/kc_main.c +++ b/kc/boot/kc_main.c @@ -1,5 +1,9 @@ #include "loader_paging.h" +#include <efi/graphics.h> +#include <efi/acpi.h> +#include <efi/error.h> + #include <loader/efi/shim.h> #include <kernel/entry.h> #include <kernel/memory/range.h> @@ -39,7 +43,7 @@ static struct efi_loader_interface *loader_interface; static struct efi_boot_data boot_data; static EFI_BOOT_SERVICES *e_bs = NULL; static uint64_t *system_page_map = NULL; -static SIMPLE_TEXT_OUTPUT_INTERFACE *eto; +static EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *eto; static struct kc_boot_data *k_boot_data; static void *object_space_base; @@ -232,7 +236,7 @@ static void collect_video_data(void) static void collect_acpi_data(void) { - EFI_GUID acpi2_guid = ACPI_20_TABLE_GUID; + EFI_GUID acpi2_guid = EFI_ACPI_20_TABLE_GUID; EFI_GUID acpi_guid = ACPI_TABLE_GUID; UINTN config_table_count = |