yystopf
/
openharmony_kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!904 修复liteos_a仓库中存在的一些拼写错误 

Merge pull request !904 from Hongjin Li/dev
This commit is contained in:
openharmony_ci 2022-06-23 04:15:03 +00:00 committed by Gitee
parent a3d757c8e1 1c0de289ec
commit bbbd96784e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
37 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Kconfig
View File

@ -265,7 +265,7 @@ config MEM_LEAKCHECK
default n
depends on DEBUG_VERSION && MEM_DEBUG
help
Answer Y to enable record the LR of Function call stack of Mem operation, it can check the mem leak through the informations of mem node.
Answer Y to enable record the LR of Function call stack of Mem operation, it can check the mem leak through the information of mem node.
config BASE_MEM_NODE_INTEGRITY_CHECK
bool "Enable integrity check or not"
default n

2
apps/shell/src/shmsg.c
View File

@ -422,7 +422,7 @@ static void DoCmdExec(const char *cmdName, const char *cmdline, unsigned int len
forkPid = fork();
if (forkPid < 0) {
printf("Faild to fork from shell\n");
printf("Failed to fork from shell\n");
return;
} else if (forkPid == 0) {
ChildExec(cmdParsed->paramArray[0], cmdParsed->paramArray, foreground);

4
apps/tftp/src/tftpc.c
View File

@ -500,7 +500,7 @@ static void lwip_tftp_send_error(s32_t iSockNum, u32_t ulError, const char *szEr
}
}
/* INTEFACE to get a file using filename
/* INTERFACE to get a file using filename
ulHostAddr - IP address of Host
szSrcFileName - Source file
szDestDirPath - Destination file path
@ -1419,7 +1419,7 @@ err_handler:
}
#ifdef TFTP_TO_RAWMEM
/* INTEFACE to get a file using filename
/* INTERFACE to get a file using filename
ulHostAddr - IP address of Host
szSrcFileName - Source file
szDestMemAddr - The target memory address in the client

4
arch/arm/arm/src/startup/reset_vector_mp.S
View File

@ -276,11 +276,11 @@ mmu_setup:
mov r12, #0x7 /* 0b0111 */
mcr p15, 0, r12, c3, c0, 0 /* Set DACR with 0b0111, client and manager domian */
isb
mrc p15, 0, r12, c1, c0, 1 /* ACTLR, Auxlliary Control Register */
mrc p15, 0, r12, c1, c0, 1 /* ACTLR, Auxiliary Control Register */
orr r12, r12, #(1 << 6) /* SMP, Enables coherent requests to the processor. */
orr r12, r12, #(1 << 2) /* Enable D-side prefetch */
orr r12, r12, #(1 << 11) /* Global BP Enable bit */
mcr p15, 0, r12, c1, c0, 1 /* ACTLR, Auxlliary Control Register */
mcr p15, 0, r12, c1, c0, 1 /* ACTLR, Auxiliary Control Register */
dsb
mrc p15, 0, r12, c1, c0, 0
bic r12, #(1 << 29 | 1 << 28) /* Disable TRE/AFE */

2
compat/posix/src/time.c
View File

@ -71,7 +71,7 @@
#ifdef LOSCFG_AARCH64
/*
* This two structures originally did't exit,
* This two structures originally didn't exit,
* they added by liteos to support 64bit interfaces on 32bit platform,
* in 64bit platform, timeval64 define to timeval which is platform adaptive.
*/

2
fs/fat/os_adapt/fatfs.h
View File

@ -64,7 +64,7 @@ extern "C" {
#define MBR_PRIMARY_PART_NUM 4
#define JUMP_CODE "\xEB\xFE\x90"
/* Partiton type */
/* Partition type */
#define FAT12 0x01 /* FAT12 as primary partition in first physical 32MB */
#define FAT16 0x04 /* FAT16 with less than 65536 sectors(32MB) */
#define EXTENDED_PARTITION_CHS 0x05

2
fs/fat/virpart/src/virpart.c
View File

@ -179,7 +179,7 @@ static INT FatfsDisablePart(void *handle)
* Scan the FAT inside the boundary of CHILD FATFS limit, and update the free cluster and last cluster
* for all CHILD FATFS.
* Acceptable Return Value:
* - FR_OK : Successfully scaned the FAT and update field.
* - FR_OK : Successfully scanned the FAT and update field.
* Others Return Value:
* - FR_INVAILD_FATFS : The FATFS object has error or the info in it has been occuried
* - FR_DENIED : The virtual partition feature has been shut down by switcher

2
fs/fat/virpart/src/virpartff.c
View File

@ -373,7 +373,7 @@ static FRESULT FatfsCheckScanFatParam(FATFS *fs)
* Scan the FAT inside the boundary of CHILD FATFS limit, and update the free cluster and last cluster
*
* Acceptable Return Value:
* - FR_OK : Successfully scaned the FAT and update field.
* - FR_OK : Successfully scanned the FAT and update field.
*
* Others Return Value:
* - FR_INVAILD_FATFS : The FATFS object has error or the info in it has been occuried

2
fs/jffs2/jffs2.patch
View File

@ -5499,7 +5499,7 @@ diff -Nupr old/fs/jffs2/readinode.c new/fs/jffs2/readinode.c
break;
default:
+ JFFS2_ERROR("Unknow f->inocache->state %d!\n", f->inocache->state);
+ JFFS2_ERROR("Unknown f->inocache->state %d!\n", f->inocache->state);
BUG();
}
}

2
fs/proc/os_adapt/fd_proc.c
View File

@ -135,7 +135,7 @@ void ProcFdInit(void)
{
struct ProcDirEntry *pde = CreateProcEntry("fd", 0, NULL);
if (pde == NULL) {
PRINT_ERR("creat /proc/fd error.\n");
PRINT_ERR("create /proc/fd error.\n");
return;
}

2
fs/proc/os_adapt/mounts_proc.c
View File

@ -91,7 +91,7 @@ void ProcMountsInit(void)
{
struct ProcDirEntry *pde = CreateProcEntry("mounts", 0, NULL);
if (pde == NULL) {
PRINT_ERR("creat mounts error!\n");
PRINT_ERR("create mounts error!\n");
return;
}

2
fs/proc/os_adapt/uptime_proc.c
View File

@ -78,7 +78,7 @@ void ProcUptimeInit(void)
{
struct ProcDirEntry *pde = CreateProcEntry("uptime", 0, NULL);
if (pde == NULL) {
PRINT_ERR("creat /proc/uptime error!\n");
PRINT_ERR("create /proc/uptime error!\n");
return;
}

8
fs/vfs/include/bcache/bcache.h
View File

@ -138,7 +138,7 @@ typedef struct tagOsBcache {
* <li>The block number is automatically adjusted if position is greater than block size.</li>
* </ul>
*
* @retval #0 read succeded
* @retval #0 read succeeded
* @retval #INT32 read failed
*
* @par Dependency:
@ -168,7 +168,7 @@ INT32 BlockCacheRead(OsBcache *bc,
* <li>The block number is automatically adjusted if position is greater than block size.</li>
* </ul>
*
* @retval #0 write succeded
* @retval #0 write succeeded
* @retval #INT32 write failed
*
* @par Dependency:
@ -193,7 +193,7 @@ INT32 BlockCacheWrite(OsBcache *bc,
* <li>None.</li>
* </ul>
*
* @retval #0 sync succeded
* @retval #0 sync succeeded
* @retval #INT32 sync failed
*
* @par Dependency:
@ -219,7 +219,7 @@ INT32 BlockCacheSync(OsBcache *bc);
* <li>None.</li>
* </ul>
*
* @retval #OsBcache * init succeded
* @retval #OsBcache * init succeeded
* @retval #NULL init failed
*
* @par Dependency:

4
kernel/base/ipc/los_signal.c
View File

@ -284,7 +284,7 @@ static int SigProcessSignalHandler(LosTaskCB *tcb, void *arg)
return 0;
}
/* If the default tcb is not setted, then set this one as default. */
/* If the default tcb is not set, then set this one as default. */
if (!info->defaultTcb) {
info->defaultTcb = tcb;
}
@ -305,7 +305,7 @@ static int SigProcessSignalHandler(LosTaskCB *tcb, void *arg)
/* Is this signal unblocked on this thread? */
isMember = OsSigIsMember(&tcb->sig.sigprocmask, info->sigInfo->si_signo);
if ((!isMember) && (!info->receivedTcb) && (tcb != info->awakenedTcb)) {
/* if unblockedTcb of this signal is not setted, then set it. */
/* if unblockedTcb of this signal is not set, then set it. */
if (!info->unblockedTcb) {
info->unblockedTcb = tcb;
}

2
kernel/common/console.c
View File

@ -1238,7 +1238,7 @@ STATIC CONSOLE_CB *OsConsoleCreate(UINT32 consoleID, const CHAR *deviceName)
ret = (INT32)LOS_SemCreate(1, &consoleCB->consoleSem);
if (ret != LOS_OK) {
PRINT_ERR("creat sem for uart failed\n");
PRINT_ERR("create sem for uart failed\n");
goto ERR_WITH_BUF;
}

12
kernel/extended/liteipc/hm_liteipc.c
View File

@ -1026,7 +1026,7 @@ LITE_OS_SEC_TEXT STATIC UINT32 CheckPara(IpcContent *content, UINT32 *dstTid)
#endif
break;
default:
PRINT_DEBUG("Unknow msg type:%d\n", msg->type);
PRINT_DEBUG("Unknown msg type:%d\n", msg->type);
return -EINVAL;
}
@ -1118,13 +1118,13 @@ LITE_OS_SEC_TEXT STATIC UINT32 CheckRecievedMsg(IpcListNode *node, IpcContent *c
}
#if (USE_TIMESTAMP == 1)
if (node->msg.timestamp != content->outMsg->timestamp) {
PRINT_ERR("Recieve a unmatch reply, drop it\n");
PRINT_ERR("Receive a unmatch reply, drop it\n");
ret = -EINVAL;
}
#else
if ((node->msg.code != content->outMsg->code) ||
(node->msg.target.token != content->outMsg->target.token)) {
PRINT_ERR("Recieve a unmatch reply, drop it\n");
PRINT_ERR("Receive a unmatch reply, drop it\n");
ret = -EINVAL;
}
#endif
@ -1132,7 +1132,7 @@ LITE_OS_SEC_TEXT STATIC UINT32 CheckRecievedMsg(IpcListNode *node, IpcContent *c
case MT_DEATH_NOTIFY:
break;
default:
PRINT_ERR("Unknow msg type:%d\n", node->msg.type);
PRINT_ERR("Unknown msg type:%d\n", node->msg.type);
ret = -EINVAL;
}
if (ret != LOS_OK) {
@ -1310,7 +1310,7 @@ LITE_OS_SEC_TEXT STATIC UINT32 HandleCmsCmd(CmsCmdContent *content)
}
return AddServiceAccess(localContent.taskID, localContent.serviceHandle);
default:
PRINT_DEBUG("Unknow cmd cmd:%d\n", localContent.cmd);
PRINT_DEBUG("Unknown cmd cmd:%d\n", localContent.cmd);
return -EINVAL;
}
return ret;
@ -1375,7 +1375,7 @@ LITE_OS_SEC_TEXT int LiteIpcIoctl(struct file *filep, int cmd, unsigned long arg
}
break;
default:
PRINT_ERR("Unknow liteipc ioctl cmd:%d\n", cmd);
PRINT_ERR("Unknown liteipc ioctl cmd:%d\n", cmd);
return -EINVAL;
}
return (INT32)ret;

4
kernel/include/los_task.h
View File

@ -977,7 +977,7 @@ extern UINT32 LOS_TaskInfoGet(UINT32 taskID, TSK_INFO_S *taskInfo);
*
* @attention
* <ul>
* <li>If any low LOSCFG_KERNEL_CORE_NUM bit of the mask is not setted, an error is reported.</li>
* <li>If any low LOSCFG_KERNEL_CORE_NUM bit of the mask is not set, an error is reported.</li>
* </ul>
*
* @param uwTaskID [IN] Type #UINT32 Task ID. The task id value is obtained from task creation.
@ -987,7 +987,7 @@ extern UINT32 LOS_TaskInfoGet(UINT32 taskID, TSK_INFO_S *taskInfo);
* @retval #LOS_ERRNO_TSK_ID_INVALID Invalid task ID.
* @retval #LOS_ERRNO_TSK_NOT_CREATED The task is not created.
* @retval #LOS_ERRNO_TSK_CPU_AFFINITY_MASK_ERR The task cpu affinity mask is incorrect.
* @retval #LOS_OK The task cpu affinity mask is successfully setted.
* @retval #LOS_OK The task cpu affinity mask is successfully set.
* @par Dependency:
* <ul><li>los_task.h: the header file that contains the API declaration.</li></ul>
* @see LOS_TaskCpuAffiGet

2
net/lwip-2.1/enhancement/src/api_shell.c
View File

@ -1326,7 +1326,7 @@ out:
} else if (ret == ERR_RTE) {
(void)snprintf_s(arp_cmd->cb_print_buf, PRINT_BUF_LEN, (PRINT_BUF_LEN - 1), "Network is unreachable\n");
} else {
(void)snprintf_s(arp_cmd->cb_print_buf, PRINT_BUF_LEN, (PRINT_BUF_LEN - 1), "Successed\n");
(void)snprintf_s(arp_cmd->cb_print_buf, PRINT_BUF_LEN, (PRINT_BUF_LEN - 1), "Succeeded\n");
}
}
#endif

2
testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_035.c
View File

@ -51,7 +51,7 @@ static UINT32 Testcase(void)
g_testCount = 0;
TEST_TASK_PARAM_INIT(task1, "it_smp_task_035", (TSK_ENTRY_FUNC)TaskF02Preempt, TASK_PRIO_TEST_TASK - 1);
/* creat preempt task */
/* create preempt task */
task1.usCpuAffiMask = 0;
ret = LOS_TaskCreate(&g_testTaskID01, &task1);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);

2
testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_042.c
View File

@ -61,7 +61,7 @@ static UINT32 Testcase(void)
TEST_TASK_PARAM_INIT(task1, "it_smp_task_042", (TSK_ENTRY_FUNC)TaskF01, TASK_PRIO_TEST_TASK);
int i;
/* creat high prio task on every cores */
/* create high prio task on every cores */
for (i = 0; i < LOSCFG_KERNEL_CORE_NUM - 1; i++) {
/* take control of every cores */
task1.usCpuAffiMask = CPUID_TO_AFFI_MASK((ArchCurrCpuid() + i + 1) % (LOSCFG_KERNEL_CORE_NUM));

2
testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_062.c
View File

@ -59,7 +59,7 @@ static UINT32 Testcase(void)
TSK_INIT_PARAM_S task1 = { 0 };
g_testCount = 0;
// 5, lengh of the queue; 50, max queue msg size.
// 5, length of the queue; 50, max queue msg size.
ret = LOS_QueueCreate("queue", 5, &g_queue, 0, 50);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);

2
testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_063.c
View File

@ -58,7 +58,7 @@ static UINT32 Testcase(void)
TSK_INIT_PARAM_S task1 = { 0 };
g_testCount = 0;
// 5, lengh of the queue; 50, max queue msg size.
// 5, length of the queue; 50, max queue msg size.
ret = LOS_QueueCreate("queue", 5, &g_queue, 0, 50);
TEST_TASK_PARAM_INIT(task1, "it_smp_task_063", (TSK_ENTRY_FUNC)TaskF01, TASK_PRIO_TEST_TASK - 1);

2
testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_068.c
View File

@ -72,7 +72,7 @@ static UINT32 Testcase(void)
TSK_INIT_PARAM_S task1 = { 0 };
g_testCount = 0;
// 5, lengh of the queue; 50, max queue msg size.
// 5, length of the queue; 50, max queue msg size.
ret = LOS_QueueCreate("queue", 5, &g_queue, 0, 50);
TEST_TASK_PARAM_INIT(task1, "it_smp_task_068", (TSK_ENTRY_FUNC)TaskF01, TASK_PRIO_TEST_TASK - 1);

2
testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_069.c
View File

@ -71,7 +71,7 @@ static UINT32 Testcase(void)
UINT32 ret;
TSK_INIT_PARAM_S task1 = { 0 };
g_testCount = 0;
// 5, lengh of the queue; 50, max queue msg size.
// 5, length of the queue; 50, max queue msg size.
ret = LOS_QueueCreate("queue", 5, &g_queue, 0, 50);
TEST_TASK_PARAM_INIT(task1, "it_smp_task_065", (TSK_ENTRY_FUNC)TaskF01, TASK_PRIO_TEST_TASK - 1);

4
testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_129.c
View File

@ -57,7 +57,7 @@ static UINT32 Testcase(void)
int i;
for (i = 0; i < LOSCFG_KERNEL_CORE_NUM; i++) {
/* creat core_num same priority tasks */
/* create core_num same priority tasks */
task1.usCpuAffiMask = 0;
ret = LOS_TaskCreate(&testTaskIDSmp[i], &task1);
ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
@ -72,7 +72,7 @@ static UINT32 Testcase(void)
timesliceCount2 = TestTickCountGet();
/* Check if task yield definitely successed */
/* Check if task yield definitely succeeded */
ICUNIT_GOTO_NOT_EQUAL(timesliceCount2, timesliceCount1, timesliceCount2 - timesliceCount1, EXIT);
for (i = 0; i < LOSCFG_KERNEL_CORE_NUM; i++) {

2
testsuites/kernel/sample/kernel_base/ipc/sem/It_los_sem.c
View File

@ -115,7 +115,7 @@ VOID ItSuiteLosSem(void)
ItLosSem037();
ItLosSem038();
#ifndef LOSCFG_KERNEL_SMP_TASK_SYNC
// LOSCFG_KERNEL_SMP_TASK_SYNC is opened ,create task success is depend on created semaphore successed;
// LOSCFG_KERNEL_SMP_TASK_SYNC is opened ,create task success is depend on created semaphore succeeded;
ItLosSem039();
ItLosSem040();
ItLosSem041();

2
testsuites/kernel/sample/posix/mutex/full/It_posix_mutex_023.c
View File

@ -39,7 +39,7 @@ extern "C" {
/* pthread_mutex_init 4-1.c
* Test that pthread_mutex_init()
* Upon succesful completion, it shall return a 0
* Upon successful completion, it shall return a 0
*
*/
static UINT32 Testcase(VOID)

2
testsuites/kernel/sample/posix/mutex/full/It_posix_mutex_027.c
View File

@ -39,7 +39,7 @@ extern "C" {
/* pthread_mutex_destroy 3-1.c
* Test that pthread_mutex_destroy()
* Upon succesful completion, it shall return a 0
* Upon successful completion, it shall return a 0
*
*/
static UINT32 Testcase(VOID)

2
testsuites/kernel/sample/posix/mutex/full/It_posix_mutex_037.c
View File

@ -43,7 +43,7 @@ extern "C" {
* source tree.
* Test that pthread_mutex_lock()
* Upon succesful completion, it shall return a 0
* Upon successful completion, it shall return a 0
*
*/
static UINT32 Testcase(VOID)

2
testsuites/kernel/sample/posix/mutex/full/It_posix_mutex_039.c
View File

@ -42,7 +42,7 @@ extern "C" {
* shall release the mutex object 'mutex'.
* Steps:
* -- Initilize a mutex object
* -- initialize a mutex object
* -- Get the mutex using pthread_mutex_lock()
* -- Release the mutex using pthread_mutex_unlock()
* -- Try to get the mutex using pthread_mutex_trylock()

2
testsuites/kernel/sample/posix/mutex/full/It_posix_mutex_041.c
View File

@ -39,7 +39,7 @@ extern "C" {
/* pthread_mutex_unlock 3-1.c
* Test that pthread_mutex_unlock()
* Upon succesful completion, it shall return zero
* Upon successful completion, it shall return zero
*
*/
static UINT32 Testcase(VOID)

2
testsuites/kernel/sample/posix/mutex/full/It_posix_mutex_047.c
View File

@ -38,7 +38,7 @@ extern "C" {
/* pthread_mutex_trylock 3-1.c
* Test that pthread_mutex_trylock()
* Upon succesful completion, it shall return a 0
* Upon successful completion, it shall return a 0
*
*/
static UINT32 Testcase(VOID)

2
testsuites/kernel/sample/posix/mutex/full/It_posix_mutex_048.c
View File

@ -43,7 +43,7 @@ extern "C" {
* -[EBUSY] The mutex could not be acquired because it was already locked.
* Steps:
* -- Initilize a mutex object
* -- initialize a mutex object
* -- Lock the mutex using pthread_mutex_lock()
* -- Try to lock the mutex using pthread_mutex_trylock() and expect EBUSY
*

2
testsuites/unittest/common/osTest.cpp
View File

@ -366,7 +366,7 @@ VOID TestInitUartDev(VOID) {}
/* ****************************************
Function:Test_PartInit
Description: creat a partition for testing,partition num is 0,mount point is jffs0
Description: create a partition for testing,partition num is 0,mount point is jffs0
Input:
[1]type: "spinor"
[2]start_addr: the partition start address

2
testsuites/unittest/extended/liteipc/smgr_demo.cpp
View File

@ -196,7 +196,7 @@ static void HandleServiceRegAndGet(int fd, IpcMsg *data)
}
}
}
printf("recieve service request, code:%d, service name:%s\n", data->code, info->serviceName);
printf("receive service request, code:%d, service name:%s\n", data->code, info->serviceName);
switch (data->code) {
case REG_CODE:
if (i == MAX_SREVICE_NUM) {

2
testsuites/unittest/extended/signal/full/signal_test_017.cpp
View File

@ -131,7 +131,7 @@ static int TestMultiPthreadFatherProcessExit()
sleep(1);
retValue = waitpid(fpids, &status, 0);
// grandchild process kill father process, so child process is recovered by init process
// child process doesn't receive termination singal from grandchild process
// child process doesn't receive termination signal from grandchild process
// so waitpid() returns -1
ICUNIT_ASSERT_EQUAL(retValue, -1, retValue);
exit(1);

8
testsuites/unittest/libc/posix/mqueue/full/It_posix_queue_043.cpp
View File

@ -82,10 +82,10 @@ EXIT:
4. use the mq_close to close the mqueue;
5. use the mq_unlink to delete the mqueue.
*-@texpect
1. Return successed
2. Return successed
3. Return successed
4. Return successed
1. Return succeeded
2. Return succeeded
3. Return succeeded
4. Return succeeded
5. Successful operation
*-@tprior 1
*-@tauto TRUE