RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 05:28:11 +00:00
Code Issues Activity Actions

Kernel/Graphics: Simplify the GenericGraphicsAdapter class

Browse source 
The old methods are already can be considered deprecated, and now after
we removed framebuffer devices entirely, we can safely remove these
methods too, which simplfies the GenericGraphicsAdapter class a lot.
This commit is contained in:
Liav A 2022-04-30 15:54:23 +03:00 • committed by Andreas Kling
parent d49a35df31
commit b96b2fb9be
7 changed files with 3 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Kernel/Graphics/GraphicsManagement.cpp
View file

@ -85,22 +85,12 @@ void GraphicsManagement::set_vga_text_mode_cursor(size_t console_width, size_t x
void GraphicsManagement::deactivate_graphical_mode()
{
// FIXME: Remove this once we don't support Framebuffer devices anymore.
for (auto& graphics_device : m_graphics_devices) {
graphics_device.enable_consoles();
}
for (auto& connector : m_display_connector_nodes) {
connector.set_display_mode({}, DisplayConnector::DisplayMode::Console);
}
}
void GraphicsManagement::activate_graphical_mode()
{
// FIXME: Remove this once we don't support Framebuffer devices anymore.
for (auto& graphics_device : m_graphics_devices) {
graphics_device.disable_consoles();
}
for (auto& connector : m_display_connector_nodes) {
connector.set_display_mode({}, DisplayConnector::DisplayMode::Graphical);
}
@ -134,7 +124,6 @@ UNMAP_AFTER_INIT bool GraphicsManagement::determine_and_initialize_isa_graphics_
dmesgln("Graphics: Using a ISA VGA compatible generic adapter");
auto adapter = ISAVGAAdapter::initialize();
m_graphics_devices.append(*adapter);
adapter->enable_consoles();
m_vga_adapter = adapter;
return true;
}
@ -142,11 +131,6 @@ UNMAP_AFTER_INIT bool GraphicsManagement::determine_and_initialize_isa_graphics_
UNMAP_AFTER_INIT bool GraphicsManagement::determine_and_initialize_graphics_device(PCI::DeviceIdentifier const& device_identifier)
{
VERIFY(is_vga_compatible_pci_device(device_identifier) || is_display_controller_pci_device(device_identifier));
auto add_and_configure_adapter = [&](GenericGraphicsAdapter& graphics_device) {
m_graphics_devices.append(graphics_device);
graphics_device.enable_consoles();
graphics_device.initialize_framebuffer_devices();
};
RefPtr<GenericGraphicsAdapter> adapter;
auto create_bootloader_framebuffer_device = [&]() {
@ -210,7 +194,7 @@ UNMAP_AFTER_INIT bool GraphicsManagement::determine_and_initialize_graphics_devi
if (!adapter)
return false;
add_and_configure_adapter(*adapter);
m_graphics_devices.append(*adapter);
// Note: If IO space is enabled, this VGA adapter is operating in VGA mode.
// Note: If no other VGA adapter is attached as m_vga_adapter, we should attach it then.