From 6adb5396b1df078814991f06f609fab4027803da Mon Sep 17 00:00:00 2001 From: Alex Kotov Date: Thu, 1 Dec 2022 03:52:12 +0400 Subject: [PATCH] Upgrade submodule "vendor/libkernaux" --- src/multiboot2.c | 26 ++------------------------ vendor/libkernaux | 2 +- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/src/multiboot2.c b/src/multiboot2.c index ba8a1e7..24b4f99 100644 --- a/src/multiboot2.c +++ b/src/multiboot2.c @@ -2,28 +2,6 @@ #include -// TODO: move these macros to libkernaux - -#define HFIELDS_COMMON(whole_name, htag_name, type) \ - struct { \ - struct KernAux_Multiboot2_HTag_##type htag_name; \ - } KERNAUX_PACKED whole_name; - -#define HFIELDS_INFO_REQ_ODD(whole_name, htag_name, data_name, align_name, \ - mbi_tag_types_count) \ - struct { \ - struct KernAux_Multiboot2_HTag_InfoReq htag_name; \ - uint32_t data_name[mbi_tag_types_count]; \ - } KERNAUX_PACKED whole_name; \ - uint8_t align_name[4]; - -#define HFIELDS_INFO_REQ_EVEN(whole_name, htag_name, data_name, align_name, \ - mbi_tag_types_count) \ - struct { \ - struct KernAux_Multiboot2_HTag_InfoReq htag_name; \ - uint32_t data_name[mbi_tag_types_count]; \ - } KERNAUX_PACKED whole_name; - #include __attribute__(( @@ -33,8 +11,8 @@ __attribute__(( )) const struct { struct KernAux_Multiboot2_Header header; - HFIELDS_INFO_REQ_ODD(tag_info_req, tag, mbi_tag_types, _align1, 1) - HFIELDS_COMMON (tag_none, tag, None) + KERNAUX_MULTIBOOT2_HFIELDS_INFO_REQ_ODD(tag_info_req, 1, _align1) + KERNAUX_MULTIBOOT2_HFIELDS_COMMON(tag_none, None) } KERNAUX_PACKED multiboot2_header = { diff --git a/vendor/libkernaux b/vendor/libkernaux index 7ea1d4b..cb83422 160000 --- a/vendor/libkernaux +++ b/vendor/libkernaux @@ -1 +1 @@ -Subproject commit 7ea1d4b2b13053963001c7348b1f8eec8233c377 +Subproject commit cb834226a73eda147c0f6d60ad14a63ad2a93628