Skip to content

Commit 142464f

Browse files
committed
[mm] remove lwp_mm_area
1 parent 768f9bc commit 142464f

File tree

12 files changed

+56
-274
lines changed

12 files changed

+56
-274
lines changed

components/lwp/arch/aarch64/cortex-a/lwp_arch.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#ifdef ARCH_MM_MMU
1616

1717
#include <lwp_arch.h>
18-
#include <lwp_mm_area.h>
1918
#include <lwp_user_mm.h>
2019
#include <mmu.h>
2120
#include <page.h>

components/lwp/arch/arm/cortex-a/lwp_arch.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#ifdef ARCH_MM_MMU
1818

1919
#include <lwp_arch.h>
20-
#include <lwp_mm_area.h>
2120
#include <lwp_user_mm.h>
2221
#include <mmu.h>
2322
#include <page.h>

components/lwp/arch/risc-v/rv64/lwp_arch.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
#include <lwp.h>
2929
#include <lwp_arch.h>
30-
#include <lwp_mm_area.h>
3130
#include <lwp_user_mm.h>
3231
#include <mmu.h>
3332
#include <page.h>

components/lwp/ioremap.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,21 @@
1515
#ifdef RT_USING_SMART
1616
#include <mmu.h>
1717
#include <lwp_mm.h>
18-
#include <lwp_mm_area.h>
1918
#include <mm_aspace.h>
2019

2120
#define DBG_TAG "mm.ioremap"
2221
#define DBG_LVL DBG_LOG
2322
#include <rtdbg.h>
2423

24+
enum ioremap_type {
25+
MM_AREA_TYPE_PHY,
26+
MM_AREA_TYPE_PHY_CACHED
27+
};
28+
2529
void *rt_ioremap_start;
2630
size_t rt_ioremap_size;
2731

28-
static void *_ioremap_type(void *paddr, size_t size, int type)
32+
static void *_ioremap_type(void *paddr, size_t size, enum ioremap_type type)
2933
{
3034
void *v_addr = NULL;
3135
size_t attr;

components/lwp/lwp.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
#include <rtdbg.h>
3838

3939
#ifdef ARCH_MM_MMU
40-
#include <lwp_mm_area.h>
4140
#include <lwp_user_mm.h>
4241
#endif /* end of ARCH_MM_MMU */
4342

@@ -737,7 +736,7 @@ static int load_elf(int fd, int len, struct rt_lwp *lwp, uint8_t *load_addr, str
737736
{
738737
if (user_area[i].size != 0)
739738
{
740-
va = lwp_map_user(lwp, user_area[i].start, user_area[i].size, (int)(i == 0));
739+
va = lwp_map_user(lwp, user_area[i].start, user_area[i].size, (i == 0));
741740
if (!va || (va != user_area[i].start))
742741
{
743742
result = -RT_ERROR;

components/lwp/lwp_mm_area.c

Lines changed: 0 additions & 122 deletions
This file was deleted.

components/lwp/lwp_mm_area.h

Lines changed: 0 additions & 52 deletions
This file was deleted.

components/lwp/lwp_shm.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include <lwp_shm.h>
1616
#include <lwp_mm.h>
1717

18-
#include <lwp_mm_area.h>
1918
#include <lwp_user_mm.h>
2019
#include <mmu.h>
2120
#include <mm_aspace.h>

components/lwp/lwp_syscall.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1364,7 +1364,7 @@ rt_thread_t sys_thread_create(void *arg[])
13641364
lwp = rt_thread_self()->lwp;
13651365
lwp_ref_inc(lwp);
13661366
#ifdef ARCH_MM_MMU
1367-
user_stack = lwp_map_user(lwp, 0, (size_t)arg[3], 0);
1367+
user_stack = lwp_map_user(lwp, 0, (size_t)arg[3], 0);
13681368
if (!user_stack)
13691369
{
13701370
goto fail;

0 commit comments

Comments
 (0)