Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kernel: APIC now uses MMIO namespace functions for mmio

This commit is contained in:
Bananymous 2023-08-10 21:03:25 +03:00
parent fd2bcc9156
commit f7449c4ab9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kernel/kernel/APIC.cpp
View File

@ -5,6 +5,7 @@
#include <kernel/CPUID.h> #include <kernel/CPUID.h>
#include <kernel/IDT.h> #include <kernel/IDT.h>
#include <kernel/Memory/PageTable.h> #include <kernel/Memory/PageTable.h>
#include <kernel/MMIO.h>
#include <string.h> #include <string.h>
@ -194,26 +195,24 @@ APIC* APIC::create()
uint32_t APIC::read_from_local_apic(ptrdiff_t offset) uint32_t APIC::read_from_local_apic(ptrdiff_t offset)
{ {
return *(uint32_t*)(m_local_apic_vaddr + offset); return MMIO::read32(m_local_apic_vaddr + offset);
} }
void APIC::write_to_local_apic(ptrdiff_t offset, uint32_t data) void APIC::write_to_local_apic(ptrdiff_t offset, uint32_t data)
{ {
*(uint32_t*)(m_local_apic_vaddr + offset) = data; MMIO::write32(m_local_apic_vaddr + offset, data);
} }
uint32_t APIC::IOAPIC::read(uint8_t offset) uint32_t APIC::IOAPIC::read(uint8_t offset)
{ {
volatile uint32_t* ioapic = (volatile uint32_t*)vaddr; MMIO::write32(vaddr, offset);
ioapic[0] = offset; return MMIO::read32(vaddr + 16);
return ioapic[4];
} }
void APIC::IOAPIC::write(uint8_t offset, uint32_t data) void APIC::IOAPIC::write(uint8_t offset, uint32_t data)
{ {
volatile uint32_t* ioapic = (volatile uint32_t*)vaddr; MMIO::write32(vaddr, offset);
ioapic[0] = offset; MMIO::write32(vaddr + 16, data);
ioapic[4] = data;
} }
void APIC::eoi(uint8_t) void APIC::eoi(uint8_t)
@ -239,6 +238,7 @@ void APIC::enable_irq(uint8_t irq)
RedirectionEntry redir; RedirectionEntry redir;
redir.lo_dword = ioapic->read(IOAPIC_REDIRS + gsi * 2); redir.lo_dword = ioapic->read(IOAPIC_REDIRS + gsi * 2);
redir.hi_dword = ioapic->read(IOAPIC_REDIRS + gsi * 2 + 1); redir.hi_dword = ioapic->read(IOAPIC_REDIRS + gsi * 2 + 1);
ASSERT(redir.mask); // TODO: handle overlapping interrupts
redir.vector = IRQ_VECTOR_BASE + irq; redir.vector = IRQ_VECTOR_BASE + irq;
redir.mask = 0; redir.mask = 0;