RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 04:17:34 +00:00
Code Issues Activity Actions

Kernel: Make UHCIController::spawn_port_process OOM-fallible

Browse source
This commit is contained in:
Idan Horowitz 2022-01-28 15:55:14 +02:00
parent ad7d4d9be1
commit c131e69748
2 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Kernel/Bus/USB/UHCI/UHCIController.cpp
View file

@ -76,7 +76,7 @@ ErrorOr<void> UHCIController::initialize()
dmesgln("UHCI: I/O base {}", m_io_base); dmesgln("UHCI: I/O base {}", m_io_base);
dmesgln("UHCI: Interrupt line: {}", interrupt_number()); dmesgln("UHCI: Interrupt line: {}", interrupt_number());
spawn_port_process(); TRY(spawn_port_process());
TRY(reset()); TRY(reset());
return start(); return start();
@ -464,15 +464,10 @@ size_t UHCIController::poll_transfer_queue(QueueHead& transfer_queue)
return transfer_size; return transfer_size;
} }
void UHCIController::spawn_port_process() ErrorOr<void> UHCIController::spawn_port_process()
{ {
RefPtr<Thread> usb_hotplug_thread; RefPtr<Thread> usb_hotplug_thread;
(void)Process::create_kernel_process(usb_hotplug_thread, TRY(KString::try_create("UHCI hotplug")), [&] {
auto process_name = KString::try_create("UHCI hotplug");
if (process_name.is_error())
TODO();
(void)Process::create_kernel_process(usb_hotplug_thread, process_name.release_value(), [&] {
for (;;) { for (;;) {
if (m_root_hub) if (m_root_hub)
m_root_hub->check_for_port_updates(); m_root_hub->check_for_port_updates();
@ -480,6 +475,7 @@ void UHCIController::spawn_port_process()
(void)Thread::current()->sleep(Time::from_seconds(1)); (void)Thread::current()->sleep(Time::from_seconds(1));
} }
}); });
return {};
} }
bool UHCIController::handle_irq(const RegisterState&) bool UHCIController::handle_irq(const RegisterState&)

2
Kernel/Bus/USB/UHCI/UHCIController.h
View file

@ -42,7 +42,7 @@ public:
virtual ErrorOr<void> reset() override; virtual ErrorOr<void> reset() override;
virtual ErrorOr<void> stop() override; virtual ErrorOr<void> stop() override;
virtual ErrorOr<void> start() override; virtual ErrorOr<void> start() override;
void spawn_port_process(); ErrorOr<void> spawn_port_process();
virtual ErrorOr<size_t> submit_control_transfer(Transfer& transfer) override; virtual ErrorOr<size_t> submit_control_transfer(Transfer& transfer) override;