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

Kernel: make DMARegion::create static and fix mapping

This commit is contained in:
Bananymous 2023-10-08 18:12:17 +03:00
parent 2aabf43ace
commit d4c9f371a6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/include/kernel/Memory/DMARegion.h
View File

@ -8,7 +8,7 @@ namespace Kernel
class DMARegion class DMARegion
{ {
public: public:
BAN::ErrorOr<BAN::UniqPtr<DMARegion>> create(size_t size); static BAN::ErrorOr<BAN::UniqPtr<DMARegion>> create(size_t size);
~DMARegion(); ~DMARegion();
size_t size() const { return m_size; } size_t size() const { return m_size; }

4
kernel/kernel/Memory/DMARegion.cpp
View File

@ -26,7 +26,7 @@ namespace Kernel
vaddr_guard.disable(); vaddr_guard.disable();
paddr_guard.disable(); paddr_guard.disable();
PageTable::kernel().map_range_at(paddr, vaddr, size, PageTable::Flags::CacheDisable | PageTable::Flags::ReadWrite | PageTable::Flags::Reserved); PageTable::kernel().map_range_at(paddr, vaddr, size, PageTable::Flags::CacheDisable | PageTable::Flags::ReadWrite | PageTable::Flags::Present);
return BAN::UniqPtr<DMARegion>::adopt(region_ptr); return BAN::UniqPtr<DMARegion>::adopt(region_ptr);
} }
@ -40,7 +40,7 @@ namespace Kernel
DMARegion::~DMARegion() DMARegion::~DMARegion()
{ {
PageTable::kernel().unmap_range(m_vaddr, m_size); PageTable::kernel().unmap_range(m_vaddr, m_size);
Heap::get().release_contiguous_pages(m_vaddr, BAN::Math::div_round_up<size_t>(m_size, PAGE_SIZE)); Heap::get().release_contiguous_pages(m_paddr, BAN::Math::div_round_up<size_t>(m_size, PAGE_SIZE));
} }
} }