From f9c6fa1134ceae24196f3b7146910908c30f903b Mon Sep 17 00:00:00 2001 From: Alex Kotov Date: Sun, 29 Nov 2020 19:46:28 +0500 Subject: [PATCH] Add more Multiboot 2 tags to example data --- tests/multiboot2_print2.c | 60 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/tests/multiboot2_print2.c b/tests/multiboot2_print2.c index f933b98..7dda350 100644 --- a/tests/multiboot2_print2.c +++ b/tests/multiboot2_print2.c @@ -97,6 +97,27 @@ static const struct { unsigned char data[8]; } tag_networking_info; + struct { + struct KernAux_Multiboot2_Tag_EFIMemoryMap tag; + unsigned char data[8]; + } tag_efi_memory_map; + + struct KernAux_Multiboot2_Tag_EFIBootServicesNotTerminated + tag_efi_boot_services_not_terminated; + + struct KernAux_Multiboot2_Tag_EFI32bitImageHandlePtr + tag_efi_32bit_image_handle_ptr; + + unsigned char _align10[4]; + + struct KernAux_Multiboot2_Tag_EFI64bitImageHandlePtr + tag_efi_64bit_image_handle_ptr; + + struct KernAux_Multiboot2_Tag_ImageLoadBasePhysAddr + tag_image_load_base_phys_addr; + + unsigned char _align11[4]; + struct KernAux_Multiboot2_Tag_None tag_none; } multiboot2_example = { .multiboot2 = { @@ -315,6 +336,45 @@ static const struct { }, .data = {0, 0, 0, 0, 0, 0, 0, 0}, }, + .tag_efi_memory_map = { + .tag = { + .base = { + .type = KERNAUX_MULTIBOOT2_TAGTYPE_EFI_MEMORY_MAP, + .size = sizeof(multiboot2_example.tag_efi_memory_map), + }, + .descriptor_size = 123, + .descriptor_version = 1, + }, + .data = {0, 0, 0, 0, 0, 0, 0, 0}, + }, + .tag_efi_boot_services_not_terminated = { + .base = { + .type = KERNAUX_MULTIBOOT2_TAGTYPE_EFI_BOOT_SERVICES_NOT_TERMINATED, + .size = + sizeof(multiboot2_example.tag_efi_boot_services_not_terminated), + }, + }, + .tag_efi_32bit_image_handle_ptr = { + .base = { + .type = KERNAUX_MULTIBOOT2_TAGTYPE_EFI_32BIT_IMAGE_HANDLE_PTR, + .size = sizeof(multiboot2_example.tag_efi_32bit_image_handle_ptr), + }, + .pointer = 0, + }, + .tag_efi_64bit_image_handle_ptr = { + .base = { + .type = KERNAUX_MULTIBOOT2_TAGTYPE_EFI_64BIT_IMAGE_HANDLE_PTR, + .size = sizeof(multiboot2_example.tag_efi_64bit_image_handle_ptr), + }, + .pointer = 0, + }, + .tag_image_load_base_phys_addr = { + .base = { + .type = KERNAUX_MULTIBOOT2_TAGTYPE_IMAGE_LOAD_BASE_PHYS_ADDR, + .size = sizeof(multiboot2_example.tag_image_load_base_phys_addr), + }, + .load_base_addr = 123, + }, .tag_none = { .base = { .type = KERNAUX_MULTIBOOT2_TAGTYPE_NONE,