mirror of
https://github.com/apache/nuttx.git
synced 2026-06-06 00:14:22 +08:00
configs/sim/nxwm now uses kconfig-frontends
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5449 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
+46
-35
@@ -461,46 +461,57 @@ nxwm
|
|||||||
|
|
||||||
nuttx-code/NxWidgets/UnitTests/READEM.txt
|
nuttx-code/NxWidgets/UnitTests/READEM.txt
|
||||||
|
|
||||||
NOTE: There is an issue with running this example under the
|
NOTES
|
||||||
simulation. In the default configuration, this example will
|
-----
|
||||||
run the NxConsole example which waits on readline() for console
|
1. This configuration uses the mconf-based configuration tool. To
|
||||||
intput. When it calls readline(), the whole system blocks
|
change this configuration using that tool, you should:
|
||||||
waiting from input from the host OS. So, in order to get
|
|
||||||
this example to run, you must comment out the readline call in
|
|
||||||
apps/nshlib/nsh_consolemain.c like:
|
|
||||||
|
|
||||||
Index: nsh_consolemain.c
|
a. Build and install the mconf tool. See nuttx/README.txt and
|
||||||
===================================================================
|
misc/tools/
|
||||||
--- nsh_consolemain.c (revision 4681)
|
|
||||||
+++ nsh_consolemain.c (working copy)
|
b. Execute 'make menuconfig' in nuttx/ in order to start the
|
||||||
@@ -117,7 +117,8 @@
|
reconfiguration process.
|
||||||
/* Execute the startup script */
|
|
||||||
|
2. There is an issue with running this example under the
|
||||||
|
simulation. In the default configuration, this example will
|
||||||
|
run the NxConsole example which waits on readline() for console
|
||||||
|
input. When it calls readline(), the whole system blocks
|
||||||
|
waiting from input from the host OS. So, in order to get
|
||||||
|
this example to run, you must comment out the readline call in
|
||||||
|
apps/nshlib/nsh_consolemain.c like:
|
||||||
|
|
||||||
|
Index: nsh_consolemain.c
|
||||||
|
===================================================================
|
||||||
|
--- nsh_consolemain.c (revision 4681)
|
||||||
|
+++ nsh_consolemain.c (working copy)
|
||||||
|
@@ -117,7 +117,8 @@
|
||||||
|
/* Execute the startup script */
|
||||||
|
|
||||||
#ifdef CONFIG_NSH_ROMFSETC
|
#ifdef CONFIG_NSH_ROMFSETC
|
||||||
- (void)nsh_script(&pstate->cn_vtbl, "init", NSH_INITPATH);
|
- (void)nsh_script(&pstate->cn_vtbl, "init", NSH_INITPATH);
|
||||||
+// REMOVE ME
|
+// REMOVE ME
|
||||||
+// (void)nsh_script(&pstate->cn_vtbl, "init", NSH_INITPATH);
|
+// (void)nsh_script(&pstate->cn_vtbl, "init", NSH_INITPATH);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Then enter the command line parsing loop */
|
/* Then enter the command line parsing loop */
|
||||||
@@ -130,7 +131,8 @@
|
@@ -130,7 +131,8 @@
|
||||||
fflush(pstate->cn_outstream);
|
fflush(pstate->cn_outstream);
|
||||||
|
|
||||||
/* Get the next line of input */
|
/* Get the next line of input */
|
||||||
-
|
-
|
||||||
+sleep(2); // REMOVE ME
|
+sleep(2); // REMOVE ME
|
||||||
+#if 0 // REMOVE ME
|
+#if 0 // REMOVE ME
|
||||||
ret = readline(pstate->cn_line, CONFIG_NSH_LINELEN,
|
ret = readline(pstate->cn_line, CONFIG_NSH_LINELEN,
|
||||||
INSTREAM(pstate), OUTSTREAM(pstate));
|
INSTREAM(pstate), OUTSTREAM(pstate));
|
||||||
if (ret > 0)
|
if (ret > 0)
|
||||||
@@ -153,6 +155,7 @@
|
@@ -153,6 +155,7 @@
|
||||||
"readline", NSH_ERRNO_OF(-ret));
|
"readline", NSH_ERRNO_OF(-ret));
|
||||||
nsh_exit(&pstate->cn_vtbl, 1);
|
nsh_exit(&pstate->cn_vtbl, 1);
|
||||||
}
|
}
|
||||||
+#endif // REMOVE ME
|
+#endif // REMOVE ME
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Clean up */
|
/* Clean up */
|
||||||
|
|
||||||
ostest
|
ostest
|
||||||
|
|
||||||
|
|||||||
@@ -1,40 +0,0 @@
|
|||||||
############################################################################
|
|
||||||
# configs/sim/nxwm/appconfig
|
|
||||||
#
|
|
||||||
# Copyright (C) 2012 Gregory Nutt. All rights reserved.
|
|
||||||
# Author: Gregory Nutt <gnutt@nuttx.org>
|
|
||||||
#
|
|
||||||
# Redistribution and use in source and binary forms, with or without
|
|
||||||
# modification, are permitted provided that the following conditions
|
|
||||||
# are met:
|
|
||||||
#
|
|
||||||
# 1. Redistributions of source code must retain the above copyright
|
|
||||||
# notice, this list of conditions and the following disclaimer.
|
|
||||||
# 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
# notice, this list of conditions and the following disclaimer in
|
|
||||||
# the documentation and/or other materials provided with the
|
|
||||||
# distribution.
|
|
||||||
# 3. Neither the name NuttX nor the names of its contributors may be
|
|
||||||
# used to endorse or promote products derived from this software
|
|
||||||
# without specific prior written permission.
|
|
||||||
#
|
|
||||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
||||||
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
||||||
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
|
||||||
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
|
||||||
# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
|
||||||
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
||||||
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
|
||||||
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
||||||
# POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
#
|
|
||||||
############################################################################
|
|
||||||
|
|
||||||
# The NSH Library
|
|
||||||
|
|
||||||
CONFIGURED_APPS += system/readline
|
|
||||||
CONFIGURED_APPS += nshlib
|
|
||||||
|
|
||||||
+579
-281
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user