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

fix: l0 shell adapt new master 

Change-Id: Ia4e0c848b76e8fda7c5a2f9e1b2246b2a09947a4
Signed-off-by: silen <wuyunjie@huawei.com>
This commit is contained in:
silen 2021-07-17 19:54:42 +08:00
parent ad15bbd6a4
commit fd2227e5c8
6 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/shell/include/shell.h
View File

@ -34,6 +34,7 @@
#include "pthread.h" #include "pthread.h"
#include "limits.h" #include "limits.h"
#include "los_compiler.h"
#ifdef __cplusplus #ifdef __cplusplus
#if __cplusplus #if __cplusplus
@ -90,7 +91,6 @@ typedef struct {
VOID *cmdMaskKeyLink; VOID *cmdMaskKeyLink;
UINT32 shellBufOffset; UINT32 shellBufOffset;
UINT32 shellKeyType; UINT32 shellKeyType;
EVENT_CB_S shellEvent;
pthread_mutex_t keyMutex; pthread_mutex_t keyMutex;
pthread_mutex_t historyMutex; pthread_mutex_t historyMutex;
CHAR shellBuf[SHOW_MAX_LEN]; CHAR shellBuf[SHOW_MAX_LEN];

2
components/shell/src/base/shcmd.c
View File

@ -38,7 +38,6 @@
#include "securec.h" #include "securec.h"
#include "los_mux.h" #include "los_mux.h"
#include "los_memory.h" #include "los_memory.h"
#include "los_typedef.h"
#define SHELL_INIT_MAGIC_FLAG 0xABABABAB #define SHELL_INIT_MAGIC_FLAG 0xABABABAB
@ -325,7 +324,6 @@ OUT:
} }
ShellCB *OsGetShellCb(VOID) ShellCB *OsGetShellCb(VOID)
{ {
return g_shellCB; return g_shellCB;
} }

1
components/shell/src/cmds/date_shell.c
View File

@ -33,7 +33,6 @@
#include "shell.h" #include "shell.h"
#include "stdlib.h" #include "stdlib.h"
#include "sys/time.h" #include "sys/time.h"
#include "los_typedef.h"
#include "sys/stat.h" #include "sys/stat.h"
#include "securec.h" #include "securec.h"

3
components/shell/src/cmds/fullpath.c
View File

@ -85,7 +85,6 @@ static char *StrNormalizePath(char *fullpath)
char *src = fullpath; char *src = fullpath;
/* 2: The position of the path character: / and the end character /0 */ /* 2: The position of the path character: / and the end character /0 */
while (*src != '\0') { while (*src != '\0') {
if (*src == '.') { if (*src == '.') {
if (*(src + 1) == '/') { if (*(src + 1) == '/') {
@ -267,6 +266,6 @@ int VfsNormalizePath(const char *directory, const char *filename, char **pathnam
} }
*pathname = fullpath; *pathname = fullpath;
return ENOERR; return 0;
} }

6
components/shell/src/cmds/task_shellcmd.c
View File

@ -31,13 +31,13 @@
#include "stdlib.h" #include "stdlib.h"
#include "los_config.h" #include "los_config.h"
#include "los_exc.h"
#include "los_task.h" #include "los_task.h"
#include "los_sem.h" #include "los_sem.h"
#include "shcmd.h" #include "shcmd.h"
#include "shell.h" #include "shell.h"
#define OS_INVALID_SEM_ID 0xFFFFFFFF #define OS_INVALID_SEM_ID 0xFFFFFFFF
#define OS_ALL_TASK_MASK 0xFFFFFFFF
LITE_OS_SEC_TEXT_MINOR UINT8 *OsShellCmdConvertTskStatus(UINT16 taskStatus) LITE_OS_SEC_TEXT_MINOR UINT8 *OsShellCmdConvertTskStatus(UINT16 taskStatus)
{ {
@ -48,8 +48,8 @@ LITE_OS_SEC_TEXT_MINOR UINT8 *OsShellCmdConvertTskStatus(UINT16 taskStatus)
} else { } else {
if (taskStatus & OS_TASK_STATUS_DELAY) { if (taskStatus & OS_TASK_STATUS_DELAY) {
return (UINT8 *)"Delay"; return (UINT8 *)"Delay";
} else if (taskStatus & OS_TASK_STATUS_PEND_QUEUE) { } else if (taskStatus & OS_TASK_STATUS_PEND_TIME) {
return (UINT8 *)"Pend"; return (UINT8 *)"PendTime";
} else if (taskStatus & OS_TASK_STATUS_PEND) { } else if (taskStatus & OS_TASK_STATUS_PEND) {
return (UINT8 *)"Pend"; return (UINT8 *)"Pend";
} else if (taskStatus & OS_TASK_STATUS_SUSPEND) { } else if (taskStatus & OS_TASK_STATUS_SUSPEND) {

3
components/shell/src/cmds/vfs_shellcmd.c
View File

@ -30,16 +30,13 @@
*/ */
#include "los_config.h" #include "los_config.h"
#include "sys/mount.h"
#include "los_task.h" #include "los_task.h"
#include "los_typedef.h"
#include "shell.h" #include "shell.h"
#include "sys/stat.h" #include "sys/stat.h"
#include "stdlib.h" #include "stdlib.h"
#include "unistd.h" #include "unistd.h"
#include "fcntl.h" #include "fcntl.h"
#include "sys/statfs.h"
#include "stdio.h" #include "stdio.h"
#include "pthread.h" #include "pthread.h"