diff --git a/src/platform/acpi.cpp b/src/platform/acpi.cpp index a87a986..d2ccf6a 100644 --- a/src/platform/acpi.cpp +++ b/src/platform/acpi.cpp @@ -17,6 +17,15 @@ ACPI* ACPI::getController() { return const_cast(controller); } +inline static void MmioWrite32(void *p, uint32_t data) { + Pagetable::map(p); + *reinterpret_cast(p) = data; +} +inline static uint32_t MmioRead32(const void *p) { + Pagetable::map(p); + return *reinterpret_cast(p); +} + ACPI::ACPI() { static const void *const ACPI_FIND_START = reinterpret_cast(0x000e0000); static const void *const ACPI_FIND_TOP = reinterpret_cast(0x000fffff); diff --git a/src/platform/include/pagetable.hpp b/src/platform/include/pagetable.hpp index 66c3580..405c38b 100644 --- a/src/platform/include/pagetable.hpp +++ b/src/platform/include/pagetable.hpp @@ -76,12 +76,3 @@ class Pagetable { static void* lowalloc(size_t count = 1); static void free(void* page); }; - -inline static void MmioWrite32(void *p, uint32_t data) { - Pagetable::map(p); - *reinterpret_cast(p) = data; -} -inline static uint32_t MmioRead32(const void *p) { - Pagetable::map(p); - return *reinterpret_cast(p); -}