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

Kernel: Rework interrupt mechanism

Browse Source 
All interruptrable classes now inherit from Interruptable which
has methdo handle_irq which is called on a interrupt.
This commit is contained in:
Bananymous
2023-10-05 18:53:45 +03:00
parent 68a913c838
commit 27eb5af6f0
23 changed files with 716 additions and 706 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/kernel/Timer/HPET.cpp
View File

@@ -131,12 +131,17 @@ namespace Kernel
for (int i = 1; i <= header->comparator_count; i++)
write_register(HPET_REG_TIMER_CONFIG(i), 0);
IDT::register_irq_handler(irq, [] { Scheduler::get().timer_reschedule(); });
InterruptController::get().enable_irq(irq);
set_irq(irq);
enable_interrupt();
return {};
}
void HPET::handle_irq()
{
Scheduler::get().timer_reschedule();
}
uint64_t HPET::ms_since_boot() const
{
// FIXME: 32 bit CPUs should use 32 bit counter with 32 bit reads

23
kernel/kernel/Timer/PIT.cpp
View File

@@ -4,6 +4,8 @@
#include <kernel/Scheduler.h>
#include <kernel/Timer/PIT.h>
#define PIT_IRQ 0
#define TIMER0_CTL 0x40
#define TIMER1_CTL 0x41
#define TIMER2_CTL 0x42
@@ -27,14 +29,6 @@
namespace Kernel
{
static volatile uint64_t s_system_time = 0;
void irq_handler()
{
s_system_time = s_system_time + 1;
Kernel::Scheduler::get().timer_reschedule();
}
BAN::ErrorOr<BAN::UniqPtr<PIT>> PIT::create()
{
PIT* pit = new PIT();
@@ -53,19 +47,24 @@ namespace Kernel
IO::outb(TIMER0_CTL, (timer_reload >> 0) & 0xff);
IO::outb(TIMER0_CTL, (timer_reload >> 8) & 0xff);
IDT::register_irq_handler(PIT_IRQ, irq_handler);
set_irq(PIT_IRQ);
enable_interrupt();
}
InterruptController::get().enable_irq(PIT_IRQ);
void PIT::handle_irq()
{
m_system_time = m_system_time + 1;
Kernel::Scheduler::get().timer_reschedule();
}
uint64_t PIT::ms_since_boot() const
{
return s_system_time * (MS_PER_S / TICKS_PER_SECOND);
return m_system_time * (MS_PER_S / TICKS_PER_SECOND);
}
timespec PIT::time_since_boot() const
{
uint64_t ticks = s_system_time;
uint64_t ticks = m_system_time;
return timespec {
.tv_sec = ticks / TICKS_PER_SECOND,
.tv_nsec = (long)((ticks % TICKS_PER_SECOND) * (NS_PER_S / TICKS_PER_SECOND))