mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 00:27:43 +00:00
Kernel: Store IRQControllers in NonnullRefPtrs instead of RefPtrs
These are always non-null, so there's no point in storing them in a nullable container.
This commit is contained in:
parent
176989d811
commit
9abbeff79f
8 changed files with 13 additions and 15 deletions
|
@ -42,12 +42,12 @@ u8 InterruptManagement::acquire_mapped_interrupt_number(u8 interrupt_number)
|
|||
return interrupt_number;
|
||||
}
|
||||
|
||||
Vector<LockRefPtr<IRQController>> const& InterruptManagement::controllers()
|
||||
Vector<NonnullLockRefPtr<IRQController>> const& InterruptManagement::controllers()
|
||||
{
|
||||
return m_interrupt_controllers;
|
||||
}
|
||||
|
||||
LockRefPtr<IRQController> InterruptManagement::get_responsible_irq_controller(u8)
|
||||
NonnullLockRefPtr<IRQController> InterruptManagement::get_responsible_irq_controller(u8)
|
||||
{
|
||||
// TODO: Support more interrupt controllers
|
||||
VERIFY(m_interrupt_controllers.size() == 1);
|
||||
|
|
|
@ -20,14 +20,14 @@ public:
|
|||
|
||||
static u8 acquire_mapped_interrupt_number(u8 original_irq);
|
||||
|
||||
Vector<LockRefPtr<IRQController>> const& controllers();
|
||||
LockRefPtr<IRQController> get_responsible_irq_controller(u8 interrupt_vector);
|
||||
Vector<NonnullLockRefPtr<IRQController>> const& controllers();
|
||||
NonnullLockRefPtr<IRQController> get_responsible_irq_controller(u8 interrupt_vector);
|
||||
|
||||
private:
|
||||
InterruptManagement() = default;
|
||||
void find_controllers();
|
||||
|
||||
Vector<LockRefPtr<IRQController>> m_interrupt_controllers;
|
||||
Vector<NonnullLockRefPtr<IRQController>> m_interrupt_controllers;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -51,8 +51,8 @@ public:
|
|||
virtual void switch_to_pic_mode();
|
||||
virtual void switch_to_ioapic_mode();
|
||||
|
||||
LockRefPtr<IRQController> get_responsible_irq_controller(u8 interrupt_vector);
|
||||
LockRefPtr<IRQController> get_responsible_irq_controller(IRQControllerType controller_type, u8 interrupt_vector);
|
||||
NonnullLockRefPtr<IRQController> get_responsible_irq_controller(u8 interrupt_vector);
|
||||
NonnullLockRefPtr<IRQController> get_responsible_irq_controller(IRQControllerType controller_type, u8 interrupt_vector);
|
||||
|
||||
Vector<ISAInterruptOverrideMetadata> const& isa_overrides() const { return m_isa_interrupt_overrides; }
|
||||
|
||||
|
@ -69,7 +69,7 @@ private:
|
|||
InterruptManagement();
|
||||
PhysicalAddress search_for_madt();
|
||||
void locate_apic_data();
|
||||
Vector<LockRefPtr<IRQController>> m_interrupt_controllers;
|
||||
Vector<NonnullLockRefPtr<IRQController>> m_interrupt_controllers;
|
||||
Vector<ISAInterruptOverrideMetadata> m_isa_interrupt_overrides;
|
||||
Vector<PCIInterruptOverrideMetadata> m_pci_interrupt_overrides;
|
||||
PhysicalAddress m_madt;
|
||||
|
|
|
@ -65,7 +65,6 @@ void InterruptManagement::enumerate_interrupt_handlers(Function<void(GenericInte
|
|||
IRQController& InterruptManagement::get_interrupt_controller(int index)
|
||||
{
|
||||
VERIFY(index >= 0);
|
||||
VERIFY(!m_interrupt_controllers[index].is_null());
|
||||
return *m_interrupt_controllers[index];
|
||||
}
|
||||
|
||||
|
@ -98,7 +97,7 @@ u8 InterruptManagement::get_irq_vector(u8 mapped_interrupt_vector)
|
|||
return mapped_interrupt_vector;
|
||||
}
|
||||
|
||||
LockRefPtr<IRQController> InterruptManagement::get_responsible_irq_controller(IRQControllerType controller_type, u8 interrupt_vector)
|
||||
NonnullLockRefPtr<IRQController> InterruptManagement::get_responsible_irq_controller(IRQControllerType controller_type, u8 interrupt_vector)
|
||||
{
|
||||
for (auto& irq_controller : m_interrupt_controllers) {
|
||||
if (irq_controller->gsi_base() <= interrupt_vector && irq_controller->type() == controller_type)
|
||||
|
@ -107,7 +106,7 @@ LockRefPtr<IRQController> InterruptManagement::get_responsible_irq_controller(IR
|
|||
VERIFY_NOT_REACHED();
|
||||
}
|
||||
|
||||
LockRefPtr<IRQController> InterruptManagement::get_responsible_irq_controller(u8 interrupt_vector)
|
||||
NonnullLockRefPtr<IRQController> InterruptManagement::get_responsible_irq_controller(u8 interrupt_vector)
|
||||
{
|
||||
if (m_interrupt_controllers.size() == 1 && m_interrupt_controllers[0]->type() == IRQControllerType::i8259) {
|
||||
return m_interrupt_controllers[0];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue