Sinipelto/banan-os
1
0
Fork 0
forked from Bananymous/banan-os
Code Pull Requests Activity

Kernel: Enter ACPI mode with lai

Browse Source
This commit is contained in:
Bananymous
2023-09-28 12:30:27 +03:00
parent 1abf787596
commit d45bf363f1
4 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
kernel/kernel/InterruptController.cpp
View File

@@ -3,6 +3,8 @@
#include <kernel/APIC.h>
#include <kernel/PIC.h>
#include <lai/helpers/sci.h>
static InterruptController* s_instance = nullptr;
InterruptController& InterruptController::get()
@@ -19,11 +21,26 @@ void InterruptController::initialize(bool force_pic)
PIC::remap();
if (!force_pic)
{
s_instance = APIC::create();
if (s_instance)
return;
if (s_instance)
{
s_instance->m_using_apic = true;
return;
}
}
dprintln("Using PIC instead of APIC");
s_instance = PIC::create();
ASSERT(s_instance);
s_instance->m_using_apic = false;
}
void InterruptController::enter_acpi_mode()
{
if (lai_enable_acpi(m_using_apic ? 1 : 0) != 0)
dwarnln("could not enter acpi mode");
}
bool interrupts_enabled()
@@ -31,4 +48,4 @@ bool interrupts_enabled()
uintptr_t flags;
asm volatile("pushf; pop %0" : "=r"(flags) :: "memory");
return flags & (1 << 9);
}
}

2
kernel/kernel/kernel.cpp
View File

@@ -161,6 +161,8 @@ static void init2(void*)
dprintln("Scheduler started");
InterruptController::get().enter_acpi_mode();
auto console = MUST(DevFileSystem::get().root_inode()->find_inode(cmdline.console));
ASSERT(console->is_tty());
((TTY*)console.ptr())->set_as_current();