diff options
| author | bernard <[email protected]> | 2013-10-10 00:22:59 +0900 |
|---|---|---|
| committer | bernard <[email protected]> | 2013-10-10 00:22:59 +0900 |
| commit | 1ffb99e6f58d2ba8d9e0f0cfba2bbb158c0ecee7 (patch) | |
| tree | c5e438f5db85072b981923d64572cdb763ca4372 /components/finsh | |
| parent | f1107f6714a2d6e53f94c957fb352846407c56f9 (diff) | |
| parent | 83bb05419f7aba80f6a10a48f88a2838a356737a (diff) | |
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
Diffstat (limited to 'components/finsh')
| -rw-r--r-- | components/finsh/msh_cmd.c | 2 | ||||
| -rw-r--r-- | components/finsh/shell.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/components/finsh/msh_cmd.c b/components/finsh/msh_cmd.c index fac90479c8..cffb374c2e 100644 --- a/components/finsh/msh_cmd.c +++ b/components/finsh/msh_cmd.c @@ -136,6 +136,7 @@ int cmd_rm(int argc, char** argv) } FINSH_FUNCTION_EXPORT_ALIAS(cmd_rm, __cmd_rm, "Remove (unlink) the FILE(s)."); +#ifdef DFS_USING_WORKDIR int cmd_cd(int argc, char** argv) { if (argc == 1) @@ -157,6 +158,7 @@ int cmd_pwd(int argc, char** argv) return 0; } FINSH_FUNCTION_EXPORT_ALIAS(cmd_pwd, __cmd_pwd, Print the name of the current working directory.); +#endif int cmd_mkdir(int argc, char** argv) { diff --git a/components/finsh/shell.c b/components/finsh/shell.c index 19dd93691e..8ff0e89e44 100644 --- a/components/finsh/shell.c +++ b/components/finsh/shell.c @@ -131,6 +131,7 @@ void finsh_set_device(const char* device_name) { /* close old finsh device */ rt_device_close(shell->device); + rt_device_set_rx_indicate(dev, RT_NULL); } shell->device = dev; |