[fix] type error

RT-Thread · Jan 3, 2023 · a7b6e50 · a7b6e50
1 parent a16d05a
commit a7b6e50
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/components/mm/mm_aspace.c b/components/mm/mm_aspace.c
@@ -68,7 +68,7 @@ static inline void _varea_post_install(rt_varea_t varea, rt_aspace_t aspace,
         varea->mem_obj->on_varea_open(varea);
 }
 
-rt_err_t _init_lock(rt_aspace_t aspace)
+int _init_lock(rt_aspace_t aspace)
 {
     MM_PGTBL_LOCK_INIT(aspace);
     rt_mutex_init(&aspace->bst_lock, "", RT_IPC_FLAG_FIFO);
@@ -224,11 +224,11 @@ static int _do_prefetch(rt_aspace_t aspace, rt_varea_t varea, void *start,
     return err;
 }
 
-rt_err_t _varea_install(rt_aspace_t aspace, rt_varea_t varea,
+int _varea_install(rt_aspace_t aspace, rt_varea_t varea,
                         rt_mm_va_hint_t hint)
 {
     void *alloc_va;
-    rt_err_t err = RT_EOK;
+    int err = RT_EOK;
 
     /**
      * find a suitable va range.
@@ -253,11 +253,11 @@ rt_err_t _varea_install(rt_aspace_t aspace, rt_varea_t varea,
     return err;
 }
 
-static rt_err_t _mm_aspace_map(rt_aspace_t aspace, rt_varea_t varea,
+static int _mm_aspace_map(rt_aspace_t aspace, rt_varea_t varea,
                                size_t attr, mm_flag_t flags,
                                rt_mem_obj_t mem_obj, size_t offset)
 {
-    rt_err_t err = RT_EOK;
+    int err = RT_EOK;
 
     WR_LOCK(aspace);
     struct rt_mm_va_hint hint = {.prefer = varea->start,
@@ -312,12 +312,12 @@ static inline int _not_support(size_t flags)
     return flags & ~(support_ops | _MMF_ALIGN_MASK);
 }
 
-rt_err_t rt_aspace_map(rt_aspace_t aspace, void **addr, size_t length,
+int rt_aspace_map(rt_aspace_t aspace, void **addr, size_t length,
                        size_t attr, mm_flag_t flags, rt_mem_obj_t mem_obj,
                        size_t offset)
 {
     // TODO check not in atomic context: irq, spinlock, local intr disable...
-    rt_err_t err;
+    int err;
     rt_varea_t varea;
 
     // filter invalid input
@@ -357,7 +357,7 @@ rt_err_t rt_aspace_map(rt_aspace_t aspace, void **addr, size_t length,
     return err;
 }
 
-rt_err_t rt_aspace_map_static(rt_aspace_t aspace, rt_varea_t varea, void **addr,
+int rt_aspace_map_static(rt_aspace_t aspace, rt_varea_t varea, void **addr,
                               size_t length, size_t attr, mm_flag_t flags,
                               rt_mem_obj_t mem_obj, size_t offset)
 {
@@ -392,11 +392,11 @@ rt_err_t rt_aspace_map_static(rt_aspace_t aspace, rt_varea_t varea, void **addr,
     return err;
 }
 
-rt_err_t _mm_aspace_map_phy(rt_aspace_t aspace, rt_varea_t varea,
+int _mm_aspace_map_phy(rt_aspace_t aspace, rt_varea_t varea,
                             rt_mm_va_hint_t hint, size_t attr, size_t pa_off,
                             void **ret_va)
 {
-    rt_err_t err;
+    int err;
     void *vaddr;
 
     // filter invalid input
@@ -444,10 +444,10 @@ rt_err_t _mm_aspace_map_phy(rt_aspace_t aspace, rt_varea_t varea,
     return err;
 }
 
-rt_err_t rt_aspace_map_phy(rt_aspace_t aspace, rt_mm_va_hint_t hint, size_t attr,
+int rt_aspace_map_phy(rt_aspace_t aspace, rt_mm_va_hint_t hint, size_t attr,
                            size_t pa_off, void **ret_va)
 {
-    rt_err_t err;
+    int err;
 
     if (hint)
     {
@@ -473,11 +473,11 @@ rt_err_t rt_aspace_map_phy(rt_aspace_t aspace, rt_mm_va_hint_t hint, size_t attr
     return err;
 }
 
-rt_err_t rt_aspace_map_phy_static(rt_aspace_t aspace, rt_varea_t varea,
+int rt_aspace_map_phy_static(rt_aspace_t aspace, rt_varea_t varea,
                                   rt_mm_va_hint_t hint, size_t attr,
                                   size_t pa_off, void **ret_va)
 {
-    rt_err_t err;
+    int err;
 
     if (varea && hint)
     {
@@ -520,7 +520,7 @@ void _aspace_unmap(rt_aspace_t aspace, void *addr, size_t length)
     }
 }
 
-rt_err_t rt_aspace_unmap(rt_aspace_t aspace, void *addr, size_t length)
+int rt_aspace_unmap(rt_aspace_t aspace, void *addr, size_t length)
 {
     if (!aspace)
     {

diff --git a/components/mm/mm_page.c b/components/mm/mm_page.c
@@ -17,7 +17,6 @@
 
 #include "mm_fault.h"
 #include "mm_private.h"
-#include "mm_rmem.h"
 #include <mm_aspace.h>
 #include <mm_flag.h>
 #include <mm_page.h>