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

Kernel: Introduce the StorageManagement class

Browse source 
The StorageManagement class has 2 roles:
1. During boot, it should find all storage controllers in the machine,
and then determine what is the boot device.
2. Later on boot, it is a registrar of all storage controllers and
storage devices. Thus, it could be used to show information about these
devices when implemented.

This change allows the user to specify a boot driver other than /dev/hda
and if it's connected in the machine - it will boot.
This commit is contained in:
Liav A 2020-12-19 15:25:06 +02:00 • committed by Andreas Kling
parent 78ae4b0530
commit 469f20d4ee
4 changed files with 182 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Kernel/init.cpp
View file

@ -65,8 +65,7 @@
#include <Kernel/RTC.h>
#include <Kernel/Random.h>
#include <Kernel/Scheduler.h>
#include <Kernel/Storage/IDEController.h>
#include <Kernel/Storage/PATADiskDevice.h>
#include <Kernel/Storage/StorageManagement.h>
#include <Kernel/TTY/PTYMultiplexer.h>
#include <Kernel/TTY/VirtualConsole.h>
#include <Kernel/Tasks/FinalizerTask.h>
@ -271,20 +270,8 @@ void init_stage2(void*)
auto root = kernel_command_line().lookup("root").value_or("/dev/hda");
if (!root.starts_with("/dev/hda")) {
klog() << "init_stage2: root filesystem must be on the first IDE hard drive (/dev/hda)";
Processor::halt();
}
RefPtr<BlockDevice> checked_root_dev;
PCI::enumerate([&](const PCI::Address& address, PCI::ID) {
if (PCI::get_class(address) == 0x1 && PCI::get_subclass(address) == 0x1) {
auto pata0 = IDEController::initialize(address, force_pio);
checked_root_dev = *pata0->device(0);
}
});
ASSERT(!checked_root_dev.is_null());
NonnullRefPtr<BlockDevice> root_dev = checked_root_dev.release_nonnull();
StorageManagement::initialize(root, force_pio);
NonnullRefPtr<BlockDevice> root_dev = StorageManagement::the().boot_device();
root = root.substring(strlen("/dev/hda"), root.length() - strlen("/dev/hda"));