diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-03 22:31:48 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-03 22:31:48 +0000 |
| commit | 7fb45f7b0753769e803bf5de5b2df638b41d07d6 (patch) | |
| tree | 8add7f616ac5d2b3e294140dd982390c49b2b7bb /nuttx | |
| parent | cb842a3b50a28145bb8be977f4e9a7069701c88d (diff) | |
| download | nuttx-7fb45f7b0753769e803bf5de5b2df638b41d07d6.tar.gz nuttx-7fb45f7b0753769e803bf5de5b2df638b41d07d6.tar.bz2 nuttx-7fb45f7b0753769e803bf5de5b2df638b41d07d6.zip | |
Fix an NxWidgets bug; Update NxWM (it kind of works now)
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4693 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/configs/sim/README.txt | 41 | ||||
| -rw-r--r-- | nuttx/fs/fs_fdopen.c | 2 |
2 files changed, 42 insertions, 1 deletions
diff --git a/nuttx/configs/sim/README.txt b/nuttx/configs/sim/README.txt index 4886a4295..3be43bf80 100644 --- a/nuttx/configs/sim/README.txt +++ b/nuttx/configs/sim/README.txt @@ -419,6 +419,47 @@ nxwm trunk/NxWidgets/UnitTests/READEM.txt + NOTE: 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 + intput. 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 + - (void)nsh_script(&pstate->cn_vtbl, "init", NSH_INITPATH); + +// REMOVE ME + +// (void)nsh_script(&pstate->cn_vtbl, "init", NSH_INITPATH); + #endif + + /* Then enter the command line parsing loop */ + @@ -130,7 +131,8 @@ + fflush(pstate->cn_outstream); + + /* Get the next line of input */ + - + +sleep(2); // REMOVE ME + +#if 0 // REMOVE ME + ret = readline(pstate->cn_line, CONFIG_NSH_LINELEN, + INSTREAM(pstate), OUTSTREAM(pstate)); + if (ret > 0) + @@ -153,6 +155,7 @@ + "readline", NSH_ERRNO_OF(-ret)); + nsh_exit(&pstate->cn_vtbl, 1); + } + +#endif // REMOVE ME + } + + /* Clean up */ + ostest Description diff --git a/nuttx/fs/fs_fdopen.c b/nuttx/fs/fs_fdopen.c index 9ee543a88..09af07124 100644 --- a/nuttx/fs/fs_fdopen.c +++ b/nuttx/fs/fs_fdopen.c @@ -168,7 +168,7 @@ FAR struct file_struct *fs_fdopen(int fd, int oflags, FAR _TCB *tcb) #endif } - /* The descriptor is in a valid range to file descriptor... do the read */ + /* The descriptor is in a valid range to file descriptor... perform some more checks */ #if CONFIG_NFILE_DESCRIPTORS > 0 else |