chinky/rtt-f030
chinky
/
rtt-f030
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[finsh] code cleanup and use RT_USING_POSIX to replace RT_USING_POSIX_STDIN.

This commit is contained in:
bernard 2017-10-17 22:28:05 +08:00
parent 9b87270682
commit d118852314
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
components/finsh/shell.h
View File

@ -44,21 +44,21 @@
#define FINSH_THREAD_STACK_SIZE 2048 #define FINSH_THREAD_STACK_SIZE 2048
#endif #endif
#ifndef FINSH_CMD_SIZE #ifndef FINSH_CMD_SIZE
#define FINSH_CMD_SIZE 80 #define FINSH_CMD_SIZE 80
#endif #endif
#define FINSH_OPTION_ECHO 0x01 #define FINSH_OPTION_ECHO 0x01
#if defined(FINSH_USING_MSH) || (defined(RT_USING_DFS) && defined(DFS_USING_WORKDIR)) #if defined(FINSH_USING_MSH) || (defined(RT_USING_DFS) && defined(DFS_USING_WORKDIR))
#define FINSH_PROMPT finsh_get_prompt() #define FINSH_PROMPT finsh_get_prompt()
const char* finsh_get_prompt(void); const char* finsh_get_prompt(void);
#else #else
#define FINSH_PROMPT "finsh>>" #define FINSH_PROMPT "finsh>>"
#endif #endif
#ifdef FINSH_USING_HISTORY #ifdef FINSH_USING_HISTORY
#ifndef FINSH_HISTORY_LINES #ifndef FINSH_HISTORY_LINES
#define FINSH_HISTORY_LINES 5 #define FINSH_HISTORY_LINES 5
#endif #endif
#endif #endif
#ifdef FINSH_USING_AUTH #ifdef FINSH_USING_AUTH
@ -75,39 +75,39 @@ const char* finsh_get_prompt(void);
enum input_stat enum input_stat
{ {
WAIT_NORMAL, WAIT_NORMAL,
WAIT_SPEC_KEY, WAIT_SPEC_KEY,
WAIT_FUNC_KEY, WAIT_FUNC_KEY,
}; };
struct finsh_shell struct finsh_shell
{ {
struct rt_semaphore rx_sem; struct rt_semaphore rx_sem;
enum input_stat stat; enum input_stat stat;
rt_uint8_t echo_mode:1; rt_uint8_t echo_mode:1;
#ifdef FINSH_USING_HISTORY #ifdef FINSH_USING_HISTORY
rt_uint16_t current_history; rt_uint16_t current_history;
rt_uint16_t history_count; rt_uint16_t history_count;
char cmd_history[FINSH_HISTORY_LINES][FINSH_CMD_SIZE]; char cmd_history[FINSH_HISTORY_LINES][FINSH_CMD_SIZE];
#endif #endif
#ifndef FINSH_USING_MSH_ONLY #ifndef FINSH_USING_MSH_ONLY
struct finsh_parser parser; struct finsh_parser parser;
#endif #endif
char line[FINSH_CMD_SIZE]; char line[FINSH_CMD_SIZE];
rt_uint8_t line_position; rt_uint8_t line_position;
rt_uint8_t line_curpos; rt_uint8_t line_curpos;
#ifndef RT_USING_POSIX_STDIN #ifndef RT_USING_POSIX
rt_device_t device; rt_device_t device;
#endif #endif
#ifdef FINSH_USING_AUTH #ifdef FINSH_USING_AUTH
char password[FINSH_PASSWORD_MAX]; char password[FINSH_PASSWORD_MAX];
#endif #endif
}; };