refactor: use a more decent physical memory map

[lunaix-os.git] / lunaix-os / kernel / mm / mmio.c

diff --git a/lunaix-os/kernel/mm/mmio.c b/lunaix-os/kernel/mm/mmio.c
index 5e0d01e28601b321c94d62914e0d26b006715655..43cc9e166ad2c0d2f288c997dfc2ec63c0a2fb69 100644 (file)
--- a/lunaix-os/kernel/mm/mmio.c
+++ b/lunaix-os/kernel/mm/mmio.c
@@ -1,18 +1,28 @@
 #include <lunaix/mm/mmio.h>
 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/vmm.h>
 #include <lunaix/mm/mmio.h>
 #include <lunaix/mm/pmm.h>
 #include <lunaix/mm/vmm.h>

+#include <lunaix/spike.h>

 
 void*
 
 void*

-ioremap(uintptr_t paddr, uint32_t size)
+ioremap(ptr_t paddr, u32_t size)

 {
 {

-    return vmm_vmap(paddr, size, PG_PREM_RW | PG_DISABLE_CACHE);
+    void* ptr = vmap(paddr, size, PG_PREM_RW | PG_DISABLE_CACHE, 0);
+
+    if (ptr) {
+        pmm_mark_chunk_occupied(KERNEL_PID,
+                                paddr >> PG_SIZE_BITS,
+                                CEIL(size, PG_SIZE_BITS),
+                                PP_FGLOCKED);
+    }
+
+    return ptr;

 }
 
 }
 

-void*
-iounmap(uintptr_t vaddr, uint32_t size)
+void
+iounmap(ptr_t vaddr, u32_t size)

 {
     for (size_t i = 0; i < size; i += PG_SIZE) {
 {
     for (size_t i = 0; i < size; i += PG_SIZE) {

-        uintptr_t paddr = vmm_del_mapping(PD_REFERENCED, vaddr + i);
+        ptr_t paddr = vmm_del_mapping(VMS_SELF, vaddr + i);

         pmm_free_page(KERNEL_PID, paddr);
     }
 }
\ No newline at end of file
         pmm_free_page(KERNEL_PID, paddr);
     }
 }
\ No newline at end of file