!803 低功耗增加idle选项

Merge pull request !803 from zhushengle/cherry-pick-1661260031
fixed 9add4b4 from https://gitee.com/zhushengle/kernel_liteos_m/pulls/795
2022-08-23 13:57:24 +00:00 · 2022-08-23 13:07:11 +00:00 · 2022-08-22 01:49:07 +00:00 · 2022-08-20 08:06:52 +00:00 · 2022-08-18 13:47:15 +00:00 · 2022-08-18 09:59:55 +00:00
438 changed files with 1455 additions and 15282 deletions
--- a/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md
+++ b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md
@@ -10,12 +10,6 @@
 ### 测试用例（新增、改动、可能影响的功能）


-### 是否涉及对外变更（典型的如：对外API规格变更、新增对外接口等等）
-
-必须选择一项（在MarkDown模式下用[x]替换[ ]即可勾选对应选项）:
- [ ] 是，涉及对外变更: 需要在commit message中按【[模板要求](https://gitee.com/openharmony/kernel_liteos_m/wikis/Commit%20message%E8%A7%84%E8%8C%83)】描述变更点
- [ ] 否，不涉及对外变更
-
 ### 是否需要同步至release（如：3.0LTS ... ）分支？

 必须选择一项（在MarkDown模式下用[x]替换[ ]即可勾选对应选项）:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,465 +0,0 @@
-#  (2022-03-30)
-
-
-### Bug Fixes
-
-* c-sky等芯片架构的BUILD.gn优化 ([3311d73](https://gitee.com/openharmony/kernel_liteos_m/commits/3311d73406b68d289b6f715a099e90f62c86abd1)), closes [#I4D129](https://gitee.com/openharmony/kernel_liteos_m/issues/I4D129)
-* change the sensitive words ([8e2248c](https://gitee.com/openharmony/kernel_liteos_m/commits/8e2248c062aaca2444cc1001873fe8e8d8cdd3c6)), closes [#I4K7](https://gitee.com/openharmony/kernel_liteos_m/issues/I4K7)
-* cortex-m55栈优化 ([59e9c6e](https://gitee.com/openharmony/kernel_liteos_m/commits/59e9c6ed73caeeed56081a768198eccc7448df6c)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4)
-* csky等新增模块的HalTickStart函数定义和实现不一致 ([07ab6a5](https://gitee.com/openharmony/kernel_liteos_m/commits/07ab6a5b77c6955f6093beeab976bdc1b32d1db9)), closes [#I4D1](https://gitee.com/openharmony/kernel_liteos_m/issues/I4D1)
-* FD_SETSIZE compatible newlibc ([82c6d5f](https://gitee.com/openharmony/kernel_liteos_m/commits/82c6d5f17478fb47ea5977a32fb76d783ee3e815))
-* fix compile warning saying dereference void * pointer ([29126a9](https://gitee.com/openharmony/kernel_liteos_m/commits/29126a98fe7a8f75695910bdf8fa1ccc6ff67288))
-* gcc编译testsuite编译问题修复 ([f7d26b8](https://gitee.com/openharmony/kernel_liteos_m/commits/f7d26b8e12fb1ba4bebe6c0fc9ca9e392537419f)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4)
-* Kconfig中打开littlefs选项默认关联打开LOSCFG_SUPPORT_LITTLEFS宏 ([b2bcab3](https://gitee.com/openharmony/kernel_liteos_m/commits/b2bcab3a5bd794c86dd4d93b1b5aeca2d097289b)), closes [#I4ENQ1](https://gitee.com/openharmony/kernel_liteos_m/issues/I4ENQ1)
-* kernel接口融合，添加/修改kernel函数 ([cee9714](https://gitee.com/openharmony/kernel_liteos_m/commits/cee9714a90f2660a0b4455f4f5a2fc42870a6aa5))
-* L0 pthread_cond_timedwait接口实现存在的几个问题 ([2219c32](https://gitee.com/openharmony/kernel_liteos_m/commits/2219c32784071b6c37ea57185382e3228ed4b0a7)), closes [#I4N9P8](https://gitee.com/openharmony/kernel_liteos_m/issues/I4N9P8)
-* liteos_kernel_only=true编译内核报错 ([adc2105](https://gitee.com/openharmony/kernel_liteos_m/commits/adc21052b2b9b55de9fc493cf74645f470edf9b5)), closes [#I4O204](https://gitee.com/openharmony/kernel_liteos_m/issues/I4O204)
-* los_exc.S中_ExcInMsp主栈中异常处理函数中异常返回类型错误 ([c51df7a](https://gitee.com/openharmony/kernel_liteos_m/commits/c51df7a94c1f21803db25f46a73a7fb291588eda)), closes [#I4EJI4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4EJI4)
-* los_interrupt.c存在未使用的参数编译出错 ([5af4c2e](https://gitee.com/openharmony/kernel_liteos_m/commits/5af4c2e2139cabe49049283f7a4280460bbf353a)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4)
-* LOS_Panic接口中增加需要增加LOS_BackTrace()，方便定位主动异常位置 ([f51d675](https://gitee.com/openharmony/kernel_liteos_m/commits/f51d675fee217e0ad519f2fa79f70b033f313dce)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4)
-* los_trace.h接口注释错误修正 ([693468e](https://gitee.com/openharmony/kernel_liteos_m/commits/693468e5274af310721f5962602a915d701a7bf0)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4)
-* m4核在任务中异常时backtrace使用的是MSP所在的栈，而不是PSP所在的栈 ([3e8aea2](https://gitee.com/openharmony/kernel_liteos_m/commits/3e8aea224e481322efef9397e4aafc3450a09d28)), closes [#I4D7](https://gitee.com/openharmony/kernel_liteos_m/issues/I4D7)
-* M核posix接口fs模块用例完善 ([ee380fb](https://gitee.com/openharmony/kernel_liteos_m/commits/ee380fb9be45ef033979ec3b8875d980b7f13198)), closes [#I4L7](https://gitee.com/openharmony/kernel_liteos_m/issues/I4L7)
-* optimize default configuration ([b2e3849](https://gitee.com/openharmony/kernel_liteos_m/commits/b2e3849bfbd470981602b0dc02f47bffb38bfe11)), closes [#I4FSC9](https://gitee.com/openharmony/kernel_liteos_m/issues/I4FSC9)
-* OsGetAllTskInfo调用和异常时无任务回调函数地址 ([1c605a3](https://gitee.com/openharmony/kernel_liteos_m/commits/1c605a338ad2317aeb464bdac85df5b9a79c99fd)), closes [#I4MG2](https://gitee.com/openharmony/kernel_liteos_m/issues/I4MG2)
-* pm codex告警清零 ([9666380](https://gitee.com/openharmony/kernel_liteos_m/commits/96663805ecfd3248e33b4deb877c8d55cc4e8eec)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4)
-* pm模块解冻线程时存在删除空链表且时间片频繁唤醒系统 ([9f185b5](https://gitee.com/openharmony/kernel_liteos_m/commits/9f185b5b52ed9506a4913f233c9ddfe45452ec05)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4)
-* **posix unittest:** posix unittest 融合 ([ad6f249](https://gitee.com/openharmony/kernel_liteos_m/commits/ad6f249d1ea878f06864d79bdbed772b21eeac49))
-* **posix:** posix兼容回退 ([207efc1](https://gitee.com/openharmony/kernel_liteos_m/commits/207efc15b859fe18d8b1dac2a3da9d7a5831aa6e))
-* **posix:** posix接口融合，接口规范兼容性修改 ([e0b1275](https://gitee.com/openharmony/kernel_liteos_m/commits/e0b12758da4a25e42110ba32da25b6d18ebed8ef))
-* **posix接口融合:** posix接口融合，接口规范兼容性修改 ([4b607fd](https://gitee.com/openharmony/kernel_liteos_m/commits/4b607fd0740a5379cd373890482235845d782b62))
-* posix线程和LOS_TaskCreate任务不兼容，补齐接口防护，防止访问野指针 ([60805e1](https://gitee.com/openharmony/kernel_liteos_m/commits/60805e1a7c3736db86695ed86cd03cfaab70a427))
-* pr模板补充说明 ([7b86f69](https://gitee.com/openharmony/kernel_liteos_m/commits/7b86f69cc0ccd5512b69fd3a1181b3440747ddb2))
-* ReadMe中无对动态加载模块待加载的共享库的限制说明。 ([f86b971](https://gitee.com/openharmony/kernel_liteos_m/commits/f86b97180f97903bb2def271b7b11fc1ae1bf9bb)), closes [#I4ICK8](https://gitee.com/openharmony/kernel_liteos_m/issues/I4ICK8)
-* shell 输入不识别命令时内存泄漏 ([0245b1a](https://gitee.com/openharmony/kernel_liteos_m/commits/0245b1a7b24fd36d23f9602d0755b274581a84ce)), closes [#I4UR9](https://gitee.com/openharmony/kernel_liteos_m/issues/I4UR9)
-* **shell:** cat针对大文件无法工作 ([d518bad](https://gitee.com/openharmony/kernel_liteos_m/commits/d518bad0dc7dd9e3fbb45423a7db5cb8c1c922dc)), closes [#I4J4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4J4)
-* shell模块task命令踩内存问题修改 ([6ffd55d](https://gitee.com/openharmony/kernel_liteos_m/commits/6ffd55dcd07ce17b693a97bb678668f763480e4d)), closes [#I4A70](https://gitee.com/openharmony/kernel_liteos_m/issues/I4A70)
-* switch inet_addr to a function ([b30e913](https://gitee.com/openharmony/kernel_liteos_m/commits/b30e9139d5502acab8c36ae9a56d4cd640786c44)), closes [#I4G4I4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4G4I4)
-* **testsuites:** cpup和测试套解耦 ([692651f](https://gitee.com/openharmony/kernel_liteos_m/commits/692651fe40f668f19b479186e52fea34d092b458))
-* tick timer时钟频率赋值修改为运行时赋值 ([ae02afc](https://gitee.com/openharmony/kernel_liteos_m/commits/ae02afc8504f64ff6bc09828f55e9602bcbcae56)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4)
-* tick中断处理时，无挂起任务时应更新当前运行任务的时间片, 并触发一次调度 ([ea12d40](https://gitee.com/openharmony/kernel_liteos_m/commits/ea12d40caf1301b4a7b6d60a2c599ceff4746c90)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4)
-* **time_func_test_01.c:** 修复testTimes测试单板配置LOSCFG_BASE_CORE_TICK_PER_SECOND = 1000的问题 ([5c982f1](https://gitee.com/openharmony/kernel_liteos_m/commits/5c982f1087f95174f2836c72648eab58adf37fd7))
-* 中断向量表对齐大小支持可配置 ([cf9c838](https://gitee.com/openharmony/kernel_liteos_m/commits/cf9c8387e3785d994aacf948b7c1b61324a3dd63)), closes [#I4M20](https://gitee.com/openharmony/kernel_liteos_m/issues/I4M20)
-* 优化trace buffer初始化，删除swtmr 桩中的无效参数 ([afbc9a5](https://gitee.com/openharmony/kernel_liteos_m/commits/afbc9a593b61461072556cb5531d90b30ce2e394)), closes [#I4DPR7](https://gitee.com/openharmony/kernel_liteos_m/issues/I4DPR7)
-* 优化低功耗流程 ([c6600d9](https://gitee.com/openharmony/kernel_liteos_m/commits/c6600d9dddb666f397ba659d47d64f334691af6b)), closes [#I46](https://gitee.com/openharmony/kernel_liteos_m/issues/I46)
-* 修复arch目录调整影响到的target目录下的文件 ([d5725b2](https://gitee.com/openharmony/kernel_liteos_m/commits/d5725b22644da8ab3e719169230303e44c7d8750)), closes [#I4JM7](https://gitee.com/openharmony/kernel_liteos_m/issues/I4JM7)
-* 修复cortex-m系列系统提供的timer在低频下时间不准的问题 ([3e569ba](https://gitee.com/openharmony/kernel_liteos_m/commits/3e569bac587d90dcd21aff7d8ec53216dfbb8f1c)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4)
-* 修复hook层LOS_HOOK_TYPE_SEM_PEND的runningTask入参可能为空 ([3fd22ac](https://gitee.com/openharmony/kernel_liteos_m/commits/3fd22ac2b0b4c690669a659246aba099fd4311ec)), closes [#I4BU4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4BU4)
-* 修复irqNum = HwiNumGet()编译错误的问题 ([16e87d7](https://gitee.com/openharmony/kernel_liteos_m/commits/16e87d78d89bec7d85c076fc738ed4ad0614b865)), closes [#I4S81](https://gitee.com/openharmony/kernel_liteos_m/issues/I4S81)
-* 修复Kconfig信息错误 ([bb04582](https://gitee.com/openharmony/kernel_liteos_m/commits/bb045829104211522cd12a7273d5853400c1ea26)), closes [#I4MZ1](https://gitee.com/openharmony/kernel_liteos_m/issues/I4MZ1)
-* 修复L0_Emulator 门禁高概率失败的问题 ([7ad2f62](https://gitee.com/openharmony/kernel_liteos_m/commits/7ad2f62a03481a3919fef1f1e46e4c9677b1e65c)), closes [#I4NB0](https://gitee.com/openharmony/kernel_liteos_m/issues/I4NB0)
-* 修复liteos-m在iar环境下的编译问题 ([4c4784e](https://gitee.com/openharmony/kernel_liteos_m/commits/4c4784e33d7944e7850009be192375aaa6e2b125)), closes [#I4Q5Q5](https://gitee.com/openharmony/kernel_liteos_m/issues/I4Q5Q5)
-* 修复los_interrupt.c文件中HalHwiInit函数里未使能未对齐异常问题 ([d32e25f](https://gitee.com/openharmony/kernel_liteos_m/commits/d32e25f3ae8e8e5ec24effa98dc8f0b3ba94d0c1)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4)
-* 修复newlib缺省PTHREAD_KEYS_MAX 问题 ([65f04bf](https://gitee.com/openharmony/kernel_liteos_m/commits/65f04bf093376a478e9585dadfc1238158cc3641)), closes [#I4OX47](https://gitee.com/openharmony/kernel_liteos_m/issues/I4OX47)
-* 修复OsQueueMailFree提早释放内存的问题 ([ec88d16](https://gitee.com/openharmony/kernel_liteos_m/commits/ec88d1628937b3def6dd613246116f6bfa4141eb))
-* 修复pm编译告警导致内核编译失败 ([18b0524](https://gitee.com/openharmony/kernel_liteos_m/commits/18b052458e1cea113df7a6bb4798a6d5e1eb751e)), closes [#I49](https://gitee.com/openharmony/kernel_liteos_m/issues/I49)
-* 修复pthread 编译告警 ([cc57f81](https://gitee.com/openharmony/kernel_liteos_m/commits/cc57f81ab85a5eb9bb4be9bd7d2863978996bcf3)), closes [#I4U16](https://gitee.com/openharmony/kernel_liteos_m/issues/I4U16)
-* 修复pthread_create相关问题 ([cd949dd](https://gitee.com/openharmony/kernel_liteos_m/commits/cd949ddae0aa4e7291b0b7f6ba83c2034cdf1301)), closes [#I4P78](https://gitee.com/openharmony/kernel_liteos_m/issues/I4P78)
-* 修复pthread_create行为与posix不一致问题 ([2b1e5a7](https://gitee.com/openharmony/kernel_liteos_m/commits/2b1e5a7a130fbca1b86a787b54f474e183541d6d)), closes [#I49W9](https://gitee.com/openharmony/kernel_liteos_m/issues/I49W9)
-* 修复readme中文档链接错误 ([8ee70a0](https://gitee.com/openharmony/kernel_liteos_m/commits/8ee70a0f8f856da29139a36ba6f8589201cdb109)), closes [#I4FD5](https://gitee.com/openharmony/kernel_liteos_m/issues/I4FD5)
-* 修复risc-v异常时，异常信息混乱且backtrace无法输出的问题 ([0fb49d4](https://gitee.com/openharmony/kernel_liteos_m/commits/0fb49d4422245e83c2435468eb7f2690f2e2c6e4)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4)
-* 修复shcmd.h需要用宏包起来的问题 ([a7a8a62](https://gitee.com/openharmony/kernel_liteos_m/commits/a7a8a62bcb7398b4194b37f62098da9cb1ce717e)), closes [#I45FU2](https://gitee.com/openharmony/kernel_liteos_m/issues/I45FU2)
-* 修复shell 模块存在大量的编译告警及codeCheck。 ([e0d8b53](https://gitee.com/openharmony/kernel_liteos_m/commits/e0d8b5328f53dcef9427a34e8b0462250bb6a40f)), closes [#I48V2](https://gitee.com/openharmony/kernel_liteos_m/issues/I48V2)
-* 修复任务栈对齐问题及补充posix和cmsis测试用例 ([ed863e9](https://gitee.com/openharmony/kernel_liteos_m/commits/ed863e90dd9aceb5d3b6d92b0a94703101b83f80))
-* 修复公版gcc编译内核，调用calloc崩溃 ([8d0ced2](https://gitee.com/openharmony/kernel_liteos_m/commits/8d0ced206951f35d5caab61969344b0ab259e5fb)), closes [#I4OFG6](https://gitee.com/openharmony/kernel_liteos_m/issues/I4OFG6)
-* 修复未使用的参数和类型比较编译报错问题 ([21b46e8](https://gitee.com/openharmony/kernel_liteos_m/commits/21b46e82f31030703d052369701f4d6d736a4a86))
-* 修复调度时间最大值不一致问题 ([9f393bc](https://gitee.com/openharmony/kernel_liteos_m/commits/9f393bcc6df592efb6940e9864ff93e932ae59ad))
-* 修正liteos-m内核README不准确信息 ([0e067b2](https://gitee.com/openharmony/kernel_liteos_m/commits/0e067b239354c28e16b05489274b33051d002508)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4)
-* 修正部分编码风格问题 ([91903a3](https://gitee.com/openharmony/kernel_liteos_m/commits/91903a37165ef364750916104be4f7dfd1d8f9a6)), closes [#I4K8M7](https://gitee.com/openharmony/kernel_liteos_m/issues/I4K8M7)
-* 内核ERR打印，线程信息，不方便问题定位。 ([232fec2](https://gitee.com/openharmony/kernel_liteos_m/commits/232fec27ac8cd2f46b5a2f5cfbe4677d0e287314)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4)
-* 内源检视问题修复 ([c24363b](https://gitee.com/openharmony/kernel_liteos_m/commits/c24363bc50364b0be1fba3b993a83c6936fc3d08))
-* 删除C文件中无用的__cplusplus ([7fe3aad](https://gitee.com/openharmony/kernel_liteos_m/commits/7fe3aaddf56b300ffcb2b186ae01ed64bef1c069)), closes [#I4D0](https://gitee.com/openharmony/kernel_liteos_m/issues/I4D0)
-* 删除OsMemboxExcInfoGetSub内存调测方法中多余的赋值语句。 ([94db0fe](https://gitee.com/openharmony/kernel_liteos_m/commits/94db0fe7a30edaa10786101f1ef662987a27734a)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4)
-* 去掉没有使用的入参consoleid。 ([a627953](https://gitee.com/openharmony/kernel_liteos_m/commits/a62795304da31e13021ea2c675d124afd2594102)), closes [#I43](https://gitee.com/openharmony/kernel_liteos_m/issues/I43)
-* 去掉编译选项-fno-short-enums ([b542aab](https://gitee.com/openharmony/kernel_liteos_m/commits/b542aab09dd92397f8c1305ac656ef14a012b5f8)), closes [#I4JY32](https://gitee.com/openharmony/kernel_liteos_m/issues/I4JY32)
-* 取消cpu进入低功耗前开中断操作 ([bd39e9e](https://gitee.com/openharmony/kernel_liteos_m/commits/bd39e9e6d67310222c363e132141bb7fee1213f1)), closes [#I4KDP8](https://gitee.com/openharmony/kernel_liteos_m/issues/I4KDP8)
-* 告警修复 ([7d2fd01](https://gitee.com/openharmony/kernel_liteos_m/commits/7d2fd01c2d7d6d4c653a307a1419bc094f5332f0))
-* 告警修复 ([2d7bf3b](https://gitee.com/openharmony/kernel_liteos_m/commits/2d7bf3b7d8ea84961e802c366899aca891f38377))
-* 在头文件中补充LOSCFG_MEM_FREE_BY_TASKID函数的声明 ([ad18026](https://gitee.com/openharmony/kernel_liteos_m/commits/ad18026a59fc2853c9580e040f959f9f42082640)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4)
-* 将curl依赖的函数新增至newlib库 ([bd04d9f](https://gitee.com/openharmony/kernel_liteos_m/commits/bd04d9f29a0b77445a71378f88b01ffdae24554f)), closes [#I4RG71](https://gitee.com/openharmony/kernel_liteos_m/issues/I4RG71)
-* 将未定义小写"true"，"false"改为"TRUE"，"FALSE"。 ([9819eb5](https://gitee.com/openharmony/kernel_liteos_m/commits/9819eb567636adf1774de9fd6039d274bee8f69b)), closes [#I43D20](https://gitee.com/openharmony/kernel_liteos_m/issues/I43D20)
-* 当前仓代码编译告警的问题 ([194ac58](https://gitee.com/openharmony/kernel_liteos_m/commits/194ac5898d1e2ffaa17f6dca405614b73da6f8bb)), closes [#I4N50](https://gitee.com/openharmony/kernel_liteos_m/issues/I4N50)
-* 支持硬浮点编译 ([988fd85](https://gitee.com/openharmony/kernel_liteos_m/commits/988fd85fae454a0d9fe01ef1c921b4f3667d5ac8)), closes [#I48](https://gitee.com/openharmony/kernel_liteos_m/issues/I48)
-* 测试用例任务栈的宏定义重复定义，导致在osTest.h中修改不生效 ([ce6cf68](https://gitee.com/openharmony/kernel_liteos_m/commits/ce6cf6879f4564393765a24c4d65448e0fddc3eb)), closes [#I4BA5](https://gitee.com/openharmony/kernel_liteos_m/issues/I4BA5)
-* 添加L0 测试门禁 ([5c168fc](https://gitee.com/openharmony/kernel_liteos_m/commits/5c168fc3e0d08dd4a8924696e17a498eb444fa70)), closes [#I4C5R4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4C5R4)
-* 添加newlib对ipv6的支持 ([f7400fb](https://gitee.com/openharmony/kernel_liteos_m/commits/f7400fbcb275cbb3b75f1aef2af1459b794432de)), closes [#I4M1](https://gitee.com/openharmony/kernel_liteos_m/issues/I4M1)
-* 添加文件版权头等信息 ([cf4e017](https://gitee.com/openharmony/kernel_liteos_m/commits/cf4e017970f8a3113bc8b6028d75775f747512c6)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4)
-* 清除因g_tm变量没有使用引入的编译告警 ([9689522](https://gitee.com/openharmony/kernel_liteos_m/commits/9689522a8e08b79244ad339dc24074843b99d33b)), closes [#I4LW3](https://gitee.com/openharmony/kernel_liteos_m/issues/I4LW3)
-* 移除los_arch_interrupt.h文件中冗余声明的函数VOID OsExcInit(VOID) ([136952f](https://gitee.com/openharmony/kernel_liteos_m/commits/136952f193fe97cfd6a88932e71811e12edfa7a5)), closes [#I4D9](https://gitee.com/openharmony/kernel_liteos_m/issues/I4D9)
-* 补充net相关头文件 ([93f616b](https://gitee.com/openharmony/kernel_liteos_m/commits/93f616b64e961013be5c5267e50d58a40b5cc6c9))
-* 解决gmtime和localtime接口由于g_tm全局变量导致的竞态问题 ([1454b76](https://gitee.com/openharmony/kernel_liteos_m/commits/1454b76482d42e78c1904028de55d82261e5ecaa)), closes [#I4LW3](https://gitee.com/openharmony/kernel_liteos_m/issues/I4LW3)
-* 解决los_pm.c:743:19: warning 编译告警 ([0c72c8b](https://gitee.com/openharmony/kernel_liteos_m/commits/0c72c8bf94b053ff90bbf2019006c52adf1eb8df)), closes [#I4D4L8](https://gitee.com/openharmony/kernel_liteos_m/issues/I4D4L8)
-* 解决定时器超时但还在队列中无法删除的问题 ([ecce17e](https://gitee.com/openharmony/kernel_liteos_m/commits/ecce17ea4878c7bdf7d7de9a6848e6bf871563de)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4)
-* 解除net对cmsis的依赖，net属于内核模块，不应该依赖内核对外接口 ([9982624](https://gitee.com/openharmony/kernel_liteos_m/commits/99826240d979c3aa820ab2aace62e3338978e6d1))
-* 调度中将pm相关的部分用LOSCFG_KERNEL_PM包含 ([d7c0059](https://gitee.com/openharmony/kernel_liteos_m/commits/d7c0059dc4fcca3f85d2cad1012353892ce28021)), closes [#I4L00](https://gitee.com/openharmony/kernel_liteos_m/issues/I4L00)
-* 调用LOS_TaskDetach操作已退出的joinable的任务时，未正确回收该任务 ([49c93b3](https://gitee.com/openharmony/kernel_liteos_m/commits/49c93b37c5e215612bbeb4619e73c809f9eb1cac)), closes [#I4DZL7](https://gitee.com/openharmony/kernel_liteos_m/issues/I4DZL7)
-* 针对pr是否同步至release分支，增加原因说明规则 ([1ee543d](https://gitee.com/openharmony/kernel_liteos_m/commits/1ee543d5d31524d543ffb297b121224dedf8602f))
-* 队列相关的API实现中,参数的校验不完全,导致程序异常 ([eef7c80](https://gitee.com/openharmony/kernel_liteos_m/commits/eef7c80a725d68af254ae55091bd36f978cf4284))
-
-
-### Features
-
-* adapt net ([8594ee4](https://gitee.com/openharmony/kernel_liteos_m/commits/8594ee469ad2d40a363e5d77f94f292ab3cb8c21))
-* add option for ioctl ([5e8ac4b](https://gitee.com/openharmony/kernel_liteos_m/commits/5e8ac4b8883f64bbffa5bb3f063a601112058396)), closes [#I4I3W5](https://gitee.com/openharmony/kernel_liteos_m/issues/I4I3W5)
-* add option SIOCGIFBRDADDR for ioctl ([33ee492](https://gitee.com/openharmony/kernel_liteos_m/commits/33ee49295329e3c394d1cc7b16f77a23ac2255a8)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4)
-* added assembly atomic interface ([1513f50](https://gitee.com/openharmony/kernel_liteos_m/commits/1513f50a474d1227a83fb655ad18c19cd792f235))
-* backtrace for arm9 ([03de7f3](https://gitee.com/openharmony/kernel_liteos_m/commits/03de7f37450a8821ea05e60e94a5d1dd359c4f99)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4)
-* Board 和 SoC分离，编译适配 ([3f1c04d](https://gitee.com/openharmony/kernel_liteos_m/commits/3f1c04dd57bca0379ce37162d9d824801e7d880f))
-* **build:** add module_group and comment out arch_cflags ([e5636f7](https://gitee.com/openharmony/kernel_liteos_m/commits/e5636f7acaf7e8b7d14dc07930b2a16c86e63c85))
-* **build:** support Kconfig ([7e67343](https://gitee.com/openharmony/kernel_liteos_m/commits/7e673430dc42c55b3a0a6d955ba8fea21d6d58ea))
-* **cmsis:** support max_count for osSemaphoreNew ([d478152](https://gitee.com/openharmony/kernel_liteos_m/commits/d478152762013975551e1af154df42987596c9a6))
-* cortex-m55支持psplimit ([db7d641](https://gitee.com/openharmony/kernel_liteos_m/commits/db7d641c223db8ab25501d79c2a6331f743d830b)), closes [#I4T7R3](https://gitee.com/openharmony/kernel_liteos_m/issues/I4T7R3)
-* littlefs最大打开文件个数修改为可通过menuconfig配置 ([9bc9f3a](https://gitee.com/openharmony/kernel_liteos_m/commits/9bc9f3aa53be7bf392d3da09adcb184dec8e3da2))
-* newlib支持pthread_equal ([ce5357e](https://gitee.com/openharmony/kernel_liteos_m/commits/ce5357eee1daf1c1b3a3aa7bdeaef0cc5a8901bf)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4)
-* provide read write for socket by #define ([d044eda](https://gitee.com/openharmony/kernel_liteos_m/commits/d044eda3c3640ae135ef528739d0c9609f40c822)), closes [#I4H8](https://gitee.com/openharmony/kernel_liteos_m/issues/I4H8)
-* synchronizing arch api ([04bf3a6](https://gitee.com/openharmony/kernel_liteos_m/commits/04bf3a682f149482d8ebdbb9ff96d6889edb487a)), closes [#I4N7](https://gitee.com/openharmony/kernel_liteos_m/issues/I4N7)
-* synchronous los_hwicreate interface ([6c68ada](https://gitee.com/openharmony/kernel_liteos_m/commits/6c68adad4db7f6112990764eafe6a3bd5f8759a5))
-* 低内存资源回收low memory killer ([ab886d8](https://gitee.com/openharmony/kernel_liteos_m/commits/ab886d848ab809942c11d0e408b8ff76c41b92b2)), closes [#I4ID0](https://gitee.com/openharmony/kernel_liteos_m/issues/I4ID0)
-* 低功耗支持冻结线程等需求 ([9b5739a](https://gitee.com/openharmony/kernel_liteos_m/commits/9b5739ab11ae7a89d35ba6f54fc62137ddc6d897)), closes [#I49](https://gitee.com/openharmony/kernel_liteos_m/issues/I49)
-* 内核提供Interrupt框架，支持多架构多平台通用化 ([e8538d0](https://gitee.com/openharmony/kernel_liteos_m/commits/e8538d041a93817cea4ae3914afcfdc6182483e7))
-* 内核提供tick timer框架，支持多架构多平台通用化 ([f635450](https://gitee.com/openharmony/kernel_liteos_m/commits/f635450d7cf7f674de3803b5eb9d759b6e4d005b)), closes [#I4N7](https://gitee.com/openharmony/kernel_liteos_m/issues/I4N7)
-* 同步调度部分优化至liteos_m ([fb11ab1](https://gitee.com/openharmony/kernel_liteos_m/commits/fb11ab181e69289f7a2edfd5857595b89f1d5d67))
-* 支持cortex-m55 ([6e17805](https://gitee.com/openharmony/kernel_liteos_m/commits/6e1780546c173365262c7a50b81896f5b3c46389)), closes [#I4Q9](https://gitee.com/openharmony/kernel_liteos_m/issues/I4Q9)
-* 支持Lms ([7b838e8](https://gitee.com/openharmony/kernel_liteos_m/commits/7b838e8a7b8e9f7fb34ca495e5cb46d70d12722b)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4)
-* 支持posix 和 cmsis join能力 ([ecfdf7f](https://gitee.com/openharmony/kernel_liteos_m/commits/ecfdf7ff9bf1adf06835968dc6f06b7c45e04862)), closes [#I44V26](https://gitee.com/openharmony/kernel_liteos_m/issues/I44V26)
-* 支持posix线程私有数据能力 ([a856303](https://gitee.com/openharmony/kernel_liteos_m/commits/a856303b9cdadcfade33de0d3a335db0332f5761)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4)
-* 支持pthread_condattr_setclock ([68dad2c](https://gitee.com/openharmony/kernel_liteos_m/commits/68dad2ccc9856dc2c1ac112bc8f30a703c1af5d9)), closes [#I4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4)
-* 支持pthread_mutex属性相关接口 ([d2be4d7](https://gitee.com/openharmony/kernel_liteos_m/commits/d2be4d7a460365844a7732df8a3eb59e6bb64897)), closes [#I4G4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4G4)
-* 支持select.h的FD_SETSIZE宏配置 ([05642f0](https://gitee.com/openharmony/kernel_liteos_m/commits/05642f05ae6b220df977f4402bc31f396bf08603)), closes [#I4RYK4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4RYK4)
-* 支持任务栈可配置 ([96cc92d](https://gitee.com/openharmony/kernel_liteos_m/commits/96cc92d03561e1a9f1030c71916068584b349626))
-* 调度、任务及pm解耦 ([cc8a794](https://gitee.com/openharmony/kernel_liteos_m/commits/cc8a794229f4236a1611183fd482740b3badbcd7)), closes [#I4JTN6](https://gitee.com/openharmony/kernel_liteos_m/issues/I4JTN6)
-* 适配三方库FatFs升级至r0.14a版本 ([92ea355](https://gitee.com/openharmony/kernel_liteos_m/commits/92ea355756ebd92b8809ecb638ffb5355d89c5e9))
-
-
-### BREAKING CHANGES
-
-* pthread_create 支持任务栈设置
-osThreadNew 支持任务栈设置
-TSK_INIT_PARAM_S 结构体添加stackAddr 字段
-
-* 涉及接口修改：
-    LOS_HwiCreate LOS_HwiDelete
-
-改动内容：
-    中断处理函数参数类型由HWI_ARG_T统一改为HwiIrqParam，封装原有arg参数及riscv部分实际使用变量pDevId, 这样一方面统一LiteOS接口，也统一了中断处理函数的arg参数
-    同步LOS_HwiDelete接口入参，新增HWI_IRQ_PARAM_S *irqParam参数，为后续共享中断功能的添加预留
-
-* 新增接口：
-LOS_TaskResRecycle
-LOS_CurrNanosec
-LOS_MDelay
-
-接口修改：
-LOS_QueueCreate：第一个入参添加const修饰并增加一种异常情况处理
-los_memory.c中 OS_ERROR 修改为LOS_NOK，重定义LOS_NOK为（UINT32）-1。
-
-接口位置转移：
-LOS_UDelay 由los_task.h/.c 转移到los_tick.h/.c 
-
-宏修改：
-LOS_ERRNO_MUX_PEND_INTERR 改名为 LOS_ERRNO_MUX_IN_INTERR
-
-* **posix接口融合:**
-
-接口修改：
-calloc
-pthread_mutex_init
-mq_unlink
-pthread_join
-pthread_exit
-pthread_attr_init
-pthread_attr_destroy
-pthread_condattr_destroy
-pthread_cond_timedwait
-pthread_mutexattr_init
-pthread_mutexattr_settype
-pthread_mutex_destroy
-pthread_mutex_timedlock
-pthread_mutex_trylockk
-pthread_mutex_unlock
-sem_getvalue
-sem_timedwait
-pthread_cond_timedwait
-nanosleep
-timer_create
-timer_settime
-timer_gettime
-testStdlibStrtoull005
-testStdlibStrtol011
-testStdlibStrtoul007
-testPthread004
-
-新增接口：
-CheckForCancel
-pthread_setcancelstate
-pthread_setcanceltype
-pthread_once
-pthread_setschedprio
-pthread_attr_setstack
-pthread_attr_getstack
-pthread_condattr_getpshared
-pthread_condattr_setpshared
-pthread_condattr_getclock
-pthread_mutexattr_gettype
-CheckMutexAttr
-OsMuxPreCheck
-sem_trywait
-MuxPendForPosix
-MuxPostForPosix
-增加overrun功能
-
-接口变化：
-mq_getsetattr 改为内部接口MqGetSetAttr
-GetTickTimeFromNow->OsGetTickTimeFromNow
-
-接口位置转移：
-pthread_equal接口由newlib下转移到kal/posix/src/pthread.c中
-
-* **posix:** 接口修改：
-calloc
-pthread_mutex_init
-mq_unlink
-pthread_join
-pthread_exit
-pthread_attr_init
-pthread_attr_destroy
-pthread_condattr_destroy
-pthread_cond_timedwait
-pthread_mutexattr_init
-pthread_mutexattr_settype
-pthread_mutex_destroy
-pthread_mutex_timedlock
-pthread_mutex_trylockk
-pthread_mutex_unlock
-sem_getvalue
-
-新增接口：
-CheckForCancel
-pthread_setcancelstate
-pthread_setcanceltype
-pthread_once
-pthread_setschedprio
-pthread_attr_setstack
-pthread_attr_getstack
-pthread_condattr_getpshared
-pthread_condattr_setpshared
-pthread_condattr_getclock
-pthread_mutexattr_gettype
-CheckMutexAttr
-OsMuxPreCheck
-sem_trywait
-
-接口变化：
-mq_getsetattr 改为内部接口OsMqGetSetAttr
-
-接口位置转移：
-pthread_equal接口由newlib下转移到kal/posix/src/pthread.c中
-
-* 新增接口：
-    LOS_HwiTrigger ArchIntTrigger
-    LOS_HwiEnable ArchIntEnable
-    LOS_HwiDisable ArchIntDisable
-    LOS_HwiClear ArchIntClear
-    LOS_HwiSetPriority ArchIntSetPriority
-
-* Assembly implementation:
-    ArchAtomicRead
-    ArchAtomicSet
-    ArchAtomicAdd
-    ArchAtomicSub
-    ArchAtomicInc
-    ArchAtomicIncRet
-    ArchAtomicDec
-    ArchAtomicDecRet
-
-* 原来版本中每个架构下提供的tick timer相关操作函数为弱函数：
-    WEAK UINT32 HalTickStart(OS_TICK_HANDLER handler);
-    WEAK VOID HalSysTickReload(UINT64 nextResponseTime);
-    WEAK UINT64 HalGetTickCycle(UINT32 *period);
-    WEAK VOID HalTickLock(VOID);
-    WEAK VOID HalTickUnlock(VOID);
-  用户如果需要启用自己的tick timer需要自己实现相关接口(强属性)，在 "内核初始化之前" 通过调用：
-  LOS_TickTimerRegister 接口替换系统默认提供的tick timer相关接口。
-  无论用户提供的tick timer 还是系统默认提供的，均在内核初始化时启动。
-*   int pthread_key_create(pthread_key_t *k, void (*dtor)(void *))
-  int pthread_key_delete(pthread_key_t k)
-  int pthread_setspecific(pthread_key_t k, const void *x)
-  void *pthread_getspecific(pthread_key_t k)
-* 1.修改arch/include下接口，以ArchXX命名函数
-2.提取公共函数声明:ArchAtomicXchg32bits、ArchAtomicDecRet、ArchAtomicCmpXchg32bits
-3.新增部分原子操作c内联实现
-* 增加低内存资源回收注册相关接口LOS_LmkOpsNodeRegister、LOS_LmkOpsNodeUnregister和内存资源释放和任务恢复接口LOS_LmkTasksKill和LOS_LmkTasksRestore.
-* SwtmrHandlerItem结构体新增swtmrID字段，用于标识超时队列中软件定时器id
-* 新增支持API:
-
-LOS_LmsCheckPoolAdd使能检测指定内存池
-LOS_LmsCheckPoolDel不检测指定内存池
-LOS_LmsAddrProtect为指定内存段上锁，不允许访问
-LOS_LmsAddrDisableProtect去能指定内存段的访问保护
-
-
-#  (2021-09-30)
-
-
-### Bug Fixes
-
-*  M核代码告警清零 ([cb5f862](https://gitee.com/openharmony/kernel_liteos_m/commits/cb5f862eafd91675bf53d0320616cc8f707a6e5a)), closes [#I4386](https://gitee.com/openharmony/kernel_liteos_m/issues/I4386)
-*  M核告警消除 ([5a9d53b](https://gitee.com/openharmony/kernel_liteos_m/commits/5a9d53b6444a3bbe084f575ef079f0da36c27c2a)), closes [#I46](https://gitee.com/openharmony/kernel_liteos_m/issues/I46)
-*  M核编译配置修改 ([deff7c9](https://gitee.com/openharmony/kernel_liteos_m/commits/deff7c921f606ed85663f91d21c12163c15aa7f8)), closes [#I46](https://gitee.com/openharmony/kernel_liteos_m/issues/I46)
-*  shell模块task命令踩内存问题修改 ([b5e84d5](https://gitee.com/openharmony/kernel_liteos_m/commits/b5e84d5516b599257151f88b5a830d6fe9e0e188)), closes [#II4](https://gitee.com/openharmony/kernel_liteos_m/issues/II4)
-*  trustzone 中断适配 ([15a2c17](https://gitee.com/openharmony/kernel_liteos_m/commits/15a2c17f791b7d6703863718d92fa35402c41067)), closes [#I42](https://gitee.com/openharmony/kernel_liteos_m/issues/I42)
-* add API LOS_HwiCreate and LOS_HwDelete ([eb668eb](https://gitee.com/openharmony/kernel_liteos_m/commits/eb668eb9e0021961230858f9bfa1599646da9a8f)), closes [#I3R75](https://gitee.com/openharmony/kernel_liteos_m/issues/I3R75)
-* add liteos_m vfs ([5479dd6](https://gitee.com/openharmony/kernel_liteos_m/commits/5479dd66d7ec96d2206a9890586fe5f07d50fbb9)), closes [#I3R493](https://gitee.com/openharmony/kernel_liteos_m/issues/I3R493)
-* backtrace代码段判断函数定义成弱函数，如果有多个代码段，那么可根据实际情况重定义 ([8692ed3](https://gitee.com/openharmony/kernel_liteos_m/commits/8692ed33a3b975bac7aa5b6ce3c40a84e281f6c5)), closes [#I420](https://gitee.com/openharmony/kernel_liteos_m/issues/I420)
-* change cpup retval range ([d00a35b](https://gitee.com/openharmony/kernel_liteos_m/commits/d00a35ba9288047e9eaba06a8ed1d15806bfca40))
-* change description according to review ([a38365e](https://gitee.com/openharmony/kernel_liteos_m/commits/a38365ed097fb398f922a5d1a72305933ae3e7b3))
-* change queuePosion to queuePosition ([e772ccb](https://gitee.com/openharmony/kernel_liteos_m/commits/e772ccb3ccd3b31269066fa59a434a23af98ce51))
-* change to OpenHarmony LiteOS-M ([259fb54](https://gitee.com/openharmony/kernel_liteos_m/commits/259fb54b3c1a208c5672f1f6551ba0424505e4b2))
-* comment error ([a37b73d](https://gitee.com/openharmony/kernel_liteos_m/commits/a37b73d7599a62a728dbf564de9d9927f995ec1b))
-* compile warning fix ([8dea15c](https://gitee.com/openharmony/kernel_liteos_m/commits/8dea15c4fcaff2957c60351781180f964c0a882d)), closes [#I4330](https://gitee.com/openharmony/kernel_liteos_m/issues/I4330)
-* compile warnings ([75f6187](https://gitee.com/openharmony/kernel_liteos_m/commits/75f61870a002e238385bc9a7632d42b0b2488c9a)), closes [#I3Y57](https://gitee.com/openharmony/kernel_liteos_m/issues/I3Y57)
-* correct ECB in comment ([e2aeb1f](https://gitee.com/openharmony/kernel_liteos_m/commits/e2aeb1ff1d4cd54a752c9f6ef976ee8e353da620))
-* correct spelling ([dd5cefb](https://gitee.com/openharmony/kernel_liteos_m/commits/dd5cefb0dace4b7a7276c880e45d5520950e9844))
-* correct spelling ([e7ea50f](https://gitee.com/openharmony/kernel_liteos_m/commits/e7ea50f13142e34a9860e75be051538fe91e234e))
-* correct the counter of exception type ([bff6587](https://gitee.com/openharmony/kernel_liteos_m/commits/bff65877a281ac1cdcbefd325dcd3ad4933edac9))
-* correct typo ([3ceface](https://gitee.com/openharmony/kernel_liteos_m/commits/3ceface13e1c15d107bc3c8460c17b9dd4c95e26))
-* cpup funciton repair ([c842251](https://gitee.com/openharmony/kernel_liteos_m/commits/c842251bab7ea6365f2bee8ae880e6efb60f0c73))
-* delete unused symbols for default config ([7ad3a22](https://gitee.com/openharmony/kernel_liteos_m/commits/7ad3a22b4d62c8b00876ff338c4ce8d1e3f3cbe2)), closes [#I45HN3](https://gitee.com/openharmony/kernel_liteos_m/issues/I45HN3)
-* fix __cplusplus typo ([c3eb3e5](https://gitee.com/openharmony/kernel_liteos_m/commits/c3eb3e59e692371f67a4e21e4b38004195ce5e10))
-* fix backtrace check issue ([b6664e6](https://gitee.com/openharmony/kernel_liteos_m/commits/b6664e66f14d432b02101c883a53cb333dc4c195))
-* fix bad params def in HalTickStart ([4443b74](https://gitee.com/openharmony/kernel_liteos_m/commits/4443b74ea63d2e458af69723a7198bbbaeb856ea)), closes [#I48](https://gitee.com/openharmony/kernel_liteos_m/issues/I48)
-* fix comment typo issue ([0c2a675](https://gitee.com/openharmony/kernel_liteos_m/commits/0c2a675e2d163eaf05aff7df226404888d78ca37))
-* fix destroy typo ([4ba6259](https://gitee.com/openharmony/kernel_liteos_m/commits/4ba6259e94bd677764922b0470fddc2590f6efa5))
-* fix function name ([f7d50d0](https://gitee.com/openharmony/kernel_liteos_m/commits/f7d50d0fbf53cdd352e94a387cf707083f1641bb))
-* fix length typo ([98d6580](https://gitee.com/openharmony/kernel_liteos_m/commits/98d65801de9e37199b5df9c8734ebcb6ff5d853d))
-* fix LOS_MEMBOX_ALIGNED macro name ([fced899](https://gitee.com/openharmony/kernel_liteos_m/commits/fced8992cf4fbc26c9722d528d642a7afe479170))
-* fix LOS_TaskNameGet comment ([c70b28b](https://gitee.com/openharmony/kernel_liteos_m/commits/c70b28bf785da12fd60ecc92a5a63fb54e52c22a))
-* fix macro typo ([1600360](https://gitee.com/openharmony/kernel_liteos_m/commits/16003604a948d081151ca4fcf0cfeea91c9e1960))
-* fix misspell in comments ([4572814](https://gitee.com/openharmony/kernel_liteos_m/commits/457281427ba286e24386d7916c4bc81f112f1c60))
-* fix NULL UNUSED redefined issue ([765bd55](https://gitee.com/openharmony/kernel_liteos_m/commits/765bd551990e906f457ec1145aea4f2bf5856547))
-* fix OS_TASK_STACK_PROTECT_SIZE undeclared error ([2a5a515](https://gitee.com/openharmony/kernel_liteos_m/commits/2a5a515f50a0f344d416218046bf0880facfb97c)), closes [#I4C5](https://gitee.com/openharmony/kernel_liteos_m/issues/I4C5)
-* fix print format compilation warning ([ef12c89](https://gitee.com/openharmony/kernel_liteos_m/commits/ef12c89c7a79791665125a0b7391f9e533a06a0f))
-* fix readme link issue ([9e332c6](https://gitee.com/openharmony/kernel_liteos_m/commits/9e332c69a5813027575786424b78f0ae2f9a4c5a))
-* fix some typo issues ([f6b8cab](https://gitee.com/openharmony/kernel_liteos_m/commits/f6b8cab2539e4d1ee9e47ab8e3eb12f1630f7393))
-* fix typo in comment ([811d3fa](https://gitee.com/openharmony/kernel_liteos_m/commits/811d3fae8a39686a1c66dfd61c897b7fd3fac2ac))
-* fix typos ([191644e](https://gitee.com/openharmony/kernel_liteos_m/commits/191644e4412fccb7142cfcd34316ad8e2d24fcdf))
-* Fixed a spelling error in FS_LOCK_TIMEOUT_SEC. ([42dc308](https://gitee.com/openharmony/kernel_liteos_m/commits/42dc3083693be13c5fa8f2ad8213245465e28adf)), closes [#I3TL66](https://gitee.com/openharmony/kernel_liteos_m/issues/I3TL66)
-* include file log_config.h in los_mpu.c ([1932d71](https://gitee.com/openharmony/kernel_liteos_m/commits/1932d714a589c9e87258d7c8ed647b6110bde543))
-* L0 GN compilation problem ([2f9bfcc](https://gitee.com/openharmony/kernel_liteos_m/commits/2f9bfcc6ee436ee3568d0c8158a8e43c9ef02623)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_m/issues/I3)
-* l0 shell adapt new master ([fd2227e](https://gitee.com/openharmony/kernel_liteos_m/commits/fd2227e5c858c840f63629c27e559580e1cbdf2f))
-* littlefs inappropriate return value and errno ([452f364](https://gitee.com/openharmony/kernel_liteos_m/commits/452f36403dd4376572d8b52352d0d8129a4617e4)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_m/issues/I3)
-* littlefs三方源码采用GN编译修改上库 ([bdb614b](https://gitee.com/openharmony/kernel_liteos_m/commits/bdb614bc2b82011d77c7c8ffb95e415d2640d19d))
-* LOS_QueueInfoGet函数统计等待读写任务有误 ([215a1f6](https://gitee.com/openharmony/kernel_liteos_m/commits/215a1f6dc06cf2348c5875f7b05193b26ec17dde)), closes [#I4C6P2](https://gitee.com/openharmony/kernel_liteos_m/issues/I4C6P2)
-* los_swtmr.h不满足自包含要求对los_config.h存在依赖，但未包含los_config.h ([ad8e96a](https://gitee.com/openharmony/kernel_liteos_m/commits/ad8e96a00f2fcaebe57feae4e3f23f99d7f1d066)), closes [#I40](https://gitee.com/openharmony/kernel_liteos_m/issues/I40)
-* **mbedtls:** mbedtls l0 support ([761b860](https://gitee.com/openharmony/kernel_liteos_m/commits/761b86096c3cf5642c95e556c11a45a3d5f413e4)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_m/issues/I3)
-* misspell ([30578a6](https://gitee.com/openharmony/kernel_liteos_m/commits/30578a6a68a0d3a203b9a00e7bd1a946356d13d2))
-* modify event API description ([9481f1d](https://gitee.com/openharmony/kernel_liteos_m/commits/9481f1d8406960b8b859cc5a84b3831eadaf040c))
-* modify the return type of LOS_IntLock from UINTPTR to UINT32. ([bcc34e2](https://gitee.com/openharmony/kernel_liteos_m/commits/bcc34e22ede5aeccea63aba9f9ce3cb9aa92cbeb))
-* modify type INLNIE ([294a6d2](https://gitee.com/openharmony/kernel_liteos_m/commits/294a6d246b6a1f7cba8ce1bc4eeb9ae11f17a003))
-* Mutex锁释放后，无任务持有的情况下，owner未清空 ([c136cfd](https://gitee.com/openharmony/kernel_liteos_m/commits/c136cfdf973ae0068154606afa3a23858822c347)), closes [#I40OC8](https://gitee.com/openharmony/kernel_liteos_m/issues/I40OC8)
-* M核littlefs当文件open失败时，需要回收fd，否则会有fd泄露 ([b458e12](https://gitee.com/openharmony/kernel_liteos_m/commits/b458e12ed54905db6667f9d5db1410f94a3d6c71)), closes [#I3XU6](https://gitee.com/openharmony/kernel_liteos_m/issues/I3XU6)
-* m核上littlefs新增错误码功能 ([a062378](https://gitee.com/openharmony/kernel_liteos_m/commits/a06237863121816fa6421aed233446a3fa4e2665)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_m/issues/I3)
-* net compile fix ([299813c](https://gitee.com/openharmony/kernel_liteos_m/commits/299813cdb43ae1e24200f0a6b006e04e4d4fcb05))
-* open shell & fix qemu compile ([911a767](https://gitee.com/openharmony/kernel_liteos_m/commits/911a767992ee540a96ee9f67e0b87195656c3eab))
-* ping cmd compile fail ([ae05de3](https://gitee.com/openharmony/kernel_liteos_m/commits/ae05de3ffda86d312d33b2e38f237dd76daf4949))
-* protect from accssing NULL pointer, access g_handle after fslock ([bc7a914](https://gitee.com/openharmony/kernel_liteos_m/commits/bc7a914bce1b227a4f57265d5ecc3f82d78533e7)), closes [#I3UCX3](https://gitee.com/openharmony/kernel_liteos_m/issues/I3UCX3)
-* remove changelog in README ([37ef8ca](https://gitee.com/openharmony/kernel_liteos_m/commits/37ef8ca7ae73bf78f56dfef36c48bcd790afb6ff)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_m/issues/I3)
-* remove libsec_kernel ([1144b75](https://gitee.com/openharmony/kernel_liteos_m/commits/1144b75f3ff9ce9e8fa114cf614d3deade8ac7c2))
-* remove project files ([4ad01ce](https://gitee.com/openharmony/kernel_liteos_m/commits/4ad01ced93684e5c7ba144ca267f8fcc2fe03105))
-* remove targets project files ([f39da5a](https://gitee.com/openharmony/kernel_liteos_m/commits/f39da5a6da59a3b1291c6b9ef7c50e6185df5ea1))
-* risc-v 锁中断在调度后失效 ([70f3aa1](https://gitee.com/openharmony/kernel_liteos_m/commits/70f3aa1c112e949d9af8e0245af5879140adefba)), closes [#I42](https://gitee.com/openharmony/kernel_liteos_m/issues/I42)
-* riscv_nuclei 编译失败 ([d3fb23c](https://gitee.com/openharmony/kernel_liteos_m/commits/d3fb23cca06580b6e447a9476a9c16643c4ea8fe)), closes [#I41](https://gitee.com/openharmony/kernel_liteos_m/issues/I41)
-* rollback resources when opendir failed ([82fad6c](https://gitee.com/openharmony/kernel_liteos_m/commits/82fad6c36f183de93d936dd2007b899c2932bcee)), closes [#I3Y577](https://gitee.com/openharmony/kernel_liteos_m/issues/I3Y577)
-* Scheduling module code to join GN compilation. ([8bf166b](https://gitee.com/openharmony/kernel_liteos_m/commits/8bf166b418ce1a6c027dc304d45fc9431923764c)), closes [#I3OA95](https://gitee.com/openharmony/kernel_liteos_m/issues/I3OA95)
-* The hook module fails to compile under the c99 compilation standard. ([a078c30](https://gitee.com/openharmony/kernel_liteos_m/commits/a078c3086fa47e05e3ffdc4e94ca202284a1487b)), closes [#I3S4](https://gitee.com/openharmony/kernel_liteos_m/issues/I3S4)
-* tick 动态化计算优化，减小中断执行时间对系统总体时间的影响，保证软件定时器的响应精度。 ([2118c84](https://gitee.com/openharmony/kernel_liteos_m/commits/2118c84616cce5b5d4569d5a82a4d5de02af1e1c)), closes [#I3YGP1](https://gitee.com/openharmony/kernel_liteos_m/issues/I3YGP1)
-* timer qemu 头文件缺失 ([12fed74](https://gitee.com/openharmony/kernel_liteos_m/commits/12fed747226c377c656b8acb8346154627845b6f))
-* update according to review comments ([4dc0d31](https://gitee.com/openharmony/kernel_liteos_m/commits/4dc0d313d1b4a39ebb62156d0bb6429ebb8b996d))
-* update arch_spec.md ([cf43988](https://gitee.com/openharmony/kernel_liteos_m/commits/cf439885234e0955bab09834b3b876d627c81605))
-* update doc usage ([5c19fd4](https://gitee.com/openharmony/kernel_liteos_m/commits/5c19fd4beca15a8b7faad847a13943a9abfe3c8c))
-* update document description ([954c2fc](https://gitee.com/openharmony/kernel_liteos_m/commits/954c2fcfb531d0da1dcc6354a0c0b14335566ed7))
-* update macro to config item ([be57ece](https://gitee.com/openharmony/kernel_liteos_m/commits/be57ece9ce6200c8868164bc0bb2f26e3062cd37))
-* 以g_sysSchedStartTime是否为0判断时间轴是否生效存在极限场景导致调度时间不生效 ([509cf59](https://gitee.com/openharmony/kernel_liteos_m/commits/509cf59befb40839a376be31958d615f066c66fd)), closes [#I45HP5](https://gitee.com/openharmony/kernel_liteos_m/issues/I45HP5)
-* 修复littlefs的多分区挂载时，对pathname的处理逻辑异常 ([b55cfc1](https://gitee.com/openharmony/kernel_liteos_m/commits/b55cfc1ba7fc470b876c555ac7d3be0aa1d3d363)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_m/issues/I3)
-* 修复littlefs编译fs.c缺少头文件件依赖配置+若干musl库的缺失问题+多分区规格宏配置问题 ([7259289](https://gitee.com/openharmony/kernel_liteos_m/commits/7259289bd98a743f596060bc607f77ab8f149129)), closes [#I3VT11](https://gitee.com/openharmony/kernel_liteos_m/issues/I3VT11)
-* 修复M核littlefs GN编译的若干错误 ([d77828e](https://gitee.com/openharmony/kernel_liteos_m/commits/d77828e206f3324424c3b1372332828a0afb84c2))
-* 修复M核上musl库缺失strdup,c的问题 ([139f83a](https://gitee.com/openharmony/kernel_liteos_m/commits/139f83af391a4f5e64ab0fccbd783dd651b87e6a)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_m/issues/I3)
-* 修复QUEUE_INFO_S中waitReadTask无法保存大于32的任务编号 ([704cca9](https://gitee.com/openharmony/kernel_liteos_m/commits/704cca97b17972d1640fd33b1fa0b5917bb92b19)), closes [#I41N78](https://gitee.com/openharmony/kernel_liteos_m/issues/I41N78)
-* 修复task命令格式错误，增加copyright ([ad15bbd](https://gitee.com/openharmony/kernel_liteos_m/commits/ad15bbd6a4d298aabc05b26d7838de6425dbc5c5))
-* 修复timer_settime只设置第一次到期时间时，到期时间不准的缺陷 ([a5f4e37](https://gitee.com/openharmony/kernel_liteos_m/commits/a5f4e37e535bff39a333c469e2f1bf1817216fe8)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_m/issues/I3)
-* 修复timer_settime只设置第一次到期时间时，到期时间不准的缺陷 ([e4b5d4e](https://gitee.com/openharmony/kernel_liteos_m/commits/e4b5d4ebe9677d49d490fe74e5ac33c4a29435a2)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_m/issues/I3)
-* 修复不规范的copyright ([2d9bbd2](https://gitee.com/openharmony/kernel_liteos_m/commits/2d9bbd2769e71e7b464bd22fc335999dd8000682)), closes [#I3SPJ1](https://gitee.com/openharmony/kernel_liteos_m/issues/I3SPJ1)
-* 修复中断操作接口头文件位置变更，导致的编译错误 ([013a953](https://gitee.com/openharmony/kernel_liteos_m/commits/013a953926ca7cefd8a2f7c74d23c36c49765b59)), closes [#I4665](https://gitee.com/openharmony/kernel_liteos_m/issues/I4665)
-* 修复文档链接失效问题 ([5d53c84](https://gitee.com/openharmony/kernel_liteos_m/commits/5d53c848124319a95f509b56ba001357c6dd8b05)), closes [#I4529](https://gitee.com/openharmony/kernel_liteos_m/issues/I4529)
-* 内核模块编译增加-Werror编译选项，且清除内核编译告警 ([3798091](https://gitee.com/openharmony/kernel_liteos_m/commits/3798091d87441ea445ec642de57e036dbbc8370e)), closes [#I46E6](https://gitee.com/openharmony/kernel_liteos_m/issues/I46E6)
-* 删除MQ内冗余的重复宏定义 ([6d72916](https://gitee.com/openharmony/kernel_liteos_m/commits/6d7291660ad04682f05850876f81dfd0cba8ea6b)), closes [#I3U5](https://gitee.com/openharmony/kernel_liteos_m/issues/I3U5)
-* 删除延时节点后，存在时间无法有效刷新的场景 ([0a87c04](https://gitee.com/openharmony/kernel_liteos_m/commits/0a87c04d58d11da2082470698de0760d72259533)), closes [#I45I9](https://gitee.com/openharmony/kernel_liteos_m/issues/I45I9)
-* 在内核初始化前期启动tick timer ([b3841ed](https://gitee.com/openharmony/kernel_liteos_m/commits/b3841ed1ddbfb3359c7a0ceca04fc0f645d440c3)), closes [#I410F0](https://gitee.com/openharmony/kernel_liteos_m/issues/I410F0)
-* 增加MPU功能的开关宏，默认关闭 ([9709d29](https://gitee.com/openharmony/kernel_liteos_m/commits/9709d29b87a3888412ffda586e16eba86adccfe7)), closes [#I3WE0](https://gitee.com/openharmony/kernel_liteos_m/issues/I3WE0)
-* 宏LOSCFG_SUPPORT_FATFS在fs.c中存在使用问题，导致无fatfs的情况下，编译出错 ([c1614ce](https://gitee.com/openharmony/kernel_liteos_m/commits/c1614ce2b4d4dfcda9532cbeeff25ad7a6558196)), closes [#I44](https://gitee.com/openharmony/kernel_liteos_m/issues/I44)
-* 延时队列为NULL时，返回的响应时间为64位最大值，导致无法更新tick timer的响应周期 ([bcec32e](https://gitee.com/openharmony/kernel_liteos_m/commits/bcec32e389634097102a203ee7e937ed3193c984)), closes [#I3W1](https://gitee.com/openharmony/kernel_liteos_m/issues/I3W1)
-* 支持smoke 测试用例 ([3ad5942](https://gitee.com/openharmony/kernel_liteos_m/commits/3ad5942301a1094a2c6b6ffee280cf09cfdb2a88)), closes [#I424](https://gitee.com/openharmony/kernel_liteos_m/issues/I424)
-* 新增函数regcomp,regfree和regexec支持 ([86d5544](https://gitee.com/openharmony/kernel_liteos_m/commits/86d5544a3fd5f41f7f2abe3b143e9f1dc9b430f8)), closes [#I3U9](https://gitee.com/openharmony/kernel_liteos_m/issues/I3U9)
-* 清理残留无效的trace代码 ([3c48951](https://gitee.com/openharmony/kernel_liteos_m/commits/3c489518576583ab6bf0d581810ef0a02b6ccd51)), closes [#I3ZMB4](https://gitee.com/openharmony/kernel_liteos_m/issues/I3ZMB4)
-* 解决arm9编译冲突问题 ([c1a6245](https://gitee.com/openharmony/kernel_liteos_m/commits/c1a624536887fef44fed37134638bf40191b9aae)), closes [#I420](https://gitee.com/openharmony/kernel_liteos_m/issues/I420)
-* 调度过程低概率触发OsSchedTaskEnQueue断言，导致系统异常 ([e5e9289](https://gitee.com/openharmony/kernel_liteos_m/commits/e5e9289a08cf1db71c09647b71a864f5a1f8a4a2)), closes [#I3VX9](https://gitee.com/openharmony/kernel_liteos_m/issues/I3VX9)
-* 调整hook类型和位置，方便调试 ([369320d](https://gitee.com/openharmony/kernel_liteos_m/commits/369320de3710486f252c55c522e8c06e19541b77)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_m/issues/I3)
-
-
-### Features
-
-* add cmsis ThreadFlags support ([cea551e](https://gitee.com/openharmony/kernel_liteos_m/commits/cea551e99ea0da8eefbaa826de2f68813252fb83))
-* add deps to musl and securec ([bfa25fc](https://gitee.com/openharmony/kernel_liteos_m/commits/bfa25fcaa355c28a6139f683c4453f677e23abd7))
-* add file type support for LfsStat ([ceaed2d](https://gitee.com/openharmony/kernel_liteos_m/commits/ceaed2dc86de2ed242aab4dd02c1f34e064583b3)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_m/issues/I3)
-* add interface of dhcp_is_bound ([84a180d](https://gitee.com/openharmony/kernel_liteos_m/commits/84a180d585686cda693bf8c6ed6b86f7c5dd5eee)), closes [#I46W08](https://gitee.com/openharmony/kernel_liteos_m/issues/I46W08)
-* add L0 shell function ([97283b7](https://gitee.com/openharmony/kernel_liteos_m/commits/97283b7c5dd44b266e94fcf0f5d21e63ee1ec7e0))
-* add LOS_ListHeadInsert function ([430b186](https://gitee.com/openharmony/kernel_liteos_m/commits/430b186be7ec1554a29a6d509188eb877d796a7e)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_m/issues/I3)
-* **kernel:** 补充获取最高、最低优先级接口 ([c24c38b](https://gitee.com/openharmony/kernel_liteos_m/commits/c24c38b084c13a2cdc5616f88bb5f63153600c28)), closes [#I42HM7](https://gitee.com/openharmony/kernel_liteos_m/issues/I42HM7)
-* L0 armquem 剥离工具链 ([67d7455](https://gitee.com/openharmony/kernel_liteos_m/commits/67d74559d1bb3820bd51da2e2bf43e41e1224314))
-* L0 支持Trace ([56c93a6](https://gitee.com/openharmony/kernel_liteos_m/commits/56c93a641b3c7a3d1ef9293ee3c95cccb559191f)), closes [#I41Y9](https://gitee.com/openharmony/kernel_liteos_m/issues/I41Y9)
-* L0 支持低功耗框架 ([558ce14](https://gitee.com/openharmony/kernel_liteos_m/commits/558ce14becab05102497afca90a43d89abaf5531)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_m/issues/I3)
-* L0 测试用例支持risc-v qemu 编译运行 ([2dd6c08](https://gitee.com/openharmony/kernel_liteos_m/commits/2dd6c080daab52eaf61e5eefe7b581190670e8a7)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_m/issues/I3)
-* **liteos_m:** support backtrace for riscv ([ca1792a](https://gitee.com/openharmony/kernel_liteos_m/commits/ca1792aa4b5a85ca4ea6e41b265858c6b24a6897)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_m/issues/I3)
-* los_memory.c代码重复率处理 ([475db62](https://gitee.com/openharmony/kernel_liteos_m/commits/475db62db1ac285fc6cab91f09af618870269580)), closes [#I44](https://gitee.com/openharmony/kernel_liteos_m/issues/I44)
-* M33平台支持GCC环境的Trustzone ([d469da2](https://gitee.com/openharmony/kernel_liteos_m/commits/d469da29c6d316640eaa7865f98ad8d6e2eb6d44)), closes [#I3Y85](https://gitee.com/openharmony/kernel_liteos_m/issues/I3Y85)
-* provide getifaddrs for liteos_m ([948501a](https://gitee.com/openharmony/kernel_liteos_m/commits/948501ac73e7887f4585eca156ad760acc2a3b1f)), closes [#I400S5](https://gitee.com/openharmony/kernel_liteos_m/issues/I400S5)
-* risc-v gn 编译框架添加汇编编译选项 ([76dc343](https://gitee.com/openharmony/kernel_liteos_m/commits/76dc343c888ec4e65eba43feb49921111b144640)), closes [#I3YS5](https://gitee.com/openharmony/kernel_liteos_m/issues/I3YS5)
-* Support arm9 ([6d7c9df](https://gitee.com/openharmony/kernel_liteos_m/commits/6d7c9dfe597affb260e8bd74fa606b6d68c2b49a)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_m/issues/I3)
-* Support arm9 fiq swi mode and using system mode. ([97b5b08](https://gitee.com/openharmony/kernel_liteos_m/commits/97b5b0837be4b8df1381af29a6f650f243322840)), closes [#I3](https://gitee.com/openharmony/kernel_liteos_m/issues/I3)
-* support non-continuous memory regions ([0facb0c](https://gitee.com/openharmony/kernel_liteos_m/commits/0facb0c0179f29a08b037655bbe691c98384dc84)), closes [#I43](https://gitee.com/openharmony/kernel_liteos_m/issues/I43)
-* 完善m核qemu串口驱动，支持shell输入 ([c4dc5ab](https://gitee.com/openharmony/kernel_liteos_m/commits/c4dc5ab0f8b5caae55efdbedf59ab07f5006f6c2)), closes [#I46N7](https://gitee.com/openharmony/kernel_liteos_m/issues/I46N7)
-* 按任务统计已经alloc的内存大小 ([53117f9](https://gitee.com/openharmony/kernel_liteos_m/commits/53117f9f47a8dd3023e83dc0cc0de224eab9719f)), closes [#I44](https://gitee.com/openharmony/kernel_liteos_m/issues/I44)
-* 支持native动态加载组件 ([d753834](https://gitee.com/openharmony/kernel_liteos_m/commits/d75383400efe5d9ca0ae4093e4f2e65fee03024b)), closes [#I418](https://gitee.com/openharmony/kernel_liteos_m/issues/I418)
-* 新增LOSCFG_BASE_CORE_TSK_SWITCH_HOOK 宏定义配置 ([39efd6f](https://gitee.com/openharmony/kernel_liteos_m/commits/39efd6fb30ee7dc9159811f5d37dffcdfe81bae0)), closes [#I40Q9](https://gitee.com/openharmony/kernel_liteos_m/issues/I40Q9)
-* 新增ROM/RAM分析工具 ([ee3403d](https://gitee.com/openharmony/kernel_liteos_m/commits/ee3403deaf24dc612b51354f31f795fb0b9a49b5))
-* 补充fs相关函数用例 ([2a95af5](https://gitee.com/openharmony/kernel_liteos_m/commits/2a95af5bf1b412de27b4518d0abf7c335366d4d7)), closes [#I3UQ4](https://gitee.com/openharmony/kernel_liteos_m/issues/I3UQ4)
-* 解决fclose等函数工具链重定义问题 ([b244ad4](https://gitee.com/openharmony/kernel_liteos_m/commits/b244ad4ad0da8d151b69071fdd6db808c91f85a5)), closes [#I3UG6](https://gitee.com/openharmony/kernel_liteos_m/issues/I3UG6)
-
-
-### BREAKING CHANGES
-
-* 新增4个对外接口，声明在los_dynlink.h文件中，分别为：
-(1) LOS_DynlinkInit: 动态加载模块初始化。
-(2) LOS_SoLoad: 加载指定路径的共享库。
-(3) LOS_FindSym: 根据共享库句柄查找指定符号。
-(4) LOS_SoUnload: 卸载共享库。
-* 1.新增一系列trace的对外API，位于los_trace.h中.
-LOS_TRACE_EASY简易插桩
-LOS_TRACE标准插桩
-LOS_TraceInit配置Trace缓冲区的地址和大小
-LOS_TraceStart开启事件记录
-LOS_TraceStop停止事件记录
-LOS_TraceRecordDump输出Trace缓冲区数据
-LOS_TraceRecordGet获取Trace缓冲区的首地址
-LOS_TraceReset清除Trace缓冲区中的事件
-LOS_TraceEventMaskSet设置事件掩码，仅记录某些模块的事件
-LOS_TraceHwiFilterHookReg注册过滤特定中断号事件的钩子函数
-* 1.原调度中基于tick timer的低功耗扩展和当前的pm模块合并，删除原对外接口LOS_SchedSleepInit,
-　变为pm模块统一提供的LOS_PmRegistered接口.
-2.原来在arch los_timer.h下提供的低功耗模式为枚举LOS_SysSleepEnum，其中OS_SYS_NORMAL_SLEEP
-  和OS_SYS_DEEP_SLEEP不符合对外定义，统一修改为LOS_SYS_NORMAL_SLEEP和LOS_SYS_DEEP_SLEEP,
-  并移至los_pm.h中.
-3.VOID HalEnterSleep(LOS_SysSleepEnum sleep) 变更为UINT32 HalEnterSleep(VOID).
-
-
-
--- a/18
+++ b/18
@@ -335,14 +335,6 @@ config KERNEL_PM
      Configuration item for low power frame tailoring.
      If you wish to build LiteOS with support for power management.

-config KERNEL_PM_IDLE
-    bool "Enable Power Management Idle"
-    default n
-    depends on KERNEL_PM
-    help
-      Configuration item for low power frame tailoring.
-      If you wish to build LiteOS with support for power management idle.
-
 config KERNEL_PM_TASK_PTIORITY
    int "Power Management Task Priority"
    default 1
@@ -521,14 +513,6 @@ config DEBUG_QUEUE
    help
      Answer Y to enable debug queue.

-config MUTEX_CREATE_TRACE
-    bool "Enable Mutex Trace Debugging"
-    default n
-    depends on ARCH_ARM
-    depends on DEBUG_KERNEL
-    help
-      Answer Y to enable debug mutex trace.
-
 config DEBUG_DEADLOCK
    bool "Enable Mutex Deadlock Debugging"
    default n
@@ -617,7 +601,7 @@ config VM_OVERLAP_CHECK
    depends on DEBUG_VERSION && MEM_DEBUG
    help
      Answer Y to enable vm overlap check.
-
+      
 config TASK_MEM_USED
    bool "Enable show task mem used or not"
    default n
--- a/README_zh.md
+++ b/README_zh.md
@@ -11,7 +11,7 @@

 OpenHarmony LiteOS-M内核是面向IoT领域构建的轻量级物联网操作系统内核，具有小体积、低功耗、高性能的特点，其代码结构简单，主要包括内核最小功能集、内核抽象层、可选组件以及工程目录等，分为硬件相关层以及硬件无关层，硬件相关层提供统一的HAL（Hardware Abstraction Layer）接口，提升硬件易适配性，不同编译工具链和芯片架构的组合分类，满足AIoT类型丰富的硬件和编译工具链的拓展。其架构图如图1所示：

-**图 1**  OpenHarmony LiteOS-M核内核架构图<a name="fig0865152210223"></a>
+**图 1**  OpenHarmony LiteOS-M核内核架构图<a name="fig0865152210223"></a>  
 ![](figures/OpenHarmony-LiteOS-M核内核架构图.png "OpenHarmony-LiteOS-M核内核架构图")

 ## 目录<a name="section161941989596"></a>
@@ -77,7 +77,7 @@ LiteOS-M内核的编译构建系统是一个基于gn和ninja的组件化构建

 ### 搭建系统基础环境

-在搭建各个开发板环境前，需要完成OpenHarmony系统基础环境搭建。系统基础环境主要是指OpenHarmony的编译环境和开发环境，详细介绍请参考官方站点[开发环境准备](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/Readme-CN.md)。开发者需要根据环境搭建文档完成环境搭建。
+在搭建各个开发板环境前，需要完成OpenHarmony系统基础环境搭建。系统基础环境主要是指OpenHarmony的编译环境和开发环境，详细介绍请参考官方站点[开发环境准备](https://gitee.com/openharmony/docs/blob/HEAD/zh-cn/device-dev/quick-start/quickstart-lite-env-setup.md)。开发者需要根据环境搭建文档完成环境搭建。

 ### 获取OpenHarmony源码

--- a/arch/BUILD.gn
+++ b/arch/BUILD.gn
@@ -43,7 +43,7 @@ module_group("arch") {
             "$board_cpu" == "ck804ef") {
    modules += [ "csky" ]
  } else if ("$board_cpu" == "") {
-    if ("$board_arch" != string_replace("$board_arch", "rv32i", "")) {
+    if ("$board_arch" == "rv32imac" || "$board_arch" == "rv32imafdc") {
      modules += [ "risc-v" ]
    } else if ("$board" == "esp32") {
      modules += [ "xtensa" ]
--- a/arch/arm/arm9/gcc/los_context.c
+++ b/arch/arm/arm9/gcc/los_context.c
@@ -59,7 +59,7 @@ LITE_OS_SEC_TEXT_INIT VOID ArchInit(VOID)
 **************************************************************************** */
 LITE_OS_SEC_TEXT_MINOR VOID ArchSysExit(VOID)
 {
-    (VOID)LOS_IntLock();
+    LOS_IntLock();
    while (1) {
    }
 }
--- a/arch/arm/cortex-m3/keil/los_context.c
+++ b/arch/arm/cortex-m3/keil/los_context.c
@@ -60,7 +60,7 @@ LITE_OS_SEC_TEXT_INIT VOID ArchInit(VOID)
 **************************************************************************** */
 LITE_OS_SEC_TEXT_MINOR VOID ArchSysExit(VOID)
 {
-    (VOID)LOS_IntLock();
+    LOS_IntLock();
    while (1) {
    }
 }
--- a/arch/arm/cortex-m33/gcc/NTZ/los_context.c
+++ b/arch/arm/cortex-m33/gcc/NTZ/los_context.c
@@ -59,7 +59,7 @@ LITE_OS_SEC_TEXT_INIT VOID ArchInit(VOID)
 **************************************************************************** */
 LITE_OS_SEC_TEXT_MINOR VOID ArchSysExit(VOID)
 {
-    (VOID)LOS_IntLock();
+    LOS_IntLock();
    while (1) {
    }
 }
--- a/arch/arm/cortex-m33/gcc/TZ/non_secure/los_context.c
+++ b/arch/arm/cortex-m33/gcc/TZ/non_secure/los_context.c
@@ -59,7 +59,7 @@ LITE_OS_SEC_TEXT_INIT VOID ArchInit(VOID)
 **************************************************************************** */
 LITE_OS_SEC_TEXT_MINOR VOID ArchSysExit(VOID)
 {
-    (VOID)LOS_IntLock();
+    LOS_IntLock();
    while (1) {
    }
 }
--- a/arch/arm/cortex-m33/gcc/TZ/non_secure/los_timer.c
+++ b/arch/arm/cortex-m33/gcc/TZ/non_secure/los_timer.c
@@ -91,7 +91,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)

 STATIC UINT64 SysTickCycleGet(UINT32 *period)
 {
-    UINT32 hwCycle = 0;
+    UINT32 hwCycle = 0；
    UINT32 intSave = LOS_IntLock();
    UINT32 val = SysTick->VAL;
    *period = SysTick->LOAD;
--- a/arch/arm/cortex-m33/gcc/TZ/non_secure/los_trustzone.c
+++ b/arch/arm/cortex-m33/gcc/TZ/non_secure/los_trustzone.c
@@ -51,7 +51,6 @@ VOID HalSecureSVCHandler(UINT32 svcID, UINTPTR arg)
            HalSecureContextLoad(g_secureContext);
            break;
        case OS_SVC_FREE_SECURE_CONTEXT:
-            LOS_ASSERT(g_secureContext != NULL);
            HalSecureContextFree(g_secureContext);
            break;
        default:
--- a/arch/arm/cortex-m33/iar/NTZ/los_context.c
+++ b/arch/arm/cortex-m33/iar/NTZ/los_context.c
@@ -59,7 +59,7 @@ LITE_OS_SEC_TEXT_INIT VOID ArchInit(VOID)
 **************************************************************************** */
 LITE_OS_SEC_TEXT_MINOR VOID ArchSysExit(VOID)
 {
-    (VOID)LOS_IntLock();
+    LOS_IntLock();
    while (1) {
    }
 }
--- a/arch/arm/cortex-m33/iar/TZ/non_secure/los_context.c
+++ b/arch/arm/cortex-m33/iar/TZ/non_secure/los_context.c
@@ -59,7 +59,7 @@ LITE_OS_SEC_TEXT_INIT VOID ArchInit(VOID)
 **************************************************************************** */
 LITE_OS_SEC_TEXT_MINOR VOID ArchSysExit(VOID)
 {
-    (VOID)LOS_IntLock();
+    LOS_IntLock();
    while (1) {
    }
 }
--- a/arch/arm/cortex-m33/iar/TZ/non_secure/los_trustzone.c
+++ b/arch/arm/cortex-m33/iar/TZ/non_secure/los_trustzone.c
@@ -51,7 +51,6 @@ VOID HalSecureSVCHandler(UINT32 svcID, UINTPTR arg)
            HalSecureContextLoad(g_secureContext);
            break;
        case OS_SVC_FREE_SECURE_CONTEXT:
-            LOS_ASSERT(g_secureContext != NULL);
            HalSecureContextFree(g_secureContext);
            break;
        default:
--- a/arch/arm/cortex-m33/iar/TZ/secure/los_secure_context.h
+++ b/arch/arm/cortex-m33/iar/TZ/secure/los_secure_context.h
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -63,3 +63,5 @@ extern VOID HalSecureContextSaveAsm(OsSecureContext *secureContext);
 #endif /* __cplusplus */

 #endif
+
+
--- a/arch/arm/cortex-m4/gcc/los_context.c
+++ b/arch/arm/cortex-m4/gcc/los_context.c
@@ -58,7 +58,7 @@ LITE_OS_SEC_TEXT_INIT VOID ArchInit(VOID)
 **************************************************************************** */
 LITE_OS_SEC_TEXT_MINOR VOID ArchSysExit(VOID)
 {
-    (VOID)LOS_IntLock();
+    LOS_IntLock();
    while (1) {
    }
 }
--- a/arch/arm/cortex-m4/iar/BUILD.gn
+++ b/arch/arm/cortex-m4/iar/BUILD.gn
@@ -1,47 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_m/liteos.gni")
-
-module_name = "arch"
-kernel_module(module_name) {
-  sources = [
-    "los_context.c",
-    "los_dispatch.S",
-    "los_exc.S",
-    "los_interrupt.c",
-    "los_mpu.c",
-    "los_timer.c",
-  ]
-  configs += [ "$LITEOSTOPDIR:warn_config" ]
-}
-
-config("public") {
-  include_dirs = [ "." ]
-}
--- a/arch/arm/cortex-m4/iar/los_context.c
+++ b/arch/arm/cortex-m4/iar/los_context.c
@@ -61,7 +61,7 @@ LITE_OS_SEC_TEXT_INIT VOID ArchInit(VOID)
 **************************************************************************** */
 LITE_OS_SEC_TEXT_MINOR VOID ArchSysExit(VOID)
 {
-    (VOID)LOS_IntLock();
+    LOS_IntLock();
    while (1) {
    }
 }
--- a/arch/arm/cortex-m55/gcc/NTZ/los_context.c
+++ b/arch/arm/cortex-m55/gcc/NTZ/los_context.c
@@ -58,7 +58,7 @@ LITE_OS_SEC_TEXT_INIT VOID ArchInit(VOID)
 **************************************************************************** */
 LITE_OS_SEC_TEXT_MINOR VOID ArchSysExit(VOID)
 {
-    (VOID)LOS_IntLock();
+    LOS_IntLock();
    while (1) {
    }
 }
--- a/arch/arm/cortex-m55/gcc/TZ/non_secure/los_context.c
+++ b/arch/arm/cortex-m55/gcc/TZ/non_secure/los_context.c
@@ -59,7 +59,7 @@ LITE_OS_SEC_TEXT_INIT VOID ArchInit(VOID)
 **************************************************************************** */
 LITE_OS_SEC_TEXT_MINOR VOID ArchSysExit(VOID)
 {
-    (VOID)LOS_IntLock();
+    LOS_IntLock();
    while (1) {
    }
 }
--- a/arch/arm/cortex-m55/gcc/TZ/non_secure/los_timer.c
+++ b/arch/arm/cortex-m55/gcc/TZ/non_secure/los_timer.c
@@ -91,7 +91,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)

 STATIC UINT64 SysTickCycleGet(UINT32 *period)
 {
-    UINT32 hwCycle = 0;
+    UINT32 hwCycle = 0；
    UINT32 intSave = LOS_IntLock();
    UINT32 val = SysTick->VAL;
    *period = SysTick->LOAD;
--- a/arch/arm/cortex-m55/gcc/TZ/non_secure/los_trustzone.c
+++ b/arch/arm/cortex-m55/gcc/TZ/non_secure/los_trustzone.c
@@ -51,7 +51,6 @@ VOID HalSecureSVCHandler(UINT32 svcID, UINTPTR arg)
            HalSecureContextLoad(g_secureContext);
            break;
        case OS_SVC_FREE_SECURE_CONTEXT:
-            LOS_ASSERT(g_secureContext != NULL);
            HalSecureContextFree(g_secureContext);
            break;
        default:
--- a/arch/arm/cortex-m55/iar/NTZ/los_context.c
+++ b/arch/arm/cortex-m55/iar/NTZ/los_context.c
@@ -59,7 +59,7 @@ LITE_OS_SEC_TEXT_INIT VOID ArchInit(VOID)
 **************************************************************************** */
 LITE_OS_SEC_TEXT_MINOR VOID ArchSysExit(VOID)
 {
-    (VOID)LOS_IntLock();
+    LOS_IntLock();
    while (1) {
    }
 }
--- a/arch/arm/cortex-m55/iar/TZ/non_secure/los_context.c
+++ b/arch/arm/cortex-m55/iar/TZ/non_secure/los_context.c
@@ -59,7 +59,7 @@ LITE_OS_SEC_TEXT_INIT VOID ArchInit(VOID)
 **************************************************************************** */
 LITE_OS_SEC_TEXT_MINOR VOID ArchSysExit(VOID)
 {
-    (VOID)LOS_IntLock();
+    LOS_IntLock();
    while (1) {
    }
 }
--- a/arch/arm/cortex-m55/iar/TZ/non_secure/los_trustzone.c
+++ b/arch/arm/cortex-m55/iar/TZ/non_secure/los_trustzone.c
@@ -51,7 +51,6 @@ VOID HalSecureSVCHandler(UINT32 svcID, UINTPTR arg)
            HalSecureContextLoad(g_secureContext);
            break;
        case OS_SVC_FREE_SECURE_CONTEXT:
-            LOS_ASSERT(g_secureContext != NULL);
            HalSecureContextFree(g_secureContext);
            break;
        default:
--- a/arch/arm/cortex-m55/iar/TZ/secure/los_secure_context.h
+++ b/arch/arm/cortex-m55/iar/TZ/secure/los_secure_context.h
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -63,3 +63,5 @@ extern VOID HalSecureContextSaveAsm(OsSecureContext *secureContext);
 #endif /* __cplusplus */

 #endif
+
+
--- a/arch/arm/cortex-m7/gcc/los_context.c
+++ b/arch/arm/cortex-m7/gcc/los_context.c
@@ -59,7 +59,7 @@ LITE_OS_SEC_TEXT_INIT VOID ArchInit(VOID)
 **************************************************************************** */
 LITE_OS_SEC_TEXT_MINOR VOID ArchSysExit(VOID)
 {
-    (VOID)LOS_IntLock();
+    LOS_IntLock();
    while (1) {
    }
 }
--- a/arch/arm/cortex-m7/iar/los_context.c
+++ b/arch/arm/cortex-m7/iar/los_context.c
@@ -59,7 +59,7 @@ LITE_OS_SEC_TEXT_INIT VOID ArchInit(VOID)
 **************************************************************************** */
 LITE_OS_SEC_TEXT_MINOR VOID ArchSysExit(VOID)
 {
-    (VOID)LOS_IntLock();
+    LOS_IntLock();
    while (1) {
    }
 }
--- a/arch/csky/v2/gcc/los_context.c
+++ b/arch/csky/v2/gcc/los_context.c
@@ -63,7 +63,7 @@ LITE_OS_SEC_TEXT_INIT VOID ArchInit(VOID)
 **************************************************************************** */
 LITE_OS_SEC_TEXT_MINOR VOID ArchSysExit(VOID)
 {
-    (VOID)LOS_IntLock();
+    LOS_IntLock();
    while (1) {
    }
 }
--- a/arch/csky/v2/gcc/los_interrupt.c
+++ b/arch/csky/v2/gcc/los_interrupt.c
@@ -612,7 +612,7 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
    HalHwiHandleReInit((UINT32)&g_hwiForm);

    HalSetVbr((UINT32)&g_hwiForm);
-    for (i = 0; i < BYTES_OF_128_INT; i++) {
+    for (int i = 0; i < BYTES_OF_128_INT; i++) {
        VIC_REG->IABR[i] = 0x0;
        VIC_REG->ICPR[i] = MASK_32_BITS;
    }
--- a/arch/include/los_arch.h
+++ b/arch/include/los_arch.h
@@ -62,13 +62,6 @@ STATIC INLINE UINTPTR ArchMspGet(VOID)
    __asm("mrs %0, msp" : "=r" (msp));
    return msp;
 }
-
-STATIC INLINE UINTPTR ArchLRGet(VOID)
-{
-    UINTPTR lr;
-    __asm("mov %0, lr" : "=r" (lr));
-    return lr;
-}
 #elif defined(__CLANG_ARM) || defined(__GNUC__)
 STATIC INLINE UINTPTR ArchSpGet(VOID)
 {
@@ -90,13 +83,6 @@ STATIC INLINE UINTPTR ArchMspGet(VOID)
    __asm volatile("mrs %0, msp" : "=r" (msp));
    return msp;
 }
-
-STATIC INLINE UINTPTR ArchLRGet(VOID)
-{
-    UINTPTR lr;
-    __asm volatile("mov %0, lr" : "=r" (lr));
-    return lr;
-}
 #else
 /* Other platforms to be improved  */
 #endif
--- a/arch/include/los_interrupt.h
+++ b/arch/include/los_interrupt.h
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -107,16 +107,13 @@ UINT32 ArchIntUnLock(VOID);
 *
 * @attention
 * <ul>
- * <li>The hardware interrupt module is usable only when the configuration item for hardware
- * interrupt tailoring is enabled.</li>
- * <li>Hardware interrupt number value range: [OS_USER_HWI_MIN,OS_USER_HWI_MAX]. The value range
- * applicable for a Cortex-A7 platform is [32,95].</li>
+ * <li>The hardware interrupt module is usable only when the configuration item for hardware interrupt tailoring is enabled.</li>
+ * <li>Hardware interrupt number value range: [OS_USER_HWI_MIN,OS_USER_HWI_MAX]. The value range applicable for a Cortex-A7 platform is [32,95].</li>
 * <li>OS_HWI_MAX_NUM specifies the maximum number of interrupts that can be created.</li>
 * <li>Before executing an interrupt on a platform, refer to the chip manual of the platform.</li>
 * </ul>
 *
- * @param  hwiNum   [IN] Type#HWI_HANDLE_T: hardware interrupt number. The value range applicable
- *                       for a Cortex-A7 platform is [32,95].
+ * @param  hwiNum   [IN] Type#HWI_HANDLE_T: hardware interrupt number. The value range applicable for a Cortex-A7 platform is [32,95].
 * @param  irqParam [IN] Type #HwiIrqParam *. ID of hardware interrupt which will base on
 *                                                when delete the hardware interrupt.
 * @retval #OS_ERRNO_HWI_NUM_INVALID              0x02000900: Invalid interrupt number.
@@ -136,16 +133,13 @@ UINT32 ArchHwiDelete(HWI_HANDLE_T hwiNum, HwiIrqParam *irqParam);
 *
 * @attention
 * <ul>
- * <li>The hardware interrupt module is usable only when the configuration item for hardware
- * interrupt tailoring is enabled.</li>
- * <li>Hardware interrupt number value range: [OS_USER_HWI_MIN,OS_USER_HWI_MAX]. The value range
- * applicable for a Cortex-A7 platform is [32,95].</li>
+ * <li>The hardware interrupt module is usable only when the configuration item for hardware interrupt tailoring is enabled.</li>
+ * <li>Hardware interrupt number value range: [OS_USER_HWI_MIN,OS_USER_HWI_MAX]. The value range applicable for a Cortex-A7 platform is [32,95].</li>
 * <li>OS_HWI_MAX_NUM specifies the maximum number of interrupts that can be created.</li>
 * <li>Before executing an interrupt on a platform, refer to the chip manual of the platform.</li>
 * </ul>
 *
- * @param  hwiNum   [IN] Type#HWI_HANDLE_T: hardware interrupt number. The value range applicable for a
- *                       Cortex-A7 platform is [32,95].
+ * @param  hwiNum   [IN] Type#HWI_HANDLE_T: hardware interrupt number. The value range applicable for a Cortex-A7 platform is [32,95].
 * @param  hwiPrio  [IN] Type#HWI_PRIOR_T: hardware interrupt priority. Ignore this parameter temporarily.
 * @param  mode     [IN] Type#HWI_MODE_T: hardware interrupt mode. Ignore this parameter temporarily.
 * @param  handler  [IN] Type#HWI_PROC_FUNC: interrupt handler used when a hardware interrupt is triggered.
@@ -155,8 +149,7 @@ UINT32 ArchHwiDelete(HWI_HANDLE_T hwiNum, HwiIrqParam *irqParam);
 * @retval #OS_ERRNO_HWI_PROC_FUNC_NULL               0x02000901: Null hardware interrupt handling function.
 * @retval #OS_ERRNO_HWI_NUM_INVALID                  0x02000900: Invalid interrupt number.
 * @retval #OS_ERRNO_HWI_NO_MEMORY                    0x02000903: Insufficient memory for hardware interrupt creation.
- * @retval #OS_ERRNO_HWI_ALREADY_CREATED              0x02000904: The interrupt handler being created has
- *                                                                already been created.
+ * @retval #OS_ERRNO_HWI_ALREADY_CREATED              0x02000904: The interrupt handler being created has already been created.
 * @retval #LOS_OK                                    0         : The interrupt is successfully created.
 * @par Dependency:
 * <ul><li>los_interrupt.h: the header file that contains the API declaration.</li></ul>
--- a/arch/risc-v/riscv32/gcc/asm/soc_common.h
+++ b/arch/risc-v/riscv32/gcc/asm/soc_common.h
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2020, Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -63,9 +63,6 @@
 #define RISCV_MIE_MEIE                      0x000000800

 /************************** mcause ***********************/
-#ifndef MCAUSE_INT_ID_MASK
-#define MCAUSE_INT_ID_MASK                  0x7FFFFFF
-#endif
 #define RISCV_MCAUSE_ECALL_U                8

 #define RISCV_USER_SOFT_IRQ                 0
@@ -75,6 +72,7 @@
 #define RISCV_USER_EXT_IRQ                  8
 #define RISCV_MACH_EXT_IRQ                  11

+
 #define READ_CSR(reg) ({                                          \
    UINT32 _tmp;                                                  \
    __asm__ volatile("csrr %0, " #reg : "=r"(_tmp) : : "memory"); \
--- a/arch/risc-v/riscv32/gcc/los_arch_interrupt.h
+++ b/arch/risc-v/riscv32/gcc/los_arch_interrupt.h
@@ -35,7 +35,6 @@
 #include "los_config.h"
 #include "los_interrupt.h"
 #include "los_arch_context.h"
-#include "los_error.h"

 #ifdef __cplusplus
 #if __cplusplus
--- a/arch/risc-v/riscv32/gcc/los_context.c
+++ b/arch/risc-v/riscv32/gcc/los_context.c
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2020, Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -35,7 +35,7 @@
 #include "los_task.h"
 #include "los_sched.h"
 #include "los_memory.h"
-#include "soc_common.h"
+#include "soc.h"

 STATIC UINT32 g_sysNeedSched = FALSE;

--- a/arch/risc-v/riscv32/gcc/los_dispatch.S
+++ b/arch/risc-v/riscv32/gcc/los_dispatch.S
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2020, Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -29,7 +29,7 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include "soc_common.h"
+#include "soc.h"

 .global  HalEnableIRQ
 .global  HalDisableIRQ
--- a/arch/risc-v/riscv32/gcc/los_exc.S
+++ b/arch/risc-v/riscv32/gcc/los_exc.S
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2020, Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -31,7 +31,7 @@

 #ifndef _LOS_EXC_S
 #define _LOS_EXC_S
-#include "soc_common.h"
+#include "soc.h"

 .macro PUSH_CALLER_REG
    addi sp, sp, -(32 * REGBYTES)
@@ -139,7 +139,8 @@ HalTrapEntry:
    sw    a0, 0 * REGBYTES(sp)
    csrr  t0, mtval
    sw    t0, 1 * REGBYTES(sp)
-    sw    zero, 2 * REGBYTES(sp)
+    csrr  t0, medeleg
+    sw    t0, 2 * REGBYTES(sp)
    sw    gp, 3 * REGBYTES(sp)
    mv    a0, sp
    csrw  mscratch, sp
--- a/arch/xtensa/lx6/gcc/los_context.c
+++ b/arch/xtensa/lx6/gcc/los_context.c
@@ -103,7 +103,7 @@ LITE_OS_SEC_TEXT_INIT VOID ArchInit(VOID)

 LITE_OS_SEC_TEXT_MINOR VOID ArchSysExit(VOID)
 {
-    (VOID)LOS_IntLock();
+    LOS_IntLock();
    while (1) {
    }
 }
--- a/components/cpup/los_cpup.c
+++ b/components/cpup/los_cpup.c
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -209,6 +209,7 @@ LITE_OS_SEC_TEXT_MINOR VOID OsTskCycleEnd(VOID)
    }

    cpuCycle = LOS_SysCycleGet();
+
    if (cpuCycle < g_cpup[taskID].startTime) {
        cpuCycle += g_cyclesPerTick;
    }
@@ -624,6 +625,7 @@ LITE_OS_SEC_TEXT_MINOR VOID OsCpupIrqEnd(UINT32 intNum)
    }

    cpuCycle = LOS_SysCycleGet();
+
    if (cpuCycle < g_irqCpup[intNum].startTime) {
        cpuCycle += g_cyclesPerTick;
    }
--- a/components/cpup/los_cpup.h
+++ b/components/cpup/los_cpup.h
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -250,8 +250,7 @@ extern UINT32 LOS_SysCpuUsage(VOID);
 * This API is used to obtain the historical CPU usage.
 * @attention
 * <ul>
- * <li>This API can be called only after the CPU usage is initialized. Otherwise, the CPU usage fails
- * to be obtained.</li>
+ * <li>This API can be called only after the CPU usage is initialized. Otherwise, the CPU usage fails to be obtained.</li>
 * </ul>
 *
 * @param  mode     [IN] UINT16. Task mode. The parameter value 0 indicates that the CPU usage within 10s will be
@@ -274,8 +273,7 @@ extern UINT32 LOS_HistorySysCpuUsage(UINT16 mode);
 * This API is used to obtain the CPU usage of a task specified by a passed-in task ID.
 * @attention
 * <ul>
- * <li>This API can be called only after the CPU usage is initialized. Otherwise, the CPU usage fails
- * to be obtained.</li>
+ * <li>This API can be called only after the CPU usage is initialized. Otherwise, the CPU usage fails to be obtained.</li>
 * <li>The passed-in task ID must be valid and the task specified by the task ID must be created. Otherwise,
 * the CPU usage fails to be obtained.</li>
 * </ul>
@@ -329,8 +327,7 @@ extern UINT32 LOS_HistoryTaskCpuUsage(UINT32 taskID, UINT16 mode);
 * This API is used to obtain the CPU usage of all tasks according to maximum number of threads.
 * @attention
 * <ul>
- * <li>This API can be called only after the CPU usage is initialized. Otherwise, the CPU usage fails
- * to be obtained.</li>
+ * <li>This API can be called only after the CPU usage is initialized. Otherwise, the CPU usage fails to be obtained.</li>
 * <li>The input parameter pointer must not be NULL, Otherwise, the CPU usage fails to be obtained.</li>
 * </ul>
 *
--- a/components/dynlink/los_dynlink.c
+++ b/components/dynlink/los_dynlink.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -41,6 +41,12 @@
 #include "los_debug.h"
 #include "los_mux.h"

+#ifdef __cplusplus
+#if __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+#endif /* __cplusplus */
+
 #if (LOSCFG_DYNLINK == 1)

 #if defined(__ICCARM__) || defined(__CC_ARM)
@@ -273,7 +279,7 @@ STATIC DynSharedObj *OsLoadInit(const CHAR *fileName, VOID *pool)
        goto ERR2;
    }

-    (void)strcpy_s(dso->buf, nameLen + 1, fileName);
+    strcpy(dso->buf, fileName);
    dso->fileName = dso->buf;
    dso->ref = 1;
    dso->pool = (pool ? pool : OS_SYS_MEM_ADDR);
@@ -861,7 +867,7 @@ STATIC VOID OsDoFini(DynSharedObj *dso)
            --func;
            finiFunc = (INIT_FINI_FUNC)(*func);
            finiFunc();
-        }
+       }
    }

    if (initFiniTab->fini.func != 0) {
@@ -923,3 +929,10 @@ INT32 LOS_DynlinkInit(VOID)
 }

 #endif /* LOSCFG_DYNLINK */
+
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* __cplusplus */
+
--- a/components/dynlink/los_dynlink.h
+++ b/components/dynlink/los_dynlink.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -129,8 +129,8 @@ typedef struct {
 } DynSharedObj;

 typedef struct {
-    CHAR    *name;
-    UINTPTR addr;
+  CHAR    *name;
+  UINTPTR addr;
 } SymInfo;

 #define SYM_EXPORT(func)                                            \
--- a/components/exchook/los_exc_info.h
+++ b/components/exchook/los_exc_info.h
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -54,15 +54,13 @@ extern "C" {
 #endif

 #if (LOSCFG_BASE_CORE_EXC_TSK_SWITCH == 1)
-#define MAX_SWITCH_INFO_SIZE    (INFO_TYPE_AND_SIZE + (sizeof(UINT32) + sizeof(CHAR) * LOS_TASK_NAMELEN) \
-                                 * OS_TASK_SWITCH_INFO_COUNT)
+#define MAX_SWITCH_INFO_SIZE    (INFO_TYPE_AND_SIZE + (sizeof(UINT32) + sizeof(CHAR) * LOS_TASK_NAMELEN) * OS_TASK_SWITCH_INFO_COUNT)
 #else
 #define MAX_SWITCH_INFO_SIZE    (0)
 #endif
-     
+
 #define MAX_MEM_INFO_SIZE       (INFO_TYPE_AND_SIZE + sizeof(MemInfoCB) * OS_SYS_MEM_NUM)
-#define MAX_EXC_MEM_SIZE        (INFO_TYPE_AND_SIZE + MAX_SCENE_INFO_SIZE + MAX_TSK_INFO_SIZE + MAX_QUEUE_INFO_SIZE \
-                                 + MAX_INT_INFO_SIZE + MAX_SWITCH_INFO_SIZE + MAX_MEM_INFO_SIZE)
+#define MAX_EXC_MEM_SIZE        (INFO_TYPE_AND_SIZE + MAX_SCENE_INFO_SIZE + MAX_TSK_INFO_SIZE + MAX_QUEUE_INFO_SIZE + MAX_INT_INFO_SIZE + MAX_SWITCH_INFO_SIZE + MAX_MEM_INFO_SIZE)

 typedef enum {
    OS_EXC_TYPE_CONTEXT     = 0,
--- a/components/fs/fatfs/fatfs.c
+++ b/components/fs/fatfs/fatfs.c
@@ -40,13 +40,12 @@
 #include "securec.h"
 #include "los_compiler.h"
 #include "los_debug.h"
-#include "los_sched.h"
+#include "cmsis_os2.h"
 #include "vfs_files.h"
 #include "vfs_operations.h"
 #include "vfs_partition.h"
 #include "vfs_maps.h"
 #include "vfs_mount.h"
-#include "los_fs.h"

 /* the max name length of different parts should not bigger than 32 */
 #define FS_DRIVE_NAME_MAX_LEN 32
@@ -74,7 +73,7 @@ static int FsLock(void)
 {
    int ret = 0;
    struct timespec absTimeout = {0};
-    if (!OsCheckKernelRunning()) {
+    if (osKernelGetState() != osKernelRunning) {
        return ret;
    }
    ret = clock_gettime(CLOCK_REALTIME, &absTimeout);
@@ -89,7 +88,7 @@ static int FsLock(void)

 static void FsUnlock(void)
 {
-    if (!OsCheckKernelRunning()) {
+    if (osKernelGetState() != osKernelRunning) {
        return;
    }
    (void)pthread_mutex_unlock(&g_fatfsMutex);
@@ -245,7 +244,7 @@ char * GetLdPath(const char *source)
    }

    char *volPath = g_volPath[partId];
-    char *ldPath = (char *)LOSCFG_FS_MALLOC_HOOK(strlen(volPath) + LDPATH_PAD);
+    char *ldPath = (char *)malloc(strlen(volPath) + LDPATH_PAD);
    if (ldPath == NULL) {
        return NULL;
    }
@@ -256,7 +255,7 @@ char * GetLdPath(const char *source)
    *ldPath = '/';
    ret = strcpy_s(ldPath + 1, strlen(volPath)+1, volPath);
    if (ret != EOK) {
-        LOSCFG_FS_FREE_HOOK(ldPath);
+        free(ldPath);
        return NULL;
    }

@@ -266,7 +265,7 @@ char * GetLdPath(const char *source)
 void PutLdPath(const char *ldPath)
 {
    if (ldPath != NULL) {
-        LOSCFG_FS_FREE_HOOK((void *)ldPath);
+        free((void *)ldPath);
    }
 }

@@ -283,12 +282,6 @@ int FatfsMount(struct MountPoint *mp, unsigned long mountflags,
        return (int)LOS_NOK;
    }

-    if (mountflags & MS_REMOUNT) {
-        ret = Remount(mp, mountflags);
-        FsUnlock();
-        return ret;
-    }
-
    char *ldPath = GetLdPath(mp->mDev);
    if (ldPath == NULL) {
        errno = EFAULT;
@@ -296,7 +289,12 @@ int FatfsMount(struct MountPoint *mp, unsigned long mountflags,
        goto ERROUT;
    }

-    fs = (FATFS *)LOSCFG_FS_MALLOC_HOOK(sizeof(FATFS));
+    if (mountflags & MS_REMOUNT) {
+        ret = Remount(mp, mountflags);
+        goto ERROUT;
+    }
+
+    fs = (FATFS *)malloc(sizeof(FATFS));
    if (fs == NULL) {
        errno = ENOMEM;
        ret = (int)LOS_NOK;
@@ -317,7 +315,7 @@ int FatfsMount(struct MountPoint *mp, unsigned long mountflags,
    return (int)LOS_OK;

 ERROUT:
-    LOSCFG_FS_FREE_HOOK(fs);
+    free(fs);
    mp->mData = NULL;
    PutLdPath(ldPath);
    FsUnlock();
@@ -370,7 +368,7 @@ int FatfsUmount(struct MountPoint *mp)
        ff_memfree(fatfs->win);
    }

-    LOSCFG_FS_FREE_HOOK(mp->mData);
+    free(mp->mData);
    mp->mData = NULL;

    ret = (int)LOS_OK;
@@ -425,7 +423,7 @@ int FatfsUmount2(struct MountPoint *mp, int flag)
        ff_memfree(fatfs->win);
    }

-    LOSCFG_FS_FREE_HOOK(mp->mData);
+    free(mp->mData);
    mp->mData = NULL;

    ret = (int)LOS_OK;
@@ -450,7 +448,7 @@ int FatfsOpen(struct File *file, const char *path, int oflag)

    fmode = FatFsGetMode(oflag);

-    fp = (FIL *)LOSCFG_FS_MALLOC_HOOK(sizeof(FIL));
+    fp = (FIL *)malloc(sizeof(FIL));
    if (fp == NULL) {
        errno = ENOMEM;
        return (int)LOS_NOK;
@@ -459,7 +457,7 @@ int FatfsOpen(struct File *file, const char *path, int oflag)
    ret = FsLock();
    if (ret != 0) {
        errno = ret;
-        LOSCFG_FS_FREE_HOOK(fp);
+        free(fp);
        return (int)LOS_NOK;
    }

@@ -468,14 +466,14 @@ int FatfsOpen(struct File *file, const char *path, int oflag)
        PRINT_ERR("FAT open ChangeDrive err 0x%x!\r\n", ret);
        errno = ENOENT;
        ret = (int)LOS_NOK;
-        LOSCFG_FS_FREE_HOOK(fp);
+        free(fp);
        goto OUT;
    }

    res = f_open(fp, path, fmode);
    if (res != FR_OK) {
        PRINT_ERR("FAT open err 0x%x!\r\n", res);
-        LOSCFG_FS_FREE_HOOK(fp);
+        free(fp);
        errno = FatfsErrno(res);
        ret = (int)LOS_NOK;
        goto OUT;
@@ -519,7 +517,7 @@ int FatfsClose(struct File *file)
        (void)ff_memfree(fp->buf);
    }
 #endif
-    LOSCFG_FS_FREE_HOOK(file->fData);
+    free(file->fData);
    file->fData = NULL;
    FsUnlock();

@@ -834,7 +832,7 @@ int FatfsOpendir(struct Dir *dir, const char *dirName)
        goto ERROUT;
    }

-    dp = (DIR *)LOSCFG_FS_MALLOC_HOOK(sizeof(DIR));
+    dp = (DIR *)malloc(sizeof(DIR));
    if (dp == NULL) {
        errno = ENOENT;
        goto ERROUT;
@@ -868,7 +866,7 @@ int FatfsOpendir(struct Dir *dir, const char *dirName)

 ERROUT:
    if (dp != NULL) {
-        LOSCFG_FS_FREE_HOOK(dp);
+        free(dp);
    }
    FsUnlock();
    return (int)LOS_NOK;
@@ -940,7 +938,7 @@ int FatfsClosedir(struct Dir *dir)
        return (int)LOS_NOK;
    }

-    LOSCFG_FS_FREE_HOOK(dir->dData);
+    free(dir->dData);
    dir->dData = NULL;
    FsUnlock();

--- a/components/fs/littlefs/lfs_adapter.c
+++ b/components/fs/littlefs/lfs_adapter.c
@@ -32,84 +32,15 @@
 #define _GNU_SOURCE 1
 #include "lfs_adapter.h"
 #include "los_config.h"
-#include "los_fs.h"
 #include "vfs_files.h"
 #include "vfs_operations.h"
 #include "vfs_partition.h"
 #include "vfs_maps.h"
 #include "vfs_mount.h"
 #include "securec.h"
-#include "los_fs.h"

-static pthread_mutex_t g_fsLocalMutex = PTHREAD_MUTEX_INITIALIZER;
-
-static struct PartitionCfg g_partitionCfg;
-static struct DeviceDesc *g_lfsDevice = NULL;
-
-static uint32_t LfsGetStartAddr(int partition)
-{
-    if (g_lfsDevice == NULL) {
-        struct DeviceDesc *device = NULL;
-        for (device = getDeviceList(); device != NULL; device = device->dNext) {
-            if (strcmp(device->dFsType, "littlefs") == 0) {
-                g_lfsDevice = device;
-                break;
-            }
-        }
-    }
-
-    if ((g_lfsDevice == NULL) || (partition >= g_lfsDevice->dPartNum)) {
-        return INVALID_DEVICE_ADDR;
-    }
-
-    return (uint32_t)g_lfsDevice->dAddrArray[partition];
-}
-
-WEAK int littlefs_block_read(const struct lfs_config *c, lfs_block_t block,
-                             lfs_off_t off, void *dst, lfs_size_t size)
-{
-    UINT32 addr = c->block_size * block + off;
-    UINT32 startaddr = LfsGetStartAddr((int)c->context);
-    if (startaddr == INVALID_DEVICE_ADDR) {
-        return -1;
-    }
-    addr += startaddr;
-
-    return (g_partitionCfg.readFunc)((int)c->context, &addr, dst, size);
-}
-
-WEAK int littlefs_block_write(const struct lfs_config *c, lfs_block_t block,
-                              lfs_off_t off, const void *dst, lfs_size_t size)
-{
-    UINT32 addr = c->block_size * block + off;
-    UINT32 startaddr = LfsGetStartAddr((int)c->context);
-    if (startaddr == INVALID_DEVICE_ADDR) {
-        return -1;
-    }
-
-    addr += startaddr;
-
-    return (g_partitionCfg.writeFunc)((int)c->context, &addr, dst, size);
-}
-
-WEAK int littlefs_block_erase(const struct lfs_config *c, lfs_block_t block)
-{
-    UINT32 addr = c->block_size * block;
-    UINT32 startaddr = LfsGetStartAddr((int)c->context);
-    if (startaddr == INVALID_DEVICE_ADDR) {
-        return -1;
-    }
-
-    addr += startaddr;
-
-    return (g_partitionCfg.eraseFunc)((int)c->context, addr, c->block_size);
-}
-
-WEAK int littlefs_block_sync(const struct lfs_config *c)
-{
-    (void)c;
-    return 0;
-}
+struct dirent g_nameValue;
+static pthread_mutex_t g_FslocalMutex = PTHREAD_MUTEX_INITIALIZER;

 static int ConvertFlagToLfsOpenFlag (int oflags)
 {
@@ -151,33 +82,10 @@ static int LittlefsErrno(int result)
    return (result < 0) ? -result : result;
 }

-void LfsConfigAdapter(struct PartitionCfg *pCfg, struct lfs_config *lfsCfg)
-{
-    lfsCfg->context = (void *)pCfg->partNo;
-
-    lfsCfg->read_size = pCfg->readSize;
-    lfsCfg->prog_size = pCfg->writeSize;
-    lfsCfg->cache_size = pCfg->cacheSize;
-    lfsCfg->block_cycles = pCfg->blockCycles;
-    lfsCfg->lookahead_size = pCfg->lookaheadSize;
-    lfsCfg->block_size = pCfg->blockSize;
-    lfsCfg->block_count = pCfg->blockCount;
-
-    lfsCfg->read = littlefs_block_read;
-    lfsCfg->prog = littlefs_block_write;
-    lfsCfg->erase = littlefs_block_erase;
-    lfsCfg->sync = littlefs_block_sync;
-
-    g_partitionCfg.readFunc = pCfg->readFunc;
-    g_partitionCfg.writeFunc = pCfg->writeFunc;
-    g_partitionCfg.eraseFunc = pCfg->eraseFunc;
-}
-
 int LfsMount(struct MountPoint *mp, unsigned long mountflags, const void *data)
 {
    int ret;
    lfs_t *mountHdl = NULL;
-    struct lfs_config *cfg = NULL;

    if ((mp == NULL) || (mp->mPath == NULL) || (data == NULL)) {
        errno = EFAULT;
@@ -185,33 +93,25 @@ int LfsMount(struct MountPoint *mp, unsigned long mountflags, const void *data)
        goto errout;
    }

-    if (mountflags & MS_REMOUNT) {
-        errno = ENOSYS;
-        ret = (int)LOS_NOK;
-        goto errout;
-    }
-
-    mountHdl = (lfs_t *)LOSCFG_FS_MALLOC_HOOK(sizeof(lfs_t) + sizeof(struct lfs_config));
+    mountHdl = (lfs_t *)malloc(sizeof(lfs_t));
    if (mountHdl == NULL) {
        errno = ENODEV;
        ret = (int)LOS_NOK;
        goto errout;
    }
-    (void)memset_s(mountHdl, sizeof(lfs_t) + sizeof(struct lfs_config), 0, sizeof(lfs_t) + sizeof(struct lfs_config));
+    (void)memset_s(mountHdl, sizeof(lfs_t), 0, sizeof(lfs_t));
    mp->mData = (void *)mountHdl;
-    cfg = (void *)((UINTPTR)mountHdl + sizeof(lfs_t));

-    LfsConfigAdapter((struct PartitionCfg *)data, cfg);
-
-    ret = lfs_mount((lfs_t *)mp->mData, cfg);
+    ret = lfs_mount((lfs_t *)mp->mData, (struct lfs_config *)data);
    if (ret != 0) {
-        ret = lfs_format((lfs_t *)mp->mData, cfg);
+        ret = lfs_format((lfs_t *)mp->mData, (struct lfs_config*)data);
        if (ret == 0) {
-            ret = lfs_mount((lfs_t *)mp->mData, cfg);
+            ret = lfs_mount((lfs_t *)mp->mData, (struct lfs_config*)data);
        }
    }
+
    if (ret != 0) {
-        LOSCFG_FS_FREE_HOOK(mountHdl);
+        free(mountHdl);
        errno = LittlefsErrno(ret);
        ret = (int)LOS_NOK;
    }
@@ -240,7 +140,7 @@ int LfsUmount(struct MountPoint *mp)
        ret = (int)LOS_NOK;
    }

-    LOSCFG_FS_FREE_HOOK(mp->mData);
+    free(mp->mData);
    mp->mData = NULL;
    return ret;
 }
@@ -334,7 +234,7 @@ int LfsOpendir(struct Dir *dir, const char *dirName)
    }

    lfs_t *lfs = (lfs_t *)dir->dMp->mData;
-    lfs_dir_t *dirInfo = (lfs_dir_t *)LOSCFG_FS_MALLOC_HOOK(sizeof(lfs_dir_t));
+    lfs_dir_t *dirInfo = (lfs_dir_t *)malloc(sizeof(lfs_dir_t));
    if (dirInfo == NULL) {
        errno = ENOMEM;
        return (int)LOS_NOK;
@@ -343,7 +243,7 @@ int LfsOpendir(struct Dir *dir, const char *dirName)
    (void)memset_s(dirInfo, sizeof(lfs_dir_t), 0, sizeof(lfs_dir_t));
    ret = lfs_dir_open(lfs, dirInfo, dirName);
    if (ret != 0) {
-        LOSCFG_FS_FREE_HOOK(dirInfo);
+        free(dirInfo);
        errno = LittlefsErrno(ret);
        goto errout;
    }
@@ -378,7 +278,7 @@ int LfsReaddir(struct Dir *dir, struct dirent *dent)

    ret = lfs_dir_read(lfs, dirInfo, &lfsInfo);
    if (ret == TRUE) {
-        pthread_mutex_lock(&g_fsLocalMutex);
+        pthread_mutex_lock(&g_FslocalMutex);
        (void)strncpy_s(dent->d_name, sizeof(dent->d_name), lfsInfo.name, strlen(lfsInfo.name) + 1);
        if (lfsInfo.type == LFS_TYPE_DIR) {
            dent->d_type = DT_DIR;
@@ -387,7 +287,7 @@ int LfsReaddir(struct Dir *dir, struct dirent *dent)
        }

        dent->d_reclen = lfsInfo.size;
-        pthread_mutex_unlock(&g_fsLocalMutex);
+        pthread_mutex_unlock(&g_FslocalMutex);

        return LOS_OK;
    }
@@ -422,7 +322,7 @@ int LfsClosedir(struct Dir *dir)
        ret = (int)LOS_NOK;
    }

-    LOSCFG_FS_FREE_HOOK(dirInfo);
+    free(dirInfo);
    dir->dData = NULL;

    return ret;
@@ -439,7 +339,7 @@ int LfsOpen(struct File *file, const char *pathName, int openFlag)
        return (int)LOS_NOK;
    }

-    lfsHandle = (lfs_file_t *)LOSCFG_FS_MALLOC_HOOK(sizeof(lfs_file_t));
+    lfsHandle = (lfs_file_t *)malloc(sizeof(lfs_file_t));
    if (lfsHandle == NULL) {
        errno = ENOMEM;
        return (int)LOS_NOK;
@@ -448,7 +348,7 @@ int LfsOpen(struct File *file, const char *pathName, int openFlag)
    int lfsOpenFlag = ConvertFlagToLfsOpenFlag(openFlag);
    ret = lfs_file_open((lfs_t *)file->fMp->mData, lfsHandle, pathName, lfsOpenFlag);
    if (ret != 0) {
-        LOSCFG_FS_FREE_HOOK(lfsHandle);
+        free(lfsHandle);
        errno = LittlefsErrno(ret);
        goto errout;
    }
@@ -567,16 +467,16 @@ int LfsClose(struct File *file)
        return (int)LOS_NOK;
    }

-    pthread_mutex_lock(&g_fsLocalMutex);
+    pthread_mutex_lock(&g_FslocalMutex);
    ret = lfs_file_close((lfs_t *)mp->mData, lfsHandle);
-    pthread_mutex_unlock(&g_fsLocalMutex);
+    pthread_mutex_unlock(&g_FslocalMutex);

    if (ret != 0) {
        errno = LittlefsErrno(ret);
        ret = (int)LOS_NOK;
    }

-    LOSCFG_FS_FREE_HOOK(file->fData);
+    free(file->fData);
    file->fData = NULL;
    return ret;
 }
@@ -659,24 +559,6 @@ int LfsSync(struct File *file)
    return ret;
 }

-int LfsFormat(const char *partName, void *privData)
-{
-    int ret;
-    lfs_t lfs = {0};
-    struct lfs_config cfg = {0};
-
-    (void)partName;
-
-    LfsConfigAdapter((struct PartitionCfg *)privData, &cfg);
-
-    ret = lfs_format(&lfs, &cfg);
-    if (ret != 0) {
-        errno = LittlefsErrno(ret);
-        ret = (int)LOS_NOK;
-    }
-    return ret;
-}
-
 static struct MountOps g_lfsMnt = {
    .mount = LfsMount,
    .umount = LfsUmount,
@@ -705,7 +587,7 @@ static struct FileOps g_lfsFops = {

 static struct FsManagement g_lfsMgt = {
    .fdisk = NULL,
-    .format = LfsFormat,
+    .format = NULL,
 };

 void LfsInit(void)
--- a/components/fs/littlefs/lfs_adapter.h
+++ b/components/fs/littlefs/lfs_adapter.h
@@ -45,6 +45,6 @@
 #include "pthread.h"

 #define INVALID_FD (-1)
-#define INVALID_DEVICE_ADDR ((uint32_t)-1)
+
 void LfsInit(void);
 #endif /* _LFS_ADAPTER_H_ */
--- a/components/fs/vfs/los_fs.h
+++ b/components/fs/vfs/los_fs.h
@@ -38,14 +38,12 @@
 #define _LOS_FS_H_

 #include "los_config.h"
-#include "los_memory.h"
 #include "dirent.h"
 #include "sys/mount.h"
 #include "sys/statfs.h"
 #include "sys/stat.h"
 #include "sys/uio.h"
 #include "unistd.h"
-#include <stdarg.h>

 #ifdef __cplusplus
 #if __cplusplus
@@ -53,14 +51,6 @@ extern "C" {
 #endif /* __cplusplus */
 #endif /* __cplusplus */

-#ifndef LOSCFG_FS_MALLOC_HOOK
-#define LOSCFG_FS_MALLOC_HOOK(size) LOS_MemAlloc((VOID *)OS_SYS_MEM_ADDR, size)
-#endif
-
-#ifndef LOSCFG_FS_FREE_HOOK
-#define LOSCFG_FS_FREE_HOOK(ptr) LOS_MemFree((VOID *)OS_SYS_MEM_ADDR, ptr)
-#endif
-
 int LOS_Open(const char *path, int flags, ...);
 int LOS_Close(int fd);
 ssize_t LOS_Read(int fd, void *buff, size_t bytes);
@@ -90,31 +80,8 @@ int LOS_Ftruncate(int fd, off_t length);
 int LOS_FsUmount(const char *target);
 int LOS_FsUmount2(const char *target, int flag);
 int LOS_FsMount(const char *source, const char *target,
-                const char *fsType, unsigned long mountflags,
-                const void *data);
-
-int OsFcntl(int fd, int cmd, va_list ap);
-int OsIoctl(int fd, int req, va_list ap);
-
-struct PartitionCfg {
-    /* partition low-level read func */
-    int  (*readFunc)(int partition, UINT32 *offset, void *buf, UINT32 size);
-    /* partition low-level write func */
-    int  (*writeFunc)(int partition, UINT32 *offset, const void *buf, UINT32 size);
-    /* partition low-level erase func */
-    int  (*eraseFunc)(int partition, UINT32 offset, UINT32 size);
-
-    int readSize;       /* size of a block read */
-    int writeSize;      /* size of a block write */
-    int blockSize;      /* size of an erasable block */
-    int blockCount;     /* number of partition blocks */
-    int cacheSize;      /* size of block caches */
-
-    int partNo;         /* partition number */
-    int lookaheadSize;  /* lookahead size */
-    int blockCycles;    /* block cycles */
-};
-
+          const char *fsType, unsigned long mountflags,
+          const void *data);
 /*
 * @brief Divide the device into partitions.
 *
@@ -126,7 +93,6 @@ struct PartitionCfg {
 * @param lengthArray List of partition size. For example:
 *     [0x10000000, 0x2000000], 256M and 512M partitions will be created and
 *     left all will not allocated.
- * @param addrArray List of partition start addr, partition num same as lengthArray
 * @param partNum Length of 'lengthArray'.
 *
 * @return Return LOS_NOK if error. Return LOS_OK if success.
@@ -137,8 +103,8 @@ struct PartitionCfg {
 *         The name is a combination of: 'deviceName'+'p'+'partitionId',
 *         such as "emmc0p0", "emmc0p1", "emmc0p2"...
 */
-int LOS_DiskPartition(const char *dev, const char *fsType, int *lengthArray, int *addrArray,
-                      int partNum);
+int LOS_DiskPartition(const char *dev, const char *fsType, int *lengthArray,
+                      int partnum);

 /*
 * @brief Format a partition.
--- a/components/fs/vfs/vfs_files.c
+++ b/components/fs/vfs/vfs_files.c
@@ -39,7 +39,7 @@

 static struct File g_files[NR_OPEN_DEFAULT];

-int FileToFd(const struct File *file)
+int FileToFd(struct File *file)
 {
    if (file == NULL) {
        return (int)LOS_NOK;
--- a/components/fs/vfs/vfs_files.h
+++ b/components/fs/vfs/vfs_files.h
@@ -89,7 +89,7 @@ struct Dir {
    void              *dData;
 };

-int FileToFd(const struct File *file);
+int FileToFd(struct File *file);
 struct File *FdToFile(int fd);
 struct File *VfsFileGet(void);
 struct File *VfsFileGetSpec(int fd);
--- a/components/fs/vfs/vfs_fs.c
+++ b/components/fs/vfs/vfs_fs.c
@@ -40,7 +40,6 @@
 #include "fcntl.h"
 #include "los_mux.h"
 #include "los_debug.h"
-#include "los_sched.h"
 #include "limits.h"
 #include "securec.h"
 #include "vfs_config.h"
@@ -86,7 +85,7 @@ int PollQueryFd(int fd, struct PollTable *table)
 #endif

 #define FREE_AND_SET_NULL(ptr) do { \
-    LOSCFG_FS_FREE_HOOK(ptr);       \
+    free(ptr);                      \
    ptr = NULL;                     \
 } while (0)

@@ -97,9 +96,6 @@ UINT32 g_fsMutex;

 int VfsLock(void)
 {
-    if (!OsCheckKernelRunning()) {
-        return LOS_OK;
-    }
    if (LOS_MuxPend(g_fsMutex, LOS_WAIT_FOREVER) != LOS_OK) {
        PRINT_ERR("VfsLock failed!");
        return (int)LOS_NOK;
@@ -110,9 +106,6 @@ int VfsLock(void)

 void VfsUnlock(void)
 {
-    if (!OsCheckKernelRunning()) {
-        return;
-    }
    (void)LOS_MuxPost(g_fsMutex);
 }

@@ -143,13 +136,13 @@ static size_t GetCanonicalPath(const char *cwd, const char *path, char *buf, siz

    offset = strlen("///") + 1; // three '/' and one '\0'
    size_t tmpLen = strlen(cwd) + strlen(path) + offset;
-    char *tmpBuf = (char *)LOSCFG_FS_MALLOC_HOOK(tmpLen);
+    char *tmpBuf = (char *)malloc(tmpLen);
    if (tmpBuf == NULL) {
        return LOS_OK;
    }

    if (-1 == sprintf_s(tmpBuf, tmpLen, "/%s/%s/", cwd, path)) {
-        LOSCFG_FS_FREE_HOOK(tmpBuf);
+        free(tmpBuf);
        return LOS_OK;
    }

@@ -158,7 +151,7 @@ static size_t GetCanonicalPath(const char *cwd, const char *path, char *buf, siz
    offset = strlen("/./") - 1;
    while ((p = strstr(tmpBuf, "/./")) != NULL) {
        if (EOK != memmove_s(p, tmpLen - (p - tmpBuf), p + offset, tmpLen - (p - tmpBuf) - offset)) {
-            LOSCFG_FS_FREE_HOOK(tmpBuf);
+            free(tmpBuf);
            return LOS_OK;
        }
    }
@@ -166,7 +159,7 @@ static size_t GetCanonicalPath(const char *cwd, const char *path, char *buf, siz
    /* replace // to / */
    while ((p = strstr(tmpBuf, "//")) != NULL) {
        if (EOK != memmove_s(p, tmpLen - (p - tmpBuf), p + 1, tmpLen - (p - tmpBuf) - 1)) {
-            LOSCFG_FS_FREE_HOOK(tmpBuf);
+            free(tmpBuf);
            return LOS_OK;
        }
    }
@@ -179,7 +172,7 @@ static size_t GetCanonicalPath(const char *cwd, const char *path, char *buf, siz
            --start;
        }
        if (EOK != memmove_s(start, tmpLen - (start - tmpBuf), p + offset, tmpLen - (p - tmpBuf) - offset)) {
-            LOSCFG_FS_FREE_HOOK(tmpBuf);
+            free(tmpBuf);
            return LOS_OK;
        }
    }
@@ -191,24 +184,23 @@ static size_t GetCanonicalPath(const char *cwd, const char *path, char *buf, siz
    }

    if ((!buf) || (bufSize == 0)) {
-        LOSCFG_FS_FREE_HOOK(tmpBuf);
+        free(tmpBuf);
        return totalLen;
    }

    if (EOK != memcpy_s(buf, bufSize, tmpBuf, (((totalLen + 1) > bufSize) ? bufSize : (totalLen + 1)))) {
-        LOSCFG_FS_FREE_HOOK(tmpBuf);
+        free(tmpBuf);
        return LOS_OK;
    }

    buf[bufSize - 1] = 0;
-    LOSCFG_FS_FREE_HOOK(tmpBuf);
+    free(tmpBuf);
    return totalLen;
 }
 #endif

 static int VfsOpen(const char *path, int flags)
 {
-    size_t len;
    struct File *file = NULL;
    int fd = -1;
    const char *pathInMp = NULL;
@@ -248,15 +240,13 @@ static int VfsOpen(const char *path, int flags)
        return fd;
    }

-    len = strlen(path) + 1;
-    file->fullPath = LOSCFG_FS_MALLOC_HOOK(len);
+    file->fullPath = strdup(path);
    if (file->fullPath == NULL) {
        VFS_ERRNO_SET(ENOMEM);
        VfsFilePut(file);
        VfsUnlock();
        return (int)LOS_NOK;
    }
-    (void)strcpy_s((char *)file->fullPath, len, path);

    file->fFlags = (UINT32)flags;
    file->fOffset = 0;
@@ -347,7 +337,7 @@ static int VfsClose(int fd)
    }

    if (file->fullPath != NULL) {
-        LOSCFG_FS_FREE_HOOK((void *)file->fullPath);
+        free((void *)file->fullPath);
    }

    VfsDetachFile(file);
@@ -592,13 +582,17 @@ static int VfsRename(const char *old, const char *new)
    return ret;
 }

-static int VfsIoctl(int fd, int func, va_list ap)
+static int VfsIoctl(int fd, int func, ...)
 {
+    va_list ap;
    unsigned long arg;
    struct File *file = NULL;
    int ret = (int)LOS_NOK;

+    va_start(ap, func);
    arg = va_arg(ap, unsigned long);
+    va_end(ap);
+
    file = VfsAttachFileReady(fd);
    if (file == NULL) {
        return ret;
@@ -654,7 +648,7 @@ static DIR *VfsOpendir(const char *path)
        return NULL;
    }

-    dir = (struct Dir *)LOSCFG_FS_MALLOC_HOOK(sizeof(struct Dir));
+    dir = (struct Dir *)malloc(sizeof(struct Dir));
    if (dir == NULL) {
        VFS_ERRNO_SET(ENOMEM);
        return NULL;
@@ -662,7 +656,7 @@ static DIR *VfsOpendir(const char *path)

    if (VfsLock() != LOS_OK) {
        VFS_ERRNO_SET(EAGAIN);
-        LOSCFG_FS_FREE_HOOK(dir);
+        free(dir);
        return NULL;
    }

@@ -670,14 +664,14 @@ static DIR *VfsOpendir(const char *path)
    if ((mp == NULL) || (pathInMp == NULL)) {
        VFS_ERRNO_SET(ENOENT);
        VfsUnlock();
-        LOSCFG_FS_FREE_HOOK(dir);
+        free(dir);
        return NULL;
    }

    if (mp->mFs->fsFops->opendir == NULL) {
        VFS_ERRNO_SET(ENOTSUP);
        VfsUnlock();
-        LOSCFG_FS_FREE_HOOK(dir);
+        free(dir);
        return NULL;
    }

@@ -688,7 +682,7 @@ static DIR *VfsOpendir(const char *path)
    if (ret == 0) {
        mp->mRefs++;
    } else {
-        LOSCFG_FS_FREE_HOOK(dir);
+        free(dir);
        dir = NULL;
    }

@@ -715,6 +709,8 @@ static struct dirent *VfsReaddir(DIR *d)
        (dir->dMp->mFs->fsFops->readdir != NULL)) {
        if (dir->dMp->mFs->fsFops->readdir(dir, &dir->dDent) == 0) {
            ret = &dir->dDent;
+        } else {
+            VFS_ERRNO_SET(EBADF);
        }
    } else {
        VFS_ERRNO_SET(ENOTSUP);
@@ -757,7 +753,7 @@ static int VfsClosedir(DIR *d)
    }

    VfsUnlock();
-    LOSCFG_FS_FREE_HOOK(dir);
+    free(dir);
    dir = NULL;
    return ret;
 }
@@ -912,13 +908,8 @@ static int MapToPosixRet(int ret)
 /* POSIX interface */
 int LOS_Open(const char *path, int flags, ...)
 {
-    if (path == NULL) {
-        errno = EINVAL;
-        return (int)LOS_NOK;
-    }
 #ifdef LOSCFG_RANDOM_DEV
-    unsigned flagMask = O_RDONLY | O_WRONLY | O_RDWR | O_APPEND | O_CREAT | O_LARGEFILE \
-                        | O_TRUNC | O_EXCL | O_DIRECTORY;
+    unsigned flagMask = O_RDONLY | O_WRONLY | O_RDWR | O_APPEND | O_CREAT | O_LARGEFILE | O_TRUNC | O_EXCL | O_DIRECTORY;
    if ((unsigned)flags & ~flagMask) {
        errno = EINVAL;
        return (int)LOS_NOK;
@@ -930,7 +921,7 @@ int LOS_Open(const char *path, int flags, ...)
        return (int)LOS_NOK;
    }

-    char *canonicalPath = (char *)LOSCFG_FS_MALLOC_HOOK(pathLen);
+    char *canonicalPath = (char *)malloc(pathLen);
    if (!canonicalPath) {
        errno = ENOMEM;
        return (int)LOS_NOK;
@@ -966,7 +957,7 @@ int LOS_Open(const char *path, int flags, ...)
    FREE_AND_SET_NULL(canonicalPath);
 #endif
 #if (LOSCFG_POSIX_PIPE_API == 1)
-    if (!strncmp(path, PIPE_DEV_PATH, strlen(PIPE_DEV_PATH))) {
+    if ((path != NULL) && !strncmp(path, PIPE_DEV_PATH, strlen(PIPE_DEV_PATH))) {
        return PipeOpen(path, flags, PIPE_DEV_FD);
    }
 #endif
@@ -1153,25 +1144,29 @@ int LOS_Fstat(int fd, struct stat *buf)
    return ret;
 }

-int OsFcntl(int fd, int cmd, va_list ap)
+int LOS_Fcntl(int fd, int cmd, ...)
 {
    struct File *filep = NULL;
+    va_list ap;
    int ret;
+    va_start(ap, cmd);

    if (fd < CONFIG_NFILE_DESCRIPTORS) {
        filep = VfsAttachFileReady(fd);
        ret = VfsVfcntl(filep, cmd, ap);
        VfsDetachFile(filep);
    } else {
-#ifndef LOSCFG_NET_LWIP_SACK
        ret = -EBADF;
-#else
+#ifdef LOSCFG_NET_LWIP_SACK
        int arg = va_arg(ap, int);
        ret = lwip_fcntl(fd, (long)cmd, arg);
+        va_end(ap);
        return ret;
 #endif /* LOSCFG_NET_LWIP_SACK */
    }

+    va_end(ap);
+
    if (ret < 0) {
        VFS_ERRNO_SET(-ret);
        ret = (int)LOS_NOK;
@@ -1179,41 +1174,21 @@ int OsFcntl(int fd, int cmd, va_list ap)
    return ret;
 }

-int LOS_Fcntl(int fd, int cmd, ...)
-{
-    va_list ap;
-    int ret;
-    va_start(ap, cmd);
-    ret = OsFcntl(fd, cmd, ap);
-    va_end(ap);
-
-    return ret;
-}
-
-int OsIoctl(int fd, int req, va_list ap)
-{
-    int ret;
-
-    if (fd < CONFIG_NFILE_DESCRIPTORS) {
-        ret = VfsIoctl(fd, req, ap);
-    } else {
-#ifndef LOSCFG_NET_LWIP_SACK
-        ret = -EBADF;
-#else
-        UINTPTR arg = va_arg(ap, UINTPTR);
-        ret = lwip_ioctl(fd, (long)req, (void *)arg);
-#endif /* LOSCFG_NET_LWIP_SACK */
-    }
-
-    return ret;
-}
-
 int LOS_Ioctl(int fd, int req, ...)
 {
    int ret;
    va_list ap;
    va_start(ap, req);
-    ret = OsIoctl(fd, req, ap);
+    if (fd < CONFIG_NFILE_DESCRIPTORS) {
+        ret = VfsIoctl(fd, req, ap);
+    } else {
+        ret = -EBADF;
+#ifdef LOSCFG_NET_LWIP_SACK
+        UINTPTR arg = va_arg(ap, UINTPTR);
+        ret = lwip_ioctl(fd, (long)req, (void *)arg);
+#endif /* LOSCFG_NET_LWIP_SACK */
+    }
+
    va_end(ap);
    return ret;
 }
@@ -1245,7 +1220,7 @@ ssize_t LOS_Readv(int fd, const struct iovec *iovBuf, int iovcnt)
        return (ssize_t)LOS_NOK;
    }
    totalLen = bufLen * sizeof(char);
-    buf = (char *)LOSCFG_FS_MALLOC_HOOK(totalLen);
+    buf = (char *)malloc(totalLen);
    if (buf == NULL) {
        return (ssize_t)LOS_NOK;
    }
@@ -1262,7 +1237,7 @@ ssize_t LOS_Readv(int fd, const struct iovec *iovBuf, int iovcnt)
        size_t lenToRead = totalLen < bytesToRead ? totalLen : bytesToRead;
        ret = memcpy_s(readBuf, bytesToRead, curBuf, lenToRead);
        if (ret != EOK) {
-            LOSCFG_FS_FREE_HOOK(buf);
+            free(buf);
            return (ssize_t)LOS_NOK;
        }
        if (totalLen < (size_t)bytesToRead) {
@@ -1271,7 +1246,7 @@ ssize_t LOS_Readv(int fd, const struct iovec *iovBuf, int iovcnt)
        curBuf += bytesToRead;
        totalLen -= bytesToRead;
    }
-    LOSCFG_FS_FREE_HOOK(buf);
+    free(buf);
    return totalBytesRead;
 }

@@ -1303,7 +1278,7 @@ ssize_t LOS_Writev(int fd, const struct iovec *iovBuf, int iovcnt)
        return (ssize_t)LOS_NOK;
    }
    totalLen = bufLen * sizeof(char);
-    buf = (char *)LOSCFG_FS_MALLOC_HOOK(totalLen);
+    buf = (char *)malloc(totalLen);
    if (buf == NULL) {
        return (ssize_t)LOS_NOK;
    }
@@ -1316,7 +1291,7 @@ ssize_t LOS_Writev(int fd, const struct iovec *iovBuf, int iovcnt)
        }
        ret = memcpy_s(curBuf, totalLen, writeBuf, bytesToWrite);
        if (ret != EOK) {
-            LOSCFG_FS_FREE_HOOK(buf);
+            free(buf);
            return (ssize_t)LOS_NOK;
        }
        curBuf += bytesToWrite;
@@ -1324,7 +1299,7 @@ ssize_t LOS_Writev(int fd, const struct iovec *iovBuf, int iovcnt)
    }

    totalBytesWritten = write(fd, buf, bufLen);
-    LOSCFG_FS_FREE_HOOK(buf);
+    free(buf);

    return totalBytesWritten;
 }
--- a/components/fs/vfs/vfs_maps.c
+++ b/components/fs/vfs/vfs_maps.c
@@ -4,8 +4,7 @@
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
 *
- * 1. Redistributions of source code must retain the above copyright notice, this list of
- *    conditions and the following disclaimer.
+ * 1. Redistributions of source code must retain the above copyright notice, this list of *    conditions and the following disclaimer.  *
 * 2. Redistributions in binary form must reproduce the above copyright notice, this list
 *    of conditions and the following disclaimer in the documentation and/or other materials
 *    provided with the distribution.
@@ -33,7 +32,6 @@
 #include "securec.h"
 #include "los_debug.h"
 #include "los_compiler.h"
-#include "los_fs.h"

 struct FsMap *g_fsMap = NULL;

@@ -56,27 +54,24 @@ struct FsMap *VfsFsMapGet(const char *fsType)
 }

 int OsFsRegister(const char *fsType, struct MountOps *fsMops,
-                 struct FileOps *fsFops, struct FsManagement *fsMgt)
+        struct FileOps *fsFops, struct FsManagement *fsMgt)
 {
-    size_t len;
    if ((fsMops == NULL) || (fsFops == NULL)) {
        return (int)LOS_NOK;
    }

-    struct FsMap *newfs = (struct FsMap *)LOSCFG_FS_MALLOC_HOOK(sizeof(struct FsMap));
+    struct FsMap *newfs = (struct FsMap *)malloc(sizeof(struct FsMap));
    if (newfs == NULL) {
        PRINT_ERR("Fs register malloc failed, fsType %s.\n", fsType);
        return (int)LOS_NOK;
    }
    (void)memset_s(newfs, sizeof(struct FsMap), 0, sizeof(struct FsMap));

-    len = strlen(fsType) + 1;
-    newfs->fsType = LOSCFG_FS_MALLOC_HOOK(len);
+    newfs->fsType = strdup(fsType);
    if (newfs->fsType == NULL) {
-        LOSCFG_FS_FREE_HOOK(newfs);
+        free(newfs);
        return (int)LOS_NOK;
    }
-    (void)strcpy_s((char *)newfs->fsType, len, fsType);

    newfs->fsMops = fsMops;
    newfs->fsFops = fsFops;
--- a/components/fs/vfs/vfs_maps.h
+++ b/components/fs/vfs/vfs_maps.h
@@ -57,7 +57,7 @@ struct FsMap {
 };

 int OsFsRegister(const char *fsType, struct MountOps *fsMops,
-                 struct FileOps *fsFops, struct FsManagement *fsMgt);
+        struct FileOps *fsFops, struct FsManagement *fsMgt);
 struct FsMap *VfsFsMapGet(const char *fsType);

 #ifdef __cplusplus
--- a/components/fs/vfs/vfs_mount.c
+++ b/components/fs/vfs/vfs_mount.c
@@ -33,8 +33,6 @@
 #include "vfs_config.h"
 #include "stdlib.h"
 #include "string.h"
-#include "errno.h"
-#include "securec.h"
 #include "vfs_operations.h"
 #include "los_compiler.h"
 #include "los_debug.h"
@@ -124,67 +122,14 @@ struct MountPoint *VfsMpFind(const char *path, const char **pathInMp)
    return bestMp;
 }

-STATIC struct MountPoint *VfsMountPointInit(const char *target, const char *fsType, unsigned long mountflags)
-{
-    struct MountPoint *mp = NULL;
-    const char *pathInMp = NULL;
-    struct FsMap *mFs = NULL;
-
-    /* find mp by target, to see if it was mounted */
-    mp = VfsMpFind(target, &pathInMp);
-    if (mp != NULL && pathInMp != NULL) {
-        return NULL;
-    }
-
-    /* Find fsMap coresponding to the fsType */
-    mFs = VfsFsMapGet(fsType);
-    if ((mFs == NULL) || (mFs->fsMops == NULL) || (mFs->fsMops->mount == NULL)) {
-        return NULL;
-    }
-
-    mp = (struct MountPoint *)LOSCFG_FS_MALLOC_HOOK(sizeof(struct MountPoint));
-    if (mp == NULL) {
-        return NULL;
-    }
-
-    mp->mFs = mFs;
-    mp->mDev = NULL;
-    mp->mRefs = 0;
-    mp->mWriteEnable = (mountflags & MS_RDONLY) ? FALSE : TRUE;
-    mp->mFs->fsRefs++;
-    mp->mNext = g_mountPoints;
-
-    return mp;
-}
-
-STATIC int VfsRemount(const char *source, const char *target,
-                      const char *fsType, unsigned long mountflags,
-                      const void *data)
-{
-    (VOID)source;
-    (VOID)fsType;
-    struct MountPoint *mp;
-
-    mp = VfsMpFind(target, NULL);
-    if (mp == NULL) {
-        errno = EINVAL;
-        return (int)LOS_NOK;
-    }
-
-    LOS_ASSERT(mp->mFs != NULL);
-    LOS_ASSERT(mp->mFs->fsMops != NULL);
-    LOS_ASSERT(mp->mFs->fsMops->mount != NULL);
-
-    return mp->mFs->fsMops->mount(mp, mountflags, data);
-}
-
 int LOS_FsMount(const char *source, const char *target,
-                const char *fsType, unsigned long mountflags,
-                const void *data)
+          const char *fsType, unsigned long mountflags,
+          const void *data)
 {
-    size_t len;
    int ret;
    struct MountPoint *mp = NULL;
+    struct FsMap *mFs = NULL;
+    const char *pathInMp = NULL;

    /* target must begin with '/', for example /system, /data, etc. */
    if ((target == NULL) || (target[0] != '/')) {
@@ -192,36 +137,36 @@ int LOS_FsMount(const char *source, const char *target,
    }

    (void)VfsLock();
-
-    if (mountflags & MS_REMOUNT) {
-        ret = VfsRemount(source, target, fsType, mountflags, data);
-        VfsUnlock();
-        return ret;
+    /* find mp by target, to see if it was mounted */
+    mp = VfsMpFind(target, &pathInMp);
+    if (mp != NULL && pathInMp != NULL) {
+        goto errout;
    }

-    mp = VfsMountPointInit(target, fsType, mountflags);
+    /* Find fsMap coresponding to the fsType */
+    mFs = VfsFsMapGet(fsType);
+    if ((mFs == NULL) || (mFs->fsMops == NULL) || (mFs->fsMops->mount == NULL)) {
+        goto errout;
+    }
+
+    mp = (struct MountPoint *)malloc(sizeof(struct MountPoint));
    if (mp == NULL) {
-        VfsUnlock();
-        return (int)LOS_NOK;
+        goto errout;
    }

+    mp->mFs = mFs;
+    mp->mDev = NULL;
    if (source != NULL) {
-        len = strlen(source) + 1;
-        mp->mDev = LOSCFG_FS_MALLOC_HOOK(len);
+        mp->mDev = strdup(source);
        if (mp->mDev == NULL) {
-            LOSCFG_FS_FREE_HOOK(mp);
-            VfsUnlock();
-            return (int)LOS_NOK;
+            goto errout;
        }
-        (void)strcpy_s((char *)mp->mDev, len, source);
    }

-    len = strlen(target) + 1;
-    mp->mPath = LOSCFG_FS_MALLOC_HOOK(len);
+    mp->mPath = strdup(target);
    if (mp->mPath == NULL) {
        goto errout;
    }
-    (void)strcpy_s((char *)mp->mPath, len, target);

    ret = mp->mFs->fsMops->mount(mp, mountflags, data);
    if (ret != 0) {
@@ -229,15 +174,18 @@ int LOS_FsMount(const char *source, const char *target,
        PRINT_ERR("mount failed, target %s.\n", target);
        goto errout;
    }
-
+    mp->mRefs = 0;
+    mp->mWriteEnable = (mountflags & MS_RDONLY) ? FALSE : TRUE;
+    mp->mFs->fsRefs++;
+    mp->mNext = g_mountPoints;
    g_mountPoints = mp;
    VfsUnlock();
    return LOS_OK;

 errout:
-    LOSCFG_FS_FREE_HOOK((void *)mp->mPath);
-    LOSCFG_FS_FREE_HOOK((void *)mp->mDev);
-    LOSCFG_FS_FREE_HOOK(mp);
+    free((void *)mp->mPath);
+    free((void *)mp->mDev);
+    free(mp);
    VfsUnlock();
    return (int)LOS_NOK;
 }
@@ -272,9 +220,9 @@ int LOS_FsUmount(const char *target)
    /* delete mp from mount list */
    MpDeleteFromList(mp);
    mp->mFs->fsRefs--;
-    LOSCFG_FS_FREE_HOOK((void *)mp->mPath);
-    LOSCFG_FS_FREE_HOOK((void *)mp->mDev);
-    LOSCFG_FS_FREE_HOOK(mp);
+    free((void *)mp->mPath);
+    free((void *)mp->mDev);
+    free(mp);

    VfsUnlock();
    return LOS_OK;
@@ -285,7 +233,7 @@ errout:
    return (int)LOS_NOK;
 }

-static void CloseFdsInMp(const struct MountPoint *mp)
+static void CloseFdsInMp(struct MountPoint *mp)
 {
    for (int fd = 0; fd < NR_OPEN_DEFAULT; fd++) {
        struct File *f = FdToFile(fd);
@@ -332,9 +280,9 @@ int LOS_FsUmount2(const char *target, int flag)
    /* delete mp from mount list */
    MpDeleteFromList(mp);
    mp->mFs->fsRefs--;
-    LOSCFG_FS_FREE_HOOK((void *)mp->mPath);
-    LOSCFG_FS_FREE_HOOK((void *)mp->mDev);
-    LOSCFG_FS_FREE_HOOK(mp);
+    free((void *)mp->mPath);
+    free((void *)mp->mDev);
+    free(mp);

    VfsUnlock();
    return LOS_OK;
--- a/components/fs/vfs/vfs_partition.c
+++ b/components/fs/vfs/vfs_partition.c
@@ -37,8 +37,6 @@
 #include "stdlib.h"
 #include "string.h"

-static struct DeviceDesc *g_deviceList = NULL;
-
 int GetPartIdByPartName(const char *partName)
 {
    if (partName == NULL) {
@@ -47,7 +45,7 @@ int GetPartIdByPartName(const char *partName)

    /* the character next to p is the partId */
    char *p = strrchr(partName, 'p');
-    if (p != NULL) {
+    if (p + 1 != NULL) {
        return atoi(p + 1);
    }

@@ -69,89 +67,16 @@ int GetDevIdByDevName(const char *dev)
    return (int)LOS_NOK;
 }

-struct DeviceDesc *getDeviceList(VOID)
-{
-    return g_deviceList;
-}
-
-static int AddDevice(const char *dev, const char *fsType, int *lengthArray, int *addrArray,
-                     int partNum)
-{
-    size_t len;
-    struct DeviceDesc *prev = NULL;
-    for (prev = g_deviceList; prev != NULL; prev = prev->dNext) {
-        if (strcmp(prev->dDev, dev) == 0) {
-            errno = -EEXIST;
-            return (int)LOS_NOK;
-        }
-    }
-
-    if (addrArray == NULL) {
-        errno = -EFAULT;
-        return (int)LOS_NOK;
-    }
-
-    prev = (struct DeviceDesc *)LOSCFG_FS_MALLOC_HOOK(sizeof(struct DeviceDesc));
-    if (prev == NULL) {
-        errno = -ENOMEM;
-        return (int)LOS_NOK;
-    }
-    len = strlen(dev) + 1;
-    prev->dDev = LOSCFG_FS_MALLOC_HOOK(len);
-    len = strlen(fsType) + 1;
-    prev->dFsType = LOSCFG_FS_MALLOC_HOOK(len);
-    prev->dAddrArray = (int *)LOSCFG_FS_MALLOC_HOOK(partNum * sizeof(int));
-    if (prev->dDev == NULL || prev->dFsType == NULL || prev->dAddrArray == NULL) {
-        goto errout;
-    }
-    (void)strcpy_s((char *)prev->dDev, len, dev);
-    (void)strcpy_s((char *)prev->dFsType, len, fsType);
-    (void)memcpy_s(prev->dAddrArray, partNum * sizeof(int), addrArray, partNum * sizeof(int));
-
-    if (lengthArray != NULL) {
-        prev->dLengthArray = (int *)LOSCFG_FS_MALLOC_HOOK(partNum * sizeof(int));
-        if (prev->dLengthArray == NULL) {
-            goto errout;
-        }
-        (void)memcpy_s(prev->dLengthArray, partNum * sizeof(int), lengthArray, partNum * sizeof(int));
-    }
-
-    prev->dNext = g_deviceList;
-    prev->dPartNum = partNum;
-    g_deviceList = prev;
-    return LOS_OK;
-errout:
-    if (prev->dDev != NULL) {
-        LOSCFG_FS_FREE_HOOK((void *)prev->dDev);
-    }
-    if (prev->dFsType != NULL) {
-        LOSCFG_FS_FREE_HOOK((void *)prev->dFsType);
-    }
-    if (prev->dAddrArray != NULL) {
-        LOSCFG_FS_FREE_HOOK((void *)prev->dAddrArray);
-    }
-    if (prev->dLengthArray != NULL) {
-        LOSCFG_FS_FREE_HOOK((void *)prev->dLengthArray);
-    }
-
-    LOSCFG_FS_FREE_HOOK(prev);
-    errno = -ENOMEM;
-    return (int)LOS_NOK;
-}
-
-
-int LOS_DiskPartition(const char *dev, const char *fsType, int *lengthArray, int *addrArray,
-                      int partNum)
+int LOS_DiskPartition(const char *dev, const char *fsType, int *lengthArray,
+                      int partnum)
 {
    int ret = (int)LOS_NOK;
    struct FsMap *fMap = VfsFsMapGet(fsType);
    if ((fMap != NULL) && (fMap->fsMgt != NULL) &&
        (fMap->fsMgt->fdisk != NULL)) {
-        ret = fMap->fsMgt->fdisk(dev, lengthArray, partNum);
-        return ret;
+        ret = fMap->fsMgt->fdisk(dev, lengthArray, partnum);
    }

-    ret = AddDevice(dev, fsType, lengthArray, addrArray, partNum);
    return ret;
 }

@@ -163,7 +88,8 @@ int LOS_PartitionFormat(const char *partName, char *fsType, void *data)
       format is not allowed when the device has been mounted. */
    struct MountPoint *iter = NULL;
    LOS_MP_FOR_EACH_ENTRY(iter) {
-        if ((iter->mPath != NULL) && (strcmp(iter->mPath, partName) == 0)) {
+        if ((iter->mFs != NULL) && (iter->mFs->fsType != NULL) &&
+            strcmp(iter->mFs->fsType, fsType) == 0) {
            errno = EBUSY;
            return (int)LOS_NOK;
        }
@@ -174,6 +100,5 @@ int LOS_PartitionFormat(const char *partName, char *fsType, void *data)
        (fMap->fsMgt->format != NULL)) {
        ret = fMap->fsMgt->format(partName, data);
    }
-
    return ret;
 }
--- a/components/fs/vfs/vfs_partition.h
+++ b/components/fs/vfs/vfs_partition.h
@@ -31,8 +31,6 @@
 #ifndef _VFS_PARTITION_H_
 #define _VFS_PARTITION_H_

-#include "los_compiler.h"
-
 #ifdef __cplusplus
 #if __cplusplus
 extern "C" {
@@ -43,19 +41,6 @@ extern "C" {

 int GetPartIdByPartName(const char *partName);
 int GetDevIdByDevName(const char *dev);
-struct DeviceDesc *getDeviceList(void);
-
-struct DeviceDesc {
-    struct FsMap      *dFs;             /* file system info */
-    struct DeviceDesc *dNext;           /* point to next mount point */
-    const char        *dPath;           /* target path, /system, /usr, etc. */
-    const char        *dDev;            /* device, "emmc0p0", "emmc0p1", etc. */
-    void              *dData;           /* specific file system handle */
-    const char        *dFsType;         /* file system type */
-    int               *dLengthArray;    /* point to device partitions length array */
-    int               *dAddrArray;      /* point to device partitions address array */
-    int                dPartNum;        /* number of device partitions */
-};

 #ifdef __cplusplus
 #if __cplusplus
--- a/components/lmk/los_lmk.c
+++ b/components/lmk/los_lmk.c
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -191,7 +191,7 @@ VOID LOS_LmkOpsNodeInfoShow(VOID)

    intSave = LOS_IntLock();
    LOS_DL_LIST_FOR_EACH_ENTRY(opsNode, &g_losLmkOps.lmkOpsList, LosLmkOpsNode, node) {
-        PRINTK("Priority: %-4u Free:0x%-8x Restore:0x%-8x\n", opsNode->priority,
+        PRINTK("Priority: %-4u Free:0x%-8x Restore:0x%-8x\n", opsNode->priority, 
               (UINT32)(UINTPTR)opsNode->freeMem, (UINT32)(UINTPTR)opsNode->restoreTask);
    }
    LOS_IntRestore(intSave);
--- a/components/lmk/los_lmk.h
+++ b/components/lmk/los_lmk.h
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -199,7 +199,7 @@ UINT32 LOS_LmkTasksRestore(VOID);
 * @brief Kill the tasks to release the used memory.
 *
 * @par Description:
- *  This API is used to kill the tasks to release the used memory when low memory killer is triggered.
+ *  This API is used to kill the tasks to release the used memory when low memory killer is triggered. 
 *
 * @attention None.
 *
--- a/components/lms/lms_libc.c
+++ b/components/lms/lms_libc.c
@@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -56,7 +56,7 @@ void *memcpy(void *dest, const void *src, size_t len)
 }

 #undef strcat
-char *strcat(char *s, const char *append)
+char *strcat (char *s, const char *append)
 {
    if ((s == NULL) || (append == NULL)) {
        return NULL;
--- a/components/lms/los_lms.c
+++ b/components/lms/los_lms.c
@@ -182,18 +182,18 @@ VOID LOS_LmsCheckPoolDel(const VOID *pool)
    LmsMemListNode *delNode = OsLmsGetPoolNode(pool);
    if (delNode == NULL) {
        PRINT_ERR("[LMS]pool %p is not on lms checklist !\n", pool);
-        goto RELEASE;
+        goto REALEASE;
    }
    delNode->used = LMS_POOL_UNUSED;
    LOS_ListDelete(&(delNode->node));

-RELEASE:
+REALEASE:
    LMS_UNLOCK(intSave);
 }

 VOID OsLmsInit(VOID)
 {
-    (VOID)memset(g_lmsCheckPoolArray, 0, sizeof(g_lmsCheckPoolArray));
+    memset(g_lmsCheckPoolArray, 0, sizeof(g_lmsCheckPoolArray));
    LOS_ListInit(&g_lmsCheckPoolList);
    static LmsHook hook = {
        .init = LOS_LmsCheckPoolAdd,
@@ -284,7 +284,7 @@ VOID OsLmsSetShadowValue(LmsMemListNode *node, UINTPTR startAddr, UINTPTR endAdd
        }

        if (shadowEnd + 1 > shadowStart) {
-            (VOID)memset((VOID *)shadowStart, value & LMS_SHADOW_MASK_U8, shadowEnd + 1 - shadowStart);
+            memset((VOID *)shadowStart, value & LMS_SHADOW_MASK_U8, shadowEnd + 1 - shadowStart);
        }
    }
 }
@@ -339,7 +339,7 @@ VOID OsLmsLosMallocMark(const VOID *curNodeStart, const VOID *nextNodeStart, UIN
    }

    OsLmsSetShadowValue(node, curNodeStartAddr, curNodeStartAddr + nodeHeadSize, LMS_SHADOW_REDZONE_U8);
-    OsLmsSetShadowValue(node, curNodeStartAddr + nodeHeadSize, nextNodeStartAddr, LMS_SHADOW_ACCESSIBLE_U8);
+    OsLmsSetShadowValue(node, curNodeStartAddr + nodeHeadSize, nextNodeStartAddr, LMS_SHADOW_ACCESSABLE_U8);
    OsLmsSetShadowValue(node, nextNodeStartAddr, nextNodeStartAddr + nodeHeadSize, LMS_SHADOW_REDZONE_U8);
    LMS_UNLOCK(intSave);
 }
@@ -357,7 +357,7 @@ VOID OsLmsCheckValid(UINTPTR checkAddr, BOOL isFreeCheck)

    OsLmsGetShadowValue(node, checkAddr, &shadowValue);
    LMS_UNLOCK(intSave);
-    if ((shadowValue == LMS_SHADOW_ACCESSIBLE) || ((isFreeCheck) && (shadowValue == LMS_SHADOW_PAINT))) {
+    if ((shadowValue == LMS_SHADOW_ACCESSABLE) || ((isFreeCheck) && (shadowValue == LMS_SHADOW_PAINT))) {
        return;
    }

@@ -380,7 +380,7 @@ VOID OsLmsLosFreeMark(const VOID *curNodeStart, const VOID *nextNodeStart, UINT3
    UINTPTR nextNodeStartAddr = (UINTPTR)nextNodeStart;

    OsLmsGetShadowValue(node, curNodeStartAddr + nodeHeadSize, &shadowValue);
-    if ((shadowValue != LMS_SHADOW_ACCESSIBLE) && (shadowValue != LMS_SHADOW_PAINT)) {
+    if ((shadowValue != LMS_SHADOW_ACCESSABLE) && (shadowValue != LMS_SHADOW_PAINT)) {
        LMS_UNLOCK(intSave);
        OsLmsReportError(curNodeStartAddr + nodeHeadSize, MEM_REGION_SIZE_1, FREE_ERRORMODE);
        return;
@@ -421,7 +421,7 @@ VOID LOS_LmsAddrDisableProtect(UINTPTR addrStart, UINTPTR addrEnd)
    LMS_LOCK(intSave);
    LmsMemListNode *node = OsLmsGetPoolNodeFromAddr(addrStart);
    if (node != NULL) {
-        OsLmsSetShadowValue(node, addrStart, addrEnd, LMS_SHADOW_ACCESSIBLE_U8);
+        OsLmsSetShadowValue(node, addrStart, addrEnd, LMS_SHADOW_ACCESSABLE_U8);
    }
    LMS_UNLOCK(intSave);
 }
@@ -440,7 +440,7 @@ STATIC UINT32 OsLmsCheckAddr(UINTPTR addr)
    LmsMemListNode *node = OsLmsGetPoolNodeFromAddr(addr);
    if (node == NULL) {
        LMS_UNLOCK(intSave);
-        return LMS_SHADOW_ACCESSIBLE_U8;
+        return LMS_SHADOW_ACCESSABLE_U8;
    }

    OsLmsGetShadowValue(node, addr, &shadowValue);
@@ -556,7 +556,7 @@ STATIC VOID OsLmsGetErrorInfo(UINTPTR addr, UINT32 size, LmsAddrInfo *info)
 {
    LmsMemListNode *node = OsLmsGetPoolNodeFromAddr(addr);
    OsLmsGetShadowInfo(node, addr, info);
-    if (info->shadowValue != LMS_SHADOW_ACCESSIBLE_U8) {
+    if (info->shadowValue != LMS_SHADOW_ACCESSABLE_U8) {
        return;
    } else {
        OsLmsGetShadowInfo(node, addr + size - 1, info);
@@ -572,7 +572,7 @@ STATIC VOID OsLmsPrintErrInfo(LmsAddrInfo *info, UINT32 errMod)
        case LMS_SHADOW_REDZONE:
            PRINT_ERR("Heap buffer overflow error detected\n");
            break;
-        case LMS_SHADOW_ACCESSIBLE:
+        case LMS_SHADOW_ACCESSABLE:
            PRINT_ERR("No error\n");
            break;
        default:
@@ -609,7 +609,7 @@ VOID OsLmsReportError(UINTPTR p, UINT32 size, UINT32 errMod)

    LMS_LOCK(intSave);
    g_checkDepth += 1;
-    (VOID)memset(&info, 0, sizeof(LmsAddrInfo));
+    memset(&info, 0, sizeof(LmsAddrInfo));

    PRINT_ERR("*****  Kernel Address Sanitizer Error Detected Start *****\n");

@@ -628,7 +628,7 @@ VOID OsLmsReportError(UINTPTR p, UINT32 size, UINT32 errMod)
 #if (LOSCFG_LMS_STORE_CHECK == 1)
 VOID __asan_store1_noabort(UINTPTR p)
 {
-    if (OsLmsCheckAddr(p) != LMS_SHADOW_ACCESSIBLE_U8) {
+    if (OsLmsCheckAddr(p) != LMS_SHADOW_ACCESSABLE_U8) {
        OsLmsReportError(p, MEM_REGION_SIZE_1, STORE_ERRMODE);
    }
 }
@@ -704,7 +704,7 @@ VOID __asan_storeN_noabort(UINTPTR p, UINT32 size)
 #if (LOSCFG_LMS_LOAD_CHECK == 1)
 VOID __asan_load1_noabort(UINTPTR p)
 {
-    if (OsLmsCheckAddr(p) != LMS_SHADOW_ACCESSIBLE_U8) {
+    if (OsLmsCheckAddr(p) != LMS_SHADOW_ACCESSABLE_U8) {
        OsLmsReportError(p, MEM_REGION_SIZE_1, LOAD_ERRMODE);
    }
 }
--- a/components/lms/los_lms_pri.h
+++ b/components/lms/los_lms_pri.h
@@ -59,13 +59,13 @@ extern "C" {
 #define LMS_POOL_RESIZE(size)          ((size) / (LMS_SHADOW_U8_REFER_BYTES + 1) * LMS_SHADOW_U8_REFER_BYTES)
 #define LMS_ADDR_ALIGN(p)              (((UINTPTR)(p) + sizeof(UINTPTR) - 1) & ~((UINTPTR)(sizeof(UINTPTR) - 1)))

-#define LMS_SHADOW_ACCESSIBLE          0x00
+#define LMS_SHADOW_ACCESSABLE          0x00
 #define LMS_SHADOW_AFTERFREE           0x03
 #define LMS_SHADOW_REDZONE             0x02
 #define LMS_SHADOW_PAINT               0x01
 #define LMS_SHADOW_MASK                0x03

-#define LMS_SHADOW_ACCESSIBLE_U8       0x00
+#define LMS_SHADOW_ACCESSABLE_U8       0x00
 #define LMS_SHADOW_AFTERFREE_U8        0xFF
 #define LMS_SHADOW_REDZONE_U8          0xAA
 #define LMS_SHADOW_MASK_U8             0xFF
--- a/components/net/lwip-2.1/BUILD.gn
+++ b/components/net/lwip-2.1/BUILD.gn
@@ -34,7 +34,7 @@ module_switch = defined(LOSCFG_NET_LWIP_SACK)
 module_name = "lwip"
 kernel_module(module_name) {
  sources = LWIP_PORTING_FILES + LWIPNOAPPSFILES - [ "$LWIPDIR/api/sockets.c" ]
-  include_dirs = [ "//commonlibrary/utils_lite/include" ]
+  include_dirs = [ "//utils/native/lite/include" ]
 }

 config("public") {
--- a/components/net/lwip-2.1/porting/include/lwip/lwipopts.h
+++ b/components/net/lwip-2.1/porting/include/lwip/lwipopts.h
@@ -240,7 +240,4 @@
 #define LWIP_SOCKET_OFFSET              CONFIG_NFILE_DESCRIPTORS
 #endif

-#define LWIP_SOCKET_IOCTL               0
-#define LWIP_SOCKET_FCNTL               0
-
 #endif /* _LWIP_PORTING_LWIPOPTS_H_ */
--- a/components/net/lwip-2.1/porting/src/api_shell.c
+++ b/components/net/lwip-2.1/porting/src/api_shell.c
@@ -373,10 +373,7 @@ LWIP_STATIC int OsPingFunc(u32_t *parg)
    while (!ping_kill && (forever || (i < cnt))) {
        iecho->seqno = htons((u16_t)i);
        iecho->chksum = 0;
-
-#if (CHECKSUM_GEN_ICMP > 0)
        iecho->chksum = inet_chksum((void *)iecho, iecho_len);
-#endif

        ret = sendto(sfd, iecho, iecho_len, 0, (struct sockaddr *)&to, (socklen_t)sizeof(to));
        if (ret < 0) {
@@ -472,9 +469,8 @@ LWIP_STATIC int OsPingFunc(u32_t *parg)
                        }
                        intrvl -= 1000; /* 1000: 1000ms = 1s */
                        sys_msleep(1000); /* 1000: 1000ms = 1s */
-                        if (ping_kill == 1) {
+                        if (ping_kill == 1)
                            break;
-                        }
                    } while (intrvl > 0);
                    succ_cnt++;
                    break;
@@ -532,7 +528,7 @@ u32_t OsShellPing(int argc, const char **argv)
 {
    int ret;
    u32_t i = 0;
-    u32_t count;
+    u32_t count = 0;
    int count_set = 0;
    u32_t interval = 1000; /* default ping interval */
    u32_t data_len = 48; /* default data length */
--- a/components/net/lwip-2.1/porting/src/lwip_init.c
+++ b/components/net/lwip-2.1/porting/src/lwip_init.c
@@ -33,8 +33,7 @@
 #include <stdlib.h>
 #include "lwip/tcpip.h"
 #include "ohos_init.h"
-
-void TcpIpPortingInit(void)
+void TcpIpPortingInit()
 {
    tcpip_init(NULL, NULL);
 }
--- a/components/net/lwip-2.1/porting/src/sockets_porting.c
+++ b/components/net/lwip-2.1/porting/src/sockets_porting.c
@@ -211,7 +211,6 @@ int close(int fd)
 }
 #endif

-#if LWIP_SOCKET_IOCTL
 #ifdef LWIP_SOCKET_IOCTL_FUNC
 int ioctl(int fd, int req, ...)
 {
@@ -223,9 +222,7 @@ int ioctl(int fd, int req, ...)
    return lwip_ioctl(fd, (long)req, (void *)arg);
 }
 #endif
-#endif

-#if LWIP_SOCKET_FCNTL
 #ifdef LWIP_SOCKET_FCNTL_FUNC
 int fcntl(int fd, int cmd, ...)
 {
@@ -237,7 +234,6 @@ int fcntl(int fd, int cmd, ...)
    return lwip_fcntl(fd, cmd, val);
 }
 #endif
-#endif

 #if LWIP_SOCKET_SELECT
 #ifdef LWIP_SOCKET_SELECT_FUNC
--- a/components/power/los_pm.c
+++ b/components/power/los_pm.c
@@ -130,7 +130,7 @@ STATIC BOOL OsPmTickTimerStop(LosPmCB *pm)
    LosPmTickTimer *tickTimer = pm->tickTimer;

    if ((tickTimer == NULL) || (tickTimer->tickLock == NULL) ||
-        (pm->sysMode == LOS_SYS_NORMAL_SLEEP)) {
+        (pm->pmMode == LOS_SYS_NORMAL_SLEEP)) {
        return FALSE;
    }

@@ -264,7 +264,6 @@ STATIC UINT32 OsPmSuspendSleep(LosPmCB *pm)

    if (pm->sysctrl->suspendCheck != NULL) {
        pm->sysctrl->suspendCheck(mode);
-        pm->sysMode = pm->pmMode;
    }

    tickTimerStop = OsPmTickTimerStop(pm);
--- a/components/security/syscall/pthread_syscall.c
+++ b/components/security/syscall/pthread_syscall.c
@@ -67,7 +67,7 @@ int SysUserTaskCreate(unsigned long entry, unsigned long userArea, unsigned long

 int SysSchedSetScheduler(unsigned int tid, int policy, int priority)
 {
-    if ((tid == 0) || (tid > LOSCFG_BASE_CORE_TSK_LIMIT)) {
+    if ((tid <= 0) || (tid > LOSCFG_BASE_CORE_TSK_LIMIT)) {
        return EINVAL;
    }

@@ -92,7 +92,7 @@ int *SysSchedGetArea(unsigned int tid)
    unsigned int intSave;
    int *area = NULL;

-    if ((tid == 0) || (tid > LOSCFG_BASE_CORE_TSK_LIMIT)) {
+    if ((tid <= 0) || (tid > LOSCFG_BASE_CORE_TSK_LIMIT)) {
        return NULL;
    }

--- a/components/security/syscall/syscall_lookup.h
+++ b/components/security/syscall/syscall_lookup.h
@@ -263,7 +263,7 @@ SYSCALL_HAND_DEF(__NR_get_thread_area, SysGetThreadArea, char *, ARG_NUM_0)
 // SYSCALL_HAND_DEF(__NR_pthread_set_detach, SysUserThreadSetDetach, int, ARG_NUM_1)
 // SYSCALL_HAND_DEF(__NR_pthread_join, SysThreadJoin, int, ARG_NUM_1)
 // SYSCALL_HAND_DEF(__NR_pthread_deatch, SysUserThreadDetach, int, ARG_NUM_1)
-SYSCALL_HAND_DEF(__NR_create_user_thread, SysUserTaskCreate, unsigned int, ARG_NUM_4)
+SYSCALL_HAND_DEF(__NR_creat_user_thread, SysUserTaskCreate, unsigned int, ARG_NUM_4)
 // SYSCALL_HAND_DEF(__NR_getrusage, SysGetrusage, int, ARG_NUM_2)
 // SYSCALL_HAND_DEF(__NR_sysconf, SysSysconf, long, ARG_NUM_1)
 // SYSCALL_HAND_DEF(__NR_ugetrlimit, SysUgetrlimit, int, ARG_NUM_2)
--- a/components/shell/src/base/shcmd.c
+++ b/components/shell/src/base/shcmd.c
@@ -43,10 +43,6 @@
 #include "los_debugtools.h"
 #endif

-#if (LOSCFG_KERNEL_TRACE == 1)
-#include "los_trace_pri.h"
-#endif
-
 #define SHELL_INIT_MAGIC_FLAG 0xABABABAB

 STATIC CmdModInfo cmdInfo;
@@ -79,13 +75,6 @@ CmdItem g_shellcmdAll[] = {
    {CMD_TYPE_EX, "st", 1, (CmdCallBackFunc)OsShellCmdSchedTrace},
 #endif
    {CMD_TYPE_EX, "help", 0, (CmdCallBackFunc)OsShellCmdHelp},
-#if (LOSCFG_KERNEL_TRACE == 1)
-    {CMD_TYPE_EX, "trace_start", 0, (CmdCallBackFunc)LOS_TraceStart},
-    {CMD_TYPE_EX, "trace_stop",  0, (CmdCallBackFunc)LOS_TraceStop},
-    {CMD_TYPE_EX, "trace_mask",  1, (CmdCallBackFunc)OsShellCmdTraceSetMask},
-    {CMD_TYPE_EX, "trace_reset", 0, (CmdCallBackFunc)LOS_TraceReset},
-    {CMD_TYPE_EX, "trace_dump", 1, (CmdCallBackFunc)OsShellCmdTraceDump},
-#endif
 };

 CmdModInfo *OsCmdInfoGet(VOID)
--- a/components/shell/src/cmds/mempt_shellcmd.c
+++ b/components/shell/src/cmds/mempt_shellcmd.c
@@ -82,6 +82,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsShellCmdFree(INT32 argc, const CHAR *argv[])
 #if (LOSCFG_MEM_WATERLINE == 1)
 LITE_OS_SEC_TEXT_MINOR UINT32 OsShellCmdWaterLine(INT32 argc, const CHAR *argv[])
 {
+    UINT32 ret;
    LOS_MEM_POOL_STATUS poolStatus;

    if (argc > 1) {
--- a/components/shell/src/cmds/vfs_shellcmd.c
+++ b/components/shell/src/cmds/vfs_shellcmd.c
@@ -544,6 +544,11 @@ STATIC INT32 OsShellCmdDoRmdir(const CHAR *pathname)
        }
        if (strcmp(dirent->d_name, "..") && strcmp(dirent->d_name, ".")) {
            size_t fullPathBufSize = strlen(pathname) + strlen(dirent->d_name) + SEPARATOR_EOF_LEN;
+            if (fullPathBufSize <= 0) {
+                PRINTK("buffer size is invalid!\n");
+                (VOID)closedir(d);
+                return -1;
+            }
            fullpath = (CHAR *)malloc(fullPathBufSize);
            if (fullpath == NULL) {
                PRINTK("malloc failure!\n");
@@ -625,24 +630,6 @@ STATIC INT32 OsIsContainersWildcard(const CHAR *filename)
    return 0;
 }

-/*  Delete a non directory file  */
-STATIC INT32 OsRmFileOnly(const CHAR *fullpath)
-{
-    struct stat statInfo = {0};
-    INT32 ret = stat(fullpath, &statInfo);
-    if (ret == 0) {
-        if (!S_ISDIR(statInfo.st_mode)) {
-            ret = unlink(fullpath);
-        } else {
-            ret = 0;
-            PRINTK("rm: cannot remove '%s': Is a directory\n", fullpath);
-        }
-    } else {
-        PRINTK("stat: get '%s' statInfo fail!\n", fullpath);
-    }
-    return ret;
-}
-
 /*  Delete a matching file or directory  */

 STATIC INT32 OsWildcardDeleteFileOrDir(const CHAR *fullpath, wildcard_type mark)
@@ -654,7 +641,7 @@ STATIC INT32 OsWildcardDeleteFileOrDir(const CHAR *fullpath, wildcard_type mark)
            ret = OsShellCmdDoRmdir(fullpath);
            break;
        case RM_FILE:
-            ret = OsRmFileOnly(fullpath);
+            ret = unlink(fullpath);
            break;
        case RM_DIR:
            ret = rmdir(fullpath);
@@ -667,6 +654,8 @@ STATIC INT32 OsWildcardDeleteFileOrDir(const CHAR *fullpath, wildcard_type mark)
        perror("rm/rmdir error!");
        return ret;
    }
+
+    PRINTK("%s match successful!delete!\n", fullpath);
    return 0;
 }

@@ -744,10 +733,6 @@ STATIC INT32 OsWildcardExtractDirectory(CHAR *fullpath, VOID *dst, wildcard_type
            break;
        }

-        if (!strcmp(dirent->d_name, ".") || !strcmp(dirent->d_name, "..")) {
-            continue;
-        }
-
        ret = strcpy_s(src, PATH_MAX, f);
        if (ret != EOK) {
            goto closedir_out;
@@ -930,7 +915,7 @@ INT32 OsShellCmdRm(INT32 argc, const CHAR **argv)
        if (OsIsContainersWildcard(fullpath)) {
            ret = OsWildcardExtractDirectory(fullpath, NULL, RM_FILE);
        } else {
-            ret = OsRmFileOnly(fullpath);
+            ret = unlink(fullpath);
        }
    }
    if (ret == -1) {
--- a/components/trace/BUILD.gn
+++ b/components/trace/BUILD.gn
@@ -64,11 +64,3 @@ kernel_module(module_name) {
    include_dirs += [ "pipeline/serial" ]
  }
 }
-
-config("public") {
-  include_dirs = [
-    ".",
-    "cnv",
-    "pipeline",
-  ]
-}
--- a/components/trace/cnv/trace_cnv.c
+++ b/components/trace/cnv/trace_cnv.c
@@ -39,6 +39,12 @@
 #include "los_swtmr.h"
 #include "los_hook.h"

+#ifdef __cplusplus
+#if __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+#endif /* __cplusplus */
+
 STATIC VOID LOS_TraceMemInit(VOID *pool, UINT32 size)
 {
    LOS_TRACE(MEM_INFO_REQ, pool);
@@ -235,9 +241,7 @@ VOID OsTraceCnvInit(VOID)
    LOS_HookReg(LOS_HOOK_TYPE_QUEUE_CREATE, LOS_TraceQueueCreate);
    LOS_HookReg(LOS_HOOK_TYPE_QUEUE_DELETE, LOS_TraceQueueDelete);
    LOS_HookReg(LOS_HOOK_TYPE_QUEUE_READ, LOS_TraceQueueRW);
-    LOS_HookReg(LOS_HOOK_TYPE_QUEUE_READ_COPY, LOS_TraceQueueRW);
    LOS_HookReg(LOS_HOOK_TYPE_QUEUE_WRITE, LOS_TraceQueueRW);
-    LOS_HookReg(LOS_HOOK_TYPE_QUEUE_WRITE_COPY, LOS_TraceQueueRW);
    LOS_HookReg(LOS_HOOK_TYPE_SEM_CREATE, LOS_TraceSemCreate);
    LOS_HookReg(LOS_HOOK_TYPE_SEM_DELETE, LOS_TraceSemDelete);
    LOS_HookReg(LOS_HOOK_TYPE_SEM_POST, LOS_TraceSemPost);
@@ -260,3 +264,9 @@ VOID OsTraceCnvInit(VOID)
    LOS_HookReg(LOS_HOOK_TYPE_SWTMR_START, LOS_TraceSwtmrStart);
    LOS_HookReg(LOS_HOOK_TYPE_SWTMR_STOP, LOS_TraceSwtmrStop);
 }
+
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* __cplusplus */
--- a/components/trace/los_trace.c
+++ b/components/trace/los_trace.c
@@ -45,6 +45,12 @@
 #include "shell.h"
 #endif

+#ifdef __cplusplus
+#if __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+#endif /* __cplusplus */
+
 #if (LOSCFG_KERNEL_TRACE == 1)
 LITE_OS_SEC_BSS STATIC UINT32 g_traceEventCount;
 LITE_OS_SEC_BSS STATIC volatile enum TraceState g_traceState = TRACE_UNINIT;
@@ -411,6 +417,18 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsShellCmdTraceDump(INT32 argc, const CHAR **argv)
    LOS_TraceRecordDump(toClient);
    return LOS_OK;
 }
+
+SHELLCMD_ENTRY(tracestart_shellcmd,   CMD_TYPE_EX, "trace_start", 0, (CmdCallBackFunc)LOS_TraceStart);
+SHELLCMD_ENTRY(tracestop_shellcmd,    CMD_TYPE_EX, "trace_stop",  0, (CmdCallBackFunc)LOS_TraceStop);
+SHELLCMD_ENTRY(tracesetmask_shellcmd, CMD_TYPE_EX, "trace_mask",  1, (CmdCallBackFunc)OsShellCmdTraceSetMask);
+SHELLCMD_ENTRY(tracereset_shellcmd,   CMD_TYPE_EX, "trace_reset", 0, (CmdCallBackFunc)LOS_TraceReset);
+SHELLCMD_ENTRY(tracedump_shellcmd,    CMD_TYPE_EX, "trace_dump", 1, (CmdCallBackFunc)OsShellCmdTraceDump);
 #endif

 #endif /* LOSCFG_KERNEL_TRACE == 1 */
+
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* __cplusplus */
--- a/components/trace/los_trace_pri.h
+++ b/components/trace/los_trace_pri.h
@@ -152,11 +152,6 @@ extern VOID OsTraceRecordDump(BOOL toClient);
 #define OsTraceNotifyStop()
 #endif

-#if (LOSCFG_SHELL == 1)
-extern UINT32 OsShellCmdTraceSetMask(INT32 argc, const CHAR **argv);
-extern UINT32 OsShellCmdTraceDump(INT32 argc, const CHAR **argv);
-#endif
-
 #ifdef __cplusplus
 #if __cplusplus
 }
--- a/components/trace/pipeline/serial/trace_pipeline_serial.c
+++ b/components/trace/pipeline/serial/trace_pipeline_serial.c
@@ -32,6 +32,12 @@
 #include "trace_pipeline_serial.h"
 #include "trace_pipeline.h"

+#ifdef __cplusplus
+#if __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+#endif /* __cplusplus */
+
 #if (LOSCFG_TRACE_CONTROL_AGENT == 1)
 UINT32 SerialPipelineInit(VOID)
 {
@@ -87,3 +93,9 @@ UINT32 OsTracePipelineInit(VOID)
    OsTracePipelineReg(&g_serialOps);
    return g_serialOps.init();
 }
+
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* __cplusplus */
--- a/components/trace/pipeline/trace_pipeline.c
+++ b/components/trace/pipeline/trace_pipeline.c
@@ -33,6 +33,12 @@
 #include "trace_tlv.h"
 #include "los_trace_pri.h"

+#ifdef __cplusplus
+#if __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+#endif /* __cplusplus */
+
 #if (LOSCFG_KERNEL_SMP == 1)
 LITE_OS_SEC_BSS SPIN_LOCK_INIT(g_pipeSpin);
 #define PIPE_LOCK(state)                   LOS_SpinLockSave(&g_pipeSpin, &(state))
@@ -148,3 +154,9 @@ UINT32 OsTraceDataWait(VOID)
 {
    return g_tracePipelineOps->wait();
 }
+
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* __cplusplus */
--- a/components/trace/pipeline/trace_tlv.c
+++ b/components/trace/pipeline/trace_tlv.c
@@ -32,6 +32,12 @@
 #include "trace_tlv.h"
 #include "securec.h"

+#ifdef __cplusplus
+#if __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+#endif /* __cplusplus */
+
 #define CRC_WIDTH  8
 #define CRC_POLY   0x1021
 #define CRC_TOPBIT 0x8000
@@ -108,3 +114,9 @@ UINT32 OsTraceDataEncode(UINT8 type, const TlvTable *table, UINT8 *src, UINT8 *d
    head->crc      = crc;
    return len + sizeof(TraceMsgTlvHead);
 }
+
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* __cplusplus */
--- a/components/trace/trace_offline.c
+++ b/components/trace/trace_offline.c
@@ -31,8 +31,12 @@

 #include "los_trace_pri.h"
 #include "trace_pipeline.h"
-#include "los_memory.h"
-#include "securec.h"
+
+#ifdef __cplusplus
+#if __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+#endif /* __cplusplus */

 #if (LOSCFG_RECORDER_MODE_OFFLINE == 1)
 #define BITS_NUM_FOR_TASK_ID 16
@@ -253,3 +257,9 @@ OfflineHead *OsTraceRecordGet(VOID)
 }

 #endif /* LOSCFG_RECORDER_MODE_OFFLINE == 1 */
+
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* __cplusplus */
--- a/components/trace/trace_online.c
+++ b/components/trace/trace_online.c
@@ -32,6 +32,12 @@
 #include "los_trace_pri.h"
 #include "trace_pipeline.h"

+#ifdef __cplusplus
+#if __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+#endif /* __cplusplus */
+
 #if (LOSCFG_RECORDER_MODE_ONLINE == 1)
 UINT32 OsTraceGetMaskTid(UINT32 taskId)
 {
@@ -99,3 +105,9 @@ OfflineHead *OsTraceRecordGet(VOID)
 }

 #endif /* LOSCFG_RECORDER_MODE_ONLINE == 1 */
+
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* __cplusplus */
--- a/config_iccarm.gni
+++ b/config_iccarm.gni
@@ -86,6 +86,10 @@ optimize_config_cflags = []
 optimize_config_asmflags = []

 if (defined(LOSCFG_COMPILE_DEBUG)) {
+  optimize_config_cflags += [
+    "-g",
+    "-gdwarf-2",
+  ]
  optimize_config_cflags += [ "-On" ]
 } else {
  if (defined(LOSCFG_COMPILE_OPTIMIZE)) {
@@ -114,14 +118,12 @@ kconfig_config_cflags += [
 warn_config_cflags = []
 warn_config_asmflags = []

-if (!defined(LOSCFG_TEST)) {
-  warn_config_cflags += [
-    "--warnings_affect_exit_code",
-    "--warnings_are_errors",
-    "--warn_about_c_style_casts",
-    "--warn_about_incomplete_constructors",
-  ]
-}
+warn_config_cflags += [
+  "--warnings_affect_exit_code",
+  "--warnings_are_errors",
+  "--warn_about_c_style_casts",
+  "--warn_about_incomplete_constructors",
+]

 #
 # dialect_config
--- a/figures/OpenHarmony-LiteOS-M核内核架构图.png
+++ b/figures/OpenHarmony-LiteOS-M核内核架构图.png
--- a/figures/architecture-of-openharmony-the-liteos-cortex-m-kernel.png
+++ b/figures/architecture-of-openharmony-the-liteos-cortex-m-kernel.png
--- a/kal/cmsis/cmsis_liteos2.c
+++ b/kal/cmsis/cmsis_liteos2.c
@@ -42,9 +42,6 @@
 #include "los_task.h"
 #include "los_timer.h"
 #include "los_debug.h"
-#if (LOSCFG_MUTEX_CREATE_TRACE == 1)
-#include "los_arch.h"
-#endif

 #include "string.h"
 #include "securec.h"
@@ -981,17 +978,21 @@ osStatus_t osEventFlagsDelete(osEventFlagsId_t ef_id)
 {
    PEVENT_CB_S pstEventCB = (PEVENT_CB_S)ef_id;
    UINT32 intSave;
-    osStatus_t ret = osOK;
+    osStatus_t ret;
    if (OS_INT_ACTIVE) {
        return osErrorISR;
    }
    intSave = LOS_IntLock();
-    if (LOS_EventDestroy(pstEventCB) != LOS_OK) {
+    if (LOS_EventDestroy(pstEventCB) == LOS_OK) {
+        ret = osOK;
+    } else {
        ret = osErrorParameter;
    }
    LOS_IntRestore(intSave);

-    if (LOS_MemFree(m_aucSysMem0, (void *)pstEventCB) != LOS_OK) {
+    if (LOS_MemFree(m_aucSysMem0, (void *)pstEventCB) == LOS_OK) {
+        ret = osOK;
+    } else {
        ret = osErrorParameter;
    }

@@ -1005,10 +1006,6 @@ osMutexId_t osMutexNew(const osMutexAttr_t *attr)
    UINT32 ret;
    UINT32 muxId;

-#if (LOSCFG_MUTEX_CREATE_TRACE == 1)
-    UINTPTR regLR = ArchLRGet();
-#endif
-
    UNUSED(attr);

    if (OS_INT_ACTIVE) {
@@ -1017,9 +1014,6 @@ osMutexId_t osMutexNew(const osMutexAttr_t *attr)

    ret = LOS_MuxCreate(&muxId);
    if (ret == LOS_OK) {
-#if (LOSCFG_MUTEX_CREATE_TRACE == 1)
-        OsSetMutexCreateInfo(GET_MUX(muxId), regLR);
-#endif
        return (osMutexId_t)(GET_MUX(muxId));
    } else {
        return (osMutexId_t)NULL;
@@ -1244,40 +1238,14 @@ osMessageQueueId_t osMessageQueueNew(uint32_t msg_count, uint32_t msg_size, cons
 {
    UINT32 queueId;
    UINT32 ret;
+    UNUSED(attr);
    osMessageQueueId_t handle;
-    const char *queueName = NULL;
-
-#if (LOSCFG_BASE_IPC_QUEUE_STATIC == 1)
-    UINT32 queueSize = 0;
-    UINT8 *staticMem = NULL;
-#endif

    if ((msg_count == 0) || (msg_size == 0) || OS_INT_ACTIVE) {
        return (osMessageQueueId_t)NULL;
    }

-    if (attr != NULL) {
-        queueName = attr->name;
-#if (LOSCFG_BASE_IPC_QUEUE_STATIC == 1)
-        queueSize = attr->mq_size;
-        staticMem = attr->mq_mem;
-        if (((queueSize == 0) && (staticMem != NULL)) || ((queueSize != 0) && (staticMem == NULL))) {
-            return (osMessageQueueId_t)NULL;
-        }
-#endif
-    }
-
-#if (LOSCFG_BASE_IPC_QUEUE_STATIC == 1)
-    if (staticMem != NULL) {
-        ret = LOS_QueueCreateStatic((const CHAR *)queueName, (UINT16)msg_count, &queueId, \
-                                    (UINT8 *)staticMem, 0, (UINT16)queueSize / msg_count);
-    } else {
-        ret = LOS_QueueCreate((const CHAR *)queueName, (UINT16)msg_count, &queueId, 0, (UINT16)msg_size);
-    }
-#else
-    ret = LOS_QueueCreate((const CHAR *)queueName, (UINT16)msg_count, &queueId, 0, (UINT16)msg_size);
-#endif
-
+    ret = LOS_QueueCreate((char *)NULL, (UINT16)msg_count, &queueId, 0, (UINT16)msg_size);
    if (ret == LOS_OK) {
        handle = (osMessageQueueId_t)(GET_QUEUE_HANDLE(queueId));
    } else {
@@ -1405,13 +1373,8 @@ osStatus_t osMessageQueueDelete(osMessageQueueId_t mq_id)

 const char *osMessageQueueGetName(osMessageQueueId_t mq_id)
 {
-    if (mq_id == NULL) {
-        return NULL;
-    }
-
-    LosQueueCB *pstQueue = (LosQueueCB *)mq_id;
-
-    return (const char *)pstQueue->queueName;
+    UNUSED(mq_id);
+    return NULL;
 }
 #endif

--- a/kal/libc/Kconfig
+++ b/kal/libc/Kconfig
@@ -43,7 +43,6 @@ rsource "newlib/Kconfig"

 config LIBC_ICCARM
    bool "iar libc"
-    depends on COMPILER_ICCARM
 rsource "iccarm/Kconfig"

 endchoice
--- a/kal/libc/iccarm/Kconfig
+++ b/kal/libc/iccarm/Kconfig
@@ -35,10 +35,4 @@ config LIBC_ICCARM_FS
    help
        This enables POSIX style file system related APIs.

-config LIBC_ICCARM_MALLOC
-    bool "Enable POSIX malloc/free API support"
-    default y
-    help
-        This enables POSIX malloc/free related APIs.
-
 endif # LIBC_ICCARM
--- a/kal/libc/musl/fs.c
+++ b/kal/libc/musl/fs.c
@@ -28,20 +28,22 @@
 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#define _GNU_SOURCE

 #include "los_config.h"
-#include <errno.h>
-#include <stdarg.h>
-#include <dirent.h>
-#include <sys/mount.h>
-#include <sys/statfs.h>
-#include <sys/stat.h>
-#include <unistd.h>
+#include "stdarg.h"
+#include "dirent.h"
+#include "sys/mount.h"
+#include "sys/statfs.h"
+#include "sys/stat.h"
+#include "unistd.h"

 #ifdef LOSCFG_LIBC_MUSL_FS
 #include "los_fs.h"
+#else
+#include "sys/stat.h"
+#endif

+#ifdef LOSCFG_LIBC_MUSL_FS
 int mount(const char *source, const char *target,
          const char *filesystemtype, unsigned long mountflags,
          const void *data)
@@ -159,45 +161,6 @@ ssize_t pwrite(int fd, const void *buf, size_t nbyte, off_t offset)
    return LOS_Pwrite(fd, buf, nbyte, offset);
 }

-int access(const char *path, int mode)
-{
-    struct stat st;
-
-    if (stat(path, &st) < 0) {
-        return -1;
-    }
-    if ((st.st_mode & S_IFDIR) || (st.st_mode & S_IFREG)) {
-        return 0;
-    }
-    if ((mode & W_OK) && !(st.st_mode & S_IWRITE)) {
-        return -1;
-    }
-
-    return 0;
-}
-
-int fcntl(int fd, int cmd, ...)
-{
-    int ret;
-    va_list vaList;
-
-    va_start(vaList, cmd);
-    ret = OsFcntl(fd, cmd, vaList);
-    va_end(vaList);
-    return ret;
-}
-
-int ioctl(int fd, int req, ...)
-{
-    int ret;
-    va_list vaList;
-
-    va_start(vaList, req);
-    ret = OsIoctl(fd, req, vaList);
-    va_end(vaList);
-    return ret;
-}
-
 #else /* #ifdef LOSCFG_FS_VFS */

 int mount(const char *source, const char *target,
@@ -312,18 +275,4 @@ ssize_t pwrite(int fd, const void *buf, size_t nbyte, off_t offset)
    return -1;
 }

-int access(const char *path, int mode)
-{
-    return -1;
-}
-
-int fcntl(int fd, int cmd, ...)
-{
-    return -1;
-}
-
-int ioctl(int fd, int req, ...)
-{
-    return -1;
-}
 #endif
--- a/kal/libc/newlib/Kconfig
+++ b/kal/libc/newlib/Kconfig
@@ -36,10 +36,4 @@ config LIBC_NEWLIB_FS
    help
        This enables POSIX style file system related APIs.

-config LIBC_NEWLIB_MALLOC
-    bool "Enable POSIX malloc/free API support"
-    default y
-    help
-        This enables POSIX malloc/free related APIs.
-
 endif # LIBC_NEWLIB
--- a/kal/libc/newlib/porting/include/netdb.h
+++ b/kal/libc/newlib/porting/include/netdb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -175,8 +175,7 @@ int gethostbyname2_r(const char * __restrict name, int af, struct hostent * __re
                     int * __restrict h_errnop);
 struct hostent *gethostbyname2(const char *name, int af);
 int gethostbyaddr_r(const void * __restrict addr, __socklen_t len, int type, struct hostent * __restrict result_buf, \
-                    char * __restrict buf, size_t buflen, struct hostent ** __restrict result, \
-                    int * __restrict h_errnop);
+                    char * __restrict buf, size_t buflen, struct hostent ** __restrict result, int * __restrict h_errnop);
 int getservbyport_r(int port, const char * __restrict proto, struct servent * __restrict result_buf, \
                    char * __restrict buf, size_t buflen, struct servent ** __restrict result);
 int getservbyname_r(const char *name, const char *proto, struct servent *result_buf, char *buf, size_t buflen, \
--- a/kal/libc/newlib/porting/include/sys/stat.h
+++ b/kal/libc/newlib/porting/include/sys/stat.h
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this list of
+ *    conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *    of conditions and the following disclaimer in the documentation and/or other materials
+ *    provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors may be used
+ *    to endorse or promote products derived from this software without specific prior written
+ *    permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _ADAPT_SYS_STAT_H
+#define _ADAPT_SYS_STAT_H
+
+#include <sys/features.h>
+#include <sys/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#define S_IFMT  0170000
+
+#define S_IFDIR 0040000
+#define S_IFCHR 0020000
+#define S_IFBLK 0060000
+#define S_IFREG 0100000
+#define S_IFIFO 0010000
+#define S_IFLNK 0120000
+#define S_IFSOCK 0140000
+
+#define S_ISDIR(mode)  (((mode) & S_IFMT) == S_IFDIR)
+#define S_ISCHR(mode)  (((mode) & S_IFMT) == S_IFCHR)
+#define S_ISBLK(mode)  (((mode) & S_IFMT) == S_IFBLK)
+#define S_ISREG(mode)  (((mode) & S_IFMT) == S_IFREG)
+#define S_ISFIFO(mode) (((mode) & S_IFMT) == S_IFIFO)
+#define S_ISLNK(mode)  (((mode) & S_IFMT) == S_IFLNK)
+#define S_ISSOCK(mode) (((mode) & S_IFMT) == S_IFSOCK)
+
+#ifndef S_IRUSR
+#define S_ISUID 04000
+#define S_ISGID 02000
+#define S_ISVTX 01000
+#define S_IRUSR 0400
+#define S_IWUSR 0200
+#define S_IXUSR 0100
+#define S_IRWXU 0700
+#define S_IRGRP 0040
+#define S_IWGRP 0020
+#define S_IXGRP 0010
+#define S_IRWXG 0070
+#define S_IROTH 0004
+#define S_IWOTH 0002
+#define S_IXOTH 0001
+#define S_IRWXO 0007
+#endif
+
+#define st_atime st_atim.tv_sec
+#define st_mtime st_mtim.tv_sec
+#define st_ctime st_ctim.tv_sec
+
+struct stat {
+    dev_t st_dev;
+    int __st_dev_padding;
+    long __st_ino_truncated;
+    mode_t st_mode;
+    nlink_t st_nlink;
+    uid_t st_uid;
+    gid_t st_gid;
+    dev_t st_rdev;
+    int __st_rdev_padding;
+    off_t st_size;
+    blksize_t st_blksize;
+    blkcnt_t st_blocks;
+    struct {
+        long tv_sec;
+        long tv_nsec;
+    } __st_atim32, __st_mtim32, __st_ctim32;
+    ino_t st_ino;
+    struct timespec st_atim;
+    struct timespec st_mtim;
+    struct timespec st_ctim;
+};
+
+int stat(const char *__restrict, struct stat *__restrict);
+int fstat(int, struct stat *);
+int mkdir(const char *, mode_t);
+
+#if defined(_GNU_SOURCE)
+#define stat64 stat
+#define fstat64 fstat
+#define blkcnt64_t blkcnt_t
+#define fsblkcnt64_t fsblkcnt_t
+#define fsfilcnt64_t fsfilcnt_t
+#define ino64_t ino_t
+#define off64_t off_t
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* !_ADAPT_SYS_STAT_H */
--- a/kal/libc/newlib/porting/src/fs.c
+++ b/kal/libc/newlib/porting/src/fs.c
@@ -27,17 +27,16 @@
 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#define _GNU_SOURCE

 #include "los_config.h"
-#include <errno.h>
-#include <stdio.h>
-#include <stdarg.h>
+#include "stdio.h"
+#include "stdarg.h"
 #include <sys/ioctl.h>
-#include <sys/stat.h>

 #ifdef LOSCFG_LIBC_NEWLIB_FS
 #include "los_fs.h"
+#else
+#include "sys/stat.h"
 #endif

 #ifdef LOSCFG_LIBC_NEWLIB_FS
@@ -148,25 +147,13 @@ int ftruncate(int fd, off_t length)
    return LOS_Ftruncate(fd, length);
 }

-int fcntl(int fd, int cmd, ...)
-{
-    int ret;
-    va_list vaList;
-
-    va_start(vaList, cmd);
-    ret = OsFcntl(fd, cmd, vaList);
-    va_end(vaList);
-    return ret;
-}
-
 int ioctl(int fd, int req, ...)
 {
+    va_list ap;
+    va_start(ap, req);
    int ret;
-    va_list vaList;
-
-    va_start(vaList, req);
-    ret = OsIoctl(fd, req, vaList);
-    va_end(vaList);
+    ret = LOS_Ioctl(fd, req, ap);
+    va_end(ap);
    return ret;
 }

@@ -180,33 +167,6 @@ ssize_t pwrite(int fd, const void *buf, size_t nbyte, off_t offset)
    return LOS_Pwrite(fd, buf, nbyte, offset);
 }

-int access(const char *path, int mode)
-{
-    struct stat st;
-
-    if (stat(path, &st) < 0) {
-        return -1;
-    }
-    if ((st.st_mode & S_IFDIR) || (st.st_mode & S_IFREG)) {
-        return 0;
-    }
-    if ((mode & W_OK) && !(st.st_mode & S_IWRITE)) {
-        return -1;
-    }
-
-    return 0;
-}
-
-int remove(const char *filename)
-{
-    int ret = unlink(filename);
-    if (ret == -EISDIR) {
-        ret = rmdir(filename);
-    }
-
-    return ret;
-}
-
 #else /* #ifdef LOSCFG_FS_VFS */

 int _open(const char *path, int oflag, ...)
@@ -249,23 +209,4 @@ int _stat(const char *path, struct stat *buf)
    return -1;
 }

-int access(const char *path, int mode)
-{
-    return -1;
-}
-
-int remove(const char *filename)
-{
-    return -1;
-}
-
-int fcntl(int fd, int cmd, ...)
-{
-    return -1;
-}
-
-int ioctl(int fd, int req, ...)
-{
-    return -1;
-}
 #endif
--- a/kal/libc/newlib/porting/src/malloc.c
+++ b/kal/libc/newlib/porting/src/malloc.c
@@ -34,7 +34,6 @@
 #include "los_memory.h"
 #include <malloc.h>

-#ifdef LOSCFG_LIBC_NEWLIB_MALLOC
 void *zalloc(size_t size)
 {
    void *ptr = NULL;
@@ -112,4 +111,3 @@ void *__wrap__calloc_r(struct _reent *reent, size_t nitems, size_t size)
    }
    return ptr;
 }
-#endif
--- a/kal/posix/include/rtc_time_hook.h
+++ b/kal/posix/include/rtc_time_hook.h
--- a/kal/posix/src/pipe.c
+++ b/kal/posix/src/pipe.c
@@ -694,7 +694,7 @@ UINT32 OsPipeInit(VOID)

    ret = LOS_MuxCreate(&g_devFdMutex);
    if (ret != LOS_OK) {
-        (VOID)LOS_MuxDelete(g_devListMutex);
+        LOS_MuxDelete(g_devListMutex);
        return ret;
    }

--- a/kal/posix/src/poll.c
+++ b/kal/posix/src/poll.c
@@ -175,7 +175,7 @@ STATIC INLINE INT32 PollTimedWait(struct pollfd *fds, nfds_t nfds, struct PollTa
            }
        } else if (left <= 0) {
            break;
-        } else {
+        } else if (left > 0) {
            clock_gettime(CLOCK_REALTIME, &curTime);
            last = (INT32)((curTime.tv_sec - startTime.tv_sec) * OS_SYS_MS_PER_SECOND +
                   (curTime.tv_nsec - startTime.tv_nsec) / (OS_SYS_NS_PER_SECOND / OS_SYS_MS_PER_SECOND));
--- a/kal/posix/src/pthread.c
+++ b/kal/posix/src/pthread.c
@@ -36,7 +36,6 @@
 #include <securec.h>
 #include <limits.h>
 #include <stdbool.h>
-#include <stdint.h>
 #include "los_config.h"
 #include "los_task.h"
 #include "los_debug.h"
--- a/kal/posix/src/pthread_cond.c
+++ b/kal/posix/src/pthread_cond.c
@@ -42,6 +42,12 @@
 #include "los_event.h"
 #include "los_mux.h"

+typedef struct {
+    volatile INT32 *realValue;
+    INT32 value;
+    UINT32 clearEvent;
+} EventCond;
+
 #define INLINE inline

 #define BROADCAST_EVENT     1
--- a/kal/posix/src/pthread_mutex.c
+++ b/kal/posix/src/pthread_mutex.c
@@ -38,9 +38,6 @@
 #include "los_debug.h"
 #include "los_hook.h"
 #include "los_sched.h"
-#if (LOSCFG_MUTEX_CREATE_TRACE == 1)
-#include "los_arch.h"
-#endif

 #define MUTEXATTR_TYPE_MASK   0x0FU
 #define OS_SYS_NS_PER_MSECOND 1000000
@@ -133,10 +130,6 @@ int pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *mutexA
    UINT32 muxHandle;
    UINT32 ret;

-#if (LOSCFG_MUTEX_CREATE_TRACE == 1)
-    UINTPTR regLR = ArchLRGet();
-#endif
-
    if (mutex == NULL) {
        return EINVAL;
    }
@@ -155,9 +148,6 @@ int pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *mutexA
    mutex->stAttr = useAttr;
    mutex->magic = _MUX_MAGIC;
    mutex->handle = muxHandle;
-#if (LOSCFG_MUTEX_CREATE_TRACE == 1)
-    OsSetMutexCreateInfo(GET_MUX(mutex->handle), regLR);
-#endif

    return 0;
 }
@@ -334,10 +324,6 @@ int pthread_mutex_timedlock(pthread_mutex_t *mutex, const struct timespec *absTi
    struct timespec curTime = {0};
    LosMuxCB *muxPended = NULL;

-#if (LOSCFG_MUTEX_CREATE_TRACE == 1)
-    UINTPTR regLR = ArchLRGet();
-#endif
-
    ret = MuxPreCheck(mutex, OS_TCB_FROM_TID(LOS_CurTaskIDGet()));
    if (ret != 0) {
        return (INT32)ret;
@@ -351,9 +337,6 @@ int pthread_mutex_timedlock(pthread_mutex_t *mutex, const struct timespec *absTi
        if (ret != LOS_OK) {
            return MapError(ret);
        }
-#if (LOSCFG_MUTEX_CREATE_TRACE == 1)
-        OsSetMutexCreateInfo(GET_MUX(mutex->handle), regLR);
-#endif
    } else {
        muxPended = GET_MUX(mutex->handle);
        if ((mutex->stAttr.type == PTHREAD_MUTEX_ERRORCHECK) &&
@@ -381,11 +364,6 @@ int pthread_mutex_lock(pthread_mutex_t *mutex)
 {
    UINT32 ret;
    LosMuxCB *muxPended = NULL;
-
-#if (LOSCFG_MUTEX_CREATE_TRACE == 1)
-    UINTPTR regLR = ArchLRGet();
-#endif
-
    LosTaskCB *runTask = OS_TCB_FROM_TID(LOS_CurTaskIDGet());

    ret = MuxPreCheck(mutex, runTask);
@@ -398,9 +376,6 @@ int pthread_mutex_lock(pthread_mutex_t *mutex)
        if (ret != LOS_OK) {
            return MapError(ret);
        }
-#if (LOSCFG_MUTEX_CREATE_TRACE == 1)
-        OsSetMutexCreateInfo(GET_MUX(mutex->handle), regLR);
-#endif
    } else {
        muxPended = GET_MUX(mutex->handle);
        if ((mutex->stAttr.type == PTHREAD_MUTEX_ERRORCHECK) &&
@@ -419,10 +394,6 @@ int pthread_mutex_trylock(pthread_mutex_t *mutex)
    UINT32 ret;
    LosMuxCB *muxPended = NULL;

-#if (LOSCFG_MUTEX_CREATE_TRACE == 1)
-    UINTPTR regLR = ArchLRGet();
-#endif
-
    ret = MuxPreCheck(mutex, OS_TCB_FROM_TID(LOS_CurTaskIDGet()));
    if (ret != 0) {
        return (INT32)ret;
@@ -433,9 +404,6 @@ int pthread_mutex_trylock(pthread_mutex_t *mutex)
        if (ret != LOS_OK) {
            return MapError(ret);
        }
-#if (LOSCFG_MUTEX_CREATE_TRACE == 1)
-        OsSetMutexCreateInfo(GET_MUX(mutex->handle), regLR);
-#endif
    } else {
        muxPended = GET_MUX(mutex->handle);
        if ((mutex->stAttr.type != PTHREAD_MUTEX_RECURSIVE) && (muxPended->muxCount != 0)) {
--- a/kal/posix/src/time.c
+++ b/kal/posix/src/time.c
@@ -501,7 +501,7 @@ time_t time(time_t *timer)
 {
    UINT64 usec = 0;
    time_t sec;
-    INT32 rtcRet;
+    INT32 rtcRet = 0;

    if (g_rtcTimeFunc.RtcGetTimeHook != NULL) {
        rtcRet = g_rtcTimeFunc.RtcGetTimeHook(&usec);
--- a/kernel/include/los_config.h
+++ b/kernel/include/los_config.h
@@ -350,14 +350,6 @@ extern "C" {
 #define LOSCFG_BASE_IPC_QUEUE_LIMIT                         6
 #endif

-/**
- * @ingroup los_config
- * Maximum supported number of static queues rather than the number of usable queues
- */
-#ifndef LOSCFG_BASE_IPC_STATIC_QUEUE_LIMIT
-#define LOSCFG_BASE_IPC_STATIC_QUEUE_LIMIT                  3
-#endif
-

 /* =============================================================================
                                       Software timer module configuration
@@ -460,7 +452,7 @@ extern UINT8 *m_aucSysMem0;

 /**
 * @ingroup los_config
- * Configuration module tailoring of more memory pool checking
+ * Configuration module tailoring of more mempry pool checking
 */
 #ifndef LOSCFG_MEM_MUL_POOL
 #define LOSCFG_MEM_MUL_POOL                                 1
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
openharmony_ci	366365fbf9	!803 低功耗增加idle选项 Merge pull request !803 from zhushengle/cherry-pick-1661260031	2022-08-23 13:57:24 +00:00
zhushengle	9f8c031324	fixed `9add4b4` from https://gitee.com/zhushengle/kernel_liteos_m/pulls/795 feat: 低功耗增加idle选项 Close #I5N9J2 Signed-off-by: zhushengle <zhushengle@huawei.com> Change-Id: I066ff415709145e585f1eb94e70263361d3d71af	2022-08-23 13:07:11 +00:00
openharmony_ci	a0f66a0d21	!797 【回合3.2Beta2】feature：允许device_path指向vendor Merge pull request !797 from Zhaotianyu/cherry-pick-1660982811	2022-08-22 01:49:07 +00:00
arvinzzz	7437d84d8a	fixed `d4db5a5` from https://gitee.com/arvinzzz/kernel_liteos_m/pulls/796 feature: BUILD.gn中device_path允许指向vendor close: #I5N9NC Signed-off-by: arvinzzz <zhaotianyu9@huawei.com> Change-Id: If6a05871a0c78a92d6370b73528674e411642e20	2022-08-20 08:06:52 +00:00
openharmony_ci	6b809620c4	!793 【回合】fix: iccarm fatfs编译问题修复回合 3.2Beta2 Merge pull request !793 from Zhaotianyu/cherry-pick-1660816794	2022-08-18 13:47:15 +00:00
arvinzzz	dbfa3a345d	fixed `99640e9` from https://gitee.com/arvinzzz/kernel_liteos_m/pulls/792 fix: fatfs iccarm编译修复 close: #I5MZ62 Signed-off-by: arvinzzz <zhaotianyu9@huawei.com> Change-Id: Ie3882e443406d5055ff58c780cd376ddd6054bbf	2022-08-18 09:59:55 +00:00
openharmony_ci	07c5e942d0	!788 fix: iccarm编译修复 Merge pull request !788 from Zhaotianyu/cherry-pick-1660717353	2022-08-17 12:54:08 +00:00
arvinzzz	ec15ef95c9	fixed `d0c50a4` from https://gitee.com/arvinzzz/kernel_liteos_m/pulls/766 fix: iccarm编译修复 close: #I5JXMJ Signed-off-by: arvinzzz <zhaotianyu9@huawei.com> Change-Id: I3fbaf459ad4807a44396f319a4d53d3cc1e7700c	2022-08-17 06:22:34 +00:00
openharmony_ci	d2b40f293d	!762 挑单 M核time支持RTC接口回合3.2Beta2 Merge pull request !762 from wangchen/0727_m	2022-07-27 07:39:09 +00:00
openharmony_ci	b95196e954	!761 refactor: Kconfig解耦 Merge pull request !761 from Zhaotianyu/cherry-pick-1658890842	2022-07-27 07:38:03 +00:00
openharmony_ci	61191eb629	!760 fix: 修复iccarm编译问题 Merge pull request !760 from Zhaotianyu/cherry-pick-1658890154	2022-07-27 07:37:28 +00:00
openharmony_ci	d47ec89be7	!759 refactor：编译框架对不同工具链的解耦优化回合 3.2Beta Merge pull request !759 from Zhaotianyu/cherry-pick-1658889939	2022-07-27 07:36:28 +00:00
wangchen	96a8074bb1	fix: 回合, M核time模块支持调用RTC接口【背景】主线代码回合3.2分支【修改方案】主线代码回合3.2分支【影响】对现有的产品编译不会有影响。 re #I5J3UR Signed-off-by: wangchen <wangchen240@huawei.com>	2022-07-27 03:29:25 +00:00
arvinzzz	91650c04a6	fixed `732a346` from https://gitee.com/arvinzzz/kernel_liteos_m/pulls/758 refactor: Kconfig选项解耦 close: #I5I7LX Signed-off-by: arvinzzz <zhaotianyu9@huawei.com> Change-Id: Ieaf3bc6bf0c345a7d7945abb9133bd40fbe9d5b8	2022-07-27 03:00:42 +00:00
i-wangliangliang	dc4cc3fb26	fixed `62eb96d` from https://gitee.com/arvinzzz/kernel_liteos_m/pulls/745 iccarm工具链编译适配 Signed-off-by: i-wangliangliang <willfox@126.com> Change-Id: I9360dc232c35ec4db7a9bee08f3c288e22941e39	2022-07-27 02:49:14 +00:00
arvinzzz	64f43fabd3	fixed `009d250` from https://gitee.com/arvinzzz/kernel_liteos_m/pulls/751 refactor: 编译框架对不同工具链的解耦优化 close: #I5GQ9A Signed-off-by: arvinzzz <zhaotianyu9@huawei.com> Change-Id: I3e371a67bdab75c53e769e08c1c54ec83c741a69	2022-07-27 02:45:39 +00:00