Kernel: Only try to use VGA text mode on x86_64
This commit is contained in:
parent
93b6111f47
commit
3852f4f136
Notes:
sideshowbarker
2024-07-17 18:23:22 +09:00
Author: https://github.com/spholz Commit: https://github.com/SerenityOS/serenity/commit/3852f4f136 Pull-request: https://github.com/SerenityOS/serenity/pull/22099 Reviewed-by: https://github.com/ADKaster ✅
1 changed files with 5 additions and 1 deletions
|
@ -19,7 +19,6 @@
|
|||
#include <Kernel/Devices/Audio/Management.h>
|
||||
#include <Kernel/Devices/DeviceManagement.h>
|
||||
#include <Kernel/Devices/GPU/Console/BootFramebufferConsole.h>
|
||||
#include <Kernel/Devices/GPU/Console/VGATextModeConsole.h>
|
||||
#include <Kernel/Devices/GPU/Management.h>
|
||||
#include <Kernel/Devices/Generic/DeviceControlDevice.h>
|
||||
#include <Kernel/Devices/Generic/FullDevice.h>
|
||||
|
@ -63,6 +62,7 @@
|
|||
# include <Kernel/Arch/x86_64/Hypervisor/VMWareBackdoor.h>
|
||||
# include <Kernel/Arch/x86_64/Interrupts/APIC.h>
|
||||
# include <Kernel/Arch/x86_64/Interrupts/PIC.h>
|
||||
# include <Kernel/Devices/GPU/Console/VGATextModeConsole.h>
|
||||
#elif ARCH(AARCH64)
|
||||
# include <Kernel/Arch/aarch64/RPi/Framebuffer.h>
|
||||
# include <Kernel/Arch/aarch64/RPi/Mailbox.h>
|
||||
|
@ -258,7 +258,11 @@ extern "C" [[noreturn]] UNMAP_AFTER_INIT void init([[maybe_unused]] BootInfo con
|
|||
if ((multiboot_flags & MULTIBOOT_INFO_FRAMEBUFFER_INFO) && !multiboot_framebuffer_addr.is_null() && multiboot_framebuffer_type == MULTIBOOT_FRAMEBUFFER_TYPE_RGB) {
|
||||
g_boot_console = &try_make_lock_ref_counted<Graphics::BootFramebufferConsole>(multiboot_framebuffer_addr, multiboot_framebuffer_width, multiboot_framebuffer_height, multiboot_framebuffer_pitch).value().leak_ref();
|
||||
} else {
|
||||
#if ARCH(X86_64)
|
||||
g_boot_console = &Graphics::VGATextModeConsole::initialize().leak_ref();
|
||||
#else
|
||||
dbgln("No early framebuffer console available");
|
||||
#endif
|
||||
}
|
||||
}
|
||||
dmesgln("Starting SerenityOS...");
|
||||
|
|
Loading…
Add table
Reference in a new issue