RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 23:07:35 +00:00
Code Issues Activity Actions

Revert "Kernel: Replace IRQHandler with the new InterruptHandler class"

Browse source 
This reverts commit 6c72736b26.

I am unable to boot on my home machine with this change in the tree.
This commit is contained in:
Andreas Kling 2020-01-22 22:23:50 +01:00
parent 8e21e31b3a
commit e64c335e5a
29 changed files with 169 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Kernel/ACPI/ACPIDynamicParser.cpp
View file

@ -41,20 +41,20 @@ void ACPIDynamicParser::initialize_without_rsdp()
}
ACPIDynamicParser::ACPIDynamicParser()
: InterruptHandler(9)
: IRQHandler(9)
, ACPIStaticParser()
{
kprintf("ACPI: Dynamic Parsing Enabled, Can parse AML\n");
}
ACPIDynamicParser::ACPIDynamicParser(ACPI_RAW::RSDPDescriptor20& rsdp)
: InterruptHandler(9)
: IRQHandler(9)
, ACPIStaticParser(rsdp)
{
kprintf("ACPI: Dynamic Parsing Enabled, Can parse AML\n");
}
void ACPIDynamicParser::handle_interrupt()
void ACPIDynamicParser::handle_irq()
{
// FIXME: Implement IRQ handling of ACPI signals!
ASSERT_NOT_REACHED();
@ -90,4 +90,4 @@ void ACPIDynamicParser::build_namespace()
{
// FIXME: Implement AML Interpretation to build the ACPI namespace
ASSERT_NOT_REACHED();
}
}

8
Kernel/ACPI/ACPIDynamicParser.h
View file

@ -29,12 +29,12 @@
#include <AK/RefPtr.h>
#include <Kernel/ACPI/ACPIStaticParser.h>
#include <Kernel/Devices/DiskDevice.h>
#include <Kernel/InterruptHandler.h>
#include <Kernel/IRQHandler.h>
#include <Kernel/Lock.h>
#include <Kernel/VM/PhysicalAddress.h>
#include <Kernel/VM/PhysicalPage.h>
class ACPIDynamicParser final : public InterruptHandler
class ACPIDynamicParser final : public IRQHandler
, ACPIStaticParser {
public:
static void initialize(ACPI_RAW::RSDPDescriptor20& rsdp);
@ -53,7 +53,7 @@ protected:
private:
void build_namespace();
// ^IRQHandler
virtual void handle_interrupt() override;
virtual void handle_irq() override;
OwnPtr<Region> m_acpi_namespace;
};
};