!231 rename qemu-virt-rv64 to qemu-virt64-riscv

Merge pull request !231 from bernard/bernard_rt-smart

components/finsh/msh.c

@@ -19,6 +19,7 @@
 
 #include "msh.h"
 #include "shell.h"
+#include <string.h>
 
 #ifdef RT_USING_DFS
 #include <dfs_posix.h>

components/lwp/ioremap.c

@@ -36,7 +36,7 @@ static void _iounmap_range(void *addr, size_t size)
     }
 }
 
-static void *_ioremap_type(void *p_addr, size_t size, int type)
+static void *_ioremap_type(void *paddr, size_t size, int type)
 {
     rt_base_t level;
     void *v_addr = NULL;
@@ -55,7 +55,7 @@ static void *_ioremap_type(void *p_addr, size_t size, int type)
     }
 
     level = rt_hw_interrupt_disable();
-    v_addr = rt_hw_mmu_map(&mmu_info, 0, p_addr, size, attr);
+    v_addr = rt_hw_mmu_map(&mmu_info, 0, paddr, size, attr);
     if (v_addr)
     {
         int ret = lwp_map_area_insert(&k_map_area, (size_t)v_addr, size, type);
@@ -69,36 +69,36 @@ static void *_ioremap_type(void *p_addr, size_t size, int type)
     return v_addr;
 }
 
-void *rt_ioremap(void *p_addr, size_t size)
+void *rt_ioremap(void *paddr, size_t size)
 {
-    return _ioremap_type(p_addr, size, MM_AREA_TYPE_PHY);
+    return _ioremap_type(paddr, size, MM_AREA_TYPE_PHY);
 }
 
-void *rt_ioremap_nocache(void *p_addr, size_t size)
+void *rt_ioremap_nocache(void *paddr, size_t size)
 {
-    return _ioremap_type(p_addr, size, MM_AREA_TYPE_PHY);
+    return _ioremap_type(paddr, size, MM_AREA_TYPE_PHY);
 }
 
-void *rt_ioremap_cached(void *p_addr, size_t size)
+void *rt_ioremap_cached(void *paddr, size_t size)
 {
-    return _ioremap_type(p_addr, size, MM_AREA_TYPE_PHY_CACHED);
+    return _ioremap_type(paddr, size, MM_AREA_TYPE_PHY_CACHED);
 }
 
 #else
 
-void *rt_ioremap(void *p_addr, size_t size)
+void *rt_ioremap(void *paddr, size_t size)
 {
-    return p_addr;
+    return paddr;
 }
 
 void *rt_ioremap_nocache(void *paddr, size_t size)
 {
-    return p_addr;
+    return paddr;
 }
 
 void *rt_ioremap_cached(void *paddr, size_t size)
 {
-    return p_addr;
+    return paddr;
 }
 
 #endif

components/lwp/ioremap.h

@@ -15,11 +15,8 @@ extern "C" {
 #endif
 
 void *rt_ioremap(void *paddr, size_t size);
-
 void *rt_ioremap_nocache(void *paddr, size_t size);
-
-void *rt_ioremap_cached(void *paddr, size_t size);
-
+void *rt_ioremap_cached (void *paddr, size_t size);
 void rt_iounmap(volatile void *addr);
 
 #ifdef __cplusplus

include/rtdef.h

@@ -200,8 +200,6 @@ typedef rt_base_t                       rt_off_t;       /**< Type for offset */
     #error not supported tool chain
 #endif
 
-#include <cpuport.h>
-
 /* initialization export */
 #ifdef RT_USING_COMPONENTS_INIT
 typedef int (*init_fn_t)(void);

include/rthw.h

@@ -200,6 +200,14 @@ typedef int rt_spinlock_t;
 
 #endif
 
+#ifdef RT_USING_CACHE
+#include <cpuport.h>
+#else
+#define rt_hw_isb()
+#define rt_hw_dmb()
+#define rt_hw_dsb()
+#endif
+
 #ifdef __cplusplus
 }
 #endif

include/rtthread.h

@@ -22,7 +22,6 @@
 #include <rtconfig.h>
 #include <rtdebug.h>
 #include <rtdef.h>
-#include <cpuport.h>
 #include <rtservice.h>
 #include <rtm.h>