diff options
author | yalei wang <wylandrea@gmail.com> | 2018-09-20 02:08:56 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@fd.io> | 2018-09-20 02:08:56 +0000 |
commit | 9f145958f0a168661b0dd4d376366d8428946ed3 (patch) | |
tree | 86bde0735773386781f12f6f75cbf637f3872acf /src/framework/common | |
parent | ea51d29ba72637b088d0e8cc781364968726e0ae (diff) | |
parent | c40c114f2cc079fa363f53ce5927491503f03f6c (diff) |
Merge "Feat: Resource recycle + nStackMaster Code removal"
Diffstat (limited to 'src/framework/common')
-rw-r--r-- | src/framework/common/mem_mgr/nsfw_shmem/nsfw_shmem_mng.c | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/src/framework/common/mem_mgr/nsfw_shmem/nsfw_shmem_mng.c b/src/framework/common/mem_mgr/nsfw_shmem/nsfw_shmem_mng.c index 08ad4cd..ba38c32 100644 --- a/src/framework/common/mem_mgr/nsfw_shmem/nsfw_shmem_mng.c +++ b/src/framework/common/mem_mgr/nsfw_shmem/nsfw_shmem_mng.c @@ -73,11 +73,7 @@ nsfw_shmem_init (nsfw_mem_para * para) NSCOMM_LOGINF ("nsfw shmem init begin"); - if (NSFW_PROC_MASTER == para->enflag) - { - iret = common_mem_pal_init (para->iargsnum, para->pargs); - } - else if (NSFW_PROC_MAIN == para->enflag) + if (NSFW_PROC_MAIN == para->enflag) { iret = common_pal_module_init (NULL, app_mode); } @@ -189,11 +185,7 @@ nsfw_shmem_createv (nsfw_mem_zone * pmeminfo, i32 inum, { NSFW_INIT_CHK_RET (); - if (NSFW_PROC_MASTER == NSFW_SHMEM_FLAG) - { - return NSFW_MEM_ERR; - } - else if (NSFW_PROC_MAIN == NSFW_SHMEM_FLAG) + if (NSFW_PROC_MAIN == NSFW_SHMEM_FLAG) { return nsfw_memzone_remote_reserv_v (pmeminfo, paddr_array, iarray_num, 0); @@ -321,11 +313,7 @@ nsfw_shmem_mbfmpcreatev (nsfw_mem_mbfpool * pmbfname, i32 inum, { NSFW_INIT_CHK_RET (); - if (NSFW_PROC_MASTER == NSFW_SHMEM_FLAG) - { - return NSFW_MEM_ERR; - } - else if (NSFW_PROC_MAIN == NSFW_SHMEM_FLAG) + if (NSFW_PROC_MAIN == NSFW_SHMEM_FLAG) { return nsfw_remote_shmem_mbf_createv (pmbfname, phandle_array, iarray_num, 0); @@ -431,11 +419,7 @@ nsfw_shmem_spcreatev (nsfw_mem_sppool * pmpinfo, i32 inum, { NSFW_INIT_CHK_RET (); - if (NSFW_PROC_MASTER == NSFW_SHMEM_FLAG) - { - return NSFW_MEM_ERR; - } - else if (NSFW_PROC_MAIN == NSFW_SHMEM_FLAG) + if (NSFW_PROC_MAIN == NSFW_SHMEM_FLAG) { return nsfw_remote_shmem_mpcreatev (pmpinfo, pringhandle_array, inum, 0); |