diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-04-05 01:46:55 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-04-05 01:46:55 +0000 |
commit | 354116817a07fe13eae9ddfb21c369d67552c72a (patch) | |
tree | 90aad11bc02348e1c88fd17c9acb96fc67b62bd3 /apps | |
parent | a086a5b65839065f33764678c541d3af4afb0568 (diff) | |
download | nuttx-354116817a07fe13eae9ddfb21c369d67552c72a.tar.gz nuttx-354116817a07fe13eae9ddfb21c369d67552c72a.tar.bz2 nuttx-354116817a07fe13eae9ddfb21c369d67552c72a.zip |
Progress toward kernel build
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3465 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps')
-rw-r--r-- | apps/nshlib/nsh_parse.c | 4 | ||||
-rw-r--r-- | apps/nshlib/nsh_proccmds.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/apps/nshlib/nsh_parse.c b/apps/nshlib/nsh_parse.c index e93c624fa..fe7423f66 100644 --- a/apps/nshlib/nsh_parse.c +++ b/apps/nshlib/nsh_parse.c @@ -153,7 +153,7 @@ static const struct cmdmap_s g_cmdmap[] = #endif #if CONFIG_NFILE_DESCRIPTORS > 0 -# ifndef CONFIG_NSH_DISABLE_LS +# ifndef CONFIG_NSH_DISABLE_DD { "dd", cmd_dd, 3, 6, "if=<infile> of=<outfile> [bs=<sectsize>] [count=<sectors>] [skip=<sectors>]" }, # endif #endif @@ -194,7 +194,7 @@ static const struct cmdmap_s g_cmdmap[] = #endif #ifndef CONFIG_DISABLE_SIGNALS -# ifndef CONFIG_NSH_DISABLE_SLEEP +# ifndef CONFIG_NSH_DISABLE_KILL { "kill", cmd_kill, 3, 3, "-<signal> <pid>" }, # endif #endif diff --git a/apps/nshlib/nsh_proccmds.c b/apps/nshlib/nsh_proccmds.c index 0ee48a71d..7abd50ec1 100644 --- a/apps/nshlib/nsh_proccmds.c +++ b/apps/nshlib/nsh_proccmds.c @@ -69,6 +69,7 @@ typedef int (*exec_t)(void); * Private Data ****************************************************************************/ +#ifndef CONFIG_NSH_DISABLE_PS static const char *g_statenames[] = { "INVALID ", @@ -85,6 +86,7 @@ static const char *g_statenames[] = "MQNFULL " #endif }; +#endif /**************************************************************************** * Public Data |