Explorar o código

[lwP] fix parameter issue

BernardXiong %!s(int64=4) %!d(string=hai) anos
pai
achega
039c4f31e9

+ 0 - 0
bsp/qemu-virt-rv64/.config → bsp/qemu-virt64-riscv/.config


+ 0 - 0
bsp/qemu-virt-rv64/.gitignore → bsp/qemu-virt64-riscv/.gitignore


+ 0 - 0
bsp/qemu-virt-rv64/Kconfig → bsp/qemu-virt64-riscv/Kconfig


+ 0 - 0
bsp/qemu-virt-rv64/SConscript → bsp/qemu-virt64-riscv/SConscript


+ 0 - 0
bsp/qemu-virt-rv64/SConstruct → bsp/qemu-virt64-riscv/SConstruct


+ 0 - 0
bsp/qemu-virt-rv64/applications/SConscript → bsp/qemu-virt64-riscv/applications/SConscript


+ 0 - 0
bsp/qemu-virt-rv64/applications/main.c → bsp/qemu-virt64-riscv/applications/main.c


+ 0 - 0
bsp/qemu-virt-rv64/driver/Kconfig → bsp/qemu-virt64-riscv/driver/Kconfig


+ 0 - 0
bsp/qemu-virt-rv64/driver/SConscript → bsp/qemu-virt64-riscv/driver/SConscript


+ 0 - 0
bsp/qemu-virt-rv64/driver/asm/sbiasm.h → bsp/qemu-virt64-riscv/driver/asm/sbiasm.h


+ 0 - 0
bsp/qemu-virt-rv64/driver/asm/sbidef.h → bsp/qemu-virt64-riscv/driver/asm/sbidef.h


+ 0 - 0
bsp/qemu-virt-rv64/driver/board.c → bsp/qemu-virt64-riscv/driver/board.c


+ 0 - 0
bsp/qemu-virt-rv64/driver/board.h → bsp/qemu-virt64-riscv/driver/board.h


+ 0 - 0
bsp/qemu-virt-rv64/driver/drv_uart.c → bsp/qemu-virt64-riscv/driver/drv_uart.c


+ 0 - 0
bsp/qemu-virt-rv64/driver/drv_uart.h → bsp/qemu-virt64-riscv/driver/drv_uart.h


+ 0 - 0
bsp/qemu-virt-rv64/driver/encoding.h → bsp/qemu-virt64-riscv/driver/encoding.h


+ 0 - 0
bsp/qemu-virt-rv64/driver/io.h → bsp/qemu-virt64-riscv/driver/io.h


+ 0 - 0
bsp/qemu-virt-rv64/driver/plic.c → bsp/qemu-virt64-riscv/driver/plic.c


+ 0 - 0
bsp/qemu-virt-rv64/driver/plic.h → bsp/qemu-virt64-riscv/driver/plic.h


+ 0 - 0
bsp/qemu-virt-rv64/driver/sbi.h → bsp/qemu-virt64-riscv/driver/sbi.h


+ 0 - 0
bsp/qemu-virt-rv64/link.lds → bsp/qemu-virt64-riscv/link.lds


+ 0 - 0
bsp/qemu-virt-rv64/link_stacksize.lds → bsp/qemu-virt64-riscv/link_stacksize.lds


+ 0 - 0
bsp/qemu-virt-rv64/qemu-dbg.sh → bsp/qemu-virt64-riscv/qemu-dbg.sh


+ 0 - 0
bsp/qemu-virt-rv64/qemu-dumpdtb.sh → bsp/qemu-virt64-riscv/qemu-dumpdtb.sh


+ 0 - 0
bsp/qemu-virt-rv64/qemu-nographic.sh → bsp/qemu-virt64-riscv/qemu-nographic.sh


+ 0 - 0
bsp/qemu-virt-rv64/rtconfig.h → bsp/qemu-virt64-riscv/rtconfig.h


+ 0 - 0
bsp/qemu-virt-rv64/rtconfig.py → bsp/qemu-virt64-riscv/rtconfig.py


+ 12 - 12
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

+ 1 - 4
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