Merge branch 'interrupt-rework' into prog-loader

[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 a52dc1bf93251138ccde1670aad6058765dd5d54..e9843d64d9ade7273b7b8e845446515752283d7d 100644 (file)
--- a/lunaix-os/kernel/mm/mmio.c
+++ b/lunaix-os/kernel/mm/mmio.c
@@ -4,7 +4,7 @@
 #include <lunaix/spike.h>
 
 void*
 #include <lunaix/spike.h>
 
 void*

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

 {
     void* ptr = vmm_vmap(paddr, size, PG_PREM_RW | PG_DISABLE_CACHE);
     if (ptr) {
 {
     void* ptr = vmm_vmap(paddr, size, PG_PREM_RW | PG_DISABLE_CACHE);
     if (ptr) {


@@ -17,10 +17,10 @@ ioremap(uintptr_t paddr, uint32_t size)
 }
 
 void*
 }
 
 void*

-iounmap(uintptr_t vaddr, uint32_t size)
+iounmap(uintptr_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);
+        uintptr_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