Aren/rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

multiboot: Fix warnings when building BIOS port

Browse Source
This commit is contained in:
mintsuki 2022-09-27 05:55:00 +02:00
parent a2ba71eb1d
commit 00e9f2ce46
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/protos/multiboot1.c
View File

@ -377,7 +377,9 @@ noreturn void multiboot1_load(char *config, char *cmdline) {
multiboot1_info->flags |= (1 << 12); multiboot1_info->flags |= (1 << 12);
#if defined (UEFI)
skip_modeset:; skip_modeset:;
#endif
} else { } else {
#if defined (UEFI) #if defined (UEFI)
panic(true, "multiboot1: Cannot use text mode with UEFI."); panic(true, "multiboot1: Cannot use text mode with UEFI.");

6
common/protos/multiboot2.c
View File

@ -109,7 +109,9 @@ noreturn void multiboot2_load(char *config, char* cmdline) {
bool is_elf_info_requested = false; bool is_elf_info_requested = false;
#if defined (UEFI)
bool is_framebuffer_required = false; bool is_framebuffer_required = false;
#endif
uint64_t entry_point = 0xffffffff; uint64_t entry_point = 0xffffffff;
@ -147,7 +149,9 @@ noreturn void multiboot2_load(char *config, char* cmdline) {
#endif #endif
break; break;
case MULTIBOOT_TAG_TYPE_FRAMEBUFFER: case MULTIBOOT_TAG_TYPE_FRAMEBUFFER:
#if defined (UEFI)
is_framebuffer_required = is_required; is_framebuffer_required = is_required;
#endif
break; break;
case MULTIBOOT_TAG_TYPE_ACPI_NEW: case MULTIBOOT_TAG_TYPE_ACPI_NEW:
is_new_acpi_required = is_required; is_new_acpi_required = is_required;
@ -586,7 +590,9 @@ noreturn void multiboot2_load(char *config, char* cmdline) {
append_tag(info_idx, &tag->common); append_tag(info_idx, &tag->common);
#if defined (UEFI)
skip_modeset:; skip_modeset:;
#endif
} }
////////////////////////////////////////////// //////////////////////////////////////////////