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

Revert "Kernel: Switch singletons to use new Singleton class"

Browse source 
This reverts commit f48feae0b2.
This commit is contained in:
Andreas Kling 2020-08-22 17:53:34 +02:00
parent 0addcb45b8
commit 2fd9e72264
44 changed files with 146 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Kernel/init.cpp
View file

@ -135,10 +135,10 @@ extern "C" [[noreturn]] void init()
InterruptManagement::initialize();
ACPI::initialize();
VFS::initialize();
KeyboardDevice::initialize();
PS2MouseDevice::create();
Console::initialize();
new VFS;
new KeyboardDevice;
new PS2MouseDevice;
new Console;
klog() << "Starting SerenityOS...";
@ -146,7 +146,7 @@ extern "C" [[noreturn]] void init()
TimeManagement::initialize();
NullDevice::initialize();
new NullDevice;
if (!get_serial_debug())
new SerialDevice(SERIAL_COM1_ADDR, 64);
new SerialDevice(SERIAL_COM2_ADDR, 65);
@ -228,7 +228,7 @@ void init_stage2()
});
if (bxvga_found) {
BXVGADevice::initialize();
new BXVGADevice;
} else {
if (multiboot_info_ptr->framebuffer_type == MULTIBOOT_FRAMEBUFFER_TYPE_RGB || multiboot_info_ptr->framebuffer_type == MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT) {
new MBVGADevice(
@ -237,7 +237,7 @@ void init_stage2()
multiboot_info_ptr->framebuffer_width,
multiboot_info_ptr->framebuffer_height);
} else {
BXVGADevice::initialize();
new BXVGADevice;
}
}
}
@ -252,8 +252,9 @@ void init_stage2()
new ZeroDevice;
new FullDevice;
new RandomDevice;
PTYMultiplexer::initialize();
new PTYMultiplexer;
new SB16;
VMWareBackdoor::initialize();
bool force_pio = kernel_command_line().contains("force_pio");