diff --git a/README.md b/README.md index e8865108..4044df34 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ After the compilation is successful, the executable file **NUCLEO-F767.hex** i ## Repositories Involved -[Kernel subsystem](https://gitee.com/openharmony/docs/blob/master/en/readme/kernel.md) +[Kernel subsystem](https://gitee.com/openharmony/docs/blob/HEAD/en/readme/kernel.md) **kernel\_liteos\_m** diff --git a/README_zh.md b/README_zh.md index ce2384c4..bf2b1787 100644 --- a/README_zh.md +++ b/README_zh.md @@ -52,11 +52,11 @@ OpenHarmony LiteOS-M内核的编译构建系统是一个基于gn和ninja的组 ### 搭建系统基础环境 -在搭建各个开发板环境前，需要完成OpenHarmony系统基础环境搭建。系统基础环境主要是指OpenHarmony的编译环境和开发环境，详细介绍请参考官方站点[Ubuntu编译环境准备](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-env-setup-linux.md)。开发者需要根据环境搭建文档，完成下述软件的安装：Python3.7+、gn、ninja、hb。对于LiteOS-M内核，还需要安装Make构建工具和[ARM GCC编译工具链](https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads)。 +在搭建各个开发板环境前，需要完成OpenHarmony系统基础环境搭建。系统基础环境主要是指OpenHarmony的编译环境和开发环境，详细介绍请参考官方站点[Ubuntu编译环境准备](https://gitee.com/openharmony/docs/blob/HEAD/zh-cn/device-dev/quick-start/quickstart-lite-env-setup-linux.md)。开发者需要根据环境搭建文档，完成下述软件的安装：Python3.7+、gn、ninja、hb。对于LiteOS-M内核，还需要安装Make构建工具和[ARM GCC编译工具链](https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads)。 ### 获取OpenHarmony源码 -开发者需要在Linux服务器上通过Git克隆获取OpenHarmony最新源码，详细的源码获取方式，请见[源码获取](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/get-code/sourcecode-acquire.md)。获取OpenHarmony完整仓代码后，假设克隆目录为`~/openHarmony`。 +开发者需要在Linux服务器上通过Git克隆获取OpenHarmony最新源码，详细的源码获取方式，请见[源码获取](https://gitee.com/openharmony/docs/blob/HEAD/zh-cn/device-dev/get-code/sourcecode-acquire.md)。获取OpenHarmony完整仓代码后，假设克隆目录为`~/openHarmony`。 ### 获取示例工程源码 @@ -78,7 +78,7 @@ chmod +x ~/openHarmony/device/st/nucleo_f767zi/build.sh cp -r ~/nucleo_f767zi/vendor/st ~/openHarmony/vendor/st ``` -关于示例代码目录的说明，可以参考资料站点[板级目录规范](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/porting/transplant-chip-board-overview.md)。如果需要自行移植开发板，请参考[板级系统移植](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/porting/transplant-chip-board.md)。 +关于示例代码目录的说明，可以参考资料站点[板级目录规范](https://gitee.com/openharmony/docs/blob/HEAD/zh-cn/device-dev/porting/transplant-chip-board-overview.md)。如果需要自行移植开发板，请参考[板级系统移植](https://gitee.com/openharmony/docs/blob/HEAD/zh-cn/device-dev/porting/transplant-chip-board.md)。 ### 编译运行 @@ -121,7 +121,7 @@ LiteOS-M内核移植的具体开发板的工程由社区开发者提供，可以 ## 相关仓 -[内核子系统](https://gitee.com/openharmony/docs/blob/master/zh-cn/readme/%E5%86%85%E6%A0%B8%E5%AD%90%E7%B3%BB%E7%BB%9F.md) +[内核子系统](https://gitee.com/openharmony/docs/blob/HEAD/zh-cn/readme/%E5%86%85%E6%A0%B8%E5%AD%90%E7%B3%BB%E7%BB%9F.md) **kernel\_liteos\_m** diff --git a/components/net/lwip-2.1/porting/include/lwip/api_shell.h b/components/net/lwip-2.1/porting/include/lwip/api_shell.h index f4c24985..7e063a15 100644 --- a/components/net/lwip-2.1/porting/include/lwip/api_shell.h +++ b/components/net/lwip-2.1/porting/include/lwip/api_shell.h @@ -6,15 +6,15 @@ * 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. + * 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. + * 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. + * 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, @@ -29,18 +29,6 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/********************************************************************************** - -* Notice of Export Control Law -=============================================== -* Huawei LiteOS may be subject to applicable export control laws and regulations, which -* might include those applicable to Huawei LiteOS of U.S. and the country in which you -* are located. -* Import, export and usage of Huawei LiteOS in any manner by you shall be in compliance -* with such applicable export control laws and regulations. -***********************************************************************************/ - - #ifndef LWIP_API_SHELL_H #define LWIP_API_SHELL_H diff --git a/components/net/lwip-2.1/porting/src/api_shell.c b/components/net/lwip-2.1/porting/src/api_shell.c index 6dd7b0c0..7db6560b 100644 --- a/components/net/lwip-2.1/porting/src/api_shell.c +++ b/components/net/lwip-2.1/porting/src/api_shell.c @@ -6,15 +6,15 @@ * 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. + * 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. + * 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. + * 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, @@ -29,18 +29,6 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/********************************************************************************** - -* Notice of Export Control Law -=============================================== -* Huawei LiteOS may be subject to applicable export control laws and regulations, which -* might include those applicable to Huawei LiteOS of U.S. and the country in which you -* are located. -* Import, export and usage of Huawei LiteOS in any manner by you shall be in compliance -* with such applicable export control laws and regulations. -***********************************************************************************/ - - #define LWIP_STATIC static #define DHCP_STATE_OFF 0 #define LWIP_EXT_POLL_SUPPORT 1 diff --git a/components/trace/los_trace.h b/components/trace/los_trace.h index 5932efa9..cc13a126 100644 --- a/components/trace/los_trace.h +++ b/components/trace/los_trace.h @@ -287,7 +287,6 @@ typedef struct { * * @par Dependency: * - * @since Huawei LiteOS V200R005C00 */ typedef BOOL (*TRACE_HWI_FILTER_HOOK)(UINT32 hwiNum); @@ -391,7 +390,6 @@ extern TRACE_EVENT_HOOK g_traceEventHook; * * @par Dependency: * - * @since Huawei LiteOS V200R005C00 */ #define LOS_TRACE(TYPE, IDENTITY, ...) \ do { \ @@ -423,7 +421,6 @@ extern TRACE_EVENT_HOOK g_traceEventHook; * * @par Dependency: * - * @since Huawei LiteOS V200R005C00 */ #define LOS_TRACE_EASY(TYPE, IDENTITY, ...) \ do { \ @@ -461,7 +458,6 @@ extern TRACE_EVENT_HOOK g_traceEventHook; * @par Dependency: * * @see LOS_TraceInit - * @since Huawei LiteOS V200R005C00 */ extern UINT32 LOS_TraceInit(VOID *buf, UINT32 size); @@ -483,7 +479,6 @@ extern UINT32 LOS_TraceInit(VOID *buf, UINT32 size); * @par Dependency: * * @see LOS_TraceStart - * @since Huawei LiteOS V200R005C00 */ extern UINT32 LOS_TraceStart(VOID); @@ -504,7 +499,6 @@ extern UINT32 LOS_TraceStart(VOID); * @par Dependency: * * @see LOS_TraceStop - * @since Huawei LiteOS V200R005C00 */ extern VOID LOS_TraceStop(VOID); @@ -525,7 +519,6 @@ extern VOID LOS_TraceStop(VOID); * @par Dependency: * * @see LOS_TraceReset - * @since Huawei LiteOS V200R005C00 */ extern VOID LOS_TraceReset(VOID); @@ -549,7 +542,6 @@ extern VOID LOS_TraceReset(VOID); * @par Dependency: * * @see LOS_TraceEventMaskSet - * @since Huawei LiteOS V200R005C00 */ extern VOID LOS_TraceEventMaskSet(UINT32 mask); @@ -572,7 +564,6 @@ extern VOID LOS_TraceEventMaskSet(UINT32 mask); * @par Dependency: * * @see LOS_TraceRecordDump - * @since Huawei LiteOS V200R005C00 */ extern VOID LOS_TraceRecordDump(BOOL toClient); @@ -595,7 +586,6 @@ extern VOID LOS_TraceRecordDump(BOOL toClient); * @par Dependency: * * @see LOS_TraceRecordGet - * @since Huawei LiteOS V200R005C00 */ extern OfflineHead *LOS_TraceRecordGet(VOID); @@ -616,7 +606,6 @@ extern OfflineHead *LOS_TraceRecordGet(VOID); * @par Dependency: * * @see LOS_TraceHwiFilterHookReg - * @since Huawei LiteOS V200R005C00 */ extern VOID LOS_TraceHwiFilterHookReg(TRACE_HWI_FILTER_HOOK hook); #ifdef __cplusplus diff --git a/components/trace/pipeline/trace_tlv.h b/components/trace/pipeline/trace_tlv.h index 27d2749b..7976a38f 100644 --- a/components/trace/pipeline/trace_tlv.h +++ b/components/trace/pipeline/trace_tlv.h @@ -85,7 +85,6 @@ typedef struct { * @par Dependency: * * @see LOS_TraceDataEncode - * @since Huawei LiteOS V200R005C00 */ extern UINT32 OsTraceDataEncode(UINT8 type, const TlvTable *table, UINT8 *src, UINT8 *dest, INT32 destLen); diff --git a/utils/los_debug.h b/utils/los_debug.h index 009b754c..8649cc0f 100644 --- a/utils/los_debug.h +++ b/utils/los_debug.h @@ -127,7 +127,6 @@ typedef enum { * @par Dependency: * * @see LOS_Printf - * @since none */ #if (LOSCFG_KERNEL_PRINTF == 1) extern INT32 printf(const CHAR *fmt, ...);