tailix/libkernaux
1
0
Fork 0
mirror of https://github.com/tailix/libkernaux.git synced 2025-09-18 22:58:55 -04:00
Code Releases Activity

Add field multiboot2_header_example2.tag_efi_*_entry_addr

Browse source
This commit is contained in:
Alex Kotov 2022-01-14 09:38:30 +05:00
parent ade74a9941
commit df4f518f77
3 changed files with 35 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/multiboot2/enums_to_str.c
View file

@ -29,7 +29,7 @@ const char *KernAux_Multiboot2_HTag_to_str(
case KERNAUX_MULTIBOOT2_HTAG_EFI_I386_ENTRY_ADDR: case KERNAUX_MULTIBOOT2_HTAG_EFI_I386_ENTRY_ADDR:
return "EFI i386 entry address"; return "EFI i386 entry address";
case KERNAUX_MULTIBOOT2_HTAG_EFI_AMD64_ENTRY_ADDR: case KERNAUX_MULTIBOOT2_HTAG_EFI_AMD64_ENTRY_ADDR:
return "EFI AMD64 entry address"; return "EFI amd64 entry address";
case KERNAUX_MULTIBOOT2_HTAG_RELOCATABLE_HEADER: case KERNAUX_MULTIBOOT2_HTAG_RELOCATABLE_HEADER:
return "relocatable header"; return "relocatable header";
default: default:

24
tests/multiboot2_header_example2.h
View file

@ -24,6 +24,14 @@ static const struct {
struct KernAux_Multiboot2_HTag_EFIBootServices tag_efi_boot_services; struct KernAux_Multiboot2_HTag_EFIBootServices tag_efi_boot_services;
struct KernAux_Multiboot2_HTag_EFII386EntryAddr tag_efi_i386_entry_addr;
uint8_t _align4[4];
struct KernAux_Multiboot2_HTag_EFIAmd64EntryAddr tag_efi_amd64_entry_addr;
uint8_t _align5[4];
struct KernAux_Multiboot2_HTag_None tag_none; struct KernAux_Multiboot2_HTag_None tag_none;
} multiboot2_header_example2 = { } multiboot2_header_example2 = {
.multiboot2_header = { .multiboot2_header = {
@ -122,6 +130,22 @@ static const struct {
.size = sizeof(multiboot2_header_example2.tag_efi_boot_services), .size = sizeof(multiboot2_header_example2.tag_efi_boot_services),
}, },
}, },
.tag_efi_i386_entry_addr = {
.base = {
.type = KERNAUX_MULTIBOOT2_HTAG_EFI_I386_ENTRY_ADDR,
.flags = 0,
.size = sizeof(multiboot2_header_example2.tag_efi_i386_entry_addr),
},
.entry_addr = 0,
},
.tag_efi_amd64_entry_addr = {
.base = {
.type = KERNAUX_MULTIBOOT2_HTAG_EFI_AMD64_ENTRY_ADDR,
.flags = 0,
.size = sizeof(multiboot2_header_example2.tag_efi_amd64_entry_addr),
},
.entry_addr = 0,
},
.tag_none = { .tag_none = {
.base = { .base = {
.type = KERNAUX_MULTIBOOT2_HTAG_NONE, .type = KERNAUX_MULTIBOOT2_HTAG_NONE,

12
tests/test_multiboot2_header_print.c
View file

@ -14,8 +14,8 @@ static const char output2[] =
"Multiboot 2 header\n" "Multiboot 2 header\n"
" magic: 920085129\n" " magic: 920085129\n"
" arch: 1\n" " arch: 1\n"
" size: 216\n" " size: 248\n"
" checksum: 3374881950\n" " checksum: 3374881918\n"
"Multiboot 2 header tag\n" "Multiboot 2 header tag\n"
" type: 1 (information request)\n" " type: 1 (information request)\n"
" flags: 0\n" " flags: 0\n"
@ -45,6 +45,14 @@ static const char output2[] =
" flags: 0\n" " flags: 0\n"
" size: 8\n" " size: 8\n"
"Multiboot 2 header tag\n" "Multiboot 2 header tag\n"
" type: 8 (EFI i386 entry address)\n"
" flags: 0\n"
" size: 12\n"
"Multiboot 2 header tag\n"
" type: 9 (EFI amd64 entry address)\n"
" flags: 0\n"
" size: 12\n"
"Multiboot 2 header tag\n"
" type: 0 (none)\n" " type: 0 (none)\n"
" flags: 0\n" " flags: 0\n"
" size: 8\n"; " size: 8\n";