Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kernel: Add command lineoption `nousb` that will disable usb controller

This commit is contained in:
Bananymous 2024-08-16 22:09:24 +03:00
parent 46b34817d2
commit 368f5e9799
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/include/kernel/PCI.h
View File

@ -139,7 +139,7 @@ namespace Kernel::PCI
static void initialize(); static void initialize();
static PCIManager& get(); static PCIManager& get();
void initialize_devices(); void initialize_devices(bool disable_usb);
template<typename F> template<typename F>
void for_each_device(F callback) void for_each_device(F callback)

6
kernel/kernel/PCI.cpp
View File

@ -177,7 +177,7 @@ namespace Kernel::PCI
} }
} }
void PCIManager::initialize_devices() void PCIManager::initialize_devices(bool disable_usb)
{ {
for_each_device( for_each_device(
[&](PCI::Device& pci_device) [&](PCI::Device& pci_device)
@ -215,7 +215,9 @@ namespace Kernel::PCI
switch (pci_device.subclass()) switch (pci_device.subclass())
{ {
case 0x03: case 0x03:
if (auto res = USBManager::get().add_controller(pci_device); res.is_error()) if (disable_usb)
dprintln("USB support disabled, will not initialize {2H}.{2H}.{2H}", pci_device.class_code(), pci_device.subclass(), pci_device.prog_if());
else if (auto res = USBManager::get().add_controller(pci_device); res.is_error())
dprintln("{}", res.error()); dprintln("{}", res.error());
break; break;
default: default:

12
kernel/kernel/kernel.cpp
View File

@ -37,6 +37,7 @@ struct ParsedCommandLine
bool force_pic = false; bool force_pic = false;
bool disable_serial = false; bool disable_serial = false;
bool disable_smp = false; bool disable_smp = false;
bool disable_usb = false;
BAN::StringView console = "tty0"_sv; BAN::StringView console = "tty0"_sv;
BAN::StringView root; BAN::StringView root;
}; };
@ -75,6 +76,8 @@ static void parse_command_line()
cmdline.disable_serial = true; cmdline.disable_serial = true;
else if (argument == "nosmp") else if (argument == "nosmp")
cmdline.disable_smp = true; cmdline.disable_smp = true;
else if (argument == "nousb")
cmdline.disable_usb = true;
else if (argument.size() > 5 && argument.substring(0, 5) == "root=") else if (argument.size() > 5 && argument.substring(0, 5) == "root=")
cmdline.root = argument.substring(5); cmdline.root = argument.substring(5);
else if (argument.size() > 8 && argument.substring(0, 8) == "console=") else if (argument.size() > 8 && argument.substring(0, 8) == "console=")
@ -199,8 +202,11 @@ static void init2(void*)
PCI::PCIManager::initialize(); PCI::PCIManager::initialize();
dprintln("PCI initialized"); dprintln("PCI initialized");
MUST(USBManager::initialize()); if (!cmdline.disable_usb)
dprintln("USBManager initialized"); {
MUST(USBManager::initialize());
dprintln("USBManager initialized");
}
if (ACPI::ACPI::get().enter_acpi_mode(InterruptController::get().is_using_apic()).is_error()) if (ACPI::ACPI::get().enter_acpi_mode(InterruptController::get().is_using_apic()).is_error())
dprintln("Failed to enter ACPI mode"); dprintln("Failed to enter ACPI mode");
@ -222,7 +228,7 @@ static void init2(void*)
// NOTE: PCI devices are the last ones to be initialized // NOTE: PCI devices are the last ones to be initialized
// so other devices can reserve predefined interrupts // so other devices can reserve predefined interrupts
PCI::PCIManager::get().initialize_devices(); PCI::PCIManager::get().initialize_devices(cmdline.disable_usb);
dprintln("PCI devices initialized"); dprintln("PCI devices initialized");
VirtualFileSystem::initialize(cmdline.root); VirtualFileSystem::initialize(cmdline.root);