diff --git a/Kconfig b/Kconfig index 7a6feeaadd9f20c419b29c2504b1f067cec86e04..8041b61d84e200970ee65ef113a8648291fb1950 100644 --- a/Kconfig +++ b/Kconfig @@ -189,7 +189,7 @@ config DEBUG_VERSION It also means you do not want to use debug modules, like shell,telnet,tftp,nfs and memory check, etc. If you select this option that means you enable a debug version for LiteOS. - That means you want a opposite behaviour compared to release version. + That means you want an opposite behaviour compared to release version. config DEBUG_KERNEL bool "Enable Debug LiteOS Kernel Resource" @@ -198,7 +198,7 @@ config DEBUG_KERNEL help If you select this option that means you enable debugging kernel resource. It also means you want to get queue, mutex, semaphore, memory debug information. - That means you want a opposite behaviour compared to release version. + That means you want an opposite behaviour compared to release version. config DEBUG_QUEUE bool "Enable Queue Debugging" diff --git a/Makefile b/Makefile index 9c026c662c2bc3aa933e212af2d6ae575c2a4ec6..8122156f788ef4d3c76ba15d63a5864ac6ecef0c 100644 --- a/Makefile +++ b/Makefile @@ -97,7 +97,7 @@ Targets: cleanall: clean all build outputs all: make liteos kernel image and rootfs image (Default target) $(APPS): build all apps - $(ROOTFS): make a original rootfs image + $(ROOTFS): make an original rootfs image $(LITEOS_LIBS_TARGET): compile all kernel modules (libraries) $(LITEOS_TARGET): make liteos kernel image update_config: update product kernel config (use menuconfig) diff --git a/fs/include/fs/fs_operation.h b/fs/include/fs/fs_operation.h index b96f0c776cfa3342cd5b60fdd19983e1d788714d..11ea049a75958f0a47d7f886667852be76597164 100644 --- a/fs/include/fs/fs_operation.h +++ b/fs/include/fs/fs_operation.h @@ -98,7 +98,7 @@ extern char *rindex(const char *s, int c); * @ingroup fs * * @par Description: - * The set_label() function shall set the value of a global varible, + * The set_label() function shall set the value of a global variable, * the value will be used to set the label of SD card in format(). * * @param name [IN] label to set, the length must be less than 12 diff --git a/fs/vfs/bcache/src/bcache.c b/fs/vfs/bcache/src/bcache.c index b0841f419ecf890e4048680519e8210749dd4d1b..238bf132fa20a7b99cc9fcf0025a19c997d3aeb5 100644 --- a/fs/vfs/bcache/src/bcache.c +++ b/fs/vfs/bcache/src/bcache.c @@ -351,7 +351,7 @@ static INT32 BcacheSyncBlock(OsBcache *bc, OsBcacheBlock *block) UINT32 len, start, end; if (block->modified == TRUE) { - D(("bcache writting block = %llu\n", block->num)); + D(("bcache writing block = %llu\n", block->num)); ret = FindFlagPos(block->flag, bc->sectorPerBlock >> UNINT_LOG2_SHIFT, &start, &end); if (ret == ENOERR) { diff --git a/kernel/base/include/los_stackinfo_pri.h b/kernel/base/include/los_stackinfo_pri.h index 2698433e68d4ea8347ab8d6ff33a6fe56fd8e5ed..3a8512d3547779d13768a706f1d8dcdcbd292918 100644 --- a/kernel/base/include/los_stackinfo_pri.h +++ b/kernel/base/include/los_stackinfo_pri.h @@ -48,7 +48,7 @@ typedef struct { } StackInfo; #define OS_INVALID_WATERLINE 0xFFFFFFFF -#define OS_STACK_MAGIC_CHECK(topstack) (*(UINTPTR *)(topstack) == OS_STACK_MAGIC_WORD) /* 1:magic valid 0:unvalid */ +#define OS_STACK_MAGIC_CHECK(topstack) (*(UINTPTR *)(topstack) == OS_STACK_MAGIC_WORD) /* 1:magic valid 0:invalid */ extern VOID OsExcStackInfo(VOID); extern VOID OsExcStackInfoReg(const StackInfo *stackInfo, UINT32 stackNum); @@ -81,4 +81,4 @@ extern UINT32 OsStackWaterLineGet(const UINTPTR *stackBottom, const UINTPTR *sta #endif /* __cplusplus */ #endif /* __cplusplus */ -#endif /* _LOS_STACK_INFO_PRI_H */ \ No newline at end of file +#endif /* _LOS_STACK_INFO_PRI_H */ diff --git a/kernel/base/mp/los_lockdep.c b/kernel/base/mp/los_lockdep.c index dae4e0ac553a60bebcec07a209c49f3158060508..24e6b3012cbd29242b3f8f66331a73fd66f10679 100644 --- a/kernel/base/mp/los_lockdep.c +++ b/kernel/base/mp/los_lockdep.c @@ -87,7 +87,7 @@ STATIC INLINE CHAR *OsLockDepErrorStringGet(enum LockDepErrType type) errorString = "lockdep overflow"; break; default: - errorString = "unknow error code"; + errorString = "unknown error code"; break; } @@ -313,7 +313,7 @@ VOID OsLockDepCheckOut(SPIN_LOCK_S *lock) /* record lock holding time */ heldlocks[depth].holdTime = OsLockDepGetCycles() - heldlocks[depth].holdTime; - /* if unlock a older lock, needs move heldLock records */ + /* if unlock an older lock, needs move heldLock records */ while (depth < lockDep->lockDepth - 1) { lockDep->heldLocks[depth] = lockDep->heldLocks[depth + 1]; depth++; diff --git a/kernel/extended/liteipc/hm_liteipc.c b/kernel/extended/liteipc/hm_liteipc.c index a406ffeb881798a447913d48822a0de788855b81..5293552a20644e3bcb50c2ea528894383b039c8b 100644 --- a/kernel/extended/liteipc/hm_liteipc.c +++ b/kernel/extended/liteipc/hm_liteipc.c @@ -1208,7 +1208,7 @@ LITE_OS_SEC_TEXT STATIC UINT32 LiteIpcMsgHandle(IpcContent *con) } content->outMsg = msg; if ((content->outMsg->type < 0) || (content->outMsg->type >= MT_DEATH_NOTIFY)) { - PRINT_ERR("LiteIpc unknow msg type:%d\n", content->outMsg->type); + PRINT_ERR("LiteIpc unknown msg type:%d\n", content->outMsg->type); ret = -EINVAL; goto BUFFER_FREE; } diff --git a/kernel/include/los_ld_elflib.h b/kernel/include/los_ld_elflib.h index 9187f7e414a613ad68981c068372931816d2dc22..b85f793422d1a0f004db511ea0d9e9ea6e13f8f9 100644 --- a/kernel/include/los_ld_elflib.h +++ b/kernel/include/los_ld_elflib.h @@ -90,10 +90,10 @@ extern VOID *LOS_SoLoad(CHAR *elfFileName); /** * @ingroup dynload - * @brief Load a object file. + * @brief Load an object file. * * @par Description: - * This API is used to load a object file under a particular module file path. + * This API is used to load an object file under a particular module file path. * @attention * - * eg. Trace a event as: + * eg. Trace an event as: * #define TASK_PRIOSET_PARAMS(taskId, taskStatus, oldPrio, newPrio) taskId, taskStatus, oldPrio, newPrio - * eg. Not Trace a event as: + * eg. Not Trace an event as: * #define TASK_PRIOSET_PARAMS(taskId, taskStatus, oldPrio, newPrio) * eg. Trace only you need parmas as: * #define TASK_PRIOSET_PARAMS(taskId, taskStatus, oldPrio, newPrio) taskId diff --git a/net/lwip-2.1/enhancement/src/api_shell.c b/net/lwip-2.1/enhancement/src/api_shell.c index 11aa30a5155816d9514b0a21700516e3a435341a..75b3bbb951098645c2f65b2cea1dcfaa6cda1408 100644 --- a/net/lwip-2.1/enhancement/src/api_shell.c +++ b/net/lwip-2.1/enhancement/src/api_shell.c @@ -1750,7 +1750,7 @@ LWIP_STATIC int osPingFunc(u32_t destip, u32_t cnt, u32_t interval, u32_t data_l PRINTK("\nPing: parameter problem ..."); break; default : - PRINTK("\nPing: unknow error ..."); + PRINTK("\nPing: unknown error ..."); break; } i++; @@ -2371,7 +2371,7 @@ LWIP_STATIC int create_ping6_socket(u8_t type, const void *param) ret = lwip_setsockopt(sfd, SOL_SOCKET, SO_BINDTODEVICE, (char *)(param), strlen((char *)(param))); if (ret == -1) { (void)lwip_close(sfd); - PRINTK("ping6: unknown iface %s\n", (char *)(param)); + PRINTK("ping6: unknownn iface %s\n", (char *)(param)); return ret; } } diff --git a/net/telnet/src/telnet_dev.c b/net/telnet/src/telnet_dev.c index ab448be1cb99ff8ed1ff83b3f57b36fc44471985..ce432daa20b958730bb5b0882143d840bfe0d72c 100644 --- a/net/telnet/src/telnet_dev.c +++ b/net/telnet/src/telnet_dev.c @@ -191,7 +191,7 @@ STATIC INT32 TelnetClose(struct file *file) } /* - * Description : When a command resolver task trys to read the telnet device, + * Description : When a command resolver task tries to read the telnet device, * this method is called, and it will take out user's commands from the FIFO to run. * Return : -1 --- On failure * Non-negative integer --- length of commands taken out from the FIFO of the telnet device. @@ -236,7 +236,7 @@ STATIC ssize_t TelnetRead(struct file *file, CHAR *buf, size_t bufLen) } /* - * Description : When a command resolver task trys to write command results to the telnet device, + * Description : When a command resolver task tries to write command results to the telnet device, * just use lwIP send function to send out results. * Return : -1 --- buffer is NULL * Non-negative integer --- length of written data, maybe 0. diff --git a/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_037.c b/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_037.c index 48f76529a237702e25fb0957904ce722a0b4f6f9..448c1b4d84374985e1d10302c8fa044821e1040e 100644 --- a/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_037.c +++ b/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_037.c @@ -66,8 +66,8 @@ static UINT32 Testcase(VOID) ret = LOS_TaskDelay(12); // 12, set delay time ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - if (g_testCount < 10) { // 10, if g_testCount < 10 set a erro code, then exit - ICUNIT_GOTO_EQUAL(g_testCount, 10, g_testCount, EXIT); // 10, if g_testCount < 10 set a erro code, then exit + if (g_testCount < 10) { // 10, if g_testCount < 10 set an erro code, then exit + ICUNIT_GOTO_EQUAL(g_testCount, 10, g_testCount, EXIT); // 10, if g_testCount < 10 set an erro code, then exit } EXIT: diff --git a/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_066.c b/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_066.c index 4eb6be894c81c1f9cc66f33d93e6e4aba4d19b93..25e91d95802c50a00aa8ecd22d63bc963c4c72d5 100644 --- a/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_066.c +++ b/testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_066.c @@ -63,7 +63,7 @@ static UINT32 Testcase(VOID) ret = LOS_SwtmrTimeGet(swTmrID, &tick); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - if (tick > 4) { // 4, if tick > 4, set a erro code, then exit + if (tick > 4) { // 4, if tick > 4, set an erro code, then exit ICUNIT_GOTO_EQUAL(1, 0, tick, EXIT); } diff --git a/testsuites/kernel/sample/posix/mutex/smoke/It_posix_mutex_016.c b/testsuites/kernel/sample/posix/mutex/smoke/It_posix_mutex_016.c index 7644b60a848ae0f03d494acd96824a3782a3d006..4ffe0bbf90687efd91efe5e57bdb783559fff850 100644 --- a/testsuites/kernel/sample/posix/mutex/smoke/It_posix_mutex_016.c +++ b/testsuites/kernel/sample/posix/mutex/smoke/It_posix_mutex_016.c @@ -74,7 +74,7 @@ static UINT32 Testcase(VOID) rc = pthread_mutexattr_getprioceiling(&mta, &prioceiling); ICUNIT_GOTO_EQUAL(rc, ENOERR, rc, EXIT); - /* Make sure that prioceiling is withing the legal SCHED_FIFO boundries. */ + /* Make sure that prioceiling is within the legal SCHED_FIFO boundries. */ if (prioceiling != i) { rc = pthread_mutexattr_destroy(&mta); ICUNIT_GOTO_EQUAL(rc, ENOERR, rc, EXIT); @@ -101,4 +101,4 @@ VOID ItPosixMux016(void) #if __cplusplus } #endif /* __cpluscplus */ -#endif /* __cpluscplus */ \ No newline at end of file +#endif /* __cpluscplus */ diff --git a/testsuites/unittest/common/osTest.cpp b/testsuites/unittest/common/osTest.cpp index ee34a9c6255fc94926381952659768a54e957ebd..f2d45da78f238550f651d6358a6b7f4c5dc59b07 100644 --- a/testsuites/unittest/common/osTest.cpp +++ b/testsuites/unittest/common/osTest.cpp @@ -469,7 +469,7 @@ int RemoveDir(const char *dir) rmdir(dir); /* now dir is empty */ } else { - perror("unknow file type!"); + perror("unknown file type!"); } return 0; }